From 1c4013ee97e18d6abccd34ebb1a6f478fe760634 Mon Sep 17 00:00:00 2001
From: Adam Wood <1017872+adamwoodnz@users.noreply.github.com>
Date: Thu, 19 Oct 2023 10:48:35 +1300
Subject: [PATCH] Add filter to replace local nav bar mobile menu icon (#480)

* Add filter to replace local nav bar mobile menu icon

* Align mobile nav menu icon with global header icon
---
 .../blocks/local-navigation-bar/index.php     | 47 +++++++++++++++++++
 .../local-navigation-bar/postcss/style.pcss   |  7 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/mu-plugins/blocks/local-navigation-bar/index.php b/mu-plugins/blocks/local-navigation-bar/index.php
index 804188aa2..ffbf31b31 100644
--- a/mu-plugins/blocks/local-navigation-bar/index.php
+++ b/mu-plugins/blocks/local-navigation-bar/index.php
@@ -10,6 +10,7 @@
 
 add_action( 'init', __NAMESPACE__ . '\init' );
 add_filter( 'render_block_data', __NAMESPACE__ . '\update_block_attributes' );
+add_filter( 'render_block', __NAMESPACE__ . '\customize_navigation_block_icon', 10, 2 );
 
 /**
  * Registers the block using the metadata loaded from the `block.json` file.
@@ -91,3 +92,49 @@ function update_block_attributes( $block ) {
 
 	return $block;
 }
+
+/**
+ * Replace a nested navigation block mobile button icon with a caret icon.
+ * Only applies if it has the 3 bar icon set, as this has an svg with <path> to update. 
+ *
+ * @param string $block_content The block content.
+ * @param array  $block The parsed block data.
+ *
+ * @return string
+ */
+function customize_navigation_block_icon( $block_content, $block ) {
+	if ( ! empty( $block['blockName'] ) && 'wporg/local-navigation-bar' === $block['blockName'] ) {
+		$tag_processor = new \WP_HTML_Tag_Processor( $block_content );
+
+		if (
+			$tag_processor->next_tag( array( 
+				'tag_name' => 'nav', 
+				'class_name' => 'wp-block-navigation' 
+			)
+		) ) {
+			if ( 
+				$tag_processor->next_tag( array( 
+					'tag_name' => 'button', 
+					'class_name' => 'wp-block-navigation__responsive-container-open' 
+				) ) &&
+				$tag_processor->next_tag( 'path' )
+			) {
+				$tag_processor->set_attribute( 'd', 'M17.5 11.6L12 16l-5.5-4.4.9-1.2L12 14l4.5-3.6 1 1.2z' );
+			}
+		
+			if ( 
+				$tag_processor->next_tag( array( 
+					'tag_name' => 'button', 
+					'class_name' => 'wp-block-navigation__responsive-container-close' 
+				) ) &&
+				$tag_processor->next_tag( 'path' )
+			) {
+				$tag_processor->set_attribute( 'd', 'M6.5 12.4L12 8l5.5 4.4-.9 1.2L12 10l-4.5 3.6-1-1.2z' );
+			}
+		
+			return $tag_processor->get_updated_html();
+		}
+	}
+
+	return $block_content;
+}
diff --git a/mu-plugins/blocks/local-navigation-bar/postcss/style.pcss b/mu-plugins/blocks/local-navigation-bar/postcss/style.pcss
index fd3ba5c1c..0c024ff84 100644
--- a/mu-plugins/blocks/local-navigation-bar/postcss/style.pcss
+++ b/mu-plugins/blocks/local-navigation-bar/postcss/style.pcss
@@ -19,6 +19,9 @@
 	@media (max-width: 889px) {
 		position: relative !important;
 		top: 0 !important;
+
+		/* Matches the padding of the global header button. */
+		padding-right: calc(16px + var(--wp--custom--alignment--scroll-bar-width)) !important;
 	}
 
 	&.is-style-brush-stroke {
@@ -61,7 +64,9 @@
 		/* Adjust the modal container so the close button is not hidden by the global header when open. */
 		@media (max-width: 599px) {
 			top: var(--wp-global-header-height);
-			padding-right: var(--wp--preset--spacing--edge-space) !important;
+
+			/* Matches the padding of the global header button. */
+			padding-right: calc(16px + var(--wp--custom--alignment--scroll-bar-width)) !important;
 			padding-left: var(--wp--preset--spacing--edge-space) !important;
 			padding-top: 21px !important;
 			padding-bottom: 18px !important;