-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Border Controls: Display color indicator and check selected color #34467
Conversation
Size Change: +2.79 kB (0%) Total Size: 1.04 MB
ℹ️ View Unchanged
|
a36f938
to
9addeb9
Compare
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.
Thanks for fixing this up @stacimc, this is testing nicely! 🎉
Before | After |
---|---|
✅ Color indicator and check mark are working for border color with this applied
✅ Works for both named color and custom color
✅ Initial state when switching between blocks appears to be correct
✅ Works in the site editor, too
LGTM!
I think we can merge this PR. All feedback got addressed, and @andrewserong did an amazing job testing it. |
* trunk: (214 commits) Fix snackbar overflow on nav editor (#34661) Mobile - Allow disabling text and background color via theme.json (#34633) Fix disabled blocks logical error on Widgets screen (#34634) [Mobile] - Global styles - Add support to render font sizes and line height (#34144) ESLint Plugin: Update eslint jsdoc dependency (#34338) Scripts: Add CHANGELOG entry for `jest-dev-server` upgrade (#34657) Bump jest-dev-server to v5 (#34560) Refactor the `core-data` store to thunks (#28389) Only capture toolbars on parent Nav block when not in vertical mode (#34615) Update Changelog for 11.5.0-rc.1 Bump plugin version to 11.5.0-rc.1 Gallery block: Fix media placeholder height in site editor (#34629) Border Controls: Display color indicator and check selected color (#34467) Remove horizontal and vertical navigation block variations from inserter (#34614) AlignmentMatrixControl : Fix/update docs (#34624) Gap block support: force gap change to cause the block to re-render (fix Safari issue) (#34567) [Block Library - Social Links]: Use the new `flex` layout (#34493) [Mobile] Update the bottom sheet header (#34309) Group block: Add a row variation (#34535) Migrate entities.js to thunks (#34582) ...
Description
The border panel was using an incorrect prop name, so the ColorGradientControl would not display the color indicator for the selected color, or the check mark for a selected preset. This updates the prop name and makes sure to handle custom as well as preset colors. (See screenshots)
How has this been tested?
Manually. I tested on trunk, and also tested after rebasing on #33743 which will switch the border panel to use the new ToolsPanel.
Screenshots
Before:
After:
Types of changes
Checklist:
*.native.js
files for terms that need renaming or removal).