-
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
Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu #52222
Conversation
…de from the Styles menu
Size Change: +225 B (0%) Total Size: 1.42 MB
ℹ️ View Unchanged
|
Flaky tests detected in c44fa4e. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5456605576
|
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.
I followed the testing instructions and both view and edit mode are working as expected.
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.
LGTM
- Clicking category tabs works
- The stylebook iframe is resizeable
- Selecting a block opens the corresponding block style pane
Nice work @t-hamano !
I think it needs a rebase though.
packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
Outdated
Show resolved
Hide resolved
Thanks for the review! I used Yoda notation and also resolved the conflict. This PR was conflicting with #52117 which automatically disables Distraction Free Mode on Style Book page. So please make sure that the behavior is maintained in this PR:
84ba181e49480a568f18c2f33290284d.mp4 |
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.
🙇🏻
Hmm, several E2E tests are failing, but this does not appear to be due to this PR, as it is also occurring on other PRs. I would like to merge this issue once it is resolved. |
Happening on all branches as far as I'm aware 😢 Related: #52167 (comment) |
I consider this PR to be a bug fix, so I will give it a backport label. |
…de from the Styles menu (#52222) * Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu * Move lines
I just cherry-picked this PR to the update/first-pre-beta-4 branch to get it included in the next release: 621aa95 |
* add hint to show template part move (#52395) * Page Content Focus: Ignore page content within a Query Loop block (#52351) * Block Editor: Pass context and className props to editor.BlockEdit filter * Page Content Focus: Ignore content blocks that are within a Query Loop * Patterns: stop endless snackbars appearing (#52012) * Patterns: Distinguish between theme patterns and template parts in category list (#52382) * Allow opt out of auto-creation of Navigation fallback (#52319) * Update welcome guide copy (#52282) * Patterns: Update pattern copy (#52340) * Post Title: The changes should be reflected when previewing a post (#52369) * Update fixed block toolbar (#52123) * update the icons for expanding and collapsing the fixed block toolbar * hide the tools selector item in document tools for fixed toolbar preference * reveal undo, redo and list view buttons * tweaks for show icon labels and hide zoom out for top toolbar option * improve the responsiveness of the fixed block toolbar * remove the overflow rule - bad experiment * update top toolbar test with the new label for buttons * update the toolbar tests to account for moving the collapse button * Drop PHP 5.6 CI jobs (#52345) * Remove PHP 5.6 PHPUnit CI job * Raise version in phpcs / WPCS * Patterns: Add handling of sync status to the wp-admin patterns list page (#52346) * Exit template focus when opening the W menu (#52235) * wrap buttons (#52249) * Update the behavior of the cached undo/redo stack (#51644) Co-authored-by: Ella van Durpe <[email protected]> * Adjust top position (#52248) * Patterns: add a hint about the rename of reusable blocks to menu and inserter (#51771) Co-authored-by: Saxon Fletcher <[email protected]> * Site Editor: update headings hierarchy in the 'Manage all' screens (#52271) * This commit: - updates heading levels on the template and template part pages - passes a `level` prop to Header from Page * update h2 size * Rolling back custom sizes * Rolling back unnecessary classNames There was a rogue space in trunk. Let's let it live * Check randomizer experiment is enabled before rendering button (#52306) * Hide parent selector when parent is 'disabled' or 'contentOnly' (#52264) * Fix incorrect aria-describedby attributes for theme patterns (#52263) * Patterns: rename sync_status and move to top level field on rest return instead of a meta field (#52146) * Fix default block dimensions visibility (#52256) * core/heading * core/details * core/list * core/table * core/video * core/verse * core/social-links * core/site-title * core/site-tagline * core/site-logo * core/post-time-to-read * core/gallery * core/code * core/categories * core/audio * core/archives * Patterns: Display all custom template part areas in sidebar nav (#52355) * Revert phpcs back to PHP 5.6 (#52384) Reverts phpcs PHP compatibility version back to 5.6. * Check if experiment enabled fr this time (#52315) * Navigation: Remove one preloaded endpoint (#52115) * default to showing status (#52226) * Command palette: rename (#52153) * Revise use of “command menu” to “command palette”. Dropping "global" where it was used as well. * Find “command center” and replace with “command palette” * Image block and behaviors: Fix some warnings (#52109) * Fix first warning * Fix second warning - dividing a NaN * Turn off DFM for style book and style editing (#52117) * Add confirmation step when deleting a Template (#52236) * [Command Palette]: Remove suggestion for deleting templates/parts (#52168) * Update stepper styling in Home template details panel (#51972) * Update stepper styling * Remove !important * [Edit Post]: Add toggle fullscreen mode and list view commands (#52184) * Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu (#52222) * Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu * Move lines * !important (#52025) * Navigation in Site View: Readd the edit button (#52111) * Fix UnitControl crashing on regex control characters. Units are now escaped using `escapeRegExp` before concatenating them into a regular expression. Fixes #52211. --------- Co-authored-by: Mitchell Austin <[email protected]> * Patterns: rename wp_block sync_status postmeta to wp_pattern_sync_status (#52232) --------- Co-authored-by: Kai Hao <[email protected]> * Site Editor Frame: Ignore Spotlight in view mode (#52262) * Guide: Place focus on the guide's container instead of its first tabbable (#52300) * Guide: Place focus on the guide's container instead of its first tabbable * Update CHANGELOG * Post editor: Require confirmation before removing Footnotes (#52277) * Post editor: Require confirmation before removing Footnotes Context: #52176 * BlockRemovalWarningModal: Limit width to 40rem * Explain that footnotes are preserved. Add warning to Site Editor * Fix react-dropdown-menu version to avoid breaking change from one of … (#52356) * Fix react-dropdown-menu version to avoid breaking change from one if its dependencies. * Changelog update * move changelog entry to the right place * Update package-lock --------- Co-authored-by: Saxon Fletcher <[email protected]> Co-authored-by: Robert Anderson <[email protected]> Co-authored-by: Glen Davies <[email protected]> Co-authored-by: James Koster <[email protected]> Co-authored-by: Dave Smith <[email protected]> Co-authored-by: George Mamadashvili <[email protected]> Co-authored-by: Andrei Draganescu <[email protected]> Co-authored-by: Tonya Mork <[email protected]> Co-authored-by: Riad Benguella <[email protected]> Co-authored-by: Ella van Durpe <[email protected]> Co-authored-by: Ramon <[email protected]> Co-authored-by: Kai Hao <[email protected]> Co-authored-by: Rich Tabor <[email protected]> Co-authored-by: Aaron Robertshaw <[email protected]> Co-authored-by: Ben Dwyer <[email protected]> Co-authored-by: Mitchell Austin <[email protected]> Co-authored-by: Carlos Bravo <[email protected]> Co-authored-by: Nik Tsekouras <[email protected]> Co-authored-by: Aki Hamano <[email protected]> Co-authored-by: Timothy Jacobs <[email protected]> Co-authored-by: Kai Hao <[email protected]> Co-authored-by: Miguel Fonseca <[email protected]>
Fixes: #51887
What?
This PR fixes three problems when entering edit mode with the Style Book open from the Styles menu.
Why?
As I understand it, the Style Book displayed in the canvas area is based on the
<GlobalStylesStyleBook />
. In this component, the canvas is resizable, tabs are visible, and blocks are clickable (default behavior).However, the Styles page overrides this with a Style Book in
<SidebarNavigationScreenGlobalStyles />
to prohibit canvas resizing, hide tabs, and make the entire canvas clickable.On the Styles page, the URL contains
wp_global_styles
. I believe this is causing this issue because the Style Book in the<SidebarNavigationScreenGlobalStyles />
has priority even when entering edit mode from this page.How?
I used
getCanvasMode()
to not render the Style Book in the<SizebarNavigationScreenGlobalStyles />
when in edit mode. This results in the Style Book being reset to its closed state when you open the Style Book on the Styles page, enter edit mode, and return to view mode. Personally, I think this is acceptable, as it is the intended behavior.Testing Instructions
Screenshots or screencast
2ae81a6a148e63a1346e272e0837e6ff.mp4