feat(Toolbar): updated spacer props to gap #10418
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,21 +34,119 @@ export interface ToolbarGroupProps extends Omit<React.HTMLProps<HTMLDivElement>, | |
| alignItems?: 'start' | 'center' | 'baseline' | 'default'; | ||
| /** Vertical alignment */ | ||
| alignSelf?: 'start' | 'center' | 'baseline' | 'default'; | ||
| /** Sets both the column and row gap at various breakpoints. */ | ||
| gap?: { | ||
| default?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap_2xl' | 'gap_3xl' | 'gap_4xl'; | ||
| md?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap_2xl' | 'gap_3xl' | 'gap_4xl'; | ||
| lg?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap_2xl' | 'gap_3xl' | 'gap_4xl'; | ||
| xl?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap_2xl' | 'gap_3xl' | 'gap_4xl'; | ||
| '2xl'?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap_2xl' | 'gap_3xl' | 'gap_4xl'; | ||
| }; | ||
| /** Sets only the column gap at various breakpoints. */ | ||
| columnGap?: { | ||
| default?: | ||
| | 'columnGapNone' | ||
| | 'columnGapXs' | ||
| | 'columnGapSm' | ||
| | 'columnGapMd' | ||
| | 'columnGapLg' | ||
| | 'columnGapXl' | ||
| | 'columnGap_2xl' | ||
| | 'columnGap_3xl' | ||
| | 'columnGap_4xl'; | ||
|
Comment on lines
+54
to
+56
There was a problem hiding this comment. Just curious about the There was a problem hiding this comment. This should be due to the missing hyphen in the margin classnames. Whatever logic There was a problem hiding this comment. Hmm... I'm not sure I understand how these values are tied to the margin modifiers? And why only the ones that start with numbers are prefixed with an underscore. |
||
| md?: | ||
| | 'columnGapNone' | ||
| | 'columnGapXs' | ||
| | 'columnGapSm' | ||
| | 'columnGapMd' | ||
| | 'columnGapLg' | ||
| | 'columnGapXl' | ||
| | 'columnGap_2xl' | ||
| | 'columnGap_3xl' | ||
| | 'columnGap_4xl'; | ||
| lg?: | ||
| | 'columnGapNone' | ||
| | 'columnGapXs' | ||
| | 'columnGapSm' | ||
| | 'columnGapMd' | ||
| | 'columnGapLg' | ||
| | 'columnGapXl' | ||
| | 'columnGap_2xl' | ||
| | 'columnGap_3xl' | ||
| | 'columnGap_4xl'; | ||
| xl?: | ||
| | 'columnGapNone' | ||
| | 'columnGapXs' | ||
| | 'columnGapSm' | ||
| | 'columnGapMd' | ||
| | 'columnGapLg' | ||
| | 'columnGapXl' | ||
| | 'columnGap_2xl' | ||
| | 'columnGap_3xl' | ||
| | 'columnGap_4xl'; | ||
| '2xl'?: | ||
| | 'columnGapNone' | ||
| | 'columnGapXs' | ||
| | 'columnGapSm' | ||
| | 'columnGapMd' | ||
| | 'columnGapLg' | ||
| | 'columnGapXl' | ||
| | 'columnGap_2xl' | ||
| | 'columnGap_3xl' | ||
| | 'columnGap_4xl'; | ||
| }; | ||
| /** Sets only the row gap at various breakpoints. */ | ||
| rowGap?: { | ||
| default?: | ||
| | 'rowGapNone' | ||
| | 'rowGapXs' | ||
| | 'rowGapSm' | ||
| | 'rowGapMd' | ||
| | 'rowGapLg' | ||
| | 'rowGapXl' | ||
| | 'rowGap_2xl' | ||
| | 'rowGao_3xl' | ||
| | 'rowGap_4xl'; | ||
| md?: | ||
| | 'rowGapNone' | ||
| | 'rowGapXs' | ||
| | 'rowGapSm' | ||
| | 'rowGapMd' | ||
| | 'rowGapLg' | ||
| | 'rowGapXl' | ||
| | 'rowGap_2xl' | ||
| | 'rowGao_3xl' | ||
| | 'rowGap_4xl'; | ||
| lg?: | ||
| | 'rowGapNone' | ||
| | 'rowGapXs' | ||
| | 'rowGapSm' | ||
| | 'rowGapMd' | ||
| | 'rowGapLg' | ||
| | 'rowGapXl' | ||
| | 'rowGap_2xl' | ||
| | 'rowGao_3xl' | ||
| | 'rowGap_4xl'; | ||
| xl?: | ||
| | 'rowGapNone' | ||
| | 'rowGapXs' | ||
| | 'rowGapSm' | ||
| | 'rowGapMd' | ||
| | 'rowGapLg' | ||
| | 'rowGapXl' | ||
| | 'rowGap_2xl' | ||
| | 'rowGao_3xl' | ||
| | 'rowGap_4xl'; | ||
| '2xl'?: | ||
| | 'rowGapNone' | ||
| | 'rowGapXs' | ||
| | 'rowGapSm' | ||
| | 'rowGapMd' | ||
| | 'rowGapLg' | ||
| | 'rowGapXl' | ||
| | 'rowGap_2xl' | ||
| | 'rowGao_3xl' | ||
| | 'rowGap_4xl'; | ||
| }; | ||
| /** Content to be rendered inside the data toolbar group */ | ||
| children?: React.ReactNode; | ||
|
|
@@ -65,8 +163,9 @@ class ToolbarGroupWithRef extends React.Component<ToolbarGroupProps> { | |
| align, | ||
| alignItems, | ||
| alignSelf, | ||
| gap, | ||
| columnGap, | ||
| rowGap, | ||
| className, | ||
| variant, | ||
| children, | ||
|
|
@@ -84,8 +183,9 @@ class ToolbarGroupWithRef extends React.Component<ToolbarGroupProps> { | |
| variant && styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup'], | ||
| formatBreakpointMods(visibility, styles, '', getBreakpoint(width)), | ||
| formatBreakpointMods(align, styles, '', getBreakpoint(width)), | ||
| formatBreakpointMods(gap, styles, '', getBreakpoint(width)), | ||
| formatBreakpointMods(columnGap, styles, '', getBreakpoint(width)), | ||
| formatBreakpointMods(rowGap, styles, '', getBreakpoint(width)), | ||
| alignItems === 'start' && styles.modifiers.alignItemsStart, | ||
| alignItems === 'center' && styles.modifiers.alignItemsCenter, | ||
| alignItems === 'baseline' && styles.modifiers.alignItemsBaseline, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a blocker, but I would update/ add unit test to verify that
formatBreakpointModsformats all the values accurately.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this be tackled as part of #7594?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can, as long as we at least test them manually.