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

Enable navigation nesting to be filtered and manually set #38621

Merged
merged 8 commits into from
Apr 4, 2022

Conversation

draganescu
Copy link
Contributor

@draganescu draganescu commented Feb 8, 2022

Closes #34611 by making maxNestingLevel available via context from the Navigation block to the NavigationSubmenu and NavigationLink blocks.

To test:

  • switch to this PR
  • create a new page
  • insert a Navigation Block
  • click Start Empty
  • try to insert 6 nested menu items
    • should not work, 5 is the default nesting
    • delete all links, leave the navigation block
    • save
  • click the dot menu in the upper right corner of the editor
  • click on "Code Editor"
  • in the code view
    • take a note of the number after "ref":: this is REFID below
    • replace:

<!-- wp:navigation {"ref":REFID} /-->

with

<!-- wp:navigation {"ref":REFID, "maxNestingLevel": 3} /-->

  • click the dot menu in the upper right corner of the editor
  • click on "Visual Editor"
  • try to insert 4 nested menu items
    • should not work, 3 is the new nesting

This update makes the nesting depth configurable by themes. It is also configurable via plugins using the blocks.getBlockAttributes filter.

@github-actions
Copy link

github-actions bot commented Feb 8, 2022

Size Change: +90 B (0%)

Total Size: 1.22 MB

Filename Size Change
build/block-library/index.min.js 173 kB +44 B (0%)
build/data/index.min.js 8.65 kB +46 B (+1%)
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 993 B
build/admin-manifest/index.min.js 1.24 kB
build/annotations/index.min.js 2.77 kB
build/api-fetch/index.min.js 2.27 kB
build/autop/index.min.js 2.15 kB
build/blob/index.min.js 487 B
build/block-directory/index.min.js 6.49 kB
build/block-directory/style-rtl.css 1.01 kB
build/block-directory/style.css 1.01 kB
build/block-editor/default-editor-styles-rtl.css 378 B
build/block-editor/default-editor-styles.css 378 B
build/block-editor/index.min.js 148 kB
build/block-editor/style-rtl.css 15.5 kB
build/block-editor/style.css 15.5 kB
build/block-library/blocks/archives/editor-rtl.css 61 B
build/block-library/blocks/archives/editor.css 60 B
build/block-library/blocks/archives/style-rtl.css 65 B
build/block-library/blocks/archives/style.css 65 B
build/block-library/blocks/audio/editor-rtl.css 150 B
build/block-library/blocks/audio/editor.css 150 B
build/block-library/blocks/audio/style-rtl.css 111 B
build/block-library/blocks/audio/style.css 111 B
build/block-library/blocks/audio/theme-rtl.css 125 B
build/block-library/blocks/audio/theme.css 125 B
build/block-library/blocks/avatar/editor-rtl.css 116 B
build/block-library/blocks/avatar/editor.css 116 B
build/block-library/blocks/avatar/style-rtl.css 59 B
build/block-library/blocks/avatar/style.css 59 B
build/block-library/blocks/block/editor-rtl.css 161 B
build/block-library/blocks/block/editor.css 161 B
build/block-library/blocks/button/editor-rtl.css 445 B
build/block-library/blocks/button/editor.css 445 B
build/block-library/blocks/button/style-rtl.css 560 B
build/block-library/blocks/button/style.css 560 B
build/block-library/blocks/buttons/editor-rtl.css 292 B
build/block-library/blocks/buttons/editor.css 292 B
build/block-library/blocks/buttons/style-rtl.css 275 B
build/block-library/blocks/buttons/style.css 275 B
build/block-library/blocks/calendar/style-rtl.css 207 B
build/block-library/blocks/calendar/style.css 207 B
build/block-library/blocks/categories/editor-rtl.css 84 B
build/block-library/blocks/categories/editor.css 83 B
build/block-library/blocks/categories/style-rtl.css 79 B
build/block-library/blocks/categories/style.css 79 B
build/block-library/blocks/code/style-rtl.css 103 B
build/block-library/blocks/code/style.css 103 B
build/block-library/blocks/code/theme-rtl.css 124 B
build/block-library/blocks/code/theme.css 124 B
build/block-library/blocks/columns/editor-rtl.css 108 B
build/block-library/blocks/columns/editor.css 108 B
build/block-library/blocks/columns/style-rtl.css 406 B
build/block-library/blocks/columns/style.css 406 B
build/block-library/blocks/comment-author-avatar/editor-rtl.css 125 B
build/block-library/blocks/comment-author-avatar/editor.css 125 B
build/block-library/blocks/comment-template/style-rtl.css 127 B
build/block-library/blocks/comment-template/style.css 127 B
build/block-library/blocks/comments-pagination-numbers/editor-rtl.css 123 B
build/block-library/blocks/comments-pagination-numbers/editor.css 121 B
build/block-library/blocks/comments-pagination/editor-rtl.css 222 B
build/block-library/blocks/comments-pagination/editor.css 209 B
build/block-library/blocks/comments-pagination/style-rtl.css 235 B
build/block-library/blocks/comments-pagination/style.css 231 B
build/block-library/blocks/comments-query-loop/editor-rtl.css 95 B
build/block-library/blocks/comments-query-loop/editor.css 95 B
build/block-library/blocks/cover/editor-rtl.css 546 B
build/block-library/blocks/cover/editor.css 547 B
build/block-library/blocks/cover/style-rtl.css 1.56 kB
build/block-library/blocks/cover/style.css 1.56 kB
build/block-library/blocks/embed/editor-rtl.css 293 B
build/block-library/blocks/embed/editor.css 293 B
build/block-library/blocks/embed/style-rtl.css 417 B
build/block-library/blocks/embed/style.css 417 B
build/block-library/blocks/embed/theme-rtl.css 124 B
build/block-library/blocks/embed/theme.css 124 B
build/block-library/blocks/file/editor-rtl.css 300 B
build/block-library/blocks/file/editor.css 300 B
build/block-library/blocks/file/style-rtl.css 255 B
build/block-library/blocks/file/style.css 255 B
build/block-library/blocks/file/view.min.js 353 B
build/block-library/blocks/freeform/editor-rtl.css 2.44 kB
build/block-library/blocks/freeform/editor.css 2.44 kB
build/block-library/blocks/gallery/editor-rtl.css 961 B
build/block-library/blocks/gallery/editor.css 964 B
build/block-library/blocks/gallery/style-rtl.css 1.51 kB
build/block-library/blocks/gallery/style.css 1.51 kB
build/block-library/blocks/gallery/theme-rtl.css 122 B
build/block-library/blocks/gallery/theme.css 122 B
build/block-library/blocks/group/editor-rtl.css 159 B
build/block-library/blocks/group/editor.css 159 B
build/block-library/blocks/group/style-rtl.css 57 B
build/block-library/blocks/group/style.css 57 B
build/block-library/blocks/group/theme-rtl.css 78 B
build/block-library/blocks/group/theme.css 78 B
build/block-library/blocks/heading/style-rtl.css 76 B
build/block-library/blocks/heading/style.css 76 B
build/block-library/blocks/html/editor-rtl.css 332 B
build/block-library/blocks/html/editor.css 333 B
build/block-library/blocks/image/editor-rtl.css 731 B
build/block-library/blocks/image/editor.css 730 B
build/block-library/blocks/image/style-rtl.css 529 B
build/block-library/blocks/image/style.css 535 B
build/block-library/blocks/image/theme-rtl.css 124 B
build/block-library/blocks/image/theme.css 124 B
build/block-library/blocks/latest-comments/style-rtl.css 284 B
build/block-library/blocks/latest-comments/style.css 284 B
build/block-library/blocks/latest-posts/editor-rtl.css 199 B
build/block-library/blocks/latest-posts/editor.css 198 B
build/block-library/blocks/latest-posts/style-rtl.css 447 B
build/block-library/blocks/latest-posts/style.css 446 B
build/block-library/blocks/list/style-rtl.css 88 B
build/block-library/blocks/list/style.css 88 B
build/block-library/blocks/media-text/editor-rtl.css 266 B
build/block-library/blocks/media-text/editor.css 263 B
build/block-library/blocks/media-text/style-rtl.css 493 B
build/block-library/blocks/media-text/style.css 490 B
build/block-library/blocks/more/editor-rtl.css 431 B
build/block-library/blocks/more/editor.css 431 B
build/block-library/blocks/navigation-link/editor-rtl.css 708 B
build/block-library/blocks/navigation-link/editor.css 706 B
build/block-library/blocks/navigation-link/style-rtl.css 94 B
build/block-library/blocks/navigation-link/style.css 94 B
build/block-library/blocks/navigation-submenu/editor-rtl.css 299 B
build/block-library/blocks/navigation-submenu/editor.css 299 B
build/block-library/blocks/navigation-submenu/view.min.js 375 B
build/block-library/blocks/navigation/editor-rtl.css 2.03 kB
build/block-library/blocks/navigation/editor.css 2.04 kB
build/block-library/blocks/navigation/style-rtl.css 1.93 kB
build/block-library/blocks/navigation/style.css 1.92 kB
build/block-library/blocks/navigation/view.min.js 2.85 kB
build/block-library/blocks/nextpage/editor-rtl.css 395 B
build/block-library/blocks/nextpage/editor.css 395 B
build/block-library/blocks/page-list/editor-rtl.css 363 B
build/block-library/blocks/page-list/editor.css 363 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 157 B
build/block-library/blocks/paragraph/editor.css 157 B
build/block-library/blocks/paragraph/style-rtl.css 260 B
build/block-library/blocks/paragraph/style.css 260 B
build/block-library/blocks/post-author/style-rtl.css 175 B
build/block-library/blocks/post-author/style.css 176 B
build/block-library/blocks/post-comments-form/style-rtl.css 446 B
build/block-library/blocks/post-comments-form/style.css 446 B
build/block-library/blocks/post-comments/style-rtl.css 521 B
build/block-library/blocks/post-comments/style.css 521 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B
build/block-library/blocks/post-excerpt/editor.css 73 B
build/block-library/blocks/post-excerpt/style-rtl.css 69 B
build/block-library/blocks/post-excerpt/style.css 69 B
build/block-library/blocks/post-featured-image/editor-rtl.css 721 B
build/block-library/blocks/post-featured-image/editor.css 721 B
build/block-library/blocks/post-featured-image/style-rtl.css 153 B
build/block-library/blocks/post-featured-image/style.css 153 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 323 B
build/block-library/blocks/post-template/style.css 323 B
build/block-library/blocks/post-terms/style-rtl.css 73 B
build/block-library/blocks/post-terms/style.css 73 B
build/block-library/blocks/post-title/style-rtl.css 80 B
build/block-library/blocks/post-title/style.css 80 B
build/block-library/blocks/preformatted/style-rtl.css 103 B
build/block-library/blocks/preformatted/style.css 103 B
build/block-library/blocks/pullquote/editor-rtl.css 198 B
build/block-library/blocks/pullquote/editor.css 198 B
build/block-library/blocks/pullquote/style-rtl.css 370 B
build/block-library/blocks/pullquote/style.css 370 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 122 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B
build/block-library/blocks/query-pagination/editor-rtl.css 221 B
build/block-library/blocks/query-pagination/editor.css 211 B
build/block-library/blocks/query-pagination/style-rtl.css 234 B
build/block-library/blocks/query-pagination/style.css 231 B
build/block-library/blocks/query/editor-rtl.css 131 B
build/block-library/blocks/query/editor.css 132 B
build/block-library/blocks/quote/style-rtl.css 213 B
build/block-library/blocks/quote/style.css 213 B
build/block-library/blocks/quote/theme-rtl.css 223 B
build/block-library/blocks/quote/theme.css 226 B
build/block-library/blocks/read-more/style-rtl.css 132 B
build/block-library/blocks/read-more/style.css 132 B
build/block-library/blocks/rss/editor-rtl.css 202 B
build/block-library/blocks/rss/editor.css 204 B
build/block-library/blocks/rss/style-rtl.css 289 B
build/block-library/blocks/rss/style.css 288 B
build/block-library/blocks/search/editor-rtl.css 165 B
build/block-library/blocks/search/editor.css 165 B
build/block-library/blocks/search/style-rtl.css 397 B
build/block-library/blocks/search/style.css 398 B
build/block-library/blocks/search/theme-rtl.css 64 B
build/block-library/blocks/search/theme.css 64 B
build/block-library/blocks/separator/editor-rtl.css 140 B
build/block-library/blocks/separator/editor.css 140 B
build/block-library/blocks/separator/style-rtl.css 233 B
build/block-library/blocks/separator/style.css 233 B
build/block-library/blocks/separator/theme-rtl.css 194 B
build/block-library/blocks/separator/theme.css 194 B
build/block-library/blocks/shortcode/editor-rtl.css 474 B
build/block-library/blocks/shortcode/editor.css 474 B
build/block-library/blocks/site-logo/editor-rtl.css 759 B
build/block-library/blocks/site-logo/editor.css 759 B
build/block-library/blocks/site-logo/style-rtl.css 181 B
build/block-library/blocks/site-logo/style.css 181 B
build/block-library/blocks/site-tagline/editor-rtl.css 86 B
build/block-library/blocks/site-tagline/editor.css 86 B
build/block-library/blocks/site-title/editor-rtl.css 84 B
build/block-library/blocks/site-title/editor.css 84 B
build/block-library/blocks/social-link/editor-rtl.css 177 B
build/block-library/blocks/social-link/editor.css 177 B
build/block-library/blocks/social-links/editor-rtl.css 674 B
build/block-library/blocks/social-links/editor.css 673 B
build/block-library/blocks/social-links/style-rtl.css 1.37 kB
build/block-library/blocks/social-links/style.css 1.36 kB
build/block-library/blocks/spacer/editor-rtl.css 332 B
build/block-library/blocks/spacer/editor.css 332 B
build/block-library/blocks/spacer/style-rtl.css 48 B
build/block-library/blocks/spacer/style.css 48 B
build/block-library/blocks/table/editor-rtl.css 471 B
build/block-library/blocks/table/editor.css 472 B
build/block-library/blocks/table/style-rtl.css 481 B
build/block-library/blocks/table/style.css 481 B
build/block-library/blocks/table/theme-rtl.css 188 B
build/block-library/blocks/table/theme.css 188 B
build/block-library/blocks/tag-cloud/style-rtl.css 226 B
build/block-library/blocks/tag-cloud/style.css 227 B
build/block-library/blocks/template-part/editor-rtl.css 149 B
build/block-library/blocks/template-part/editor.css 149 B
build/block-library/blocks/template-part/theme-rtl.css 101 B
build/block-library/blocks/template-part/theme.css 101 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B
build/block-library/blocks/text-columns/editor.css 95 B
build/block-library/blocks/text-columns/style-rtl.css 166 B
build/block-library/blocks/text-columns/style.css 166 B
build/block-library/blocks/verse/style-rtl.css 87 B
build/block-library/blocks/verse/style.css 87 B
build/block-library/blocks/video/editor-rtl.css 571 B
build/block-library/blocks/video/editor.css 572 B
build/block-library/blocks/video/style-rtl.css 173 B
build/block-library/blocks/video/style.css 173 B
build/block-library/blocks/video/theme-rtl.css 124 B
build/block-library/blocks/video/theme.css 124 B
build/block-library/common-rtl.css 934 B
build/block-library/common.css 932 B
build/block-library/editor-rtl.css 9.96 kB
build/block-library/editor.css 9.96 kB
build/block-library/reset-rtl.css 478 B
build/block-library/reset.css 478 B
build/block-library/style-rtl.css 11.3 kB
build/block-library/style.css 11.3 kB
build/block-library/theme-rtl.css 689 B
build/block-library/theme.css 694 B
build/block-serialization-default-parser/index.min.js 1.12 kB
build/block-serialization-spec-parser/index.min.js 2.83 kB
build/blocks/index.min.js 46.8 kB
build/components/index.min.js 223 kB
build/components/style-rtl.css 14.9 kB
build/components/style.css 14.9 kB
build/compose/index.min.js 11.2 kB
build/core-data/index.min.js 14.5 kB
build/customize-widgets/index.min.js 11 kB
build/customize-widgets/style-rtl.css 1.39 kB
build/customize-widgets/style.css 1.39 kB
build/data-controls/index.min.js 663 B
build/date/index.min.js 32 kB
build/deprecated/index.min.js 518 B
build/dom-ready/index.min.js 336 B
build/dom/index.min.js 4.58 kB
build/edit-navigation/index.min.js 15.8 kB
build/edit-navigation/style-rtl.css 4.04 kB
build/edit-navigation/style.css 4.05 kB
build/edit-post/classic-rtl.css 546 B
build/edit-post/classic.css 547 B
build/edit-post/index.min.js 29.6 kB
build/edit-post/style-rtl.css 7.07 kB
build/edit-post/style.css 7.07 kB
build/edit-site/index.min.js 46.6 kB
build/edit-site/style-rtl.css 7.74 kB
build/edit-site/style.css 7.71 kB
build/edit-widgets/index.min.js 16.3 kB
build/edit-widgets/style-rtl.css 4.4 kB
build/edit-widgets/style.css 4.39 kB
build/editor/index.min.js 38.4 kB
build/editor/style-rtl.css 3.71 kB
build/editor/style.css 3.71 kB
build/element/index.min.js 4.29 kB
build/escape-html/index.min.js 548 B
build/format-library/index.min.js 6.62 kB
build/format-library/style-rtl.css 571 B
build/format-library/style.css 571 B
build/hooks/index.min.js 1.66 kB
build/html-entities/index.min.js 454 B
build/i18n/index.min.js 3.79 kB
build/is-shallow-equal/index.min.js 535 B
build/keyboard-shortcuts/index.min.js 1.83 kB
build/keycodes/index.min.js 1.41 kB
build/list-reusable-blocks/index.min.js 1.75 kB
build/list-reusable-blocks/style-rtl.css 838 B
build/list-reusable-blocks/style.css 838 B
build/media-utils/index.min.js 2.94 kB
build/notices/index.min.js 957 B
build/nux/index.min.js 2.12 kB
build/nux/style-rtl.css 751 B
build/nux/style.css 749 B
build/plugins/index.min.js 1.98 kB
build/preferences/index.min.js 1.2 kB
build/primitives/index.min.js 949 B
build/priority-queue/index.min.js 611 B
build/react-i18n/index.min.js 704 B
build/react-refresh-entry/index.min.js 8.44 kB
build/react-refresh-runtime/index.min.js 7.31 kB
build/redux-routine/index.min.js 2.69 kB
build/reusable-blocks/index.min.js 2.24 kB
build/reusable-blocks/style-rtl.css 256 B
build/reusable-blocks/style.css 256 B
build/rich-text/index.min.js 11.2 kB
build/server-side-render/index.min.js 1.61 kB
build/shortcode/index.min.js 1.52 kB
build/token-list/index.min.js 668 B
build/url/index.min.js 1.99 kB
build/vendors/react-dom.min.js 38.5 kB
build/vendors/react.min.js 4.34 kB
build/viewport/index.min.js 1.08 kB
build/warning/index.min.js 280 B
build/widgets/index.min.js 7.21 kB
build/widgets/style-rtl.css 1.16 kB
build/widgets/style.css 1.16 kB
build/wordcount/index.min.js 1.07 kB

compressed-size-action

@draganescu draganescu added [Block] Navigation Affects the Navigation Block [Feature] Extensibility The ability to extend blocks or the editing experience [Type] Enhancement A suggestion for improvement. labels Feb 16, 2022
@draganescu draganescu marked this pull request as ready for review February 16, 2022 11:15
@draganescu draganescu added this to the Gutenberg 12.7 milestone Feb 16, 2022
@draganescu draganescu self-assigned this Feb 16, 2022
@ntsekouras ntsekouras removed this from the Gutenberg 12.7 milestone Feb 25, 2022
@draganescu draganescu requested a review from talldan March 4, 2022 09:27
@scruffian scruffian force-pushed the add/nesting-filter-for-nav-link branch from f21d0f4 to 037cf41 Compare March 4, 2022 09:56
@draganescu
Copy link
Contributor Author

It seems the testing instructions don't really work, I had my plugin activated and I thought they do. But no matter how many times I tried adding a filter via the console failed for me. Yet, I have the same snippet in a small JS plugin and it works.

@draganescu
Copy link
Contributor Author

In other news, having a conversation with @scruffian about this PR, we found that allowed nesting level is less of a site setting (we don't have such a thing now, except for a technical limitation afaik) but more of a theme setting: usually there is a specific visual menu structure that is broken on deeper than X levels of nesting.

Therefore, I will move this PR to make the maxNestingLevel an attribute of the navigation block. This makes it possible to:

  • set it in theme.json for the entire theme
  • set in "by hand" in the template file with <!-- wp:navigation {"ref":1358, "maxNestingLevel": 3} /-->

@scruffian
Copy link
Contributor

set it in theme.json for the entire theme

Currently block attributes can't be set in theme.json. See #35114

@draganescu
Copy link
Contributor Author

@scruffian yes, I assume though we will want that.

@draganescu
Copy link
Contributor Author

With the innerBlocks of the navigation block being uncontrolled and part of the menu custom post type it looks like passing down a maxNestingLevel attribute of the navigation block as a prop of the NavigatioLink block is not doable. Looking into another option (context to the rescue?)

@draganescu
Copy link
Contributor Author

@scruffian I've updated the PR's description to reflect the new direction.

@draganescu draganescu changed the title Add navigation nesting to block edit to be filtered Enable navigation nesting to be filtered and manually set Mar 6, 2022
Copy link
Contributor

@getdave getdave left a comment

Choose a reason for hiding this comment

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

Thank you for tackling this problem. Seems like it's more complex than anyone initially suspected.

I found one thing - if you have a heavily nested Classic Menu then it will happily import it and not restrict the UI.

Screen.Capture.on.2022-03-07.at.15-00-34.mov

Also as this is important to Theme resilience then I'd like to see an e2e test which covers the max nesting. It just has to follow the same steps as you've described in your testing process for this PR.

@draganescu
Copy link
Contributor Author

@getdave that is a great catch. I'll see how to enforce the nesting limit.
+1 to the e2e test, adding.

@draganescu
Copy link
Contributor Author

@getdave I updated createDataTree in menu-items-to-blocks not build more than maxNestingLevel deep. This should solve the classic menu import problem. Will continue w/ adding the test.

Also I see that trunk is quite conflicting compared to this PR, quite a bunch of changes in the block.

Copy link
Contributor

@getdave getdave left a comment

Choose a reason for hiding this comment

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

Thanks for your persistence with this.

I tested with my deeply nested menu and saw that the nesting level seemed to go to maxNestingLevel + 1.

Screen Shot 2022-03-09 at 06 39 54

I then tried adding the nesting attribute to the block manually after import and the menu was still nested at 6 rather than the 3 that I set in the attribute.

Now...I understand why this is happening, but if - for example - this attribute was set by a user or by the Theme on theme switch when you already have a menu in place then it's not going to work.

Scenario: Whilst on Theme A I import a heavily nested menu and it's clipped at 5 levels deep. I then switch to Theme B which restricts Nav depth to 3 levels deep in its Header. After Theme switch, I select my previous menu and it will show at 5 levels deep because there's nothing stopping me right?

I think perhaps we would need to look at this from a different angle. Instead of trying to restrict depth at creation time (i.e. via UI or import) we want to try and do it from the Nav block itself.

Ideally the block would check the maxNestingLevel of it's child nodes and then restrict the visibility of these nodes.

Now I've tried something like this with innerblocks before and I could get it to work. After all, you can't say "here's the list of blocks, but don't render these ones". Therefore I think we'd need to look at a CSS solution for hiding the blocks which exceed the depth.

There are a tonne of tools and selectors for accessing blocks in the tree so this should be possible?

@getdave
Copy link
Contributor

getdave commented Mar 9, 2022

This will also need a rebase to account for #39219. I'm sorry 😞

@draganescu
Copy link
Contributor Author

Yes all valid observations. We should probably need both things:

  • Restrict creation nesting
  • Import menus as they are
  • Restrict nesting in UI and on rendering even if the underlying data is deeper

@getdave
Copy link
Contributor

getdave commented Mar 9, 2022

  • Restrict nesting in UI and on rendering even if the underlying data is deeper

This is important. You might import a menu in Theme A which has maxNesting of 3 but then switch to Theme B which has maxNesting of 4. You would want underlying data to be there to support that.

I think if we expose a UI toggle for maxNestingLevel we should add a warning notice next to it if there is more data available than is being displayed.

@draganescu
Copy link
Contributor Author

I will reset this PR to the state where the block offers via context the creation limit and it then goes to display deeper nested menus anyway. It's a good 1st step and we can carry on with the updates to innerBlocks via a follow up PR.

@draganescu
Copy link
Contributor Author

Searching for a cause to the bug with the not working submenu button I compared to trunk and the difference is on this branch for second submenu links REPLACE_BLOCKS is never fired because canInsertBlockType is false. Investigating, but it looks unrelated since the changes have nothing to do with this.

@scruffian
Copy link
Contributor

The latest commit fixes the issues I was having

@draganescu draganescu force-pushed the add/nesting-filter-for-nav-link branch from 8d45d1f to 6416d72 Compare March 12, 2022 09:45
@getdave
Copy link
Contributor

getdave commented Mar 14, 2022

@draganescu Are you ready for another review here?

@draganescu draganescu force-pushed the add/nesting-filter-for-nav-link branch from 6416d72 to d26d608 Compare March 16, 2022 19:07
@draganescu draganescu force-pushed the add/nesting-filter-for-nav-link branch 2 times, most recently from a0f0d9b to 62ddd36 Compare March 24, 2022 18:32
@draganescu
Copy link
Contributor Author

@getdave let's give this a new run, it's basically only about limiting for creation (so it should do nothing to imported classic menus). I added a test.

@draganescu draganescu force-pushed the add/nesting-filter-for-nav-link branch from 62ddd36 to 51a2a9a Compare April 1, 2022 10:03
@adamziel
Copy link
Contributor

adamziel commented Apr 1, 2022

E2E failures feel like flaky tests, I just restarted them.

@@ -52,6 +52,7 @@
"fontSize",
"customFontSize",
"showSubmenuIcon",
"maxNestingLevel",
Copy link
Member

Choose a reason for hiding this comment

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

I'd suggest calling this maxLevel

Copy link
Contributor

@adamziel adamziel left a comment

Choose a reason for hiding this comment

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

There's one last problem I noticed – the default maxNestingLevel says 5, but I can only go 4 levels deep:

CleanShot 2022-04-04 at 11 48 32

Other than that I think we're good so I'm approving. Feel free to fix it here, in a follow up PR, or push back that 5 is not inclusive, but there's no need to block approvals on this issue.

I got confused and tested the wrong Nav block out of the two I added :D we're good here

Copy link
Contributor

@getdave getdave left a comment

Choose a reason for hiding this comment

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

Screen Shot 2022-04-04 at 10 56 35

Screen Shot 2022-04-04 at 10 58 27

Test both with and without the maxNestingLevel attribute set on the block. Worked as described.

With the test coverage this is a lot better.

My main problem is still that as a Themer I cannot force my Nav to only have X levels of nesting. As discussed we can still import a menu and it will ignore the max nesting setting.

Given that this is likely to be a common workflow it's probably the major weakness of the feature as it stands.

That said, we should ship and iterate!

Thanks for persisting with this one 👏

@@ -351,7 +349,7 @@ export default function NavigationSubmenuEdit( {
return {
isAtMaxNesting:
getBlockParentsByBlockName( clientId, name ).length >=
MAX_NESTING,
maxNestingLevel,
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we add this to the dependency array for the useSelect?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure ... This does not change dynamically ... I see a future where this will have an inspector control for when building themes, but until then it's a value from the markup.

@draganescu draganescu merged commit 9f7103a into trunk Apr 4, 2022
@draganescu draganescu deleted the add/nesting-filter-for-nav-link branch April 4, 2022 12:58
@github-actions github-actions bot added this to the Gutenberg 13.0 milestone Apr 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Navigation Affects the Navigation Block [Feature] Extensibility The ability to extend blocks or the editing experience [Type] Enhancement A suggestion for improvement.
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Filter the nesting level of items in the navigation block
6 participants