Skip to content

Commit

Permalink
fix(Group): spacing adaptivity (#5364)
Browse files Browse the repository at this point in the history
- исправил адаптивность(вынес определение mode на js)
- исправил разделители между группами
  • Loading branch information
SevereCloud authored Jun 27, 2023
1 parent e640cb6 commit 7c418a4
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 41 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 18 additions & 27 deletions packages/vkui/src/components/Group/Group.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
display: none;
}

.Group--sizeX-compact + .Group__separator--spacing + .Group__separator--separator,
.Group--mode-plain + .Group__separator--spacing + .Group__separator--separator {
.Group--mode-plain + * + .Group__separator--separator {
display: block;
}

@media (--sizeX-compact) {
.Group--sizeX-none + .Group__separator--spacing + .Group__separator--separator {
.Group--sizeX-none.Group--mode-none + * + .Group__separator--separator {
display: block;
}
}

.Group--sizeX-regular.Group--mode-none + .Group__separator--spacing {
.Group--mode-card + .Group__separator--spacing {
display: block;
}

Expand All @@ -30,12 +29,25 @@
}
}

.Group--sizeX-regular.Group--mode-none.Group--padding-s,
.Group:last-of-type ~ .Group__separator {
display: none;
}

.Group:last-of-type ~ .Group__separator--force,
.Group--mode-card:last-of-type + .Group__separator--spacing {
display: block;
}

@media (--sizeX-regular) {
.Group--sizeX-none.Group--mode-none:last-of-type + .Group__separator--spacing {
display: block;
}
}

.Group--mode-card.Group--padding-s {
padding: 4px;
}

.Group--sizeX-regular.Group--mode-none.Group--padding-m,
.Group--mode-card.Group--padding-m {
padding: 8px;
}
Expand All @@ -62,7 +74,6 @@
}
}

.Group--sizeX-regular.Group--mode-none,
.Group--mode-card {
background: var(--vkui--color_background_content);
border-radius: var(--vkui--size_border_radius_paper--regular);
Expand All @@ -77,7 +88,6 @@
}
}

.Group--sizeX-regular.Group--mode-none::after,
.Group--mode-card::after {
content: '';
left: 0;
Expand All @@ -104,8 +114,6 @@
}
}

.Group--sizeX-compact.Group--mode-none + .Group__separator,
.Group--sizeX-compact.Group--mode-none + .Group__separator + .Group__separator,
.Group--mode-plain + .Group__separator,
.Group--mode-plain + .Group__separator + .Group__separator {
padding-top: 8px;
Expand All @@ -120,23 +128,6 @@
}
}

.Group:last-of-type ~ .Group__separator {
display: none;
}

.Group:last-of-type ~ .Group__separator--force,
.Group--sizeX-regular.Group--mode-none:last-of-type + .Group__separator--spacing,
.Group--sizeX-regular.Group--mode-card:last-of-type + .Group__separator--spacing {
display: block;
}

@media (--sizeX-regular) {
.Group--sizeX-none.Group--mode-card:last-of-type + .Group__separator--spacing,
.Group--sizeX-none.Group--mode-none:last-of-type + .Group__separator--spacing {
display: block;
}
}

.Group__description {
display: block;
padding: 4px 16px 16px;
Expand Down
7 changes: 5 additions & 2 deletions packages/vkui/src/components/Group/Group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import styles from './Group.module.css';
const sizeXClassNames = {
none: styles['Group--sizeX-none'],
[SizeType.COMPACT]: styles['Group--sizeX-compact'],
[SizeType.REGULAR]: styles['Group--sizeX-regular'],
};

export interface GroupProps
Expand Down Expand Up @@ -70,6 +69,10 @@ export const Group = ({
mode = isInsideModal ? 'plain' : 'none';
}

if (mode === 'none' && sizeX !== 'none') {
mode = sizeX === SizeType.REGULAR ? 'card' : 'plain';
}

const isTabPanel = restProps.role === 'tabpanel';

if (
Expand Down Expand Up @@ -99,7 +102,7 @@ export const Group = ({
'vkuiInternalGroup',
styles['Group'],
platform === Platform.IOS && styles['Group--ios'],
sizeXClassNames[sizeX],
sizeX !== SizeType.REGULAR && sizeXClassNames[sizeX],
mode &&
{
none: classNames(styles['Group--mode-none'], 'vkuiInternalGroup--mode-none'),
Expand Down

0 comments on commit 7c418a4

Please sign in to comment.