Flex: Remove flex gap polyfill
#43995
Merged
Conversation
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
- Fixes regression in CustomSelectControl - Fixes styles for labelPosition='bottom'
mirka
added
[Type] Bug
mirka
commented
Sep 8, 2022
| @@ -138,7 +90,6 @@ export function useFlex( props: WordPressComponentProps< FlexProps, 'div' > ) { | |||
| isReverse, | |||
| justify, | |||
| wrap, | |||
| rtlWatchResult, | |||
There was a problem hiding this comment.
We don't need to rely on rtl.watch() anymore.
| isFocused={ isFocused } | ||
| labelPosition={ labelPosition } | ||
| ref={ ref } | ||
| > | ||
| <LabelWrapper> |
There was a problem hiding this comment.
This LabelWrapper was moved into Label itself, so it can be rendered only when the label is visible. Otherwise it stays in the DOM even when the label is visually hidden, and messes with the flex gap.
Comment on lines
-36
to
-50
| const rootLabelPositionStyles = ( { labelPosition }: RootProps ) => { | ||
| switch ( labelPosition ) { | ||
| case 'top': | ||
| return css` | ||
| align-items: flex-start; | ||
| flex-direction: column; | ||
| `; | ||
| case 'bottom': | ||
| return css` | ||
| align-items: flex-start; | ||
| flex-direction: column-reverse; | ||
| `; | ||
| case 'edge': | ||
| return css` | ||
| justify-content: space-between; |
There was a problem hiding this comment.
This was actually redundant because there was already a hook that added this logic and passed it as props to the Flex component:
gutenberg/packages/components/src/input-control/input-base.tsx
Lines 35 to 52 in 6987dd8
Comment on lines
-73
to
-76
| // Normalizes the margins from the <Flex /> (components/ui/flex/) container. | ||
| const containerMarginStyles = ( { hideLabel }: ContainerProps ) => { | ||
| return hideLabel ? css( { margin: '0 !important' } ) : null; | ||
| }; |
|
Thanks for working on this, it's a deligt to see so much red code! |
ciampo
approved these changes
Sep 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What?
Removes the margin-based polyfill implementation of flex
gap.Why?
Flex
gapis now at an acceptable adoption percentage.Using the browser's native flex gap will make our code much simpler, and will avoid complications with child components having legacy style overrides involving margins.
Testing Instructions
npm run storybook:devand check that Flex, VStack, and HStack still work as expected when thegapandwrapprops are set.npm run devand smoke test the editor UI.There is a good chance of whitespace regressions where there are margin overrides involved. The only one I could find was a regression in CustomSelectControl, which I fixed at the root by removing margin overrides in InputControl.
Screenshots
This cleanup also fixes a bug in InputControl when
labelPosition='bottom':Otherwise, there shouldn't be any visual changes.