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

Avoid override certain paths on theme variation switch #59921

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from

Conversation

matiasbenedetto
Copy link
Contributor

@matiasbenedetto matiasbenedetto commented Mar 15, 2024

What?

Avoid overriding certain paths on the theme variation switch.

Why?

Theme variation switching overrides certain theme.json data paths that are not supposed to override.
A theme variation is data intended to change the theme level data and not the custom data and it should only affect settings/styles defined by themes and not the custom styles defined by users.

This change is added to fix part of this issue #59818

How?

Add an array of theme.json paths that the theme variation should not overwrite.

Testing Instructions

  1. Activate a theme that includes variations in their settings.typography.fontFamilies theme.json data (for example TwentyTwentyFour).
  2. Install a few fonts using the Font Library.
  3. Go to the style variations panel and switch the variation.
  4. Check that the fonts installed using the font library are still listed as installed and active.

Use cases

Custom colors

Let's say the user want to add 2 colors to create a notice paragraph on their posts. This is how it would work:

Trunk

2024-03-18.15-43-23.mp4

This PR

2024-03-18.14-44-25.mp4

Using custom fonts in posts

In this example, I'm installing a custom font and using it in a post. On Trunk, after applying a style variation, the custom font selected by the user previously is not rendered. Running this PR it is.

Trunk:

2024-03-18.15-58-51.mp4

This PR:

2024-03-18.16-04-46.mp4

Active fonts

In the trunk one the active fonts installed using the font library are lost of theme variation switch and in the this PR the font families remain active. It means that the active fonts used in posts or blocks will continue working as expected.

Trunk

2024-03-15.14-59-00.mp4

This PR

2024-03-15.14-54-46.mp4

Copy link

github-actions bot commented Mar 15, 2024

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 props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: matiasbenedetto <[email protected]>
Co-authored-by: scruffian <[email protected]>
Co-authored-by: getdave <[email protected]>
Co-authored-by: youknowriad <[email protected]>
Co-authored-by: MaggieCabrera <[email protected]>
Co-authored-by: jasmussen <[email protected]>
Co-authored-by: jameskoster <[email protected]>
Co-authored-by: annezazu <[email protected]>
Co-authored-by: SaxonF <[email protected]>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@matiasbenedetto matiasbenedetto added [Feature] Themes Questions or issues with incorporating or styling blocks in a theme. Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json [Feature] Font Library [Type] Bug An existing feature does not function as intended labels Mar 15, 2024
Copy link

github-actions bot commented Mar 15, 2024

Size Change: +150 B (0%)

Total Size: 1.71 MB

Filename Size Change
build/block-library/index.min.js 218 kB -7 B (0%)
build/components/index.min.js 224 kB -2 B (0%)
build/core-data/index.min.js 72.8 kB +25 B (0%)
build/data/index.min.js 8.98 kB +40 B (0%)
build/edit-site/index.min.js 218 kB +89 B (0%)
build/editor/index.min.js 64 kB +5 B (0%)
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 955 B
build/annotations/index.min.js 2.69 kB
build/api-fetch/index.min.js 2.32 kB
build/autop/index.min.js 2.1 kB
build/blob/index.min.js 578 B
build/block-directory/index.min.js 7.26 kB
build/block-directory/style-rtl.css 1.03 kB
build/block-directory/style.css 1.03 kB
build/block-editor/content-rtl.css 4.43 kB
build/block-editor/content.css 4.43 kB
build/block-editor/default-editor-styles-rtl.css 394 B
build/block-editor/default-editor-styles.css 394 B
build/block-editor/index.min.js 252 kB
build/block-editor/style-rtl.css 15.6 kB
build/block-editor/style.css 15.6 kB
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 126 B
build/block-library/blocks/audio/theme.css 126 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 104 B
build/block-library/blocks/avatar/style.css 104 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 415 B
build/block-library/blocks/button/editor.css 414 B
build/block-library/blocks/button/style-rtl.css 627 B
build/block-library/blocks/button/style.css 626 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 113 B
build/block-library/blocks/categories/editor.css 112 B
build/block-library/blocks/categories/style-rtl.css 124 B
build/block-library/blocks/categories/style.css 124 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 421 B
build/block-library/blocks/columns/style.css 421 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 647 B
build/block-library/blocks/cover/editor.css 650 B
build/block-library/blocks/cover/style-rtl.css 1.69 kB
build/block-library/blocks/cover/style.css 1.68 kB
build/block-library/blocks/details/editor-rtl.css 65 B
build/block-library/blocks/details/editor.css 65 B
build/block-library/blocks/details/style-rtl.css 98 B
build/block-library/blocks/details/style.css 98 B
build/block-library/blocks/embed/editor-rtl.css 322 B
build/block-library/blocks/embed/editor.css 322 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 126 B
build/block-library/blocks/embed/theme.css 126 B
build/block-library/blocks/file/editor-rtl.css 316 B
build/block-library/blocks/file/editor.css 316 B
build/block-library/blocks/file/style-rtl.css 280 B
build/block-library/blocks/file/style.css 281 B
build/block-library/blocks/file/view.min.js 324 B
build/block-library/blocks/footnotes/style-rtl.css 201 B
build/block-library/blocks/footnotes/style.css 199 B
build/block-library/blocks/form-input/editor-rtl.css 227 B
build/block-library/blocks/form-input/editor.css 227 B
build/block-library/blocks/form-input/style-rtl.css 343 B
build/block-library/blocks/form-input/style.css 343 B
build/block-library/blocks/form-submission-notification/editor-rtl.css 340 B
build/block-library/blocks/form-submission-notification/editor.css 340 B
build/block-library/blocks/form-submit-button/style-rtl.css 69 B
build/block-library/blocks/form-submit-button/style.css 69 B
build/block-library/blocks/form/view.min.js 471 B
build/block-library/blocks/freeform/editor-rtl.css 2.61 kB
build/block-library/blocks/freeform/editor.css 2.61 kB
build/block-library/blocks/gallery/editor-rtl.css 947 B
build/block-library/blocks/gallery/editor.css 952 B
build/block-library/blocks/gallery/style-rtl.css 1.72 kB
build/block-library/blocks/gallery/style.css 1.72 kB
build/block-library/blocks/gallery/theme-rtl.css 108 B
build/block-library/blocks/gallery/theme.css 108 B
build/block-library/blocks/group/editor-rtl.css 647 B
build/block-library/blocks/group/editor.css 647 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 189 B
build/block-library/blocks/heading/style.css 189 B
build/block-library/blocks/html/editor-rtl.css 336 B
build/block-library/blocks/html/editor.css 337 B
build/block-library/blocks/image/editor-rtl.css 878 B
build/block-library/blocks/image/editor.css 878 B
build/block-library/blocks/image/style-rtl.css 1.6 kB
build/block-library/blocks/image/style.css 1.59 kB
build/block-library/blocks/image/theme-rtl.css 126 B
build/block-library/blocks/image/theme.css 126 B
build/block-library/blocks/image/view.min.js 1.54 kB
build/block-library/blocks/latest-comments/style-rtl.css 357 B
build/block-library/blocks/latest-comments/style.css 357 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 306 B
build/block-library/blocks/media-text/editor.css 305 B
build/block-library/blocks/media-text/style-rtl.css 505 B
build/block-library/blocks/media-text/style.css 503 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 668 B
build/block-library/blocks/navigation-link/editor.css 669 B
build/block-library/blocks/navigation-link/style-rtl.css 259 B
build/block-library/blocks/navigation-link/style.css 257 B
build/block-library/blocks/navigation-submenu/editor-rtl.css 296 B
build/block-library/blocks/navigation-submenu/editor.css 295 B
build/block-library/blocks/navigation/editor-rtl.css 2.26 kB
build/block-library/blocks/navigation/editor.css 2.26 kB
build/block-library/blocks/navigation/style-rtl.css 2.26 kB
build/block-library/blocks/navigation/style.css 2.25 kB
build/block-library/blocks/navigation/view.min.js 1.02 kB
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 377 B
build/block-library/blocks/page-list/editor.css 377 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 235 B
build/block-library/blocks/paragraph/editor.css 235 B
build/block-library/blocks/paragraph/style-rtl.css 335 B
build/block-library/blocks/paragraph/style.css 335 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 508 B
build/block-library/blocks/post-comments-form/style.css 508 B
build/block-library/blocks/post-content/editor-rtl.css 74 B
build/block-library/blocks/post-content/editor.css 74 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 71 B
build/block-library/blocks/post-excerpt/editor.css 71 B
build/block-library/blocks/post-excerpt/style-rtl.css 141 B
build/block-library/blocks/post-excerpt/style.css 141 B
build/block-library/blocks/post-featured-image/editor-rtl.css 666 B
build/block-library/blocks/post-featured-image/editor.css 662 B
build/block-library/blocks/post-featured-image/style-rtl.css 342 B
build/block-library/blocks/post-featured-image/style.css 342 B
build/block-library/blocks/post-navigation-link/style-rtl.css 215 B
build/block-library/blocks/post-navigation-link/style.css 214 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 409 B
build/block-library/blocks/post-template/style.css 408 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-time-to-read/style-rtl.css 69 B
build/block-library/blocks/post-time-to-read/style.css 69 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 125 B
build/block-library/blocks/preformatted/style.css 125 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 354 B
build/block-library/blocks/pullquote/style.css 354 B
build/block-library/blocks/pullquote/theme-rtl.css 168 B
build/block-library/blocks/pullquote/theme.css 168 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 486 B
build/block-library/blocks/query/editor.css 486 B
build/block-library/blocks/query/view.min.js 958 B
build/block-library/blocks/quote/style-rtl.css 237 B
build/block-library/blocks/quote/style.css 237 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 140 B
build/block-library/blocks/read-more/style.css 140 B
build/block-library/blocks/rss/editor-rtl.css 149 B
build/block-library/blocks/rss/editor.css 149 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 184 B
build/block-library/blocks/search/editor.css 184 B
build/block-library/blocks/search/style-rtl.css 629 B
build/block-library/blocks/search/style.css 628 B
build/block-library/blocks/search/theme-rtl.css 114 B
build/block-library/blocks/search/theme.css 114 B
build/block-library/blocks/search/view.min.js 478 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 229 B
build/block-library/blocks/separator/style.css 229 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 323 B
build/block-library/blocks/shortcode/editor.css 323 B
build/block-library/blocks/site-logo/editor-rtl.css 754 B
build/block-library/blocks/site-logo/editor.css 754 B
build/block-library/blocks/site-logo/style-rtl.css 204 B
build/block-library/blocks/site-logo/style.css 204 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 682 B
build/block-library/blocks/social-links/editor.css 681 B
build/block-library/blocks/social-links/style-rtl.css 1.48 kB
build/block-library/blocks/social-links/style.css 1.48 kB
build/block-library/blocks/spacer/editor-rtl.css 350 B
build/block-library/blocks/spacer/editor.css 350 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 395 B
build/block-library/blocks/table/editor.css 395 B
build/block-library/blocks/table/style-rtl.css 639 B
build/block-library/blocks/table/style.css 639 B
build/block-library/blocks/table/theme-rtl.css 146 B
build/block-library/blocks/table/theme.css 146 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 403 B
build/block-library/blocks/template-part/editor.css 403 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/term-description/style-rtl.css 111 B
build/block-library/blocks/term-description/style.css 111 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 552 B
build/block-library/blocks/video/editor.css 555 B
build/block-library/blocks/video/style-rtl.css 185 B
build/block-library/blocks/video/style.css 185 B
build/block-library/blocks/video/theme-rtl.css 126 B
build/block-library/blocks/video/theme.css 126 B
build/block-library/classic-rtl.css 179 B
build/block-library/classic.css 179 B
build/block-library/common-rtl.css 1.11 kB
build/block-library/common.css 1.11 kB
build/block-library/editor-elements-rtl.css 75 B
build/block-library/editor-elements.css 75 B
build/block-library/editor-rtl.css 12.4 kB
build/block-library/editor.css 12.4 kB
build/block-library/elements-rtl.css 54 B
build/block-library/elements.css 54 B
build/block-library/reset-rtl.css 472 B
build/block-library/reset.css 472 B
build/block-library/style-rtl.css 14.8 kB
build/block-library/style.css 14.8 kB
build/block-library/theme-rtl.css 688 B
build/block-library/theme.css 693 B
build/block-serialization-default-parser/index.min.js 1.12 kB
build/block-serialization-spec-parser/index.min.js 2.87 kB
build/blocks/index.min.js 51.8 kB
build/commands/index.min.js 15.6 kB
build/commands/style-rtl.css 935 B
build/commands/style.css 930 B
build/components/style-rtl.css 11.8 kB
build/components/style.css 11.9 kB
build/compose/index.min.js 12.6 kB
build/core-commands/index.min.js 2.77 kB
build/customize-widgets/index.min.js 11.2 kB
build/customize-widgets/style-rtl.css 1.36 kB
build/customize-widgets/style.css 1.36 kB
build/data-controls/index.min.js 640 B
build/date/index.min.js 17.9 kB
build/deprecated/index.min.js 451 B
build/dom-ready/index.min.js 324 B
build/dom/index.min.js 4.65 kB
build/edit-post/classic-rtl.css 558 B
build/edit-post/classic.css 558 B
build/edit-post/index.min.js 24.2 kB
build/edit-post/style-rtl.css 5.58 kB
build/edit-post/style.css 5.57 kB
build/edit-site/style-rtl.css 15 kB
build/edit-site/style.css 15 kB
build/edit-widgets/index.min.js 17.3 kB
build/edit-widgets/style-rtl.css 4.17 kB
build/edit-widgets/style.css 4.16 kB
build/editor/style-rtl.css 5.36 kB
build/editor/style.css 5.35 kB
build/element/index.min.js 4.83 kB
build/escape-html/index.min.js 537 B
build/format-library/index.min.js 8.03 kB
build/format-library/style-rtl.css 492 B
build/format-library/style.css 490 B
build/hooks/index.min.js 1.55 kB
build/html-entities/index.min.js 448 B
build/i18n/index.min.js 3.58 kB
build/interactivity/file.min.js 447 B
build/interactivity/image.min.js 1.67 kB
build/interactivity/index.min.js 13 kB
build/interactivity/navigation.min.js 1.15 kB
build/interactivity/query.min.js 740 B
build/interactivity/router.min.js 1.36 kB
build/interactivity/search.min.js 618 B
build/is-shallow-equal/index.min.js 527 B
build/keyboard-shortcuts/index.min.js 1.74 kB
build/keycodes/index.min.js 1.46 kB
build/list-reusable-blocks/index.min.js 2.11 kB
build/list-reusable-blocks/style-rtl.css 851 B
build/list-reusable-blocks/style.css 849 B
build/media-utils/index.min.js 2.92 kB
build/modules/importmap-polyfill.min.js 12.2 kB
build/notices/index.min.js 948 B
build/nux/index.min.js 2 kB
build/nux/style-rtl.css 747 B
build/nux/style.css 742 B
build/patterns/index.min.js 5.73 kB
build/patterns/style-rtl.css 553 B
build/patterns/style.css 552 B
build/plugins/index.min.js 1.8 kB
build/preferences-persistence/index.min.js 2.05 kB
build/preferences/index.min.js 2.81 kB
build/preferences/style-rtl.css 710 B
build/preferences/style.css 712 B
build/primitives/index.min.js 975 B
build/priority-queue/index.min.js 1.52 kB
build/private-apis/index.min.js 1 kB
build/react-i18n/index.min.js 623 B
build/react-refresh-entry/index.min.js 9.47 kB
build/react-refresh-runtime/index.min.js 6.78 kB
build/redux-routine/index.min.js 2.7 kB
build/reusable-blocks/index.min.js 2.73 kB
build/reusable-blocks/style-rtl.css 256 B
build/reusable-blocks/style.css 256 B
build/rich-text/index.min.js 10.5 kB
build/router/index.min.js 1.79 kB
build/server-side-render/index.min.js 1.96 kB
build/shortcode/index.min.js 1.39 kB
build/style-engine/index.min.js 2.1 kB
build/token-list/index.min.js 582 B
build/url/index.min.js 3.72 kB
build/vendors/inert-polyfill.min.js 2.48 kB
build/vendors/react-dom.min.js 41.7 kB
build/vendors/react.min.js 4.02 kB
build/viewport/index.min.js 957 B
build/warning/index.min.js 249 B
build/widgets/index.min.js 7.21 kB
build/widgets/style-rtl.css 1.17 kB
build/widgets/style.css 1.17 kB
build/wordcount/index.min.js 1.02 kB

compressed-size-action

} ) );
setUserConfig( ( currentConfig ) => {
// Avoids overwriting certain paths when applying a theme variation.
for ( const path of PATHS_TO_AVOID_OVERWRITING ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why this needs to be a loop. Isn't it only really one path we want to avoid overwriting?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is currently but that could change in the future. If we wanted to simplify this PR we could avoid the loop and make the "path" a single string and not an array of strings.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if that would be better, if we don't have other cases that this need to happen for.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Dave said, the loop makes the code simpler when more paths are added. In fact, I added a new path for custom color palettes in this commit: 651b30d

@youknowriad
Copy link
Contributor

Just wanted to share that I am not sure I agree with the proposed change in this PR. Let me think about it more and I'll come back with better thoughts. Let's also try to get some opinions here

@youknowriad
Copy link
Contributor

Is the idea of the PR to keep "active font families" consistent when we switch variations?

For me given that when switching variations we're also potentially switching the font families that are actually used... it doesn't make sense to keep the same "active font families" (even custom ones) because you want to optimize your frontend with and only load the ones that are used. If you want to reuse more font families, I think it's fine to go and active them again.

@getdave
Copy link
Contributor

getdave commented Mar 18, 2024

Pinging Editor Triage leads for opinion - @fabiankaegy @annezazu 🙏

@getdave
Copy link
Contributor

getdave commented Mar 18, 2024

Thanks for working on this @matiasbenedetto 👍

FWIW, my perspective is that the behaviour when switching variation should be:

  • the existing Theme variation's fonts are deactivated (but remain installed)
  • new Theme variation's fonts are installed and activated.
  • any custom fonts installed/activated by the user remain unaffected at all times (this is where my and @youknowriad's opinions appear to differ).

The only downside is that if the user has manually applied the Theme variation's fonts from an older Theme variation to specific elements, then these changes will be lost on Theme variation switch.

However, that seems reasonable considering that it's unlikely you would want typographic treatments from a different style to continue to apply when you switch that style.

@youknowriad
Copy link
Contributor

any custom installed/activated fonts remain at all times (this is where my and @youknowriad opinion differ it seems).

For me, if that should be the case, it would mean that we need a separate place to store the active fonts and not reuse the "global styles" endpoint/storage... This creates a precedent that I'm not sure that we should allow at the moment.

The only downside is that if the user has manually applied the Theme variation's fonts from an older Theme variation to specific elements, then these changes will be lost on Theme variation switch.

Theme variation font or something you add manually is the same thing for me. there's no conceptual difference in how things are stored. So I believe we should treat them in the same way. It's just a "preset" for multiple user changes that a user can apply together.

@youknowriad
Copy link
Contributor

youknowriad commented Mar 18, 2024

In fact, there's nothing different here compared to "colors" for instance. If I modify the color palette manually (add custom colors there) and then I switch theme variations, my custom colors are gone too.

@scruffian
Copy link
Contributor

In fact, there's nothing different here compared to "colors" for instance. If I modify the color palette manually (add custom colors there) and then I switch theme variations, my custom colors are gone too.

Also, if theme variations define less variations than the base variation then any colors you selected from the base variation will be lost when you switch to a variation with less colors.

@MaggieCabrera
Copy link
Contributor

In fact, there's nothing different here compared to "colors" for instance. If I modify the color palette manually (add custom colors there) and then I switch theme variations, my custom colors are gone too.

This is key here. We are fixing it here just for fonts, which I'm not particularly opposed to, but we gotta keep in mind the "bug", if we decide that's what it is, is affecting everything else that the user changes, not just the fonts.

I've been chatting with designers using the site editor, and some of them find it jarring that changing a style variation overrides every single global style made by the user. If the user never saved their changes, those are lost and can't be recovered via revisions, which is very destructive, given that we don't warn that this will happen.

I think the reason why this happens like this is because there is no way to go back to the "default" state other than resetting global style changes, but that changes if/when we merge #59717

I suggest approaching this holistically and looking for a way to solve the whole issue, even if we start by fixing just the fonts, we have to take into account the whole flow. We could create a new style variation with the user settings that doesn't get changed if the user changes any of the presets and that is applied on top of them since custom is already a layer on top of the theme. This makes sense technically, I wonder if it's confusing from a UI/UX standpoint. It's still better than losing the user's changes.

@matiasbenedetto
Copy link
Contributor Author

matiasbenedetto commented Mar 18, 2024

From my perspective, theme style variations should only affect settings/styles defined by themes and not the custom styles defined by users. It seems like an error to assume the user wants to switch custom-defined settings such as color palettes and font families when switching a theme variation. What would be the reason to assume that activating a theme variant, which can be as 'small' as changing the spacing on the elements, should remove all the custom settings defined by the user? That intention can be safely assumed on a theme switch because of how historically themes worked on WordPress but not on theme style variations that are only partial changes of the same theme.

From a technical perspective, the settings defined in the theme style variations are treated correctly as theme data and cannot set custom settings. The custom and the theme data cannot collide in the global styles database persistence because they are stored in different keys, theme and custom. From both a technical and user perspective, there doesn't seem to be a good reason why WordPress whips the user custom configurations when applying a theme variation.

Is the idea of the PR to keep "active font families" consistent when we switch variations?

Nope, that's not the only objective, that's only one of the objectives.

In fact, there's nothing different here compared to "colors" for instance. If I modify the color palette manually (add custom colors there) and then I switch theme variations, my custom colors are gone too.

Exactly, that's unexpected, and there's no good reason that the user wants to wipe all the custom configs laboriously created.
Up to this point, my testing is limited, but I could identify at least two paths where this change is needed:

  • settings.typography.fontFamilies
  • settings.colors.palette

They can be added to the list when we identify more areas where this is needed.

I added more screencasts in the PR body featuring the differences between this PR and trunk.

@youknowriad
Copy link
Contributor

From my perspective, theme style variations should only affect settings/styles defined by themes and not the custom styles defined by users.

I think what's missing here is that while theme style variations are "mostly defined" by themes today, that's just a temporary thing. Variations are a set of styles and settings that override your own settings and styles entirely. The endpoint is already filterable, so they can come from plugins too and ultimately, users will also be able to save their own settings that they customized in the UI as a variations.

So consider "custom" keys as "user changes" is actually wrong. Anything can be customized through the UI of global styles, not just the "custom" presets. Even "theme" presets can be overridden. (in fact it's already possible to do that for colors in the UI)


Now, I agree that there are downsides to the current behavior, it's not clear to the user that he's replacing "everything" when picking a variations and this one of the reasons we're now exploring color presets and typesets as separate variations for the users to pick from. When picking a "color preset" only color related changes are overridden...

I think overall, the issue here is more a UX issue, and I agree with @MaggieCabrera that we should take a holistic approach here. I think there's no rush in finding a solution now, this issue is present in global styles for multiple releases now. I'm sure this has been discussed already elsewhere so linking @jasmussen and @jameskoster

@matiasbenedetto
Copy link
Contributor Author

matiasbenedetto commented Mar 18, 2024

So consider "custom" keys as "user changes" is actually wrong. Anything can be customized through the UI of global styles, not just the "custom" presets. Even "theme" presets can be overridden. (in fact it's already possible to do that for colors in the UI)

That's a good point, but I think that it's correct to assume if the user is updating the presets labeled as 'theme', they will change when theme-related styles change but not when adding 'custom ' configs.

image

@jasmussen
Copy link
Contributor

Now, I agree that there are downsides to the current behavior, it's not clear to the user that he's replacing "everything" when picking a variations and this one of the reasons we're now exploring color presets and typesets as separate variations for the users to pick from. When picking a "color preset" only color related changes are overridden...

A quick CC for @SaxonF and @richtabor as well.

The majority, for me, comes back to the fact that we have highly visible undo/redo buttons in the top toolbar, and we now also have very visual style revisions: #58578 (comment)

That means whatever changes you make across are very easy to revert, so there's little harm done, whatever issues may be at the root.

The point made is also clear, this is an issue present even with global styles. We have this issue to allow saving and managing custom style variations. A key piece:

activating custom styles

We can revisit this flow based on learnings since that issue was made, but the main flow is the same, whether it's complete style variations, or just color or font variations. This should mainly address the original issue that any customizations you've made on top of a chosen variation makes it show up as an unsaved custom variation. Like the undo stack and the style revisions, this ultimately adds to the logbook for what you've done. Which IMO is ultimately the solution here: we do allow you to change broad swathes of visuals in a single click, because it's trivial to go back.

@jameskoster
Copy link
Contributor

I agree with @MaggieCabrera that we should take a holistic approach here.

+1000. It has been discussed a lot, but I don't think I've seen a holistic design vision that connects all the things.

I've been chatting with designers using the site editor, and some of them find it jarring that changing a style variation overrides every single global style made by the user

Imo this is the main hurdle to tackle – what is the ideal UX when you 'edit' a chosen variation, or switch to another variation?

Do we mark variations as edited and provide a reset action (similar to theme templates)? Or, do we have a persistent "Custom" variation which becomes active when you edit an existing variation? Or do we do something else entirely?

Solving this will address a big pain point in the whole global styles experience.

@annezazu
Copy link
Contributor

This has come up in MANY different ways as evidenced in this related issue: #46397 It's really jarring to switch variations and lose everything. At the same time, this would technically be consistent with what is today. We also have more robust revisions at this point so, in theory, it should be "safer" to lose things considering one can compare and roll back. This feels larger than this release to solve as others have noted so I think it's not a deal breaking thing to fix this time around. I do think this current experience needs to be greatly improved or, at least, communicated better ("save before switching variations").

@SaxonF
Copy link
Contributor

SaxonF commented Mar 20, 2024

This is particularly annoying when you have added custom CSS which also gets removed.

This work, which decouples fonts/colors from variations, should help a little bit as you can try fonts/colors from other variations without overriding other properties.

You can make changes to templates provided by the theme , and "clear customizations" if needed, so I'd expect similar behaviour here. If I make a change, including choosing a font or colour set, I should be able to save those changes to the variation. If a user attempts to change variations without saving, we prompt to save or create a new variation before switching. I should be able to "clear customizations" to go back to theme defaults.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Font Library [Feature] Themes Questions or issues with incorporating or styling blocks in a theme. Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json [Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants