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

Fix issue with responsive navigation causing wrapping. #35820

Merged
merged 3 commits into from
Oct 21, 2021

Conversation

jasmussen
Copy link
Contributor

Description

Fixes #35549.

When the mobile responsive overlay menu was enabled, subsequent child containers such as social links would wrap on a new line:

This PR fixes that:

Screenshot 2021-10-21 at 09 30 28

Screenshot 2021-10-21 at 09 30 38

How has this been tested?

Here's some test content:

<!-- wp:paragraph -->
<p>Nav without responsiveness:</p>
<!-- /wp:paragraph -->

<!-- wp:navigation -->
<!-- wp:navigation-link {"label":"New Page","type":"page","id":30646,"url":"http://local-wordpress.local/new-page/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"Home","type":"page","id":28543,"url":"http://local-wordpress.local/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"About","type":"page","id":30315,"url":"http://local-wordpress.local/about/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:social-links -->
<ul class="wp-block-social-links"><!-- wp:social-link {"url":"hgjk","service":"wordpress"} /-->

<!-- wp:social-link {"url":"hjklhj","service":"bandcamp"} /-->

<!-- wp:social-link {"url":"hjklhjkl","service":"behance"} /--></ul>
<!-- /wp:social-links -->
<!-- /wp:navigation -->

<!-- wp:paragraph -->
<p>Nav with responsiveness:</p>
<!-- /wp:paragraph -->

<!-- wp:navigation {"overlayMenu":"mobile"} -->
<!-- wp:navigation-link {"label":"New Page","type":"page","id":30646,"url":"http://local-wordpress.local/new-page/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"Home","type":"page","id":28543,"url":"http://local-wordpress.local/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"About","type":"page","id":30315,"url":"http://local-wordpress.local/about/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:social-links -->
<ul class="wp-block-social-links"><!-- wp:social-link {"url":"hgjk","service":"wordpress"} /-->

<!-- wp:social-link {"url":"hjklhj","service":"bandcamp"} /-->

<!-- wp:social-link {"url":"hjklhjkl","service":"behance"} /--></ul>
<!-- /wp:social-links -->
<!-- /wp:navigation -->

<!-- wp:paragraph -->
<p>Vertical:</p>
<!-- /wp:paragraph -->

<!-- wp:navigation {"orientation":"vertical"} -->
<!-- wp:navigation-link {"label":"New Page","type":"page","id":30646,"url":"http://local-wordpress.local/new-page/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"Home","type":"page","id":28543,"url":"http://local-wordpress.local/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"About","type":"page","id":30315,"url":"http://local-wordpress.local/about/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:social-links -->
<ul class="wp-block-social-links"><!-- wp:social-link {"url":"hgjk","service":"wordpress"} /-->

<!-- wp:social-link {"url":"hjklhj","service":"bandcamp"} /-->

<!-- wp:social-link {"url":"hjklhjkl","service":"behance"} /--></ul>
<!-- /wp:social-links -->
<!-- /wp:navigation -->

<!-- wp:paragraph -->
<p>Vertical responsive:</p>
<!-- /wp:paragraph -->

<!-- wp:navigation {"orientation":"vertical","overlayMenu":"mobile"} -->
<!-- wp:navigation-link {"label":"New Page","type":"page","id":30646,"url":"http://local-wordpress.local/new-page/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"Home","type":"page","id":28543,"url":"http://local-wordpress.local/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"About","type":"page","id":30315,"url":"http://local-wordpress.local/about/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:social-links -->
<ul class="wp-block-social-links"><!-- wp:social-link {"url":"hgjk","service":"wordpress"} /-->

<!-- wp:social-link {"url":"hjklhj","service":"bandcamp"} /-->

<!-- wp:social-link {"url":"hjklhjkl","service":"behance"} /--></ul>
<!-- /wp:social-links -->
<!-- /wp:navigation -->

Insert a navigation menu with both a few items, and some social links. Enable responsiveness ("mobile"), and verify the layout doesn't change. Verify also for the vertical version. And check that the overlay still looks good.

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).

@jasmussen jasmussen added [Type] Bug An existing feature does not function as intended [Block] Navigation Affects the Navigation Block [Block] Social Affects the Social Block - used to display Social Media accounts labels Oct 21, 2021
@jasmussen jasmussen requested review from pbking and scruffian October 21, 2021 07:34
@jasmussen jasmussen self-assigned this Oct 21, 2021
@github-actions
Copy link

github-actions bot commented Oct 21, 2021

Size Change: +149 B (0%)

Total Size: 1.07 MB

Filename Size Change
build/block-editor/index.min.js 135 kB +33 B (0%)
build/block-library/blocks/navigation/style-rtl.css 1.69 kB +33 B (+2%)
build/block-library/blocks/navigation/style.css 1.68 kB +29 B (+2%)
build/block-library/style-rtl.css 10.3 kB +28 B (0%)
build/block-library/style.css 10.3 kB +26 B (0%)
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 931 B
build/admin-manifest/index.min.js 1.09 kB
build/annotations/index.min.js 2.7 kB
build/api-fetch/index.min.js 2.21 kB
build/autop/index.min.js 2.08 kB
build/blob/index.min.js 459 B
build/block-directory/index.min.js 6.2 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/style-rtl.css 13.9 kB
build/block-editor/style.css 13.9 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 58 B
build/block-library/blocks/audio/editor.css 58 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/block/editor-rtl.css 161 B
build/block-library/blocks/block/editor.css 161 B
build/block-library/blocks/button/editor-rtl.css 470 B
build/block-library/blocks/button/editor.css 470 B
build/block-library/blocks/button/style-rtl.css 549 B
build/block-library/blocks/button/style.css 549 B
build/block-library/blocks/buttons/editor-rtl.css 309 B
build/block-library/blocks/buttons/editor.css 309 B
build/block-library/blocks/buttons/style-rtl.css 317 B
build/block-library/blocks/buttons/style.css 317 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 90 B
build/block-library/blocks/code/style.css 90 B
build/block-library/blocks/code/theme-rtl.css 131 B
build/block-library/blocks/code/theme.css 131 B
build/block-library/blocks/columns/editor-rtl.css 206 B
build/block-library/blocks/columns/editor.css 205 B
build/block-library/blocks/columns/style-rtl.css 497 B
build/block-library/blocks/columns/style.css 496 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.17 kB
build/block-library/blocks/cover/style.css 1.17 kB
build/block-library/blocks/embed/editor-rtl.css 488 B
build/block-library/blocks/embed/editor.css 488 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 322 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 977 B
build/block-library/blocks/gallery/editor.css 982 B
build/block-library/blocks/gallery/style-rtl.css 1.6 kB
build/block-library/blocks/gallery/style.css 1.59 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 114 B
build/block-library/blocks/heading/style.css 114 B
build/block-library/blocks/home-link/style-rtl.css 247 B
build/block-library/blocks/home-link/style.css 247 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 502 B
build/block-library/blocks/image/style.css 505 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 137 B
build/block-library/blocks/latest-posts/editor.css 137 B
build/block-library/blocks/latest-posts/style-rtl.css 528 B
build/block-library/blocks/latest-posts/style.css 527 B
build/block-library/blocks/list/style-rtl.css 94 B
build/block-library/blocks/list/style.css 94 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 568 B
build/block-library/blocks/navigation-link/editor.css 570 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/style-rtl.css 195 B
build/block-library/blocks/navigation-submenu/style.css 195 B
build/block-library/blocks/navigation-submenu/view.min.js 343 B
build/block-library/blocks/navigation/editor-rtl.css 1.71 kB
build/block-library/blocks/navigation/editor.css 1.71 kB
build/block-library/blocks/navigation/view.min.js 2.74 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 377 B
build/block-library/blocks/page-list/editor.css 377 B
build/block-library/blocks/page-list/style-rtl.css 198 B
build/block-library/blocks/page-list/style.css 198 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 273 B
build/block-library/blocks/paragraph/style.css 273 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 140 B
build/block-library/blocks/post-comments-form/style.css 140 B
build/block-library/blocks/post-comments/style-rtl.css 360 B
build/block-library/blocks/post-comments/style.css 359 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 396 B
build/block-library/blocks/post-featured-image/editor.css 397 B
build/block-library/blocks/post-featured-image/style-rtl.css 156 B
build/block-library/blocks/post-featured-image/style.css 156 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 391 B
build/block-library/blocks/post-template/style.css 392 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 60 B
build/block-library/blocks/post-title/style.css 60 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 378 B
build/block-library/blocks/pullquote/style.css 378 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 262 B
build/block-library/blocks/query-pagination/editor.css 255 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 187 B
build/block-library/blocks/quote/style.css 187 B
build/block-library/blocks/quote/theme-rtl.css 223 B
build/block-library/blocks/quote/theme.css 226 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 99 B
build/block-library/blocks/separator/editor.css 99 B
build/block-library/blocks/separator/style-rtl.css 250 B
build/block-library/blocks/separator/style.css 250 B
build/block-library/blocks/separator/theme-rtl.css 172 B
build/block-library/blocks/separator/theme.css 172 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 770 B
build/block-library/blocks/site-logo/editor.css 770 B
build/block-library/blocks/site-logo/style-rtl.css 165 B
build/block-library/blocks/site-logo/style.css 165 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 824 B
build/block-library/blocks/social-links/editor.css 823 B
build/block-library/blocks/social-links/style-rtl.css 1.32 kB
build/block-library/blocks/social-links/style.css 1.32 kB
build/block-library/blocks/spacer/editor-rtl.css 307 B
build/block-library/blocks/spacer/editor.css 307 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 146 B
build/block-library/blocks/tag-cloud/style.css 146 B
build/block-library/blocks/template-part/editor-rtl.css 560 B
build/block-library/blocks/template-part/editor.css 559 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 815 B
build/block-library/common.css 812 B
build/block-library/editor-rtl.css 9.65 kB
build/block-library/editor.css 9.65 kB
build/block-library/index.min.js 149 kB
build/block-library/reset-rtl.css 474 B
build/block-library/reset.css 474 B
build/block-library/theme-rtl.css 668 B
build/block-library/theme.css 673 B
build/block-serialization-default-parser/index.min.js 1.09 kB
build/block-serialization-spec-parser/index.min.js 2.79 kB
build/blocks/index.min.js 46 kB
build/components/index.min.js 212 kB
build/components/style-rtl.css 15.3 kB
build/components/style.css 15.3 kB
build/compose/index.min.js 10.4 kB
build/core-data/index.min.js 12.4 kB
build/customize-widgets/index.min.js 11.2 kB
build/customize-widgets/style-rtl.css 1.5 kB
build/customize-widgets/style.css 1.49 kB
build/data-controls/index.min.js 614 B
build/data/index.min.js 7.1 kB
build/date/index.min.js 31.5 kB
build/deprecated/index.min.js 428 B
build/dom-ready/index.min.js 304 B
build/dom/index.min.js 4.46 kB
build/edit-navigation/index.min.js 15.8 kB
build/edit-navigation/style-rtl.css 3.76 kB
build/edit-navigation/style.css 3.76 kB
build/edit-post/classic-rtl.css 492 B
build/edit-post/classic.css 494 B
build/edit-post/index.min.js 29.4 kB
build/edit-post/style-rtl.css 7.12 kB
build/edit-post/style.css 7.12 kB
build/edit-site/index.min.js 30.6 kB
build/edit-site/style-rtl.css 5.74 kB
build/edit-site/style.css 5.74 kB
build/edit-widgets/index.min.js 15.8 kB
build/edit-widgets/style-rtl.css 4.12 kB
build/edit-widgets/style.css 4.13 kB
build/editor/index.min.js 37.6 kB
build/editor/style-rtl.css 3.78 kB
build/editor/style.css 3.77 kB
build/element/index.min.js 3.21 kB
build/escape-html/index.min.js 517 B
build/format-library/index.min.js 5.99 kB
build/format-library/style-rtl.css 571 B
build/format-library/style.css 571 B
build/hooks/index.min.js 1.55 kB
build/html-entities/index.min.js 424 B
build/i18n/index.min.js 3.6 kB
build/is-shallow-equal/index.min.js 501 B
build/keyboard-shortcuts/index.min.js 1.72 kB
build/keycodes/index.min.js 1.3 kB
build/list-reusable-blocks/index.min.js 1.85 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.92 kB
build/notices/index.min.js 845 B
build/nux/index.min.js 2.03 kB
build/nux/style-rtl.css 747 B
build/nux/style.css 743 B
build/plugins/index.min.js 1.83 kB
build/primitives/index.min.js 921 B
build/priority-queue/index.min.js 582 B
build/react-i18n/index.min.js 671 B
build/redux-routine/index.min.js 2.63 kB
build/reusable-blocks/index.min.js 2.19 kB
build/reusable-blocks/style-rtl.css 256 B
build/reusable-blocks/style.css 256 B
build/rich-text/index.min.js 10.7 kB
build/server-side-render/index.min.js 1.52 kB
build/shortcode/index.min.js 1.48 kB
build/token-list/index.min.js 562 B
build/url/index.min.js 1.74 kB
build/viewport/index.min.js 1.02 kB
build/warning/index.min.js 248 B
build/widgets/index.min.js 7.11 kB
build/widgets/style-rtl.css 1.16 kB
build/widgets/style.css 1.16 kB
build/wordcount/index.min.js 1.04 kB

compressed-size-action

@@ -230,7 +230,8 @@
// Menu items with no background.
.wp-block-navigation,
.wp-block-navigation .wp-block-page-list,
.wp-block-navigation__container {
.wp-block-navigation__container,
.wp-block-navigation__responsive-container-content {
gap: var(--wp--style--block-gap, 2em);
Copy link
Contributor

Choose a reason for hiding this comment

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

This is causing an extra separation on mobile, don't know if it's intended:
Screen Capture on 2021-10-21 at 10-46-15

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hrm. Good catch, I don't think it is. Let me take a look.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm going to open a PR for the padding issue on the social links, btw

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm going to open a PR for the padding issue on the social links, btw

You mean this one, right?
padding

If yes, then the way to fix that is probably to replace a with .wp-block-navigation-item__content, as we've done with all the other instances of the raw anchor link.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, this is a little messy:
gap

Essentially we want to treat menu items and social links as if they were spaced with the same gap, as direct descendants of one container rather than each with their own child container.

How would you feel about applying display: contents; on those containers? I feel like it would open a deep rabbit hole, so I'l probably fix the gap as is but it's a bit of a head scratcher.

Copy link
Contributor

Choose a reason for hiding this comment

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

mmh, I'm thinking, could we use column-gap in this case instead of gap? Then it only affects them horizontally.

Copy link
Contributor Author

@jasmussen jasmussen Oct 21, 2021

Choose a reason for hiding this comment

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

It wasn't so much the vertical issue, I slipstreamed a fix for that. It was more that we have this structure:

Navigation
	Link Container
		... menu items
	Social Icons Container
		... social icons

Essentially I feel like we want to apply gap as if the structure was this:

Navigation
	Menu Item
	Menu Item
	Menu Item
	Social Link
	Social Link
	Social Link

Right now this PR accomplishes that by applying gap to both the root navigation container, the Link container and the Social Icons container. Just wondering whether in the future/a separate exploration, there's a better way 🤔

Copy link
Contributor

Choose a reason for hiding this comment

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

I see what you mean, let me test this a bit

@jasmussen
Copy link
Contributor Author

Superb review, thank you. I pushed some fixes to:

Things are now looking good to me:
Screenshot 2021-10-21 at 11 10 59
Screenshot 2021-10-21 at 11 10 34
Screenshot 2021-10-21 at 11 10 39

@MaggieCabrera
Copy link
Contributor

MaggieCabrera commented Oct 21, 2021

I'm breaking this a bit more, I'm sorry!

I'm using this markup:

<!-- wp:paragraph -->
<p>Nav with responsiveness:</p>
<!-- /wp:paragraph -->

<!-- wp:navigation {"overlayMenu":"mobile"} -->
<!-- wp:navigation-link {"label":"Google","type":"","id":"","url":"http://Google","kind":"custom","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"Text","type":"page","id":2202,"url":"http://free.local/test-6/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:home-link {"label":"Home"} /-->

<!-- wp:social-links -->
<ul class="wp-block-social-links"><!-- wp:social-link {"url":"hgjk","service":"wordpress"} /-->

<!-- wp:social-link {"url":"hjklhj","service":"bandcamp"} /-->

<!-- wp:social-link {"url":"hjklhjkl","service":"behance"} /--></ul>
<!-- /wp:social-links -->

<!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","buttonPosition":"button-inside","buttonUseIcon":true} /-->
<!-- /wp:navigation -->

<!-- wp:navigation {"overlayMenu":"mobile"} -->
<!-- wp:navigation-link {"label":"Google","type":"","id":"","url":"http://Google","kind":"custom","isTopLevelLink":true} /-->

<!-- wp:navigation-link {"label":"Text","type":"page","id":2202,"url":"http://free.local/test-6/","kind":"post-type","isTopLevelLink":true} /-->

<!-- wp:home-link {"label":"Home"} /-->

<!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","buttonPosition":"button-inside","buttonUseIcon":true} /-->

<!-- wp:social-links -->
<ul class="wp-block-social-links"><!-- wp:social-link {"url":"hgjk","service":"wordpress"} /-->

<!-- wp:social-link {"url":"hjklhj","service":"bandcamp"} /-->

<!-- wp:social-link {"url":"hjklhjkl","service":"behance"} /--></ul>
<!-- /wp:social-links -->
<!-- /wp:navigation -->

On desktop this works like a charm:

Before:

Screenshot 2021-10-21 at 11 22 58

vs After:
Screenshot 2021-10-21 at 11 22 54

On mobile though the spacing is still a bit off when I'm adding the search block.

Before:

Option 1 Option 2
Screenshot 2021-10-21 at 11 23 49 Screenshot 2021-10-21 at 11 23 43

After:

Option 1 Option 2
Screenshot 2021-10-21 at 11 25 21 Screenshot 2021-10-21 at 11 25 15

I agree with what you say about treating social and menu links as if they were inside the same container, but I don't think that applies to other blocks that may be inside the navigation. This is a tricky one!

@jasmussen
Copy link
Contributor Author

This is excellent, thank you for testing. I'm wondering what to fix here vs. in #35823, where I'm tackling a bit of the same issue.

@MaggieCabrera
Copy link
Contributor

This is excellent, thank you for testing. I'm wondering what to fix here vs. in #35823, where I'm tackling a bit of the same issue.

Well, since the original issue of this PR is actually solved, I'm happy to approve this if you are going to polish the spacing at #35823

@jasmussen
Copy link
Contributor Author

Let me take a quick look at that search+social links thing, I need to rebase the other one anyway! Thank you.

@jasmussen
Copy link
Contributor Author

Solid debugging. I removed the rule to unset the gap inside the open overlay menu after all, because the thing that causes problematic spacing is the margin:
debug

And so there's a little extra space now:

Screenshot 2021-10-21 at 11 57 22

But I believe I can/should fix that in #35823.

The rest also looks good:

Screenshot 2021-10-21 at 11 55 56

Screenshot 2021-10-21 at 11 56 07

@MaggieCabrera
Copy link
Contributor

Solid debugging. I removed the rule to unset the gap inside the open overlay menu after all, because the thing that causes problematic spacing is the margin

Yeah, looks like getting rid of the margins is more consistent too with how we are aiming to use gap. Works for me and the tests look fine!

@jasmussen jasmussen merged commit a07fe6a into trunk Oct 21, 2021
@jasmussen jasmussen deleted the try/fix-nav-wrapping branch October 21, 2021 10:41
@github-actions github-actions bot added this to the Gutenberg 11.9 milestone Oct 21, 2021
fullofcaffeine added a commit that referenced this pull request Oct 21, 2021
* trunk: (494 commits)
  remove consecutive rc warning (#35855)
  Update Changelog for 11.8.0-rc.2
  Bump plugin version to 11.8.0-rc.2
  [RNMobile] Disable React Native E2E Tests (iOS) (#35844)
  Add section about using the schema during development (#35835)
  Add a method to disable auto-accepting dialogs (#35828)
  Wrap NavigationContainer with SafeAreaView. (#35570)
  Update Appium to 1.22.0 (#35829)
  Post Comment: Handle the case where a comment does not exist (#35810)
  Clear selected block when clicking on the gray background (#35816)
  Post excerpt: Don't print the wrapper when there is no excerpt (#35749)
  [Block] Navigation: Fix padding for social links on mobile (#35824)
  Fix issue with responsive navigation causing wrapping. (#35820)
  [Block Editor]: Fix displaying only `none` alignment option (#35822)
  Add API to access global settings, styles, and stylesheet (#34843)
  Mobile Release v1.64.1 (#35804)
  Add resizer to template part focus mode (#35728)
  Update Changelog for 11.7.1
  Gallery block: Only show the gallery upload error message if mixed multiple files uploaded (#35790)
  Update Changelog for 11.8.0-rc.1
  ...
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 [Block] Social Affects the Social Block - used to display Social Media accounts [Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Navigation: Social icons on a new line
3 participants