From 3a6eba39065fd275cd8dc881c44a94591d5b10ce Mon Sep 17 00:00:00 2001 From: tellthemachines Date: Fri, 9 Jul 2021 13:44:44 +1000 Subject: [PATCH 1/5] Allow Site Title and Logo inside Navigation block. --- packages/block-library/src/navigation/edit.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js index 0f55e958e5b97..79e06d370460a 100644 --- a/packages/block-library/src/navigation/edit.js +++ b/packages/block-library/src/navigation/edit.js @@ -46,6 +46,8 @@ const ALLOWED_BLOCKS = [ 'core/page-list', 'core/spacer', 'core/home-link', + 'core/site-title', + 'core/site-logo', ]; const LAYOUT = { From 3c3f3ad0cde76430aa386c012fb341cb423162ef Mon Sep 17 00:00:00 2001 From: jasmussen Date: Fri, 9 Jul 2021 08:24:18 +0200 Subject: [PATCH 2/5] Fix space-between issue. --- packages/block-library/src/navigation/style.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss index 2d3671c847a6c..2e9e68f155f9a 100644 --- a/packages/block-library/src/navigation/style.scss +++ b/packages/block-library/src/navigation/style.scss @@ -359,6 +359,7 @@ .items-justified-space-between .wp-block-navigation__container { justify-content: space-between; + flex: 1; } // Vertical justification. From fef9de2242bc6862761f564d835169eb3444bda1 Mon Sep 17 00:00:00 2001 From: tellthemachines Date: Tue, 13 Jul 2021 16:19:24 +1000 Subject: [PATCH 3/5] Include site title and logo in list of links --- packages/block-library/src/navigation/index.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php index df93471feecbc..c72899210b0bd 100644 --- a/packages/block-library/src/navigation/index.php +++ b/packages/block-library/src/navigation/index.php @@ -256,15 +256,20 @@ function render_block_core_navigation( $attributes, $content, $block ) { $inner_blocks_html = ''; $is_list_open = false; foreach ( $inner_blocks as $inner_block ) { - if ( ( 'core/navigation-link' === $inner_block->name || 'core/home-link' === $inner_block->name ) && ! $is_list_open ) { + if ( ( 'core/navigation-link' === $inner_block->name || 'core/home-link' === $inner_block->name || 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) && ! $is_list_open ) { $is_list_open = true; $inner_blocks_html .= '
    '; } - if ( 'core/navigation-link' !== $inner_block->name && 'core/home-link' !== $inner_block->name && $is_list_open ) { + if ( 'core/navigation-link' !== $inner_block->name && 'core/home-link' !== $inner_block->name && 'core/site-title' !== $inner_block->name && 'core/site-logo' !== $inner_block->name && $is_list_open ) { $is_list_open = false; $inner_blocks_html .= '
'; } - $inner_blocks_html .= $inner_block->render(); + if( 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) { + $inner_blocks_html .= '
  • ' . $inner_block->render() . '
    • '; + } else { + $inner_blocks_html .= $inner_block->render(); + } + } if ( $is_list_open ) { From c78512f9c6b029d20b0ae352bbb1fa6e50c3d812 Mon Sep 17 00:00:00 2001 From: tellthemachines Date: Wed, 14 Jul 2021 13:26:37 +1000 Subject: [PATCH 4/5] Fix php linting errors --- packages/block-library/src/navigation/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php index c72899210b0bd..43def1fc3d12c 100644 --- a/packages/block-library/src/navigation/index.php +++ b/packages/block-library/src/navigation/index.php @@ -264,12 +264,11 @@ function render_block_core_navigation( $attributes, $content, $block ) { $is_list_open = false; $inner_blocks_html .= ''; } - if( 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) { + if ( 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) { $inner_blocks_html .= '
  • ' . $inner_block->render() . '
    • '; } else { $inner_blocks_html .= $inner_block->render(); } - } if ( $is_list_open ) { From 3ff02d7234cb0b51341232059b9f5dacbb862edc Mon Sep 17 00:00:00 2001 From: tellthemachines Date: Tue, 24 Aug 2021 13:15:03 +1000 Subject: [PATCH 5/5] Add navigation item class to list item wrappers. --- packages/block-library/src/navigation/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php index 43def1fc3d12c..68246111ffe0e 100644 --- a/packages/block-library/src/navigation/index.php +++ b/packages/block-library/src/navigation/index.php @@ -265,7 +265,7 @@ function render_block_core_navigation( $attributes, $content, $block ) { $inner_blocks_html .= ''; } if ( 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) { - $inner_blocks_html .= '
  • ' . $inner_block->render() . '
    • '; + $inner_blocks_html .= '
  • ' . $inner_block->render() . '
    • '; } else { $inner_blocks_html .= $inner_block->render(); }