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

Revert "Font Library: Group fonts by source (#63211)" #65590

Merged
merged 3 commits into from
Sep 30, 2024

Conversation

vcanales
Copy link
Member

@vcanales vcanales commented Sep 24, 2024

This reverts commit e7bf3b6.

Todo

  • Make sure e2e tests pass. Figure out if the merge removed valid code (there were conflicts that needed to be solved before reverting the commit.
  • Update Global Styles Typography screen description to better explain what can be found in that panel.

What?

Following up on this discussion on #63505, this PR reverts the changes introduced in #63211, which grouped fonts by their sources (theme and custom) in the Font Library.

Why?

Users only need to interact with active fonts within the Typography panel, regardless of whether they come from the theme or are custom additions.

How?

The implementation involves:

  • Removing the grouping of fonts by source in the Typography panel.
  • Restoring the previous singular font group display where all active fonts are shown together.
  • Adjusting the relevant components and styles to reflect the pre-grouping state.

Testing Instructions

  1. Global Styles Testing

    • Navigate to the Global Styles settings in the site editor.
    • Open the Typography panel.
    • Verify that all active fonts are displayed together without distinction between theme and custom fonts.
    • Ensure you can manage (add, remove, or disable) fonts.
  2. Font Management

    • Open the Font Library modal.
    • Test the management of active fonts, ensuring that font operations (e.g., disabling a font from the library) are working as expected.

Screenshots

Before this PR Now
image image

cc. @richtabor

Copy link

github-actions bot commented Sep 24, 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: vcanales <vcanales@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: afercia <afercia@git.wordpress.org>
Co-authored-by: richtabor <richtabor@git.wordpress.org>

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

@vcanales vcanales added [Type] Regression Related to a regression in the latest release [Feature] Font Library Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json labels Sep 24, 2024
@vcanales vcanales self-assigned this Sep 24, 2024
Copy link

github-actions bot commented Sep 24, 2024

Size Change: +1.21 kB (+0.07%)

Total Size: 1.77 MB

Filename Size Change
build-module/interactivity-router/index.min.js 3 kB -6 B (-0.2%)
build/blob/index.min.js 579 B -15 B (-2.53%)
build/block-directory/index.min.js 7.26 kB +145 B (+2.04%)
build/block-directory/style-rtl.css 1.07 kB +56 B (+5.52%) 🔍
build/block-directory/style.css 1.07 kB +55 B (+5.42%) 🔍
build/block-editor/content-rtl.css 4.46 kB -5 B (-0.11%)
build/block-editor/content.css 4.46 kB -4 B (-0.09%)
build/block-editor/index.min.js 256 kB -105 B (-0.04%)
build/block-editor/style-rtl.css 15.6 kB -28 B (-0.18%)
build/block-editor/style.css 15.5 kB -28 B (-0.18%)
build/block-library/blocks/form/view.min.js 470 B -14 B (-2.89%)
build/block-library/index.min.js 219 kB +19 B (+0.01%)
build/blocks/index.min.js 52.6 kB +27 B (+0.05%)
build/components/index.min.js 226 kB +728 B (+0.32%)
build/core-data/index.min.js 73.4 kB -19 B (-0.03%)
build/dom/index.min.js 4.66 kB -1 B (-0.02%)
build/edit-post/index.min.js 13.6 kB +1 B (+0.01%)
build/edit-site/index.min.js 217 kB -253 B (-0.12%)
build/edit-site/posts-rtl.css 7.36 kB +62 B (+0.85%)
build/edit-site/posts.css 7.37 kB +64 B (+0.88%)
build/edit-site/style-rtl.css 12.6 kB +56 B (+0.45%)
build/edit-site/style.css 12.6 kB +60 B (+0.48%)
build/edit-widgets/index.min.js 17.8 kB +57 B (+0.32%)
build/editor/index.min.js 103 kB +338 B (+0.33%)
build/editor/style-rtl.css 9.33 kB -3 B (-0.03%)
build/editor/style.css 9.34 kB +1 B (+0.01%)
build/hooks/index.min.js 1.65 kB +107 B (+6.93%) 🔍
build/rich-text/index.min.js 10.1 kB -44 B (-0.44%)
build/url/index.min.js 3.9 kB -25 B (-0.64%)
build/widgets/index.min.js 7.17 kB -14 B (-0.19%)
ℹ️ View Unchanged
Filename Size
build-module/a11y/index.min.js 482 B
build-module/block-library/file/view.min.js 447 B
build-module/block-library/image/view.min.js 1.78 kB
build-module/block-library/navigation/view.min.js 1.16 kB
build-module/block-library/query/view.min.js 743 B
build-module/block-library/search/view.min.js 616 B
build-module/interactivity/debug.min.js 16.7 kB
build-module/interactivity/index.min.js 13.4 kB
build/a11y/index.min.js 952 B
build/annotations/index.min.js 2.26 kB
build/api-fetch/index.min.js 2.32 kB
build/autop/index.min.js 2.12 kB
build/block-editor/default-editor-styles-rtl.css 394 B
build/block-editor/default-editor-styles.css 394 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 149 B
build/block-library/blocks/audio/editor.css 151 B
build/block-library/blocks/audio/style-rtl.css 132 B
build/block-library/blocks/audio/style.css 132 B
build/block-library/blocks/audio/theme-rtl.css 134 B
build/block-library/blocks/audio/theme.css 134 B
build/block-library/blocks/avatar/editor-rtl.css 115 B
build/block-library/blocks/avatar/editor.css 115 B
build/block-library/blocks/avatar/style-rtl.css 104 B
build/block-library/blocks/avatar/style.css 104 B
build/block-library/blocks/button/editor-rtl.css 265 B
build/block-library/blocks/button/editor.css 265 B
build/block-library/blocks/button/style-rtl.css 538 B
build/block-library/blocks/button/style.css 538 B
build/block-library/blocks/buttons/editor-rtl.css 291 B
build/block-library/blocks/buttons/editor.css 291 B
build/block-library/blocks/buttons/style-rtl.css 328 B
build/block-library/blocks/buttons/style.css 328 B
build/block-library/blocks/calendar/style-rtl.css 240 B
build/block-library/blocks/calendar/style.css 240 B
build/block-library/blocks/categories/editor-rtl.css 132 B
build/block-library/blocks/categories/editor.css 131 B
build/block-library/blocks/categories/style-rtl.css 152 B
build/block-library/blocks/categories/style.css 152 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 122 B
build/block-library/blocks/code/theme.css 122 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 420 B
build/block-library/blocks/columns/style.css 420 B
build/block-library/blocks/comment-author-avatar/editor-rtl.css 124 B
build/block-library/blocks/comment-author-avatar/editor.css 124 B
build/block-library/blocks/comment-author-name/style-rtl.css 72 B
build/block-library/blocks/comment-author-name/style.css 72 B
build/block-library/blocks/comment-content/style-rtl.css 120 B
build/block-library/blocks/comment-content/style.css 120 B
build/block-library/blocks/comment-date/style-rtl.css 65 B
build/block-library/blocks/comment-date/style.css 65 B
build/block-library/blocks/comment-edit-link/style-rtl.css 70 B
build/block-library/blocks/comment-edit-link/style.css 70 B
build/block-library/blocks/comment-reply-link/style-rtl.css 71 B
build/block-library/blocks/comment-reply-link/style.css 71 B
build/block-library/blocks/comment-template/style-rtl.css 200 B
build/block-library/blocks/comment-template/style.css 199 B
build/block-library/blocks/comments-pagination-numbers/editor-rtl.css 122 B
build/block-library/blocks/comments-pagination-numbers/editor.css 121 B
build/block-library/blocks/comments-pagination/editor-rtl.css 228 B
build/block-library/blocks/comments-pagination/editor.css 217 B
build/block-library/blocks/comments-pagination/style-rtl.css 234 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 832 B
build/block-library/blocks/comments/editor.css 832 B
build/block-library/blocks/comments/style-rtl.css 632 B
build/block-library/blocks/comments/style.css 631 B
build/block-library/blocks/cover/editor-rtl.css 641 B
build/block-library/blocks/cover/editor.css 642 B
build/block-library/blocks/cover/style-rtl.css 1.62 kB
build/block-library/blocks/cover/style.css 1.6 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 86 B
build/block-library/blocks/details/style.css 86 B
build/block-library/blocks/embed/editor-rtl.css 331 B
build/block-library/blocks/embed/editor.css 331 B
build/block-library/blocks/embed/style-rtl.css 419 B
build/block-library/blocks/embed/style.css 419 B
build/block-library/blocks/embed/theme-rtl.css 133 B
build/block-library/blocks/embed/theme.css 133 B
build/block-library/blocks/file/editor-rtl.css 326 B
build/block-library/blocks/file/editor.css 326 B
build/block-library/blocks/file/style-rtl.css 278 B
build/block-library/blocks/file/style.css 279 B
build/block-library/blocks/file/view.min.js 324 B
build/block-library/blocks/footnotes/style-rtl.css 198 B
build/block-library/blocks/footnotes/style.css 197 B
build/block-library/blocks/form-input/editor-rtl.css 229 B
build/block-library/blocks/form-input/editor.css 229 B
build/block-library/blocks/form-input/style-rtl.css 357 B
build/block-library/blocks/form-input/style.css 357 B
build/block-library/blocks/form-submission-notification/editor-rtl.css 344 B
build/block-library/blocks/form-submission-notification/editor.css 341 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/freeform/editor-rtl.css 2.6 kB
build/block-library/blocks/freeform/editor.css 2.6 kB
build/block-library/blocks/gallery/editor-rtl.css 946 B
build/block-library/blocks/gallery/editor.css 951 B
build/block-library/blocks/gallery/style-rtl.css 1.83 kB
build/block-library/blocks/gallery/style.css 1.82 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 334 B
build/block-library/blocks/group/editor.css 334 B
build/block-library/blocks/group/style-rtl.css 103 B
build/block-library/blocks/group/style.css 103 B
build/block-library/blocks/group/theme-rtl.css 79 B
build/block-library/blocks/group/theme.css 79 B
build/block-library/blocks/heading/style-rtl.css 188 B
build/block-library/blocks/heading/style.css 188 B
build/block-library/blocks/html/editor-rtl.css 346 B
build/block-library/blocks/html/editor.css 347 B
build/block-library/blocks/image/editor-rtl.css 785 B
build/block-library/blocks/image/editor.css 787 B
build/block-library/blocks/image/style-rtl.css 1.59 kB
build/block-library/blocks/image/style.css 1.59 kB
build/block-library/blocks/image/theme-rtl.css 137 B
build/block-library/blocks/image/theme.css 137 B
build/block-library/blocks/image/view.min.js 1.65 kB
build/block-library/blocks/latest-comments/style-rtl.css 355 B
build/block-library/blocks/latest-comments/style.css 354 B
build/block-library/blocks/latest-posts/editor-rtl.css 179 B
build/block-library/blocks/latest-posts/editor.css 179 B
build/block-library/blocks/latest-posts/style-rtl.css 509 B
build/block-library/blocks/latest-posts/style.css 510 B
build/block-library/blocks/list/style-rtl.css 107 B
build/block-library/blocks/list/style.css 107 B
build/block-library/blocks/loginout/style-rtl.css 61 B
build/block-library/blocks/loginout/style.css 61 B
build/block-library/blocks/media-text/editor-rtl.css 321 B
build/block-library/blocks/media-text/editor.css 320 B
build/block-library/blocks/media-text/style-rtl.css 558 B
build/block-library/blocks/media-text/style.css 556 B
build/block-library/blocks/more/editor-rtl.css 427 B
build/block-library/blocks/more/editor.css 427 B
build/block-library/blocks/navigation-link/editor-rtl.css 644 B
build/block-library/blocks/navigation-link/editor.css 645 B
build/block-library/blocks/navigation-link/style-rtl.css 192 B
build/block-library/blocks/navigation-link/style.css 191 B
build/block-library/blocks/navigation-submenu/editor-rtl.css 295 B
build/block-library/blocks/navigation-submenu/editor.css 294 B
build/block-library/blocks/navigation/editor-rtl.css 2.19 kB
build/block-library/blocks/navigation/editor.css 2.2 kB
build/block-library/blocks/navigation/style-rtl.css 2.25 kB
build/block-library/blocks/navigation/style.css 2.23 kB
build/block-library/blocks/navigation/view.min.js 1.03 kB
build/block-library/blocks/nextpage/editor-rtl.css 392 B
build/block-library/blocks/nextpage/editor.css 392 B
build/block-library/blocks/page-list/editor-rtl.css 378 B
build/block-library/blocks/page-list/editor.css 378 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 236 B
build/block-library/blocks/paragraph/editor.css 236 B
build/block-library/blocks/paragraph/style-rtl.css 341 B
build/block-library/blocks/paragraph/style.css 340 B
build/block-library/blocks/post-author-biography/style-rtl.css 74 B
build/block-library/blocks/post-author-biography/style.css 74 B
build/block-library/blocks/post-author-name/style-rtl.css 69 B
build/block-library/blocks/post-author-name/style.css 69 B
build/block-library/blocks/post-author/editor-rtl.css 107 B
build/block-library/blocks/post-author/editor.css 107 B
build/block-library/blocks/post-author/style-rtl.css 188 B
build/block-library/blocks/post-author/style.css 189 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 527 B
build/block-library/blocks/post-comments-form/style.css 528 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-content/style-rtl.css 79 B
build/block-library/blocks/post-content/style.css 79 B
build/block-library/blocks/post-date/style-rtl.css 62 B
build/block-library/blocks/post-date/style.css 62 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 155 B
build/block-library/blocks/post-excerpt/style.css 155 B
build/block-library/blocks/post-featured-image/editor-rtl.css 729 B
build/block-library/blocks/post-featured-image/editor.css 726 B
build/block-library/blocks/post-featured-image/style-rtl.css 347 B
build/block-library/blocks/post-featured-image/style.css 347 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 399 B
build/block-library/blocks/post-template/style.css 398 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 70 B
build/block-library/blocks/post-time-to-read/style.css 70 B
build/block-library/blocks/post-title/style-rtl.css 162 B
build/block-library/blocks/post-title/style.css 162 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 134 B
build/block-library/blocks/pullquote/editor.css 134 B
build/block-library/blocks/pullquote/style-rtl.css 342 B
build/block-library/blocks/pullquote/style.css 342 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 121 B
build/block-library/blocks/query-pagination-numbers/editor.css 118 B
build/block-library/blocks/query-pagination/editor-rtl.css 154 B
build/block-library/blocks/query-pagination/editor.css 154 B
build/block-library/blocks/query-pagination/style-rtl.css 237 B
build/block-library/blocks/query-pagination/style.css 237 B
build/block-library/blocks/query-title/style-rtl.css 64 B
build/block-library/blocks/query-title/style.css 64 B
build/block-library/blocks/query/editor-rtl.css 452 B
build/block-library/blocks/query/editor.css 451 B
build/block-library/blocks/query/view.min.js 958 B
build/block-library/blocks/quote/style-rtl.css 238 B
build/block-library/blocks/quote/style.css 238 B
build/block-library/blocks/quote/theme-rtl.css 233 B
build/block-library/blocks/quote/theme.css 236 B
build/block-library/blocks/read-more/style-rtl.css 138 B
build/block-library/blocks/read-more/style.css 138 B
build/block-library/blocks/rss/editor-rtl.css 101 B
build/block-library/blocks/rss/editor.css 101 B
build/block-library/blocks/rss/style-rtl.css 288 B
build/block-library/blocks/rss/style.css 287 B
build/block-library/blocks/search/editor-rtl.css 199 B
build/block-library/blocks/search/editor.css 199 B
build/block-library/blocks/search/style-rtl.css 672 B
build/block-library/blocks/search/style.css 671 B
build/block-library/blocks/search/theme-rtl.css 113 B
build/block-library/blocks/search/theme.css 113 B
build/block-library/blocks/search/view.min.js 475 B
build/block-library/blocks/separator/editor-rtl.css 100 B
build/block-library/blocks/separator/editor.css 100 B
build/block-library/blocks/separator/style-rtl.css 248 B
build/block-library/blocks/separator/style.css 248 B
build/block-library/blocks/separator/theme-rtl.css 195 B
build/block-library/blocks/separator/theme.css 195 B
build/block-library/blocks/shortcode/editor-rtl.css 286 B
build/block-library/blocks/shortcode/editor.css 286 B
build/block-library/blocks/site-logo/editor-rtl.css 806 B
build/block-library/blocks/site-logo/editor.css 803 B
build/block-library/blocks/site-logo/style-rtl.css 218 B
build/block-library/blocks/site-logo/style.css 218 B
build/block-library/blocks/site-tagline/editor-rtl.css 87 B
build/block-library/blocks/site-tagline/editor.css 87 B
build/block-library/blocks/site-tagline/style-rtl.css 65 B
build/block-library/blocks/site-tagline/style.css 65 B
build/block-library/blocks/site-title/editor-rtl.css 85 B
build/block-library/blocks/site-title/editor.css 85 B
build/block-library/blocks/site-title/style-rtl.css 143 B
build/block-library/blocks/site-title/style.css 143 B
build/block-library/blocks/social-link/editor-rtl.css 338 B
build/block-library/blocks/social-link/editor.css 338 B
build/block-library/blocks/social-links/editor-rtl.css 757 B
build/block-library/blocks/social-links/editor.css 756 B
build/block-library/blocks/social-links/style-rtl.css 1.51 kB
build/block-library/blocks/social-links/style.css 1.5 kB
build/block-library/blocks/spacer/editor-rtl.css 346 B
build/block-library/blocks/spacer/editor.css 346 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-of-contents/style-rtl.css 83 B
build/block-library/blocks/table-of-contents/style.css 83 B
build/block-library/blocks/table/editor-rtl.css 394 B
build/block-library/blocks/table/editor.css 394 B
build/block-library/blocks/table/style-rtl.css 640 B
build/block-library/blocks/table/style.css 639 B
build/block-library/blocks/table/theme-rtl.css 152 B
build/block-library/blocks/table/theme.css 152 B
build/block-library/blocks/tag-cloud/editor-rtl.css 144 B
build/block-library/blocks/tag-cloud/editor.css 144 B
build/block-library/blocks/tag-cloud/style-rtl.css 266 B
build/block-library/blocks/tag-cloud/style.css 265 B
build/block-library/blocks/template-part/editor-rtl.css 368 B
build/block-library/blocks/template-part/editor.css 368 B
build/block-library/blocks/template-part/theme-rtl.css 113 B
build/block-library/blocks/template-part/theme.css 113 B
build/block-library/blocks/term-description/style-rtl.css 126 B
build/block-library/blocks/term-description/style.css 126 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 165 B
build/block-library/blocks/text-columns/style.css 165 B
build/block-library/blocks/verse/style-rtl.css 98 B
build/block-library/blocks/verse/style.css 98 B
build/block-library/blocks/video/editor-rtl.css 396 B
build/block-library/blocks/video/editor.css 397 B
build/block-library/blocks/video/style-rtl.css 192 B
build/block-library/blocks/video/style.css 192 B
build/block-library/blocks/video/theme-rtl.css 134 B
build/block-library/blocks/video/theme.css 134 B
build/block-library/classic-rtl.css 179 B
build/block-library/classic.css 179 B
build/block-library/common-rtl.css 1.1 kB
build/block-library/common.css 1.1 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 472 B
build/block-library/reset.css 472 B
build/block-library/style-rtl.css 14.9 kB
build/block-library/style.css 14.9 kB
build/block-library/theme-rtl.css 708 B
build/block-library/theme.css 712 B
build/block-serialization-default-parser/index.min.js 1.12 kB
build/block-serialization-spec-parser/index.min.js 2.87 kB
build/commands/index.min.js 16.1 kB
build/commands/style-rtl.css 955 B
build/commands/style.css 952 B
build/components/style-rtl.css 12.3 kB
build/components/style.css 12.3 kB
build/compose/index.min.js 12.7 kB
build/core-commands/index.min.js 3.11 kB
build/customize-widgets/index.min.js 11 kB
build/customize-widgets/style-rtl.css 1.35 kB
build/customize-widgets/style.css 1.35 kB
build/data-controls/index.min.js 641 B
build/data/index.min.js 8.98 kB
build/date/index.min.js 18 kB
build/deprecated/index.min.js 458 B
build/dom-ready/index.min.js 325 B
build/edit-post/classic-rtl.css 578 B
build/edit-post/classic.css 580 B
build/edit-post/style-rtl.css 2.54 kB
build/edit-post/style.css 2.54 kB
build/edit-widgets/style-rtl.css 4.19 kB
build/edit-widgets/style.css 4.19 kB
build/element/index.min.js 4.83 kB
build/escape-html/index.min.js 537 B
build/format-library/index.min.js 8.11 kB
build/format-library/style-rtl.css 476 B
build/format-library/style.css 476 B
build/html-entities/index.min.js 445 B
build/i18n/index.min.js 3.58 kB
build/is-shallow-equal/index.min.js 526 B
build/keyboard-shortcuts/index.min.js 1.31 kB
build/keycodes/index.min.js 1.46 kB
build/list-reusable-blocks/index.min.js 2.18 kB
build/list-reusable-blocks/style-rtl.css 846 B
build/list-reusable-blocks/style.css 846 B
build/media-utils/index.min.js 3.2 kB
build/notices/index.min.js 946 B
build/nux/index.min.js 1.61 kB
build/nux/style-rtl.css 749 B
build/nux/style.css 745 B
build/patterns/index.min.js 7.34 kB
build/patterns/style-rtl.css 687 B
build/patterns/style.css 685 B
build/plugins/index.min.js 1.81 kB
build/preferences-persistence/index.min.js 2.06 kB
build/preferences/index.min.js 2.9 kB
build/preferences/style-rtl.css 554 B
build/preferences/style.css 554 B
build/primitives/index.min.js 829 B
build/priority-queue/index.min.js 1.54 kB
build/private-apis/index.min.js 1.01 kB
build/react-i18n/index.min.js 630 B
build/react-refresh-entry/index.min.js 9.47 kB
build/react-refresh-runtime/index.min.js 6.76 kB
build/redux-routine/index.min.js 2.69 kB
build/reusable-blocks/index.min.js 2.55 kB
build/reusable-blocks/style-rtl.css 256 B
build/reusable-blocks/style.css 256 B
build/router/index.min.js 1.96 kB
build/server-side-render/index.min.js 1.94 kB
build/shortcode/index.min.js 1.4 kB
build/style-engine/index.min.js 2.04 kB
build/token-list/index.min.js 581 B
build/vendors/react-dom.min.js 41.7 kB
build/vendors/react-jsx-runtime.min.js 560 B
build/vendors/react.min.js 4.02 kB
build/viewport/index.min.js 965 B
build/warning/index.min.js 250 B
build/widgets/style-rtl.css 1.16 kB
build/widgets/style.css 1.16 kB
build/wordcount/index.min.js 1.03 kB

compressed-size-action

@noisysocks noisysocks added the Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Sep 24, 2024
Copy link
Contributor

@t-hamano t-hamano left a comment

Choose a reason for hiding this comment

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

This PR appears to contain an unintended change.

The purpose is just to revert the font grouping in the global styles sidebar, so I don't think there's any need to change the installed-fonts.js file.

In fact, when comparing trunk with this PR, there are differences in the font library modal.

  1. The title has changed. Additionally, the order of the Theme section and the Custom (Installed Fonts) section has been swapped:
trunk This PR
trunk-library pr-library
  1. When there are no fonts, the message "No fonts installed." appears in the Library tab, but this is not the case with this PR:
trunk This PR
trunk-library-empty pr-modal-empty

From what I understand, we should only need to make the following changes in the trunk:

Diff
diff --git a/packages/edit-site/src/components/global-styles/font-families.js b/packages/edit-site/src/components/global-styles/font-families.js
index 6a554b1363..b40ab0a543 100644
--- a/packages/edit-site/src/components/global-styles/font-families.js
+++ b/packages/edit-site/src/components/global-styles/font-families.js
@@ -61,12 +61,12 @@ function FontFamilies() {
                        ) }
 
                        <VStack spacing={ 4 }>
-                               { themeFonts.length > 0 && (
-                                       <VStack>
+                               { [ ...themeFonts, ...customFonts ].length > 0 && (
+                                       <>
                                                <Subtitle level={ 3 }>
                                                        {
                                                                /* translators: Heading for a list of fonts provided by the theme. */
-                                                               _x( 'Theme', 'font source' )
+                                                               _x( 'Fonts', 'font source' )
                                                        }
                                                </Subtitle>
                                                <ItemGroup size="large" isBordered isSeparated>
@@ -76,18 +76,6 @@ function FontFamilies() {
                                                                        font={ font }
                                                                />
                                                        ) ) }
-                                               </ItemGroup>
-                                       </VStack>
-                               ) }
-                               { customFonts.length > 0 && (
-                                       <VStack>
-                                               <Subtitle level={ 3 }>
-                                                       {
-                                                               /* translators: Heading for a list of fonts installed by the user. */
-                                                               _x( 'Custom', 'font source' )
-                                                       }
-                                               </Subtitle>
-                                               <ItemGroup size="large" isBordered isSeparated>
                                                        { customFonts.map( ( font ) => (
                                                                <FontFamilyItem
                                                                        key={ font.slug }
@@ -95,7 +83,7 @@ function FontFamilies() {
                                                                />
                                                        ) ) }
                                                </ItemGroup>
-                                       </VStack>
+                                       </>
                                ) }
                                { ! hasFonts && (
                                        <VStack>

@t-hamano t-hamano requested a review from afercia September 24, 2024 07:00
@afercia
Copy link
Contributor

afercia commented Sep 24, 2024

Following up on this discussion on #63505, this PR reverts the changes introduced in #63211

There is no agreement on the proposed revert. The discussion on #63505 is still ongoing and didn't make to a consensus. As such, I would kindly ask you to refrain from merging this PR until a shared solution has been identified and agreed upon, thanks.

@vcanales
Copy link
Member Author

The purpose is just to revert the font grouping in the global styles sidebar, so I don't think there's any need to change the installed-fonts.js file.

Thanks. The revert had conflicts, and this helps me narrow down what I missed when merging them.

@vcanales vcanales force-pushed the revert-group-fonts-by-source branch from f517c55 to 68bb1be Compare September 24, 2024 12:56
@t-hamano
Copy link
Contributor

I understand that no consensus has been reached and the discussion needs to continue. I'm not also sure I fully agree with reverting font grouping.

However, if we do not ship this PR, that is, if we maintain font grouping, users will experience UI changes in WP 6.7. If we find an ideal UI in the future and implement it, users will experience UI changes again, and they may be confused by the repeated changes.

Considering that, it might make sense to revert the font grouping at the time of WP 6.7 and provide users with the same UI as before.

Comment on lines 49 to 52
const hasInstalledFonts =
hasFonts ||
baseFontFamilies?.theme?.length > 0 ||
baseCustomFonts?.length > 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

There may be cases where fonts are installed in a theme, but all fonts are disabled. In this case, the expected text is "No fonts activated" and the button text is "Manage fonts".

However, if we remove these codes, including hasInstalledFonts, the expected text does not appear:

fonts

See #63533 for the intention of these codes.

I don't think this PR should make any changes other than reverting the font grouping.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for checking again; I think the revert is constrained to the grouping now.

@vcanales
Copy link
Member Author

However, if we do not ship this PR, that is, if we maintain font grouping, users will experience UI changes in WP 6.7. If we find an ideal UI in the future and implement it, users will experience UI changes again, and they may be confused by the repeated changes.

Considering that, it might make sense to revert the font grouping at the time of WP 6.7 and provide users with the same UI as before.

These are my thoughts as well. We can keep the discussion going, but there's enough disagreement over the original change—implementing grouping—to warrant a reversal until we reach an agreement.

@afercia
Copy link
Contributor

afercia commented Sep 24, 2024

However, if we do not ship this PR, that is, if we maintain font grouping, users will experience UI changes in WP 6.7. If we find an ideal UI in the future and implement it, users will experience UI changes again, and they may be confused by the repeated changes.

I totally agree but this is true for any change in the UI. And there's a lot of them at every release that are then changed again and again in the following releases. Ideally it should not happen. Stability sholduohs be a priority for the UI but is this principle is true, then I would love to see it applied to all UI changes not just the ones some contributors don't like.

@afercia
Copy link
Contributor

afercia commented Sep 24, 2024

For what is worth, reverting the UI to how it was before #63211 is a no-go for me. Of course, it's just my opinion as experienced contributor.
For the rationale, please see #63505 (comment)

@vcanales vcanales force-pushed the revert-group-fonts-by-source branch from 68bb1be to ef44d04 Compare September 24, 2024 15:04
@vcanales
Copy link
Member Author

What do you all think about expanding the description for the Typography screen, adding context about the Fonts?

Changing the current description to "Available fonts, typographic styles, and the application of those styles on site elements" would probably help clarify what is on this screen.

image

We currently don't mention Fonts in this description, and adding it explains their presence on this screen without the need for additional labels or altering the Subtitle.

@t-hamano
Copy link
Contributor

We currently don't mention Fonts in this description, and adding it explains their presence on this screen without the need for additional labels or altering the Subtitle.

This is a very good suggestion. Perhaps the description should have been updated when the Font panel was added.

Once the description is updated, this seems to me to be the best approach for WP 6.7.

@t-hamano t-hamano self-requested a review September 25, 2024 15:50
@t-hamano
Copy link
Contributor

Let's merge this PR. I fully understand that there are various opinions, we haven't reached a consensus yet, and we need to continue discussing it in the future.

Considering the impact on users and future improvements, I think it makes sense to ship this PR at this time.

@richtabor @afercia What do you think about the description update?

@richtabor
Copy link
Member

There is no agreement on the proposed revert. The discussion on #63505 is still ongoing and didn't make to a consensus. As such, I would kindly ask you to refrain from merging this PR until a shared solution has been identified and agreed upon, thanks.

We should not push something into core that introduces unfamiliar UI/UX patterns.

We need to revert and revisit, rather than change something for millions of users that makes it more complicated, then end up changing it back in the next release.

@richtabor
Copy link
Member

However, if we do not ship this PR, that is, if we maintain font grouping, users will experience UI changes in WP 6.7. If we find an ideal UI in the future and implement it, users will experience UI changes again, and they may be confused by the repeated changes.

Considering that, it might make sense to revert the font grouping at the time of WP 6.7 and provide users with the same UI as before.

100%. Change must be worth the change. I'm in support of improving this area, but what is in trunk, proposed for 6.7, is not the ideal path forward.

@richtabor
Copy link
Member

Considering the impact on users and future improvements, I think it makes sense to ship this PR at this time.

@richtabor @afercia What do you think about the description update?

Yes, that's ok. I think we can drop the elements part:

"Available fonts, typographic styles, and the application of those styles.

@vcanales
Copy link
Member Author

"Available fonts, typographic styles, and the application of those styles.

@richtabor done

Copy link

Flaky tests detected in 1787780.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/11071846322
📝 Reported issues:

Copy link
Contributor

@t-hamano t-hamano left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@noisysocks noisysocks merged commit 66bd5e2 into trunk Sep 30, 2024
64 checks passed
@noisysocks noisysocks deleted the revert-group-fonts-by-source branch September 30, 2024 00:59
@github-actions github-actions bot added this to the Gutenberg 19.4 milestone Sep 30, 2024
@github-actions github-actions bot removed the Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Sep 30, 2024
gutenbergplugin pushed a commit that referenced this pull request Sep 30, 2024
* Revert "Font Library: Group fonts by source (#63211)"

* update typography screen description

* update screen description

Co-authored-by: vcanales <vcanales@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: afercia <afercia@git.wordpress.org>
Co-authored-by: richtabor <richtabor@git.wordpress.org>
@github-actions github-actions bot added the Backported to WP Core Pull request that has been successfully merged into WP Core label Sep 30, 2024
Copy link

I just cherry-picked this PR to the wp/6.7 branch to get it included in the next release: 88d6723

@afercia
Copy link
Contributor

afercia commented Oct 2, 2024

Let's merge this PR. I fully understand that there are various opinions, we haven't reached a consensus yet, and we need to continue discussing it in the future.

@t-hamano would you like to create a new issue as a follow-up when you have a chance, please? Please mark it with the accessibility label.

To me, this change doesn't solve the fundamental issue about clarity of the UI. As an user, I don't understand what the list of fonts is about. As I mentioned on this comment, this list needs to clearly communicate it's a list of active fonts and there may be more fonts available.

In a way, the new description contributes to make the UI even more unclear because it explicitly says 'available fonts`, while the list of fonts may not show all the actually available fonts.

In fact, when deactivating some fonts, the list shows only the active ones. Screenshot:

Screenshot 2024-10-02 at 13 56 37

However, in my case I have 9 more fonts installed and available but the UI doesn't inform me about that at all. This UI is unclear as it doesn't provide useful information for users and needs to be iterated on.

@t-hamano
Copy link
Contributor

t-hamano commented Oct 2, 2024

would you like to create a new issue as a follow-up when you have a chance, please? Please mark it with the accessibility label.

I think it would be a good idea to continue the discussion in #63505. It might be a good idea to update the issue title and description. There are already a lot of opinions written in #63505, so I would like to make use of them.

To me, this change doesn't solve the fundamental issue about clarity of the UI. As an user, I don't understand what the list of fonts is about. As I mentioned #63505 (comment), this list needs to clearly communicate it's a list of active fonts and there may be more fonts available.

Is there a better explanation for how to solve this problem in WP 6.7? If so, we can backport it to WP 6.7.

@afercia
Copy link
Contributor

afercia commented Oct 2, 2024

Is there a better explanation for how to solve this problem in WP 6.7? If so, we can backport it to WP 6.7.

I will comment on the issue.

huubl pushed a commit to huubl/gutenberg that referenced this pull request Oct 2, 2024
…ress#65590)

* Revert "Font Library: Group fonts by source (WordPress#63211)"

* update typography screen description

* update screen description

Co-authored-by: vcanales <vcanales@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: afercia <afercia@git.wordpress.org>
Co-authored-by: richtabor <richtabor@git.wordpress.org>
huubl added a commit to huubl/gutenberg that referenced this pull request Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backported to WP Core Pull request that has been successfully merged into WP Core [Feature] Font Library Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json [Type] Regression Related to a regression in the latest release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants