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

Include the block variations on the inserter selector #25182

Merged
merged 5 commits into from
Sep 9, 2020
Merged

Include the block variations on the inserter selector #25182

merged 5 commits into from
Sep 9, 2020

Conversation

youknowriad
Copy link
Contributor

The way block variations are included in the inserter is very hacky. It also results in a number of issues:

  • Variations need to be included in all situations manually
  • The search algorithm doesn't treat them as their own unit causing bad results
  • We had to add hacky code to make the inserter "limit" work.

This PR solves this by just moving the inserter variations to the inserter items selector.

@youknowriad youknowriad added [Type] Enhancement A suggestion for improvement. [Feature] Inserter The main way to insert blocks using the + button in the editing interface [Feature] Block Variations Block variations, including introducing new variations and variations as a feature labels Sep 9, 2020
@youknowriad youknowriad self-assigned this Sep 9, 2020
@github-actions
Copy link

github-actions bot commented Sep 9, 2020 •
edited
Loading

Size Change: -232 B (0%)

Total Size: 1.2 MB

Filename Size Change
build/block-editor/index.js 128 kB -238 B (0%)
build/block-editor/style-rtl.css 11.1 kB +3 B (0%)
build/block-editor/style.css 11.1 kB +3 B (0%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.67 kB 0 B
build/api-fetch/index.js 3.41 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/index.js 8.5 kB 0 B
build/block-directory/style-rtl.css 953 B 0 B
build/block-directory/style.css 952 B 0 B
build/block-library/editor-rtl.css 8.68 kB 0 B
build/block-library/editor.css 8.68 kB 0 B
build/block-library/index.js 139 kB 0 B
build/block-library/style-rtl.css 7.59 kB 0 B
build/block-library/style.css 7.58 kB 0 B
build/block-library/theme-rtl.css 754 B 0 B
build/block-library/theme.css 754 B 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/blocks/index.js 47.7 kB 0 B
build/components/index.js 200 kB 0 B
build/components/style-rtl.css 15.5 kB 0 B
build/components/style.css 15.5 kB 0 B
build/compose/index.js 9.68 kB 0 B
build/core-data/index.js 12.3 kB 0 B
build/data-controls/index.js 1.29 kB 0 B
build/data/index.js 8.54 kB 0 B
build/date/index.js 31.9 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 568 B 0 B
build/dom/index.js 4.48 kB 0 B
build/edit-navigation/index.js 11.7 kB 0 B
build/edit-navigation/style-rtl.css 1.16 kB 0 B
build/edit-navigation/style.css 1.16 kB 0 B
build/edit-post/index.js 305 kB 0 B
build/edit-post/style-rtl.css 6.26 kB 0 B
build/edit-post/style.css 6.25 kB 0 B
build/edit-site/index.js 19.3 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.js 12.1 kB 0 B
build/edit-widgets/style-rtl.css 2.46 kB 0 B
build/edit-widgets/style.css 2.45 kB 0 B
build/editor/editor-styles-rtl.css 492 B 0 B
build/editor/editor-styles.css 493 B 0 B
build/editor/index.js 45.6 kB 0 B
build/editor/style-rtl.css 3.81 kB 0 B
build/editor/style.css 3.81 kB 0 B
build/element/index.js 4.64 kB 0 B
build/escape-html/index.js 733 B 0 B
build/format-library/index.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.js 2.13 kB 0 B
build/html-entities/index.js 622 B 0 B
build/i18n/index.js 3.57 kB 0 B
build/is-shallow-equal/index.js 711 B 0 B
build/keyboard-shortcuts/index.js 2.52 kB 0 B
build/keycodes/index.js 1.95 kB 0 B
build/list-reusable-blocks/index.js 3.12 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.js 5.32 kB 0 B
build/notices/index.js 1.79 kB 0 B
build/nux/index.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.js 2.56 kB 0 B
build/primitives/index.js 1.41 kB 0 B
build/priority-queue/index.js 789 B 0 B
build/redux-routine/index.js 2.85 kB 0 B
build/rich-text/index.js 13.9 kB 0 B
build/server-side-render/index.js 2.77 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 4.06 kB 0 B
build/viewport/index.js 1.85 kB 0 B
build/warning/index.js 1.13 kB 0 B
build/wordcount/index.js 1.17 kB 0 B

compressed-size-action

ntsekouras
ntsekouras approved these changes Sep 9, 2020
View reviewed changes
Copy link
Contributor

@ntsekouras ntsekouras left a comment

Choose a reason for hiding this comment

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

Great work here Riad! 💯. I've left a comment about adding keywords in getItemFromVariation to include those as well. You can test it by searching for example music.

packages/block-editor/src/store/selectors.js Show resolved Hide resolved
@youknowriad youknowriad force-pushed the update/include-variations-in-inserter-selector branch from a56098c to ea67fe1 Compare September 9, 2020 09:45
mcsf
mcsf reviewed Sep 9, 2020
View reviewed changes
Copy link
Contributor

@mcsf mcsf left a comment

Choose a reason for hiding this comment

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

Happy to see this refactor.

packages/block-editor/src/store/selectors.js Outdated Show resolved Hide resolved
@mcsf
Copy link
Contributor

mcsf commented Sep 9, 2020

Great work here Riad! 💯. I've left a comment about adding keywords in getItemFromVariation to include those as well. You can test it by searching for example music.

Good catch. :)

@youknowriad @mcsf
remove useless comment
3e532d8 
Co-authored-by: Miguel Fonseca <miguelcsf@gmail.com>
@youknowriad youknowriad merged commit 28ab9ff into master Sep 9, 2020
@youknowriad youknowriad deleted the update/include-variations-in-inserter-selector branch September 9, 2020 10:22
@github-actions github-actions bot added this to the Gutenberg 9.0 milestone Sep 9, 2020
gziolo added a commit that referenced this pull request Jan 26, 2021
@gziolo
Remove obsolete getVariations call that was disconnected in #25182
f51c381
@gziolo gziolo mentioned this pull request Jan 26, 2021
Merged
6 tasks
This was referenced Mar 18, 2021
Merged
Closed
Closed
Merged
This was referenced Mar 18, 2021
Closed
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ntsekouras ntsekouras ntsekouras approved these changes

@mcsf mcsf mcsf approved these changes

@ellatrix ellatrix Awaiting requested review from ellatrix

@ajitbohra ajitbohra Awaiting requested review from ajitbohra

@chrisvanpatten chrisvanpatten Awaiting requested review from chrisvanpatten

@mkaz mkaz Awaiting requested review from mkaz

Assignees

@youknowriad youknowriad

Labels
[Feature] Block Variations Block variations, including introducing new variations and variations as a feature [Feature] Inserter The main way to insert blocks using the + button in the editing interface [Type] Enhancement A suggestion for improvement.
Projects
None yet
Milestone
Gutenberg 9.0
Development

Successfully merging this pull request may close these issues.
3 participants
@youknowriad @mcsf @ntsekouras