site-logo block: Use option instead of theme-mod by aristath · Pull Request #32229 · WordPress/gutenberg

aristath · 2021-05-26T09:45:24Z

Description

This PR reverts #31994 and updates the theme-mod-to-option sync methods a bit.

Types of changes

Reverted Use custom_logo theme-mod instead of site_logo setting for the site-logo block #31994
Renamed the pre-existing sync functions and tweaked their inline docs a bit
Added method to update the theme-mod when the option sets updated.
Includes Make sure wp_get_attachment_image_src filter gets removed in the site-logo even when no logo exists #32187

Checklist:

My code is tested.
My code follows the WordPress code style.
My code follows the accessibility standards.
I've tested my changes with keyboard and screen readers.
My code has proper inline documentation.
I've included developer documentation if appropriate.
I've updated all React Native files affected by any refactorings/renamings in this PR (please manually search all *.native.js files for terms that need renaming or removal).

…r the site-logo block (#31994)" This reverts commit 622505f.

github-actions · 2021-05-26T09:53:21Z

Size Change: -941 B (0%)

Total Size: 1.86 MB

Filename	Size	Change
`build/block-directory/index.js`	6.61 kB	+2 B (0%)
`build/block-editor/index.js`	118 kB	-1.32 kB (-1%)
`build/block-editor/style-rtl.css`	12.9 kB	+9 B (0%)
`build/block-editor/style.css`	12.9 kB	+9 B (0%)
`build/block-library/index.js`	147 kB	-55 B (0%)
`build/components/index.js`	189 kB	+173 B (0%)
`build/compose/index.js`	10 kB	+2 B (0%)
`build/customize-widgets/index.js`	43.2 kB	+72 B (0%)
`build/customize-widgets/style-rtl.css`	1.48 kB	+59 B (+4%)
`build/customize-widgets/style.css`	1.48 kB	+59 B (+4%)
`build/data/index.js`	7.22 kB	-2 B (0%)
`build/edit-navigation/index.js`	13.8 kB	+8 B (0%)
`build/edit-post/index.js`	571 kB	+26 B (0%)
`build/edit-site/index.js`	25.7 kB	+2 B (0%)
`build/edit-widgets/index.js`	292 kB	+5 B (0%)
`build/editor/index.js`	38.4 kB	+13 B (0%)
`build/list-reusable-blocks/index.js`	2.07 kB	+5 B (0%)
`build/nux/index.js`	2.31 kB	+3 B (0%)
`build/plugins/index.js`	1.99 kB	+2 B (0%)
`build/reusable-blocks/index.js`	2.53 kB	+3 B (0%)
`build/rich-text/index.js`	10.6 kB	-11 B (0%)

ℹ️ View Unchanged

Filename	Size	Change
`build/a11y/index.js`	1.12 kB	0 B
`build/annotations/index.js`	2.93 kB	0 B
`build/api-fetch/index.js`	2.42 kB	0 B
`build/autop/index.js`	2.28 kB	0 B
`build/blob/index.js`	673 B	0 B
`build/block-directory/style-rtl.css`	989 B	0 B
`build/block-directory/style.css`	990 B	0 B
`build/block-library/blocks/archives/editor-rtl.css`	61 B	0 B
`build/block-library/blocks/archives/editor.css`	60 B	0 B
`build/block-library/blocks/archives/style-rtl.css`	65 B	0 B
`build/block-library/blocks/archives/style.css`	65 B	0 B
`build/block-library/blocks/audio/editor-rtl.css`	58 B	0 B
`build/block-library/blocks/audio/editor.css`	58 B	0 B
`build/block-library/blocks/audio/style-rtl.css`	112 B	0 B
`build/block-library/blocks/audio/style.css`	112 B	0 B
`build/block-library/blocks/block/editor-rtl.css`	161 B	0 B
`build/block-library/blocks/block/editor.css`	161 B	0 B
`build/block-library/blocks/button/editor-rtl.css`	475 B	0 B
`build/block-library/blocks/button/editor.css`	474 B	0 B
`build/block-library/blocks/button/style-rtl.css`	603 B	0 B
`build/block-library/blocks/button/style.css`	602 B	0 B
`build/block-library/blocks/buttons/editor-rtl.css`	315 B	0 B
`build/block-library/blocks/buttons/editor.css`	315 B	0 B
`build/block-library/blocks/buttons/style-rtl.css`	375 B	0 B
`build/block-library/blocks/buttons/style.css`	375 B	0 B
`build/block-library/blocks/calendar/style-rtl.css`	208 B	0 B
`build/block-library/blocks/calendar/style.css`	208 B	0 B
`build/block-library/blocks/categories/editor-rtl.css`	84 B	0 B
`build/block-library/blocks/categories/editor.css`	83 B	0 B
`build/block-library/blocks/categories/style-rtl.css`	79 B	0 B
`build/block-library/blocks/categories/style.css`	79 B	0 B
`build/block-library/blocks/code/style-rtl.css`	90 B	0 B
`build/block-library/blocks/code/style.css`	90 B	0 B
`build/block-library/blocks/columns/editor-rtl.css`	190 B	0 B
`build/block-library/blocks/columns/editor.css`	190 B	0 B
`build/block-library/blocks/columns/style-rtl.css`	422 B	0 B
`build/block-library/blocks/columns/style.css`	422 B	0 B
`build/block-library/blocks/cover/editor-rtl.css`	644 B	0 B
`build/block-library/blocks/cover/editor.css`	646 B	0 B
`build/block-library/blocks/cover/style-rtl.css`	1.22 kB	0 B
`build/block-library/blocks/cover/style.css`	1.23 kB	0 B
`build/block-library/blocks/embed/editor-rtl.css`	486 B	0 B
`build/block-library/blocks/embed/editor.css`	486 B	0 B
`build/block-library/blocks/embed/style-rtl.css`	401 B	0 B
`build/block-library/blocks/embed/style.css`	400 B	0 B
`build/block-library/blocks/file/editor-rtl.css`	301 B	0 B
`build/block-library/blocks/file/editor.css`	300 B	0 B
`build/block-library/blocks/file/frontend.js`	771 B	0 B
`build/block-library/blocks/file/style-rtl.css`	255 B	0 B
`build/block-library/blocks/file/style.css`	255 B	0 B
`build/block-library/blocks/freeform/editor-rtl.css`	2.44 kB	0 B
`build/block-library/blocks/freeform/editor.css`	2.44 kB	0 B
`build/block-library/blocks/gallery/editor-rtl.css`	704 B	0 B
`build/block-library/blocks/gallery/editor.css`	705 B	0 B
`build/block-library/blocks/gallery/style-rtl.css`	1.06 kB	0 B
`build/block-library/blocks/gallery/style.css`	1.06 kB	0 B
`build/block-library/blocks/group/editor-rtl.css`	160 B	0 B
`build/block-library/blocks/group/editor.css`	160 B	0 B
`build/block-library/blocks/group/style-rtl.css`	57 B	0 B
`build/block-library/blocks/group/style.css`	57 B	0 B
`build/block-library/blocks/heading/editor-rtl.css`	129 B	0 B
`build/block-library/blocks/heading/editor.css`	129 B	0 B
`build/block-library/blocks/heading/style-rtl.css`	76 B	0 B
`build/block-library/blocks/heading/style.css`	76 B	0 B
`build/block-library/blocks/home-link/style-rtl.css`	259 B	0 B
`build/block-library/blocks/home-link/style.css`	259 B	0 B
`build/block-library/blocks/html/editor-rtl.css`	281 B	0 B
`build/block-library/blocks/html/editor.css`	281 B	0 B
`build/block-library/blocks/image/editor-rtl.css`	717 B	0 B
`build/block-library/blocks/image/editor.css`	716 B	0 B
`build/block-library/blocks/image/style-rtl.css`	481 B	0 B
`build/block-library/blocks/image/style.css`	485 B	0 B
`build/block-library/blocks/latest-comments/style-rtl.css`	281 B	0 B
`build/block-library/blocks/latest-comments/style.css`	282 B	0 B
`build/block-library/blocks/latest-posts/editor-rtl.css`	137 B	0 B
`build/block-library/blocks/latest-posts/editor.css`	137 B	0 B
`build/block-library/blocks/latest-posts/style-rtl.css`	523 B	0 B
`build/block-library/blocks/latest-posts/style.css`	522 B	0 B
`build/block-library/blocks/legacy-widget/editor-rtl.css`	557 B	0 B
`build/block-library/blocks/legacy-widget/editor.css`	557 B	0 B
`build/block-library/blocks/list/style-rtl.css`	63 B	0 B
`build/block-library/blocks/list/style.css`	63 B	0 B
`build/block-library/blocks/media-text/editor-rtl.css`	176 B	0 B
`build/block-library/blocks/media-text/editor.css`	176 B	0 B
`build/block-library/blocks/media-text/style-rtl.css`	492 B	0 B
`build/block-library/blocks/media-text/style.css`	489 B	0 B
`build/block-library/blocks/more/editor-rtl.css`	434 B	0 B
`build/block-library/blocks/more/editor.css`	434 B	0 B
`build/block-library/blocks/navigation-link/editor-rtl.css`	633 B	0 B
`build/block-library/blocks/navigation-link/editor.css`	634 B	0 B
`build/block-library/blocks/navigation-link/style-rtl.css`	94 B	0 B
`build/block-library/blocks/navigation-link/style.css`	94 B	0 B
`build/block-library/blocks/navigation/editor-rtl.css`	1.54 kB	0 B
`build/block-library/blocks/navigation/editor.css`	1.54 kB	0 B
`build/block-library/blocks/navigation/frontend.js`	2.85 kB	0 B
`build/block-library/blocks/navigation/style-rtl.css`	1.8 kB	0 B
`build/block-library/blocks/navigation/style.css`	1.8 kB	0 B
`build/block-library/blocks/nextpage/editor-rtl.css`	395 B	0 B
`build/block-library/blocks/nextpage/editor.css`	395 B	0 B
`build/block-library/blocks/page-list/editor-rtl.css`	310 B	0 B
`build/block-library/blocks/page-list/editor.css`	311 B	0 B
`build/block-library/blocks/page-list/style-rtl.css`	233 B	0 B
`build/block-library/blocks/page-list/style.css`	233 B	0 B
`build/block-library/blocks/paragraph/editor-rtl.css`	157 B	0 B
`build/block-library/blocks/paragraph/editor.css`	157 B	0 B
`build/block-library/blocks/paragraph/style-rtl.css`	247 B	0 B
`build/block-library/blocks/paragraph/style.css`	248 B	0 B
`build/block-library/blocks/post-author/editor-rtl.css`	209 B	0 B
`build/block-library/blocks/post-author/editor.css`	209 B	0 B
`build/block-library/blocks/post-author/style-rtl.css`	183 B	0 B
`build/block-library/blocks/post-author/style.css`	184 B	0 B
`build/block-library/blocks/post-comments-form/style-rtl.css`	140 B	0 B
`build/block-library/blocks/post-comments-form/style.css`	140 B	0 B
`build/block-library/blocks/post-comments/style-rtl.css`	360 B	0 B
`build/block-library/blocks/post-comments/style.css`	359 B	0 B
`build/block-library/blocks/post-content/editor-rtl.css`	139 B	0 B
`build/block-library/blocks/post-content/editor.css`	139 B	0 B
`build/block-library/blocks/post-excerpt/editor-rtl.css`	73 B	0 B
`build/block-library/blocks/post-excerpt/editor.css`	73 B	0 B
`build/block-library/blocks/post-excerpt/style-rtl.css`	69 B	0 B
`build/block-library/blocks/post-excerpt/style.css`	69 B	0 B
`build/block-library/blocks/post-featured-image/editor-rtl.css`	338 B	0 B
`build/block-library/blocks/post-featured-image/editor.css`	338 B	0 B
`build/block-library/blocks/post-featured-image/style-rtl.css`	141 B	0 B
`build/block-library/blocks/post-featured-image/style.css`	141 B	0 B
`build/block-library/blocks/post-title/style-rtl.css`	60 B	0 B
`build/block-library/blocks/post-title/style.css`	60 B	0 B
`build/block-library/blocks/preformatted/style-rtl.css`	103 B	0 B
`build/block-library/blocks/preformatted/style.css`	103 B	0 B
`build/block-library/blocks/pullquote/editor-rtl.css`	183 B	0 B
`build/block-library/blocks/pullquote/editor.css`	183 B	0 B
`build/block-library/blocks/pullquote/style-rtl.css`	318 B	0 B
`build/block-library/blocks/pullquote/style.css`	318 B	0 B
`build/block-library/blocks/query-loop/editor-rtl.css`	98 B	0 B
`build/block-library/blocks/query-loop/editor.css`	97 B	0 B
`build/block-library/blocks/query-loop/style-rtl.css`	315 B	0 B
`build/block-library/blocks/query-loop/style.css`	317 B	0 B
`build/block-library/blocks/query-pagination-numbers/editor-rtl.css`	122 B	0 B
`build/block-library/blocks/query-pagination-numbers/editor.css`	121 B	0 B
`build/block-library/blocks/query-pagination/editor-rtl.css`	270 B	0 B
`build/block-library/blocks/query-pagination/editor.css`	262 B	0 B
`build/block-library/blocks/query-pagination/style-rtl.css`	168 B	0 B
`build/block-library/blocks/query-pagination/style.css`	168 B	0 B
`build/block-library/blocks/query-title/editor-rtl.css`	86 B	0 B
`build/block-library/blocks/query-title/editor.css`	86 B	0 B
`build/block-library/blocks/query/editor-rtl.css`	131 B	0 B
`build/block-library/blocks/query/editor.css`	132 B	0 B
`build/block-library/blocks/quote/style-rtl.css`	169 B	0 B
`build/block-library/blocks/quote/style.css`	169 B	0 B
`build/block-library/blocks/rss/editor-rtl.css`	201 B	0 B
`build/block-library/blocks/rss/editor.css`	202 B	0 B
`build/block-library/blocks/rss/style-rtl.css`	290 B	0 B
`build/block-library/blocks/rss/style.css`	290 B	0 B
`build/block-library/blocks/search/editor-rtl.css`	189 B	0 B
`build/block-library/blocks/search/editor.css`	189 B	0 B
`build/block-library/blocks/search/style-rtl.css`	359 B	0 B
`build/block-library/blocks/search/style.css`	362 B	0 B
`build/block-library/blocks/separator/editor-rtl.css`	99 B	0 B
`build/block-library/blocks/separator/editor.css`	99 B	0 B
`build/block-library/blocks/separator/style-rtl.css`	251 B	0 B
`build/block-library/blocks/separator/style.css`	251 B	0 B
`build/block-library/blocks/shortcode/editor-rtl.css`	512 B	0 B
`build/block-library/blocks/shortcode/editor.css`	512 B	0 B
`build/block-library/blocks/site-logo/editor-rtl.css`	440 B	0 B
`build/block-library/blocks/site-logo/editor.css`	441 B	0 B
`build/block-library/blocks/site-logo/style-rtl.css`	154 B	0 B
`build/block-library/blocks/site-logo/style.css`	154 B	0 B
`build/block-library/blocks/social-link/editor-rtl.css`	164 B	0 B
`build/block-library/blocks/social-link/editor.css`	165 B	0 B
`build/block-library/blocks/social-links/editor-rtl.css`	800 B	0 B
`build/block-library/blocks/social-links/editor.css`	799 B	0 B
`build/block-library/blocks/social-links/style-rtl.css`	1.32 kB	0 B
`build/block-library/blocks/social-links/style.css`	1.33 kB	0 B
`build/block-library/blocks/spacer/editor-rtl.css`	308 B	0 B
`build/block-library/blocks/spacer/editor.css`	308 B	0 B
`build/block-library/blocks/spacer/style-rtl.css`	48 B	0 B
`build/block-library/blocks/spacer/style.css`	48 B	0 B
`build/block-library/blocks/table/editor-rtl.css`	478 B	0 B
`build/block-library/blocks/table/editor.css`	478 B	0 B
`build/block-library/blocks/table/style-rtl.css`	480 B	0 B
`build/block-library/blocks/table/style.css`	480 B	0 B
`build/block-library/blocks/tag-cloud/editor-rtl.css`	118 B	0 B
`build/block-library/blocks/tag-cloud/editor.css`	118 B	0 B
`build/block-library/blocks/tag-cloud/style-rtl.css`	94 B	0 B
`build/block-library/blocks/tag-cloud/style.css`	94 B	0 B
`build/block-library/blocks/template-part/editor-rtl.css`	551 B	0 B
`build/block-library/blocks/template-part/editor.css`	550 B	0 B
`build/block-library/blocks/term-description/editor-rtl.css`	90 B	0 B
`build/block-library/blocks/term-description/editor.css`	90 B	0 B
`build/block-library/blocks/text-columns/editor-rtl.css`	95 B	0 B
`build/block-library/blocks/text-columns/editor.css`	95 B	0 B
`build/block-library/blocks/text-columns/style-rtl.css`	166 B	0 B
`build/block-library/blocks/text-columns/style.css`	166 B	0 B
`build/block-library/blocks/verse/style-rtl.css`	87 B	0 B
`build/block-library/blocks/verse/style.css`	87 B	0 B
`build/block-library/blocks/video/editor-rtl.css`	569 B	0 B
`build/block-library/blocks/video/editor.css`	570 B	0 B
`build/block-library/blocks/video/style-rtl.css`	173 B	0 B
`build/block-library/blocks/video/style.css`	173 B	0 B
`build/block-library/common-rtl.css`	1.26 kB	0 B
`build/block-library/common.css`	1.26 kB	0 B
`build/block-library/editor-rtl.css`	9.93 kB	0 B
`build/block-library/editor.css`	9.92 kB	0 B
`build/block-library/reset-rtl.css`	506 B	0 B
`build/block-library/reset.css`	507 B	0 B
`build/block-library/style-rtl.css`	10.3 kB	0 B
`build/block-library/style.css`	10.3 kB	0 B
`build/block-library/theme-rtl.css`	692 B	0 B
`build/block-library/theme.css`	693 B	0 B
`build/block-serialization-default-parser/index.js`	1.29 kB	0 B
`build/block-serialization-spec-parser/index.js`	3.06 kB	0 B
`build/blocks/index.js`	47.2 kB	0 B
`build/components/style-rtl.css`	16.2 kB	0 B
`build/components/style.css`	16.2 kB	0 B
`build/core-data/index.js`	12.1 kB	0 B
`build/data-controls/index.js`	829 B	0 B
`build/date/index.js`	31.8 kB	0 B
`build/deprecated/index.js`	739 B	0 B
`build/dom-ready/index.js`	577 B	0 B
`build/dom/index.js`	4.62 kB	0 B
`build/edit-navigation/style-rtl.css`	3.08 kB	0 B
`build/edit-navigation/style.css`	3.08 kB	0 B
`build/edit-post/classic-rtl.css`	454 B	0 B
`build/edit-post/classic.css`	454 B	0 B
`build/edit-post/style-rtl.css`	6.81 kB	0 B
`build/edit-post/style.css`	6.8 kB	0 B
`build/edit-site/style-rtl.css`	4.75 kB	0 B
`build/edit-site/style.css`	4.75 kB	0 B
`build/edit-widgets/style-rtl.css`	3.46 kB	0 B
`build/edit-widgets/style.css`	3.47 kB	0 B
`build/editor/style-rtl.css`	3.92 kB	0 B
`build/editor/style.css`	3.91 kB	0 B
`build/element/index.js`	3.44 kB	0 B
`build/escape-html/index.js`	739 B	0 B
`build/format-library/index.js`	5.67 kB	0 B
`build/format-library/style-rtl.css`	637 B	0 B
`build/format-library/style.css`	639 B	0 B
`build/hooks/index.js`	1.76 kB	0 B
`build/html-entities/index.js`	627 B	0 B
`build/i18n/index.js`	3.73 kB	0 B
`build/is-shallow-equal/index.js`	710 B	0 B
`build/keyboard-shortcuts/index.js`	1.65 kB	0 B
`build/keycodes/index.js`	1.43 kB	0 B
`build/list-reusable-blocks/style-rtl.css`	629 B	0 B
`build/list-reusable-blocks/style.css`	628 B	0 B
`build/media-utils/index.js`	3.08 kB	0 B
`build/notices/index.js`	1.07 kB	0 B
`build/nux/style-rtl.css`	718 B	0 B
`build/nux/style.css`	716 B	0 B
`build/primitives/index.js`	1.03 kB	0 B
`build/priority-queue/index.js`	791 B	0 B
`build/react-i18n/index.js`	923 B	0 B
`build/redux-routine/index.js`	2.82 kB	0 B
`build/reusable-blocks/style-rtl.css`	225 B	0 B
`build/reusable-blocks/style.css`	225 B	0 B
`build/server-side-render/index.js`	1.63 kB	0 B
`build/shortcode/index.js`	1.68 kB	0 B
`build/token-list/index.js`	846 B	0 B
`build/url/index.js`	1.95 kB	0 B
`build/viewport/index.js`	1.28 kB	0 B
`build/warning/index.js`	1.13 kB	0 B
`build/widgets/index.js`	1.66 kB	0 B
`build/wordcount/index.js`	1.24 kB	0 B

_{compressed-size-action}

TimothyBJacobs

Code LGTM!

creativecoder

Thanks for this PR!

I tested these scenarios

Set site_logo in Site Logo block: ✅ option is synced to custom_logo theme mod
Set custom_logo in Customizer: ✅ option is synced to site_logo option
Delete site_logo with delete_option: ❌ custom logo_theme mod is not deleted (but it does work when using update_option with an empty value)
Delete custom_logo from the Customizer: ✅ site_logo option is deleted
Switch themes: ✅ logo continues to display in Site Logo block (and in Customizer)

Functionally this looks good. We may want to consider hooking into delete_option_site_logo as well ... but see below for a caveat.

In testing this with some logging, I did notice that simultaneously hooking into pre_set_theme_mod_custom_logo and update_option_site_logo runs some extra updates:

Update site_logo from the Site Logo block

As expected, update_option_site_logo action is triggered and calls the hooked function that runs set_theme_mod to sync to the custom_logo theme mod
This also causes the pre_set_theme_mod_custom_logo action to run and call update_option again
But it stops there, because the option value is the same as what's already set

Update custom_logo from the Customizer

As expected pre_set_theme_mod_custom_logo action is triggered calls the hooked function that runs update_option to sync to the site_logo option
This also causes the update_option_site_logo action to run and call set_theme_mod again
Then the pre_set_theme_mod_custom_logo action is triggered a second time and calls update_option again
But it stops there, because the option value is the same as what's already set

packages/block-library/src/site-logo/index.php

colorful-tones · 2021-05-26T22:44:12Z

I just took this PR for a quick spin in TwentyTwentyOne. I created a New Page and added Site Logo and able to attach media. Working nicely from editorial flow perspective 👍

aristath · 2021-05-27T07:32:13Z

In testing this with some logging, I did notice that simultaneously hooking into pre_set_theme_mod_custom_logo and update_option_site_logo runs some extra updates:

fixed 👍

* Revert "Use `custom_logo` theme-mod instead of `site_logo` setting for the site-logo block (#31994)" This reverts commit 622505f. * Update sync methods * move the remove_filter call * rename functions * avoid crossing fire.

This includes the following fixes: - Generate babel polyfill dynamically WordPress/gutenberg#31279 - Improve the List View component WordPress/gutenberg#31290 WordPress/gutenberg#32063 - Template mode: - Fix embed dimensions WordPress/gutenberg#32057 - Update the welcome guide WordPress/gutenberg#32055 WordPress/gutenberg#32026 - Don’t display the notice at the same time as the welcome guide WordPress/gutenberg#32076 - Remove MetaBoxes WordPress/gutenberg#32315 - Update the title area WordPress/gutenberg#32037 - Widgets Screen: - Fix unsaved changes WordPress/gutenberg#31757 - Fix toolbar alignment WordPress/gutenberg#31991 - Fix block toolbar position after scroll WordPress/gutenberg#32212 - Fix the visible widget area header WordPress/gutenberg#32262 - Fix legacy widgets preview WordPress/gutenberg#32260 - - Block Widgets in the customizer: - Fix customizer title overlapping block toolbar WordPress/gutenberg#32140 - Fix styling issues WordPress/gutenberg#32072 - Fix escape key events WordPress/gutenberg#32175 - Add preferences menu group label WordPress/gutenberg#32259 - Fix creating and replacing legacy widgets WordPress/gutenberg#32005 - Fix the welcome guide’s image WordPress/gutenberg#32264 WordPress/gutenberg#32302 - Fix Cover to Image transform duotone error WordPress/gutenberg#32006 - Remove filter_var usage from blocks WordPress/gutenberg#32046 - Fix image width for aligned Post Featured Image block WordPress/gutenberg#32070 - Prevent excessive Image block re-rendering WordPress/gutenberg#32102 - Remove gutenberg domain from core blocks WordPress/gutenberg#32152 - Use the block editor context class for the the different settings filters WordPress/gutenberg#32159 - Fix Latest Posts block grid view WordPress/gutenberg#32160 - Fix preset classes generation per block WordPress/gutenberg#32190 - Fix logic to enable custom colors and gradients WordPress/gutenberg#32200 - Update the Site Logo logic to use a dedicated site option WordPress/gutenberg#32229 - Limit the Latest Posts block’s featured image width WordPress/gutenberg#32245 - Remove opacity animation in the canvas. WordPress/gutenberg#32266 - Make the focus style valid CSS WordPress/gutenberg#32305 - Fix theme.json styles for the core/list block WordPress/gutenberg#32343 - Fix PHP notice when calling render_block WordPress/gutenberg#32135 Props nosolosw, noisysocks. See #52991. git-svn-id: https://develop.svn.wordpress.org/trunk@51051 602fd350-edb4-49c9-b593-d223f7449a82

This includes the following fixes: - Generate babel polyfill dynamically WordPress/gutenberg#31279 - Improve the List View component WordPress/gutenberg#31290 WordPress/gutenberg#32063 - Template mode: - Fix embed dimensions WordPress/gutenberg#32057 - Update the welcome guide WordPress/gutenberg#32055 WordPress/gutenberg#32026 - Don’t display the notice at the same time as the welcome guide WordPress/gutenberg#32076 - Remove MetaBoxes WordPress/gutenberg#32315 - Update the title area WordPress/gutenberg#32037 - Widgets Screen: - Fix unsaved changes WordPress/gutenberg#31757 - Fix toolbar alignment WordPress/gutenberg#31991 - Fix block toolbar position after scroll WordPress/gutenberg#32212 - Fix the visible widget area header WordPress/gutenberg#32262 - Fix legacy widgets preview WordPress/gutenberg#32260 - - Block Widgets in the customizer: - Fix customizer title overlapping block toolbar WordPress/gutenberg#32140 - Fix styling issues WordPress/gutenberg#32072 - Fix escape key events WordPress/gutenberg#32175 - Add preferences menu group label WordPress/gutenberg#32259 - Fix creating and replacing legacy widgets WordPress/gutenberg#32005 - Fix the welcome guide’s image WordPress/gutenberg#32264 WordPress/gutenberg#32302 - Fix Cover to Image transform duotone error WordPress/gutenberg#32006 - Remove filter_var usage from blocks WordPress/gutenberg#32046 - Fix image width for aligned Post Featured Image block WordPress/gutenberg#32070 - Prevent excessive Image block re-rendering WordPress/gutenberg#32102 - Remove gutenberg domain from core blocks WordPress/gutenberg#32152 - Use the block editor context class for the the different settings filters WordPress/gutenberg#32159 - Fix Latest Posts block grid view WordPress/gutenberg#32160 - Fix preset classes generation per block WordPress/gutenberg#32190 - Fix logic to enable custom colors and gradients WordPress/gutenberg#32200 - Update the Site Logo logic to use a dedicated site option WordPress/gutenberg#32229 - Limit the Latest Posts block’s featured image width WordPress/gutenberg#32245 - Remove opacity animation in the canvas. WordPress/gutenberg#32266 - Make the focus style valid CSS WordPress/gutenberg#32305 - Fix theme.json styles for the core/list block WordPress/gutenberg#32343 - Fix PHP notice when calling render_block WordPress/gutenberg#32135 Props nosolosw, noisysocks. See #52991. Built from https://develop.svn.wordpress.org/trunk@51051 git-svn-id: http://core.svn.wordpress.org/trunk@50660 1a063a9b-81f0-0310-95a4-ce76da25c4cd

This includes the following fixes: - Generate babel polyfill dynamically WordPress/gutenberg#31279 - Improve the List View component WordPress/gutenberg#31290 WordPress/gutenberg#32063 - Template mode: - Fix embed dimensions WordPress/gutenberg#32057 - Update the welcome guide WordPress/gutenberg#32055 WordPress/gutenberg#32026 - Don’t display the notice at the same time as the welcome guide WordPress/gutenberg#32076 - Remove MetaBoxes WordPress/gutenberg#32315 - Update the title area WordPress/gutenberg#32037 - Widgets Screen: - Fix unsaved changes WordPress/gutenberg#31757 - Fix toolbar alignment WordPress/gutenberg#31991 - Fix block toolbar position after scroll WordPress/gutenberg#32212 - Fix the visible widget area header WordPress/gutenberg#32262 - Fix legacy widgets preview WordPress/gutenberg#32260 - - Block Widgets in the customizer: - Fix customizer title overlapping block toolbar WordPress/gutenberg#32140 - Fix styling issues WordPress/gutenberg#32072 - Fix escape key events WordPress/gutenberg#32175 - Add preferences menu group label WordPress/gutenberg#32259 - Fix creating and replacing legacy widgets WordPress/gutenberg#32005 - Fix the welcome guide’s image WordPress/gutenberg#32264 WordPress/gutenberg#32302 - Fix Cover to Image transform duotone error WordPress/gutenberg#32006 - Remove filter_var usage from blocks WordPress/gutenberg#32046 - Fix image width for aligned Post Featured Image block WordPress/gutenberg#32070 - Prevent excessive Image block re-rendering WordPress/gutenberg#32102 - Remove gutenberg domain from core blocks WordPress/gutenberg#32152 - Use the block editor context class for the the different settings filters WordPress/gutenberg#32159 - Fix Latest Posts block grid view WordPress/gutenberg#32160 - Fix preset classes generation per block WordPress/gutenberg#32190 - Fix logic to enable custom colors and gradients WordPress/gutenberg#32200 - Update the Site Logo logic to use a dedicated site option WordPress/gutenberg#32229 - Limit the Latest Posts block’s featured image width WordPress/gutenberg#32245 - Remove opacity animation in the canvas. WordPress/gutenberg#32266 - Make the focus style valid CSS WordPress/gutenberg#32305 - Fix theme.json styles for the core/list block WordPress/gutenberg#32343 - Fix PHP notice when calling render_block WordPress/gutenberg#32135 Props nosolosw, noisysocks. See #52991. Built from https://develop.svn.wordpress.org/trunk@51051 git-svn-id: https://core.svn.wordpress.org/trunk@50660 1a063a9b-81f0-0310-95a4-ce76da25c4cd

cpapazoglou · 2021-06-07T14:36:26Z

Hi there! Just a heads up (if you already haven't noticed it), register_setting() is also affecting saving in /wp-admin/options-general.php.

gutenberg/lib/rest-api.php

Lines 190 to 217 in 27afc4d

    
           register_setting( 
        
           	'general', 
        
           	'theme_mods_' . get_option( 'stylesheet' ), 
        
           	array( 
        
           		'type'         => 'object', 
        
           		'show_in_rest' => array( 
        
           			'name'   => 'theme_mods_' . get_option( 'stylesheet' ), 
        
           			'schema' => array( 
        
           				'type'       => 'object', 
        
           				'properties' => array( 
        
           					'custom_logo' => array( 'type' => 'integer' ), 
        
           				), 
        
           			), 
        
           		), 
        
           	) 
        
           ); 
        
           /** 
        
            * Expose the "stylesheet" setting in the REST API. 
        
            */ 
        
           register_setting( 
        
           	'general', 
        
           	'stylesheet', 
        
           	array( 
        
           		'type'         => 'string', 
        
           		'show_in_rest' => true, 
        
           	) 
        
           );

Cause, it updates $new_allowed_options with the provided option. options-general.php awaits all $new_allowed_options to be present in the form and thus we were getting an empty stylesheet.

Probably, using register_setting() in a rest_api_init hook as you already do in this PR https://github.com/WordPress/gutenberg/pull/32229/files#diff-92dc6950bcaf54290625664019ea23b023cb3f156de19586612c8d3e3cf52adcR81
is a good solution 👏!

Related issue Automattic/wp-calypso#53447

creativecoder · 2021-06-07T15:34:37Z

@cpapazoglou Just to be clear: it looks like the changes merged from this PR fix the issue, is that right?

cpapazoglou · 2021-06-07T15:38:43Z

@cpapazoglou Just to be clear: it looks like the changes merged from this PR fix the issue, is that right?

Sure they do!

* Revert "Use `custom_logo` theme-mod instead of `site_logo` setting for the site-logo block (#31994)" This reverts commit 622505f. * Update sync methods * move the remove_filter call * rename functions * avoid crossing fire.

pablinos · 2021-06-09T08:59:49Z

packages/block-library/src/site-logo/index.php

+	}
+}
+
+add_action( 'update_option_site_logo', '_sync_site_logo_to_custom_logo', 10, 2 );


We were fixing an issue last night where this code sync'd values from a conflicting site option in Jetpack.

One possible solution might be to check that the current theme supports the custom_logo theme mod, and if not, then we don't register this action.

/cc @creativecoder @kraftbj @fullofcaffeine

… the wp_option data corruption bug

…eproduce the wp_option data corruption bug" This reverts commit 17eb33b.

… the wp_option data corruption bug

…eproduce the wp_option data corruption bug" This reverts commit 17eb33b.

…t corrupted data (#32797) * Manually revert the relevant portions of #32229 in order to reproduce the wp_option data corruption bug * Test regression for settings update corrupting some wp_options * Cleanup * Revert "Manually revert the relevant portions of #32229 in order to reproduce the wp_option data corruption bug" This reverts commit 17eb33b. * Add comment to remind us that to eventually add a similar test to core

This includes the following fixes: - Generate babel polyfill dynamically WordPress/gutenberg#31279 - Improve the List View component WordPress/gutenberg#31290 WordPress/gutenberg#32063 - Template mode: - Fix embed dimensions WordPress/gutenberg#32057 - Update the welcome guide WordPress/gutenberg#32055 WordPress/gutenberg#32026 - Don’t display the notice at the same time as the welcome guide WordPress/gutenberg#32076 - Remove MetaBoxes WordPress/gutenberg#32315 - Update the title area WordPress/gutenberg#32037 - Widgets Screen: - Fix unsaved changes WordPress/gutenberg#31757 - Fix toolbar alignment WordPress/gutenberg#31991 - Fix block toolbar position after scroll WordPress/gutenberg#32212 - Fix the visible widget area header WordPress/gutenberg#32262 - Fix legacy widgets preview WordPress/gutenberg#32260 - - Block Widgets in the customizer: - Fix customizer title overlapping block toolbar WordPress/gutenberg#32140 - Fix styling issues WordPress/gutenberg#32072 - Fix escape key events WordPress/gutenberg#32175 - Add preferences menu group label WordPress/gutenberg#32259 - Fix creating and replacing legacy widgets WordPress/gutenberg#32005 - Fix the welcome guide’s image WordPress/gutenberg#32264 WordPress/gutenberg#32302 - Fix Cover to Image transform duotone error WordPress/gutenberg#32006 - Remove filter_var usage from blocks WordPress/gutenberg#32046 - Fix image width for aligned Post Featured Image block WordPress/gutenberg#32070 - Prevent excessive Image block re-rendering WordPress/gutenberg#32102 - Remove gutenberg domain from core blocks WordPress/gutenberg#32152 - Use the block editor context class for the the different settings filters WordPress/gutenberg#32159 - Fix Latest Posts block grid view WordPress/gutenberg#32160 - Fix preset classes generation per block WordPress/gutenberg#32190 - Fix logic to enable custom colors and gradients WordPress/gutenberg#32200 - Update the Site Logo logic to use a dedicated site option WordPress/gutenberg#32229 - Limit the Latest Posts block’s featured image width WordPress/gutenberg#32245 - Remove opacity animation in the canvas. WordPress/gutenberg#32266 - Make the focus style valid CSS WordPress/gutenberg#32305 - Fix theme.json styles for the core/list block WordPress/gutenberg#32343 - Fix PHP notice when calling render_block WordPress/gutenberg#32135 Props nosolosw, noisysocks. See #52991. Built from https://develop.svn.wordpress.org/trunk@51051 git-svn-id: http://core.svn.wordpress.org/trunk@50660 1a063a9b-81f0-0310-95a4-ce76da25c4cd

aristath added 2 commits May 26, 2021 11:38

Revert "Use custom_logo theme-mod instead of site_logo setting fo…

82e0dc1

…r the site-logo block (#31994)" This reverts commit 622505f.

Update sync methods

390ed4f

aristath added Backport to WP Beta/RC [Block] Site Logo Affects the Site Logo Block labels May 26, 2021

aristath requested review from a team, carolinan, mtias, scruffian and youknowriad May 26, 2021 09:45

aristath requested review from TimothyBJacobs, ajitbohra and spacedmonkey as code owners May 26, 2021 09:45

youknowriad requested a review from gziolo May 26, 2021 09:46

move the remove_filter call

ce73237

aristath linked an issue May 26, 2021 that may be closed by this pull request

Site Logo Block: logo data source and block UX #32065

Closed

This was referenced May 26, 2021

Make sure wp_get_attachment_image_src filter gets removed in the site-logo even when no logo exists #32187

Closed

fixes issue with site-logo when option is unset #32092

Closed

aristath linked an issue May 26, 2021 that may be closed by this pull request

Site Logo Block doesn't load after previously uploading #32171

Closed

TimothyBJacobs approved these changes May 26, 2021

View reviewed changes

creativecoder reviewed May 26, 2021

View reviewed changes

packages/block-library/src/site-logo/index.php Outdated Show resolved Hide resolved

colorful-tones mentioned this pull request May 26, 2021

Site Logo Block doesn't load after previously uploading #32171

Closed

aristath added 2 commits May 27, 2021 10:18

rename functions

389aed8

avoid crossing fire.

f496527

aristath merged commit 8dabee3 into trunk May 27, 2021

aristath deleted the fix/site-logo-use-option branch May 27, 2021 09:02

github-actions bot added this to the Gutenberg 10.8 milestone May 27, 2021

aristath mentioned this pull request May 27, 2021

Add logo block WordPress/wordpress-develop#1275

Closed

youknowriad removed the Backport to WP Beta/RC label May 31, 2021

youknowriad mentioned this pull request May 31, 2021

Update to the latest WP packages WordPress/wordpress-develop#1319

Closed

5 tasks

bobbingwide mentioned this pull request Jun 1, 2021

Update Fizzie to cater for changes in Gutenberg 10.7.1 bobbingwide/fizzie#68

Closed

niaccurshi mentioned this pull request Jun 7, 2021

current rest-api.php breaks sites when saving options-general.php (10.7.1-10.7.3) #32486

Closed

cpapazoglou mentioned this pull request Jun 7, 2021

Saving certain site settings (E.g. in Advanced General) breaks/reverts theme Automattic/wp-calypso#53447

Closed

ockham mentioned this pull request Jun 8, 2021

The image from the site logo block can not be removed from the customizer #25173

Closed

Sandstromer mentioned this pull request Jun 8, 2021

Broken theme mods option #32511

Closed

pablinos reviewed Jun 9, 2021

View reviewed changes

fullofcaffeine added a commit that referenced this pull request Jun 17, 2021

Manually revert the relevant portions of #32229 in order to reproduce…

17eb33b

… the wp_option data corruption bug

fullofcaffeine mentioned this pull request Jun 18, 2021

Add regression E2E test for the bug that caused some wp_options to get corrupted data #32797

Merged

7 tasks

fullofcaffeine added a commit that referenced this pull request Jun 18, 2021

Revert "Manually revert the relevant portions of #32229 in order to r…

b8a11ed

…eproduce the wp_option data corruption bug" This reverts commit 17eb33b.

fullofcaffeine added a commit that referenced this pull request Jun 24, 2021

Manually revert the relevant portions of #32229 in order to reproduce…

b335ceb

… the wp_option data corruption bug

fullofcaffeine added a commit that referenced this pull request Jun 24, 2021

Revert "Manually revert the relevant portions of #32229 in order to r…

9ffad29

…eproduce the wp_option data corruption bug" This reverts commit 17eb33b.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

site-logo block: Use option instead of theme-mod#32229

site-logo block: Use option instead of theme-mod#32229
aristath merged 5 commits intotrunkfrom
fix/site-logo-use-option

aristath commented May 26, 2021 •

edited

Loading

Uh oh!

github-actions bot commented May 26, 2021 •

edited

Loading

Uh oh!

TimothyBJacobs left a comment

Uh oh!

creativecoder left a comment

Uh oh!

Uh oh!

colorful-tones commented May 26, 2021

Uh oh!

aristath commented May 27, 2021

Uh oh!

cpapazoglou commented Jun 7, 2021 •

edited

Loading

Uh oh!

creativecoder commented Jun 7, 2021

Uh oh!

cpapazoglou commented Jun 7, 2021

Uh oh!

pablinos Jun 9, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

aristath commented May 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Checklist:

Uh oh!

github-actions bot commented May 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TimothyBJacobs left a comment

Choose a reason for hiding this comment

Uh oh!

creativecoder left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

colorful-tones commented May 26, 2021

Uh oh!

aristath commented May 27, 2021

Uh oh!

cpapazoglou commented Jun 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

creativecoder commented Jun 7, 2021

Uh oh!

cpapazoglou commented Jun 7, 2021

Uh oh!

pablinos Jun 9, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

aristath commented May 26, 2021 •

edited

Loading

github-actions bot commented May 26, 2021 •

edited

Loading

cpapazoglou commented Jun 7, 2021 •

edited

Loading