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.

Sign up for GitHub

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

Jump to bottom

Show the default style variation if none provided #24217

Merged
merged 1 commit into from
Jul 27, 2020
Merged

Show the default style variation if none provided #24217

merged 1 commit into from
Jul 27, 2020

Conversation

youknowriad
Copy link
Contributor

@youknowriad youknowriad commented Jul 27, 2020 •
edited
Loading

closes #24147

The logic to add default style variations was only checking the "blockType.styles" property and not the registered styles.

Testing instructions

  • Add a style variations to the list block like so
wp.blocks.registerBlockStyle( 'core/list', {
	name: 'test',
	label: 'Test',
} );
  • The default style variation should be also added to the block styles switcher.

@youknowriad youknowriad added [Type] Bug An existing feature does not function as intended [Feature] Theme Style Variations Related to style variations provided by block themes Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta labels Jul 27, 2020
@youknowriad youknowriad requested a review from ellatrix as a code owner July 27, 2020 12:39
@youknowriad youknowriad self-assigned this Jul 27, 2020
@github-actions
Copy link

Size Change: +1 B

Total Size: 1.16 MB

Filename Size Change
build/block-editor/index.min.js 125 kB +1 B
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.min.js 1.14 kB 0 B
build/annotations/index.min.js 3.67 kB 0 B
build/api-fetch/index.min.js 3.44 kB 0 B
build/autop/index.min.js 2.82 kB 0 B
build/blob/index.min.js 620 B 0 B
build/block-directory/index.min.js 7.93 kB 0 B
build/block-directory/style-rtl.css 953 B 0 B
build/block-directory/style.css 952 B 0 B
build/block-editor/style-rtl.css 10.8 kB 0 B
build/block-editor/style.css 10.8 kB 0 B
build/block-library/editor-rtl.css 7.63 kB 0 B
build/block-library/editor.css 7.63 kB 0 B
build/block-library/index.min.js 132 kB 0 B
build/block-library/style-rtl.css 7.83 kB 0 B
build/block-library/style.css 7.83 kB 0 B
build/block-library/theme-rtl.css 728 B 0 B
build/block-library/theme.css 729 B 0 B
build/block-serialization-default-parser/index.min.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.min.js 3.1 kB 0 B
build/blocks/index.min.js 48.2 kB 0 B
build/components/index.min.js 200 kB 0 B
build/components/style-rtl.css 15.7 kB 0 B
build/components/style.css 15.7 kB 0 B
build/compose/index.min.js 9.67 kB 0 B
build/core-data/index.min.js 11.5 kB 0 B
build/data-controls/index.min.js 1.29 kB 0 B
build/data/index.min.js 8.45 kB 0 B
build/date/index.min.js 5.38 kB 0 B
build/deprecated/index.min.js 772 B 0 B
build/dom-ready/index.min.js 568 B 0 B
build/dom/index.min.js 3.23 kB 0 B
build/edit-navigation/index.min.js 10.8 kB 0 B
build/edit-navigation/style-rtl.css 1.08 kB 0 B
build/edit-navigation/style.css 1.08 kB 0 B
build/edit-post/index.min.js 304 kB 0 B
build/edit-post/style-rtl.css 5.61 kB 0 B
build/edit-post/style.css 5.61 kB 0 B
build/edit-site/index.min.js 17 kB 0 B
build/edit-site/style-rtl.css 3.06 kB 0 B
build/edit-site/style.css 3.06 kB 0 B
build/edit-widgets/index.min.js 9.38 kB 0 B
build/edit-widgets/style-rtl.css 2.45 kB 0 B
build/edit-widgets/style.css 2.45 kB 0 B
build/editor/editor-styles-rtl.css 537 B 0 B
build/editor/editor-styles.css 539 B 0 B
build/editor/index.min.js 45.3 kB 0 B
build/editor/style-rtl.css 3.8 kB 0 B
build/editor/style.css 3.79 kB 0 B
build/element/index.min.js 4.65 kB 0 B
build/escape-html/index.min.js 733 B 0 B
build/format-library/index.min.js 7.72 kB 0 B
build/format-library/style-rtl.css 547 B 0 B
build/format-library/style.css 548 B 0 B
build/hooks/index.min.js 2.13 kB 0 B
build/html-entities/index.min.js 621 B 0 B
build/i18n/index.min.js 3.56 kB 0 B
build/is-shallow-equal/index.min.js 711 B 0 B
build/keyboard-shortcuts/index.min.js 2.52 kB 0 B
build/keycodes/index.min.js 1.94 kB 0 B
build/list-reusable-blocks/index.min.js 3.11 kB 0 B
build/list-reusable-blocks/style-rtl.css 476 B 0 B
build/list-reusable-blocks/style.css 476 B 0 B
build/media-utils/index.min.js 5.33 kB 0 B
build/notices/index.min.js 1.79 kB 0 B
build/nux/index.min.js 3.4 kB 0 B
build/nux/style-rtl.css 671 B 0 B
build/nux/style.css 668 B 0 B
build/plugins/index.min.js 2.56 kB 0 B
build/primitives/index.min.js 1.41 kB 0 B
build/priority-queue/index.min.js 789 B 0 B
build/redux-routine/index.min.js 2.85 kB 0 B
build/rich-text/index.min.js 13.9 kB 0 B
build/server-side-render/index.min.js 2.71 kB 0 B
build/shortcode/index.min.js 1.7 kB 0 B
build/token-list/index.min.js 1.27 kB 0 B
build/url/index.min.js 4.06 kB 0 B
build/viewport/index.min.js 1.85 kB 0 B
build/warning/index.min.js 1.14 kB 0 B
build/wordcount/index.min.js 1.17 kB 0 B

compressed-size-action

@StefanXhunga
Copy link

I need to be those requested changes

@youknowriad
Copy link
Contributor Author

@StefanXhunga I'm not sure I understand your message?

ocean90
ocean90 reviewed Jul 27, 2020
View reviewed changes
packages/block-editor/src/components/block-styles/index.js
@@ -110,18 +110,21 @@ function BlockStyles( {
return null;
}

if ( ! type.styles && ! find( styles, 'isDefault' ) ) {
Copy link
Member

Choose a reason for hiding this comment

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

Looks like you already knew it two years ago :) https://github.com/WordPress/gutenberg/pull/12519/files#r240045926

Copy link
Member

Choose a reason for hiding this comment

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

Ah, so what happened was that by setting [] as default for styles, the !type.styles was no longer true. 👍

@ItsJonQ ItsJonQ self-requested a review July 27, 2020 14:16
ItsJonQ
ItsJonQ approved these changes Jul 27, 2020
View reviewed changes
Copy link

@ItsJonQ ItsJonQ left a comment

Choose a reason for hiding this comment

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

🚀 from me! Changes look good to me! Tested it locally, (using the supplied test code), and it looks like it worked as expected 👍

Screen Shot 2020-07-27 at 10 14 01 AM

@youknowriad youknowriad merged commit 6caa42a into master Jul 27, 2020
@youknowriad youknowriad deleted the fix/default-style-variations branch July 27, 2020 14:18
@github-actions github-actions bot added this to the Gutenberg 8.7 milestone Jul 27, 2020
youknowriad added a commit that referenced this pull request Jul 27, 2020
@youknowriad
Show the default style variation if none provided (#24217)
64badeb
@youknowriad youknowriad mentioned this pull request Jul 27, 2020
Merged
@youknowriad youknowriad 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 Jul 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ocean90 ocean90 ocean90 left review comments

@oandregal oandregal oandregal left review comments

@ItsJonQ ItsJonQ ItsJonQ approved these changes

@ellatrix ellatrix Awaiting requested review from ellatrix

Assignees

@youknowriad youknowriad

Labels
[Feature] Theme Style Variations Related to style variations provided by block themes [Type] Bug An existing feature does not function as intended
Projects
None yet
Milestone
Gutenberg 8.7
Development

Successfully merging this pull request may close these issues.

The "Default" style is gone from WordPress 5.5.
5 participants
@youknowriad @StefanXhunga @oandregal @ocean90 @ItsJonQ