ToggleControl: Convert to TypeScript #43717
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
This was referenced Aug 30, 2022
mirka
commented
Aug 30, 2022
| const classes = cx( | ||
| 'components-toggle-control', | ||
| className, | ||
| ! __nextHasNoMarginBottom && css( { marginBottom: space( 3 ) } ) |
There was a problem hiding this comment.
For back compat, we set a custom value (12px) here instead of simply passing through the __nextHasNoMarginBottom to BaseControl. This is because ToggleControl was setting a custom margin-bottom value (12px) that was different from BaseControl's margin-bottom (8px).
|
Size Change: -87 B (0%) Total Size: 1.24 MB
ℹ️ View Unchanged
|
ciampo
approved these changes
Aug 31, 2022
There was a problem hiding this comment.
素晴らしい 🚀
We can merge once test failures are addressed
(also, pinging @jasmussen as promised in #39209 (comment))
| import ToggleControl from '../'; | ||
|
|
||
| describe( 'ToggleControl', () => { | ||
| it( 'triggers change callback with numeric value', () => { |
There was a problem hiding this comment.
Curious test name, I don't understand the "numeric value" part
| render( <ToggleControl label="My toggle" onChange={ () => {} } /> ); | ||
| expect( | ||
| screen.getByRole( 'checkbox' ) | ||
| ).not.toHaveAccessibleDescription(); |
mirka
force-pushed
the
ts-toggle-control
branch
from
cb823cf to
acd3541
Compare
ciampo
reviewed
Sep 1, 2022
Comment on lines
-2
to
-19
| .components-base-control { | ||
| .components-base-control__field { | ||
| align-items: center; | ||
| display: flex; | ||
| margin-bottom: 0; | ||
|
|
||
| & > label { | ||
| flex-grow: 1; | ||
| padding: 0.6rem 0 0.6rem 10px; | ||
| } | ||
| } | ||
| & + & { | ||
| margin-top: $grid-unit-20; | ||
| } | ||
|
|
||
| .components-base-control__help { | ||
| margin: -$grid-unit-10 0 $grid-unit-10 58px; | ||
| font-size: $helptext-font-size; | ||
| font-style: normal; | ||
| color: $gray-700; |
There was a problem hiding this comment.
Chipping at it a little bit at a time ⏳
ciampo
reviewed
Sep 1, 2022
| @@ -74,7 +74,6 @@ | |||
| "src/search-control", | |||
| "src/snackbar", | |||
| "src/tab-panel", | |||
| "src/toggle-control", | |||
|
Storybook looks good to me. That is — I don't see anything wrong with the toggle control. |
|
In my review I missed the case where the toggle has help text. This is how the toggle use to look with the spacing between toggle and help text:
This is how it looks now:
The space may have been a teensy bit too big in the previous case — it should be 8px — but it's gone at the moment. Sorry for not catching this! |
No worries, that style breakage is due to overrides in the Inspector, not the component itself. It should be fine in Storybook. I'll see what I can do about the override breakage. |
cbravobernal
added
the
[Type] Code Quality
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.
Part of #35744 #38730
What?
__nextHasNoMarginBottomprop for removing margins.Why?
Better devex.
Testing Instructions
npm run storybook:devand check the stories for ToggleControl.Note that the space between the toggle and the
helptext is narrower than on trunk. This is intentional, to address #39209 (comment).