Skip to content
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

Edit block style variations from global styles #46343

Merged
merged 27 commits into from
Jan 11, 2023

Conversation

tellthemachines
Copy link
Contributor

@tellthemachines tellthemachines commented Dec 7, 2022

Why?

Closes #44417.

This is an initial approach to editing block style variations in global styles. It's still a work in progress and not the complete implementation for #44417.

How?

Currently this PR only allows to edit existing variations, which works to a limited extent, given some of the classic core block variations style elements not yet available as block supports, or aren't added to every block. It also leverages the existing global styles interface for now, so the "variations" section appears as if it were another block support.

Limitations

  • Style variations can only make use of whatever the block supports, so their scope is much more limited than the classic CSS variations.

Todoes

Testing Instructions

  1. In Global Styles, navigate to "Blocks" and then into a block that has variations, e.g. Button, Image, or Site Logo.
  2. Check that a "Variations" section is rendered inside the Block screen and that clicking on that section brings up the Variations screen;
  3. Check that inside the Variations screen all core variations for the block are rendered;
  4. Clicking into the variations, it should be possible to change their styles and those changes should only affect that specific variation.

Testing Instructions for Keyboard

Global Styles can be accessed from the Site Editor header by clicking the "Styles" button. Unfortunately keyboard navigation to the sidebar is broken, so it is necessary to tab 5-6 times after clicking "Styles" to actually arrive in the sidebar. (The first button in the sidebar is called "Open Style Book"; from then on tabbing a few more times should take us to the "Blocks" section)

Screenshots or screencast

Screenshot 2022-12-20 at 2 19 08 pm

Screenshot 2022-12-20 at 2 19 37 pm

Screenshot 2022-12-20 at 2 19 46 pm

@github-actions
Copy link

github-actions bot commented Dec 7, 2022

Size Change: +4.16 kB (0%)

Total Size: 1.33 MB

Filename Size Change
build/block-editor/content-rtl.css 2.96 kB +252 B (+9%) 🔍
build/block-editor/content.css 2.96 kB +251 B (+9%) 🔍
build/block-editor/index.min.js 184 kB +2.29 kB (+1%)
build/block-editor/style-rtl.css 14.6 kB -166 B (-1%)
build/block-editor/style.css 14.6 kB -173 B (-1%)
build/block-library/index.min.js 198 kB +398 B (0%)
build/components/index.min.js 203 kB +78 B (0%)
build/components/style-rtl.css 11.6 kB -1 B (0%)
build/components/style.css 11.6 kB -2 B (0%)
build/data/index.min.js 7.69 kB -476 B (-6%)
build/edit-post/index.min.js 34.6 kB -188 B (-1%)
build/edit-site/index.min.js 66.5 kB +1.43 kB (+2%)
build/edit-site/style-rtl.css 9.3 kB +239 B (+3%)
build/edit-site/style.css 9.3 kB +231 B (+3%)
build/editor/index.min.js 44.1 kB +24 B (0%)
build/widgets/index.min.js 7.31 kB +35 B (0%)
build/widgets/style-rtl.css 1.18 kB -32 B (-3%)
build/widgets/style.css 1.18 kB -32 B (-3%)
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 993 B
build/annotations/index.min.js 2.78 kB
build/api-fetch/index.min.js 2.27 kB
build/autop/index.min.js 2.15 kB
build/blob/index.min.js 487 B
build/block-directory/index.min.js 7.16 kB
build/block-directory/style-rtl.css 1.04 kB
build/block-directory/style.css 1.04 kB
build/block-editor/default-editor-styles-rtl.css 403 B
build/block-editor/default-editor-styles.css 403 B
build/block-library/blocks/archives/editor-rtl.css 61 B
build/block-library/blocks/archives/editor.css 60 B
build/block-library/blocks/archives/style-rtl.css 90 B
build/block-library/blocks/archives/style.css 90 B
build/block-library/blocks/audio/editor-rtl.css 150 B
build/block-library/blocks/audio/editor.css 150 B
build/block-library/blocks/audio/style-rtl.css 122 B
build/block-library/blocks/audio/style.css 122 B
build/block-library/blocks/audio/theme-rtl.css 138 B
build/block-library/blocks/audio/theme.css 138 B
build/block-library/blocks/avatar/editor-rtl.css 116 B
build/block-library/blocks/avatar/editor.css 116 B
build/block-library/blocks/avatar/style-rtl.css 84 B
build/block-library/blocks/avatar/style.css 84 B
build/block-library/blocks/block/editor-rtl.css 305 B
build/block-library/blocks/block/editor.css 305 B
build/block-library/blocks/button/editor-rtl.css 485 B
build/block-library/blocks/button/editor.css 485 B
build/block-library/blocks/button/style-rtl.css 532 B
build/block-library/blocks/button/style.css 532 B
build/block-library/blocks/buttons/editor-rtl.css 337 B
build/block-library/blocks/buttons/editor.css 337 B
build/block-library/blocks/buttons/style-rtl.css 332 B
build/block-library/blocks/buttons/style.css 332 B
build/block-library/blocks/calendar/style-rtl.css 239 B
build/block-library/blocks/calendar/style.css 239 B
build/block-library/blocks/categories/editor-rtl.css 84 B
build/block-library/blocks/categories/editor.css 83 B
build/block-library/blocks/categories/style-rtl.css 100 B
build/block-library/blocks/categories/style.css 100 B
build/block-library/blocks/code/editor-rtl.css 53 B
build/block-library/blocks/code/editor.css 53 B
build/block-library/blocks/code/style-rtl.css 121 B
build/block-library/blocks/code/style.css 121 B
build/block-library/blocks/code/theme-rtl.css 124 B
build/block-library/blocks/code/theme.css 124 B
build/block-library/blocks/columns/editor-rtl.css 108 B
build/block-library/blocks/columns/editor.css 108 B
build/block-library/blocks/columns/style-rtl.css 406 B
build/block-library/blocks/columns/style.css 406 B
build/block-library/blocks/comment-author-avatar/editor-rtl.css 125 B
build/block-library/blocks/comment-author-avatar/editor.css 125 B
build/block-library/blocks/comment-content/style-rtl.css 92 B
build/block-library/blocks/comment-content/style.css 92 B
build/block-library/blocks/comment-template/style-rtl.css 199 B
build/block-library/blocks/comment-template/style.css 198 B
build/block-library/blocks/comments-pagination-numbers/editor-rtl.css 123 B
build/block-library/blocks/comments-pagination-numbers/editor.css 121 B
build/block-library/blocks/comments-pagination/editor-rtl.css 222 B
build/block-library/blocks/comments-pagination/editor.css 209 B
build/block-library/blocks/comments-pagination/style-rtl.css 235 B
build/block-library/blocks/comments-pagination/style.css 231 B
build/block-library/blocks/comments-title/editor-rtl.css 75 B
build/block-library/blocks/comments-title/editor.css 75 B
build/block-library/blocks/comments/editor-rtl.css 840 B
build/block-library/blocks/comments/editor.css 839 B
build/block-library/blocks/comments/style-rtl.css 637 B
build/block-library/blocks/comments/style.css 636 B
build/block-library/blocks/cover/editor-rtl.css 612 B
build/block-library/blocks/cover/editor.css 613 B
build/block-library/blocks/cover/style-rtl.css 1.57 kB
build/block-library/blocks/cover/style.css 1.56 kB
build/block-library/blocks/embed/editor-rtl.css 293 B
build/block-library/blocks/embed/editor.css 293 B
build/block-library/blocks/embed/style-rtl.css 410 B
build/block-library/blocks/embed/style.css 410 B
build/block-library/blocks/embed/theme-rtl.css 138 B
build/block-library/blocks/embed/theme.css 138 B
build/block-library/blocks/file/editor-rtl.css 300 B
build/block-library/blocks/file/editor.css 300 B
build/block-library/blocks/file/style-rtl.css 253 B
build/block-library/blocks/file/style.css 254 B
build/block-library/blocks/file/view.min.js 353 B
build/block-library/blocks/freeform/editor-rtl.css 2.44 kB
build/block-library/blocks/freeform/editor.css 2.44 kB
build/block-library/blocks/gallery/editor-rtl.css 984 B
build/block-library/blocks/gallery/editor.css 988 B
build/block-library/blocks/gallery/style-rtl.css 1.55 kB
build/block-library/blocks/gallery/style.css 1.55 kB
build/block-library/blocks/gallery/theme-rtl.css 122 B
build/block-library/blocks/gallery/theme.css 122 B
build/block-library/blocks/group/editor-rtl.css 654 B
build/block-library/blocks/group/editor.css 654 B
build/block-library/blocks/group/style-rtl.css 57 B
build/block-library/blocks/group/style.css 57 B
build/block-library/blocks/group/theme-rtl.css 78 B
build/block-library/blocks/group/theme.css 78 B
build/block-library/blocks/heading/style-rtl.css 76 B
build/block-library/blocks/heading/style.css 76 B
build/block-library/blocks/html/editor-rtl.css 332 B
build/block-library/blocks/html/editor.css 333 B
build/block-library/blocks/image/editor-rtl.css 829 B
build/block-library/blocks/image/editor.css 828 B
build/block-library/blocks/image/style-rtl.css 627 B
build/block-library/blocks/image/style.css 630 B
build/block-library/blocks/image/theme-rtl.css 137 B
build/block-library/blocks/image/theme.css 137 B
build/block-library/blocks/latest-comments/style-rtl.css 298 B
build/block-library/blocks/latest-comments/style.css 298 B
build/block-library/blocks/latest-posts/editor-rtl.css 213 B
build/block-library/blocks/latest-posts/editor.css 212 B
build/block-library/blocks/latest-posts/style-rtl.css 478 B
build/block-library/blocks/latest-posts/style.css 478 B
build/block-library/blocks/list/style-rtl.css 88 B
build/block-library/blocks/list/style.css 88 B
build/block-library/blocks/media-text/editor-rtl.css 266 B
build/block-library/blocks/media-text/editor.css 263 B
build/block-library/blocks/media-text/style-rtl.css 507 B
build/block-library/blocks/media-text/style.css 505 B
build/block-library/blocks/more/editor-rtl.css 431 B
build/block-library/blocks/more/editor.css 431 B
build/block-library/blocks/navigation-link/editor-rtl.css 716 B
build/block-library/blocks/navigation-link/editor.css 715 B
build/block-library/blocks/navigation-link/style-rtl.css 115 B
build/block-library/blocks/navigation-link/style.css 115 B
build/block-library/blocks/navigation-submenu/editor-rtl.css 299 B
build/block-library/blocks/navigation-submenu/editor.css 299 B
build/block-library/blocks/navigation/editor-rtl.css 2.13 kB
build/block-library/blocks/navigation/editor.css 2.14 kB
build/block-library/blocks/navigation/style-rtl.css 2.22 kB
build/block-library/blocks/navigation/style.css 2.2 kB
build/block-library/blocks/navigation/view-modal.min.js 2.81 kB
build/block-library/blocks/navigation/view.min.js 447 B
build/block-library/blocks/nextpage/editor-rtl.css 395 B
build/block-library/blocks/nextpage/editor.css 395 B
build/block-library/blocks/page-list/editor-rtl.css 376 B
build/block-library/blocks/page-list/editor.css 376 B
build/block-library/blocks/page-list/style-rtl.css 175 B
build/block-library/blocks/page-list/style.css 175 B
build/block-library/blocks/paragraph/editor-rtl.css 174 B
build/block-library/blocks/paragraph/editor.css 174 B
build/block-library/blocks/paragraph/style-rtl.css 279 B
build/block-library/blocks/paragraph/style.css 281 B
build/block-library/blocks/post-author/style-rtl.css 175 B
build/block-library/blocks/post-author/style.css 176 B
build/block-library/blocks/post-comments-form/editor-rtl.css 96 B
build/block-library/blocks/post-comments-form/editor.css 96 B
build/block-library/blocks/post-comments-form/style-rtl.css 501 B
build/block-library/blocks/post-comments-form/style.css 501 B
build/block-library/blocks/post-date/style-rtl.css 61 B
build/block-library/blocks/post-date/style.css 61 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B
build/block-library/blocks/post-excerpt/editor.css 73 B
build/block-library/blocks/post-excerpt/style-rtl.css 69 B
build/block-library/blocks/post-excerpt/style.css 69 B
build/block-library/blocks/post-featured-image/editor-rtl.css 586 B
build/block-library/blocks/post-featured-image/editor.css 584 B
build/block-library/blocks/post-featured-image/style-rtl.css 318 B
build/block-library/blocks/post-featured-image/style.css 318 B
build/block-library/blocks/post-navigation-link/style-rtl.css 153 B
build/block-library/blocks/post-navigation-link/style.css 153 B
build/block-library/blocks/post-template/editor-rtl.css 99 B
build/block-library/blocks/post-template/editor.css 98 B
build/block-library/blocks/post-template/style-rtl.css 282 B
build/block-library/blocks/post-template/style.css 282 B
build/block-library/blocks/post-terms/style-rtl.css 96 B
build/block-library/blocks/post-terms/style.css 96 B
build/block-library/blocks/post-title/style-rtl.css 100 B
build/block-library/blocks/post-title/style.css 100 B
build/block-library/blocks/preformatted/style-rtl.css 103 B
build/block-library/blocks/preformatted/style.css 103 B
build/block-library/blocks/pullquote/editor-rtl.css 135 B
build/block-library/blocks/pullquote/editor.css 135 B
build/block-library/blocks/pullquote/style-rtl.css 326 B
build/block-library/blocks/pullquote/style.css 325 B
build/block-library/blocks/pullquote/theme-rtl.css 167 B
build/block-library/blocks/pullquote/theme.css 167 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B
build/block-library/blocks/query-pagination/editor-rtl.css 221 B
build/block-library/blocks/query-pagination/editor.css 211 B
build/block-library/blocks/query-pagination/style-rtl.css 288 B
build/block-library/blocks/query-pagination/style.css 284 B
build/block-library/blocks/query-title/style-rtl.css 63 B
build/block-library/blocks/query-title/style.css 63 B
build/block-library/blocks/query/editor-rtl.css 440 B
build/block-library/blocks/query/editor.css 440 B
build/block-library/blocks/quote/style-rtl.css 213 B
build/block-library/blocks/quote/style.css 213 B
build/block-library/blocks/quote/theme-rtl.css 223 B
build/block-library/blocks/quote/theme.css 226 B
build/block-library/blocks/read-more/style-rtl.css 132 B
build/block-library/blocks/read-more/style.css 132 B
build/block-library/blocks/rss/editor-rtl.css 202 B
build/block-library/blocks/rss/editor.css 204 B
build/block-library/blocks/rss/style-rtl.css 289 B
build/block-library/blocks/rss/style.css 288 B
build/block-library/blocks/search/editor-rtl.css 165 B
build/block-library/blocks/search/editor.css 165 B
build/block-library/blocks/search/style-rtl.css 409 B
build/block-library/blocks/search/style.css 406 B
build/block-library/blocks/search/theme-rtl.css 114 B
build/block-library/blocks/search/theme.css 114 B
build/block-library/blocks/separator/editor-rtl.css 146 B
build/block-library/blocks/separator/editor.css 146 B
build/block-library/blocks/separator/style-rtl.css 234 B
build/block-library/blocks/separator/style.css 234 B
build/block-library/blocks/separator/theme-rtl.css 194 B
build/block-library/blocks/separator/theme.css 194 B
build/block-library/blocks/shortcode/editor-rtl.css 474 B
build/block-library/blocks/shortcode/editor.css 474 B
build/block-library/blocks/site-logo/editor-rtl.css 490 B
build/block-library/blocks/site-logo/editor.css 490 B
build/block-library/blocks/site-logo/style-rtl.css 203 B
build/block-library/blocks/site-logo/style.css 203 B
build/block-library/blocks/site-tagline/editor-rtl.css 86 B
build/block-library/blocks/site-tagline/editor.css 86 B
build/block-library/blocks/site-title/editor-rtl.css 116 B
build/block-library/blocks/site-title/editor.css 116 B
build/block-library/blocks/site-title/style-rtl.css 57 B
build/block-library/blocks/site-title/style.css 57 B
build/block-library/blocks/social-link/editor-rtl.css 184 B
build/block-library/blocks/social-link/editor.css 184 B
build/block-library/blocks/social-links/editor-rtl.css 674 B
build/block-library/blocks/social-links/editor.css 673 B
build/block-library/blocks/social-links/style-rtl.css 1.4 kB
build/block-library/blocks/social-links/style.css 1.39 kB
build/block-library/blocks/spacer/editor-rtl.css 332 B
build/block-library/blocks/spacer/editor.css 332 B
build/block-library/blocks/spacer/style-rtl.css 48 B
build/block-library/blocks/spacer/style.css 48 B
build/block-library/blocks/table/editor-rtl.css 457 B
build/block-library/blocks/table/editor.css 457 B
build/block-library/blocks/table/style-rtl.css 651 B
build/block-library/blocks/table/style.css 650 B
build/block-library/blocks/table/theme-rtl.css 157 B
build/block-library/blocks/table/theme.css 157 B
build/block-library/blocks/tag-cloud/style-rtl.css 251 B
build/block-library/blocks/tag-cloud/style.css 253 B
build/block-library/blocks/template-part/editor-rtl.css 404 B
build/block-library/blocks/template-part/editor.css 404 B
build/block-library/blocks/template-part/theme-rtl.css 101 B
build/block-library/blocks/template-part/theme.css 101 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B
build/block-library/blocks/text-columns/editor.css 95 B
build/block-library/blocks/text-columns/style-rtl.css 166 B
build/block-library/blocks/text-columns/style.css 166 B
build/block-library/blocks/verse/style-rtl.css 99 B
build/block-library/blocks/verse/style.css 99 B
build/block-library/blocks/video/editor-rtl.css 691 B
build/block-library/blocks/video/editor.css 694 B
build/block-library/blocks/video/style-rtl.css 179 B
build/block-library/blocks/video/style.css 179 B
build/block-library/blocks/video/theme-rtl.css 139 B
build/block-library/blocks/video/theme.css 139 B
build/block-library/classic-rtl.css 162 B
build/block-library/classic.css 162 B
build/block-library/common-rtl.css 1.05 kB
build/block-library/common.css 1.05 kB
build/block-library/editor-elements-rtl.css 75 B
build/block-library/editor-elements.css 75 B
build/block-library/editor-rtl.css 11.7 kB
build/block-library/editor.css 11.7 kB
build/block-library/elements-rtl.css 54 B
build/block-library/elements.css 54 B
build/block-library/reset-rtl.css 478 B
build/block-library/reset.css 478 B
build/block-library/style-rtl.css 12.4 kB
build/block-library/style.css 12.4 kB
build/block-library/theme-rtl.css 698 B
build/block-library/theme.css 703 B
build/block-serialization-default-parser/index.min.js 1.13 kB
build/block-serialization-spec-parser/index.min.js 2.83 kB
build/blocks/index.min.js 50.4 kB
build/compose/index.min.js 12.3 kB
build/core-data/index.min.js 15.9 kB
build/customize-widgets/index.min.js 11.7 kB
build/customize-widgets/style-rtl.css 1.41 kB
build/customize-widgets/style.css 1.41 kB
build/data-controls/index.min.js 663 B
build/date/index.min.js 32.1 kB
build/deprecated/index.min.js 518 B
build/dom-ready/index.min.js 336 B
build/dom/index.min.js 4.71 kB
build/edit-navigation/index.min.js 16.2 kB
build/edit-navigation/style-rtl.css 4.12 kB
build/edit-navigation/style.css 4.13 kB
build/edit-post/classic-rtl.css 571 B
build/edit-post/classic.css 571 B
build/edit-post/style-rtl.css 7.45 kB
build/edit-post/style.css 7.44 kB
build/edit-widgets/index.min.js 16.8 kB
build/edit-widgets/style-rtl.css 4.46 kB
build/edit-widgets/style.css 4.47 kB
build/editor/style-rtl.css 3.69 kB
build/editor/style.css 3.68 kB
build/element/index.min.js 4.93 kB
build/escape-html/index.min.js 548 B
build/experiments/index.min.js 882 B
build/format-library/index.min.js 7.2 kB
build/format-library/style-rtl.css 598 B
build/format-library/style.css 597 B
build/hooks/index.min.js 1.66 kB
build/html-entities/index.min.js 454 B
build/i18n/index.min.js 3.79 kB
build/is-shallow-equal/index.min.js 535 B
build/keyboard-shortcuts/index.min.js 1.79 kB
build/keycodes/index.min.js 1.88 kB
build/list-reusable-blocks/index.min.js 2.13 kB
build/list-reusable-blocks/style-rtl.css 865 B
build/list-reusable-blocks/style.css 865 B
build/media-utils/index.min.js 2.94 kB
build/notices/index.min.js 977 B
build/plugins/index.min.js 1.95 kB
build/preferences-persistence/index.min.js 2.23 kB
build/preferences/index.min.js 1.35 kB
build/primitives/index.min.js 960 B
build/priority-queue/index.min.js 1.59 kB
build/react-i18n/index.min.js 702 B
build/react-refresh-entry/index.min.js 8.44 kB
build/react-refresh-runtime/index.min.js 7.31 kB
build/redux-routine/index.min.js 2.75 kB
build/reusable-blocks/index.min.js 2.26 kB
build/reusable-blocks/style-rtl.css 283 B
build/reusable-blocks/style.css 283 B
build/rich-text/index.min.js 10.8 kB
build/server-side-render/index.min.js 2.09 kB
build/shortcode/index.min.js 1.52 kB
build/style-engine/index.min.js 1.53 kB
build/token-list/index.min.js 650 B
build/url/index.min.js 3.7 kB
build/vendors/inert-polyfill.min.js 2.48 kB
build/vendors/react-dom.min.js 41.8 kB
build/vendors/react.min.js 4.02 kB
build/viewport/index.min.js 1.09 kB
build/warning/index.min.js 280 B
build/wordcount/index.min.js 1.06 kB

compressed-size-action

@tellthemachines tellthemachines force-pushed the add/block-style-editing branch 3 times, most recently from d4d987c to 08c98a2 Compare December 13, 2022 02:10
@annezazu annezazu mentioned this pull request Dec 13, 2022
57 tasks
@tellthemachines tellthemachines force-pushed the add/block-style-editing branch 2 times, most recently from 0a5c337 to f86176c Compare December 19, 2022 05:15
@tellthemachines tellthemachines marked this pull request as ready for review December 20, 2022 03:21
@jameskoster
Copy link
Contributor

Would it be possible to include the block preview (with the style variation applied) here?

Screenshot 2022-12-20 at 11 23 40

I guess the variation title should be capitalised as well.

Not something to fix here, but it's very easy to get lost in all the Styles panels, and style variations are going to add another layer of complexity. For example the screenshot above – you have nothing to really orient where you are. It would be good to explore options.

@jasmussen
Copy link
Contributor

Nice, this is really close already. Here's a GIF showing the global styles interface of changing the button block "fill" variation:

variations

Will it be possible to get closer to the ItemGroup based visuals of the original design?

@ramonjd
Copy link
Member

ramonjd commented Dec 21, 2022

Testing this. Looking great so far.

  • Changes I make to block variations in the site editor are saved and are reflected when I select the corresponding block variations in the editor 👍

I had some observations while testing. Some may not be related to the changes in this PR:

  1. This is a question of design, but I'm wondering if the interface should resemble the block styles we see in the post editor (with the buttons and preview). Reason being, is that "variation" is an internal term so I trying to find a connect between the two.
  2. Potential bug: in the site editor go to styles > color > text/background and try to select a text color. The sidebar goes blank. Same is for all color panels, e.g., insert a table in the site editor, colors > text or block > table > variations > default > colors > text. I'm not sure, but maybe something to do with navigation rendering?
  3. The image and table styles aren't reflected in the site editor. I think this might be due to the way the styles are applied using __experimentalSelector ? To replicate, insert a table or image block in the site editor, then modify the block's variation styles.
  4. This is probably not a huge deal: the default variation global styles don't apply to existing blocks. So, create a post with a table block but don't click on a style variation button (the default variation is "Default"). Save the post then go to the site editor, and set some styles for the table block default variation. Save, then go back to the previous post and refresh the page. The styles aren't applied, and only show up when I toggle variations. This is because the style variation classes aren't added by default, is-style-regular. Not sure how we get around that unless we apply the style class to blocks by default, and risk a deprecation hailstorm 🤔
  5. The ToolsPanel reset button doesn't seem to have any effect. E.g., change the border values of the image block variations in the site editor. Save, then return and try to reset them. I think this is related to Block style resets doesn't work after saving and reloading the site-editor #46505

@tellthemachines
Copy link
Contributor Author

Thanks for all the feedback folks!

Would it be possible to include the block preview (with the style variation applied) here?

Sure!

Will it be possible to get closer to the ItemGroup based visuals of the original design?

Absolutely, this first pass is more aiming to get the functionality right, and I'll look into putting the actual UI in place as per the designs next 😄

Potential bug: in the site editor go to styles > color > text/background and try to select a text color. The sidebar goes blank

Actual bug 😅 I've been messing around with the navigation paths to integrate the variations screens and must have broken something, thanks for spotting it!

The image and table styles aren't reflected in the site editor. I think this might be due to the way the styles are applied using __experimentalSelector ? To replicate, insert a table or image block in the site editor, then modify the block's variation styles.

Hmm, I can't reproduce this unless with the default state as you report in your 4th point. Could it be the same issue?

@ramonjd
Copy link
Member

ramonjd commented Dec 21, 2022

Hmm, I can't reproduce this unless with the default state as you report in your 4th point. Could it be the same issue?

Ah yeah, sorry for the red herring.

I retested and you're right: is when the default variation class isn't applied (on a freshly-added block)

@tellthemachines
Copy link
Contributor Author

Update: I just pushed the beginnings of adding new style variations. Please ignore what it looks like for now 😅 as I just dumped a button in there to be able to test the functionality. So far it only works for blocks that already have variations, though it should be easy to expand it to all blocks if we want.

What doesn't work at all is getting the newly added variations to show in the post editor. Unless I'm mistaken, we're going to need something like #34178 in place before we can do that.

My feeling is that the ability to add new variations is the key piece here, as opposed to editing existing ones. Would you say that @jasmussen , @jameskoster ? If so, it might make sense to put this on hold until we get #34178 done.

In any case, I'll shortly be off for the holidays so don't worry if this PR isn't updated for the next week or so, I haven't forgotten it!

@jasmussen
Copy link
Contributor

My feeling is that the ability to add new variations is the key piece here, as opposed to editing existing ones.

I think that is a key part of it, absolutely. Though depending on what's technically feasible, I would suggest it equally important to edit and customize the existing ones, especially if such changes can reflect on existing content without needing an update. I.e. if I change the default button "outline" style to have a dashed border, would that automatically translate to every existing piece on the site using outline buttons?

Enjoy your AFK, thanks for all the work here!

@tellthemachines
Copy link
Contributor Author

I change the default button "outline" style to have a dashed border, would that automatically translate to every existing piece on the site using outline buttons?

Yeah, that already works in this PR, except in the case @ramonjd pointed out above: if the block hasn't been changed from its initial default style, it won't have the style classname attached. We'll have to look into how best to approach this. Adding the default style classname to every block would land us in deprecation hell 😅

We could try to add the class only if the default style has been changed. I don't think inline styles are a great option here because these are global, so we want to keep their specificity fairly low.

If editing existing styles is useful by itself, then I'll leave out adding new ones for now, get existing ones working well, and then tackle the new ones separately after #34178 is done.

@jasmussen
Copy link
Contributor

Adding the default style classname to every block would land us in deprecation hell 😅

Is it possible to treat the default style in a special manner, both with regards to the block (class or not), and with regards to the variations interface? By simply knowing what the default is, we might be able to make these aspects controllable, maybe? Apologies if I'm oversimplifying! 🙏

@tellthemachines
Copy link
Contributor Author

Thanks for reviewing @andrewserong ! Those are great suggestions and I'll follow up with another PR shortly.

Yeah, I thought about just changing the name of the button style to Default, but went with this to make sure it always displays as "Default" so people know it's the default style for that block.

@tellthemachines tellthemachines merged commit a4879a6 into trunk Jan 11, 2023
@tellthemachines tellthemachines deleted the add/block-style-editing branch January 11, 2023 05:56
@github-actions github-actions bot added this to the Gutenberg 15.0 milestone Jan 11, 2023
@jameskoster
Copy link
Contributor

Nice work on this one 🥳

Agreed! I think this would be best addressed as a follow-up given it seems to need some design work.

I opened a couple of issues: #47021, #47026.

markjaquith pushed a commit to markjaquith/WordPress that referenced this pull request Feb 1, 2023
To allow editing of block style variations in global styles, this changeset adds the following for server side support:

* building of block style schema into `WP_Theme_JSON::sanitize()`.
* appending of style variation selectors to block metadata in `WP_Theme_JSON::get_blocks_metadata()`.
* building of selectors and variations for nodes in `WP_Theme_JSON::get_block_nodes()`.

Tests for happy and unhappy paths are included.

Reference:
* [WordPress/gutenberg#46343 Gutenberg PR 46343]

Follow-up to [54118], [50973], [50959].

Props isabel_brison, 
Fixes #57583.
Built from https://develop.svn.wordpress.org/trunk@55172


git-svn-id: http://core.svn.wordpress.org/trunk@54705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
github-actions bot pushed a commit to platformsh/wordpress-performance that referenced this pull request Feb 1, 2023
To allow editing of block style variations in global styles, this changeset adds the following for server side support:

* building of block style schema into `WP_Theme_JSON::sanitize()`.
* appending of style variation selectors to block metadata in `WP_Theme_JSON::get_blocks_metadata()`.
* building of selectors and variations for nodes in `WP_Theme_JSON::get_block_nodes()`.

Tests for happy and unhappy paths are included.

Reference:
* [WordPress/gutenberg#46343 Gutenberg PR 46343]

Follow-up to [54118], [50973], [50959].

Props isabel_brison, 
Fixes #57583.
Built from https://develop.svn.wordpress.org/trunk@55172


git-svn-id: https://core.svn.wordpress.org/trunk@54705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
@femkreations femkreations added the Needs User Documentation Needs new user documentation label Feb 1, 2023
@fabiankaegy fabiankaegy added the Needs Dev Note Requires a developer note for a major WordPress release cycle label Mar 2, 2023
@fabiankaegy
Copy link
Member

@bph I realize it is probably already a bit late but I think this here should really get a dev note / some documentation for the 6.2 release

@bph
Copy link
Contributor

bph commented Mar 2, 2023

@fabiankaegy thank you so much for flagging this. It's not too late :-)

@tellthemachines
Copy link
Contributor Author

Here goes the dev note:

Edit block style variations from theme.json

This new theme.json API allows existing core block style variations to be styled directly from the theme.json file. It does not currently allow adding new variations. Styles should be added as follows:

	"styles": {
		"blocks": {
			"core/image": {
				"variations": {
					"rounded": {
						"border": {
							"width": "10px",
							"color": "#cc3ee6"
						}	
					}
				}
			}
                }
       }

Each variation should be targeted by its name, which can be found in the block's block.json file, under "styles".

There is also a corresponding UI in the block section of global styles:

Screenshot 2023-03-03 at 10 23 55 am

VenusPR added a commit to VenusPR/Wordpress_Richard that referenced this pull request Mar 9, 2023
To allow editing of block style variations in global styles, this changeset adds the following for server side support:

* building of block style schema into `WP_Theme_JSON::sanitize()`.
* appending of style variation selectors to block metadata in `WP_Theme_JSON::get_blocks_metadata()`.
* building of selectors and variations for nodes in `WP_Theme_JSON::get_block_nodes()`.

Tests for happy and unhappy paths are included.

Reference:
* [WordPress/gutenberg#46343 Gutenberg PR 46343]

Follow-up to [54118], [50973], [50959].

Props isabel_brison, 
Fixes #57583.
Built from https://develop.svn.wordpress.org/trunk@55172


git-svn-id: http://core.svn.wordpress.org/trunk@54705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
@oandregal
Copy link
Member

👋 Prepared a follow-up at #49807

I've also noticed that there are no docs for this at https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-json/ It'd be great to have some.

@oandregal
Copy link
Member

PR to add docs for variations in theme.json at #49826

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json Needs Dev Note Requires a developer note for a major WordPress release cycle Needs User Documentation Needs new user documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Style variations for block types
10 participants