Button: Add __next40pxDefaultSize in block-editor 6
#65742
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
mirka
added
[Type] Code Quality
21 tasks
|
Size Change: -251 B (-0.01%) Total Size: 1.77 MB
ℹ️ View Unchanged
|
mirka
commented
Sep 30, 2024
| @@ -28,8 +28,7 @@ export default function SkipToSelectedBlock() { | |||
|
|
|||
| return selectedBlockClientId ? ( | |||
| <Button | |||
| // TODO: Switch to `true` (40px size) if possible | |||
| __next40pxDefaultSize={ false } | |||
| __next40pxDefaultSize | |||
There was a problem hiding this comment.
Insert a Paragraph block, and hit Tab all the way through the block inspector sidebar until this skip button pops up.
| Before | After |
|---|---|
 |
 |
| line-height: normal; | ||
| box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6); | ||
| text-decoration: none; | ||
| outline: none; | ||
| z-index: z-index(".skip-to-selected-block"); |
There was a problem hiding this comment.
I removed some arbitrary and/or seemingly unnecessary style overrides. Maybe we can also remove the font size and weight, but left those as is for now.
There was a problem hiding this comment.
could we remove the background styles too?
There was a problem hiding this comment.
I can kind of see how someone would want a background color here, given that the button floats above a white background. I'd say a complete reconsideration of the remaining overrides (font size, weight, background) is a separate issue.
| @@ -44,8 +44,7 @@ function ToolSelector( props, ref ) { | |||
| <Dropdown | |||
| renderToggle={ ( { isOpen, onToggle } ) => ( | |||
| <Button | |||
| // TODO: Switch to `true` (40px size) if possible | |||
| __next40pxDefaultSize={ false } | |||
| size="compact" | |||
There was a problem hiding this comment.
In the app, the size="compact" is already passed from the consumer, but let's add it to the component itself as well.
| @@ -38,8 +41,7 @@ class URLInputButton extends Component { | |||
| return ( | |||
| <div className="block-editor-url-input__button"> | |||
| <Button | |||
| // TODO: Switch to `true` (40px size) if possible | |||
| __next40pxDefaultSize={ false } | |||
| size="compact" | |||
There was a problem hiding this comment.
This isn't used in the app anymore, so I tested with a story.
diff --git a/packages/block-editor/src/components/url-input/stories/index.story.js b/packages/block-editor/src/components/url-input/stories/index.story.js
new file mode 100644
index 0000000000..68a5bc360b
--- /dev/null
+++ b/packages/block-editor/src/components/url-input/stories/index.story.js
@@ -0,0 +1,10 @@
+/**
+ * Internal dependencies
+ */
+import URLInputButton from '../button';
+
+export default { title: 'BlockEditor/URLInputButton' };
+
+export const Default = () => {
+ return <URLInputButton />;
+};
| Before | After |
|---|---|
 |
 |
I doubt anyone uses this anymore, since the styles are kind of broken/outdated already. I changed it to use the same suffix UI pattern as the other similar URL controls.
| @@ -540,8 +540,7 @@ class URLInput extends Component { | |||
| > | |||
| { suggestions.map( ( suggestion, index ) => ( | |||
| <Button | |||
| // TODO: Switch to `true` (40px size) if possible | |||
| __next40pxDefaultSize={ false } | |||
| __next40pxDefaultSize | |||
There was a problem hiding this comment.
Insert a Paragraph block, select a string range and click the Link button in the block toolbar. I'm not sure what conditions are needed to reach this code naturally — it's not what you normally see in a URLInput in Gutenberg. To force the condition, you can comment out the block with the if ( isFunction( renderSuggestions ) ) conditional, a few lines above this.
| Before | After |
|---|---|
 |
 |
Comment on lines
-112
to
-117
|
|
||
| .components-button { | ||
| flex-shrink: 0; | ||
| width: $button-size; | ||
| height: $button-size; | ||
| } |
There was a problem hiding this comment.
This used to apply in the URLInputButton. No longer seems necessary.
|
|
||
| return ( | ||
| <fieldset className="block-editor-hooks__flex-layout-vertical-alignment-control"> |
There was a problem hiding this comment.
This FlexLayoutVerticalAlignmentControl component is only used in this file, and only in the isToolbar={ true } case. This ! isToolbar condition is never reached. I also confirmed with a temporary story in Storybook that the styles/functionality in this code path is currently broken. Let's just remove the dead code.
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
mirka
added
the
Backport to WP 6.7 Beta/RC
ciampo
approved these changes
Sep 30, 2024
| line-height: normal; | ||
| box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6); | ||
| text-decoration: none; | ||
| outline: none; | ||
| z-index: z-index(".skip-to-selected-block"); |
There was a problem hiding this comment.
could we remove the background styles too?
Oops. Added more tags. |
gutenbergplugin
pushed a commit
that referenced
this pull request
Oct 1, 2024
* Fix in Skip to selected block * Fix in Tool selector * Fix in URLInputButton * Fix in URLInput * Remove dead code in FlexLayoutVerticalAlignmentControl Co-authored-by: mirka <[email protected]> Co-authored-by: ciampo <[email protected]> Co-authored-by: tyxla <[email protected]>
github-actions
bot
removed
the
Backport to WP 6.7 Beta/RC
|
I just cherry-picked this PR to the wp/6.7 branch to get it included in the next release: 716bc73 |
github-actions
bot
added
the
Backported to WP Core
getdave
pushed a commit
that referenced
this pull request
Oct 1, 2024
* Fix in Skip to selected block * Fix in Tool selector * Fix in URLInputButton * Fix in URLInput * Remove dead code in FlexLayoutVerticalAlignmentControl Co-authored-by: mirka <[email protected]> Co-authored-by: ciampo <[email protected]> Co-authored-by: tyxla <[email protected]>
huubl
pushed a commit
to huubl/gutenberg
that referenced
this pull request
Oct 2, 2024
* Fix in Skip to selected block * Fix in Tool selector * Fix in URLInputButton * Fix in URLInput * Remove dead code in FlexLayoutVerticalAlignmentControl Co-authored-by: mirka <[email protected]> Co-authored-by: ciampo <[email protected]> Co-authored-by: tyxla <[email protected]>
huubl
added a commit
to huubl/gutenberg
that referenced
this pull request
Oct 2, 2024
…ess#65742)" This reverts commit e9a991a.
draganescu
pushed a commit
that referenced
this pull request
Oct 2, 2024
* Fix in Skip to selected block * Fix in Tool selector * Fix in URLInputButton * Fix in URLInput * Remove dead code in FlexLayoutVerticalAlignmentControl Co-authored-by: mirka <[email protected]> Co-authored-by: ciampo <[email protected]> Co-authored-by: tyxla <[email protected]>
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 #65018
What?
Adds the
__next40pxDefaultSizeprop to Buttons remaining in the block-editor package.