From cc19f6ae2ed419a0169d2153f793168d908df961 Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Tue, 20 Sep 2022 10:28:50 +0200
Subject: [PATCH 1/9] Replace micromodal for Alpinejs directives

---
 .../block-library/src/navigation/block.json   |  2 +-
 .../block-library/src/navigation/index.php    | 39 ++++++++---
 .../src/navigation/view-modal.js              | 68 -------------------
 3 files changed, 31 insertions(+), 78 deletions(-)
 delete mode 100644 packages/block-library/src/navigation/view-modal.js

diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
index a8c65b5a88b75b..06dff2610aa3af 100644
--- a/packages/block-library/src/navigation/block.json
+++ b/packages/block-library/src/navigation/block.json
@@ -130,7 +130,7 @@
 			}
 		}
 	},
-	"viewScript": [ "file:./view.min.js", "file:./view-modal.min.js" ],
+	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-navigation-editor",
 	"style": "wp-block-navigation"
 }
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 5173f96040b4d0..f8358791557fbc 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -426,10 +426,25 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		wp_enqueue_script( 'wp-block-navigation-view' );
 	}
 
-	$should_load_modal_view_script = isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'];
-	if ( $should_load_modal_view_script ) {
-		wp_enqueue_script( 'wp-block-navigation-view-modal' );
-	}
+	// Register @alpine/focus plugin
+	wp_register_script(
+		'AlpineJS_focus',
+		'https://unpkg.com/@alpinejs/focus@3.10.3/dist/cdn.min.js',
+		array(),
+		"3.10.3",
+		true // Load it in the footer
+	);
+	wp_enqueue_script( 'AlpineJS_focus' );
+
+	// Register Alpine
+	wp_register_script(
+		'AlpineJS',
+		'https://unpkg.com/alpinejs@3.10.3/dist/cdn.min.js',
+		array('AlpineJS_focus'),
+		"3.10.3",
+		true // Load it in the footer
+	);
+	wp_enqueue_script( 'AlpineJS' );
 
 	$inner_blocks = $block->inner_blocks;
 
@@ -632,11 +647,17 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
 
 	$responsive_container_markup = sprintf(
-		'<button aria-haspopup="true" %3$s class="%6$s" data-micromodal-trigger="%1$s">%9$s</button>
-			<div class="%5$s" style="%7$s" id="%1$s">
+		'<button x-on:click="open = true" aria-haspopup="true" %3$s class="%6$s" data-micromodal-trigger="%1$s">%9$s</button>
+			<div 
+				x-on:keydown.escape="open = false"
+				:class="open && \'is-menu-open\ has-modal-open\'"
+				:aria-hidden="open ? false : true"
+				class="%5$s" style="%7$s"
+				id="%1$s"
+			>
 				<div class="wp-block-navigation__responsive-close" tabindex="-1" data-micromodal-close>
-					<div class="wp-block-navigation__responsive-dialog" aria-label="%8$s">
-							<button %4$s data-micromodal-close class="wp-block-navigation__responsive-container-close">%10$s</button>
+					<div x-trap="open" class="wp-block-navigation__responsive-dialog" aria-label="%8$s" aria-modal="true" role="dialog">
+							<button x-on:click="open = false" %4$s data-micromodal-close class="wp-block-navigation__responsive-container-close">%10$s</button>
 						<div class="wp-block-navigation__responsive-container-content" id="%1$s-content">
 							%2$s
 						</div>
@@ -656,7 +677,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	);
 
 	return sprintf(
-		'<nav %1$s>%2$s</nav>',
+		'<nav %1$s x-data="{open: false}">%2$s</nav>',
 		$wrapper_attributes,
 		$responsive_container_markup
 	);
diff --git a/packages/block-library/src/navigation/view-modal.js b/packages/block-library/src/navigation/view-modal.js
deleted file mode 100644
index 477f05b5d5e51e..00000000000000
--- a/packages/block-library/src/navigation/view-modal.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * External dependencies
- */
-import MicroModal from 'micromodal';
-
-// Responsive navigation toggle.
-function navigationToggleModal( modal ) {
-	const dialogContainer = modal.querySelector(
-		`.wp-block-navigation__responsive-dialog`
-	);
-
-	const isHidden = 'true' === modal.getAttribute( 'aria-hidden' );
-
-	modal.classList.toggle( 'has-modal-open', ! isHidden );
-	dialogContainer.toggleAttribute( 'aria-modal', ! isHidden );
-
-	if ( isHidden ) {
-		dialogContainer.removeAttribute( 'role' );
-		dialogContainer.removeAttribute( 'aria-modal' );
-	} else {
-		dialogContainer.setAttribute( 'role', 'dialog' );
-		dialogContainer.setAttribute( 'aria-modal', 'true' );
-	}
-
-	// Add a class to indicate the modal is open.
-	const htmlElement = document.documentElement;
-	htmlElement.classList.toggle( 'has-modal-open' );
-}
-
-window.addEventListener( 'load', () => {
-	MicroModal.init( {
-		onShow: navigationToggleModal,
-		onClose: navigationToggleModal,
-		openClass: 'is-menu-open',
-	} );
-
-	// Close modal automatically on clicking anchor links inside modal.
-	const navigationLinks = document.querySelectorAll(
-		'.wp-block-navigation-item__content'
-	);
-
-	navigationLinks.forEach( function ( link ) {
-		// Ignore non-anchor links and anchor links which open on a new tab.
-		if (
-			! link.getAttribute( 'href' )?.startsWith( '#' ) ||
-			link.attributes?.target === '_blank'
-		) {
-			return;
-		}
-
-		// Find the specific parent modal for this link
-		// since .close() won't work without an ID if there are
-		// multiple navigation menus in a post/page.
-		const modal = link.closest(
-			'.wp-block-navigation__responsive-container'
-		);
-		const modalId = modal?.getAttribute( 'id' );
-
-		link.addEventListener( 'click', () => {
-			// check if modal exists and is open before trying to close it
-			// otherwise Micromodal will toggle the `has-modal-open` class
-			// on the html tag which prevents scrolling
-			if ( modalId && modal.classList.contains( 'has-modal-open' ) ) {
-				MicroModal.close( modalId );
-			}
-		} );
-	} );
-} );

From c44fbb73337157a064af2d6ec2f5a42c275048a1 Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Tue, 20 Sep 2022 10:56:04 +0200
Subject: [PATCH 2/9] Remove micromodal attributes

---
 packages/block-library/src/navigation/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index f8358791557fbc..f053ddeb3574c9 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -647,7 +647,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
 
 	$responsive_container_markup = sprintf(
-		'<button x-on:click="open = true" aria-haspopup="true" %3$s class="%6$s" data-micromodal-trigger="%1$s">%9$s</button>
+		'<button x-on:click="open = true" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
 			<div 
 				x-on:keydown.escape="open = false"
 				:class="open && \'is-menu-open\ has-modal-open\'"
@@ -655,9 +655,9 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 				class="%5$s" style="%7$s"
 				id="%1$s"
 			>
-				<div class="wp-block-navigation__responsive-close" tabindex="-1" data-micromodal-close>
+				<div class="wp-block-navigation__responsive-close" tabindex="-1">
 					<div x-trap="open" class="wp-block-navigation__responsive-dialog" aria-label="%8$s" aria-modal="true" role="dialog">
-							<button x-on:click="open = false" %4$s data-micromodal-close class="wp-block-navigation__responsive-container-close">%10$s</button>
+							<button x-on:click="open = false" %4$s class="wp-block-navigation__responsive-container-close">%10$s</button>
 						<div class="wp-block-navigation__responsive-container-content" id="%1$s-content">
 							%2$s
 						</div>

From c406a3ddab14f09439ab18c8e5d36278a433a759 Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Tue, 20 Sep 2022 10:59:11 +0200
Subject: [PATCH 3/9] Focus first element of the menu

---
 packages/block-library/src/navigation/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index f053ddeb3574c9..f2972380982de9 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -574,7 +574,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	foreach ( $inner_blocks as $inner_block ) {
 		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 || 'core/navigation-submenu' === $inner_block->name ) && ! $is_list_open ) {
 			$is_list_open       = true;
-			$inner_blocks_html .= '<ul class="wp-block-navigation__container">';
+			$inner_blocks_html .= '<ul x-ref="items" class="wp-block-navigation__container">';
 		}
 		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 && 'core/navigation-submenu' !== $inner_block->name && $is_list_open ) {
 			$is_list_open       = false;
@@ -647,7 +647,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
 
 	$responsive_container_markup = sprintf(
-		'<button x-on:click="open = true" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
+		'<button x-on:click="open = true; $focus.within($refs.items).first()" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
 			<div 
 				x-on:keydown.escape="open = false"
 				:class="open && \'is-menu-open\ has-modal-open\'"

From 473f140bbf69d54dec572dad2d475e9c9424094f Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Wed, 21 Sep 2022 14:15:02 +0200
Subject: [PATCH 4/9] Go back to hamburger button when closing modal

---
 packages/block-library/src/navigation/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index f2972380982de9..8596df619bc14f 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -647,9 +647,9 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
 
 	$responsive_container_markup = sprintf(
-		'<button x-on:click="open = true; $focus.within($refs.items).first()" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
+		'<button x-ref="hamburger" x-on:click="open = true; $focus.within($refs.items).first()" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
 			<div 
-				x-on:keydown.escape="open = false"
+				x-on:keydown.escape="open = false; $focus.focus($refs.hamburger)"
 				:class="open && \'is-menu-open\ has-modal-open\'"
 				:aria-hidden="open ? false : true"
 				class="%5$s" style="%7$s"
@@ -657,7 +657,7 @@ class="%5$s" style="%7$s"
 			>
 				<div class="wp-block-navigation__responsive-close" tabindex="-1">
 					<div x-trap="open" class="wp-block-navigation__responsive-dialog" aria-label="%8$s" aria-modal="true" role="dialog">
-							<button x-on:click="open = false" %4$s class="wp-block-navigation__responsive-container-close">%10$s</button>
+							<button x-on:click="open = false; $focus.focus($refs.hamburger)" %4$s class="wp-block-navigation__responsive-container-close">%10$s</button>
 						<div class="wp-block-navigation__responsive-container-content" id="%1$s-content">
 							%2$s
 						</div>

From a134608495de5d7613e0198d485e9c2625d4c1ba Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Wed, 21 Sep 2022 14:19:26 +0200
Subject: [PATCH 5/9] Remove scripts versions to prevent redirections

---
 packages/block-library/src/navigation/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 8596df619bc14f..48030e04d7bf51 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -431,7 +431,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		'AlpineJS_focus',
 		'https://unpkg.com/@alpinejs/focus@3.10.3/dist/cdn.min.js',
 		array(),
-		"3.10.3",
+		null,
 		true // Load it in the footer
 	);
 	wp_enqueue_script( 'AlpineJS_focus' );
@@ -441,7 +441,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		'AlpineJS',
 		'https://unpkg.com/alpinejs@3.10.3/dist/cdn.min.js',
 		array('AlpineJS_focus'),
-		"3.10.3",
+		null,
 		true // Load it in the footer
 	);
 	wp_enqueue_script( 'AlpineJS' );

From 0a0598f147f3b413e6b223eb5acdb07bed153b29 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 21 Sep 2022 16:32:32 +0200
Subject: [PATCH 6/9] Move focus logic to x-effect

---
 packages/block-library/src/navigation/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 48030e04d7bf51..7e95275d3fe7dd 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -647,17 +647,17 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
 
 	$responsive_container_markup = sprintf(
-		'<button x-ref="hamburger" x-on:click="open = true; $focus.within($refs.items).first()" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
+		'<button x-ref="hamburger" x-on:click="open = true" aria-haspopup="true" %3$s class="%6$s">%9$s</button>
 			<div 
-				x-on:keydown.escape="open = false; $focus.focus($refs.hamburger)"
+				x-on:keydown.escape="open = false"
 				:class="open && \'is-menu-open\ has-modal-open\'"
 				:aria-hidden="open ? false : true"
 				class="%5$s" style="%7$s"
 				id="%1$s"
 			>
 				<div class="wp-block-navigation__responsive-close" tabindex="-1">
-					<div x-trap="open" class="wp-block-navigation__responsive-dialog" aria-label="%8$s" aria-modal="true" role="dialog">
-							<button x-on:click="open = false; $focus.focus($refs.hamburger)" %4$s class="wp-block-navigation__responsive-container-close">%10$s</button>
+					<div x-trap="open" x-effect="open === true ? $focus.within($refs.items).first() : $focus.focus($refs.hamburger)" class="wp-block-navigation__responsive-dialog" aria-label="%8$s" aria-modal="true" role="dialog">
+							<button x-on:click="open = false" %4$s class="wp-block-navigation__responsive-container-close">%10$s</button>
 						<div class="wp-block-navigation__responsive-container-content" id="%1$s-content">
 							%2$s
 						</div>

From b4ebb349c3ef6e8067bd6218e4c10a66f076a82a Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Thu, 22 Sep 2022 14:28:00 +0200
Subject: [PATCH 7/9] Change view.js in navigation block for directives

---
 .../src/navigation-submenu/index.php          |  7 +-
 .../block-library/src/navigation/block.json   |  1 -
 .../block-library/src/navigation/index.php    |  4 -
 packages/block-library/src/navigation/view.js | 74 -------------------
 4 files changed, 5 insertions(+), 81 deletions(-)
 delete mode 100644 packages/block-library/src/navigation/view.js

diff --git a/packages/block-library/src/navigation-submenu/index.php b/packages/block-library/src/navigation-submenu/index.php
index 3c41fb340cafb6..74828651a5f23a 100644
--- a/packages/block-library/src/navigation-submenu/index.php
+++ b/packages/block-library/src/navigation-submenu/index.php
@@ -161,6 +161,9 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 			( $open_on_click ? ' open-on-click' : '' ) . ( $open_on_hover_and_click ? ' open-on-hover-click' : '' ) .
 			( $is_active ? ' current-menu-item' : '' ),
 			'style' => $style_attribute,
+			'x-data' => '{open: false}',
+			'x-on:click.outside' => 'open = false',
+			'x-on:keydown.escape' => 'open = false'
 		)
 	);
 
@@ -214,11 +217,11 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 		if ( $show_submenu_indicators ) {
 			// The submenu icon is rendered in a button here
 			// so that there's a clickable element to open the submenu.
-			$html .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
+			$html .= '<button x-on:click="open = ! open" aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" :aria-expanded="open ? true : false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
 		}
 	} else {
 		// If menus open on click, we render the parent as a button.
-		$html .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
+		$html .= '<button x-on:click="open = ! open" aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" :aria-expanded="open ? true : false"';
 
 		// Wrap title with span to isolate it from submenu icon.
 		$html .= '<span class="wp-block-navigation-item__label">';
diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
index 06dff2610aa3af..4672b306b814c4 100644
--- a/packages/block-library/src/navigation/block.json
+++ b/packages/block-library/src/navigation/block.json
@@ -130,7 +130,6 @@
 			}
 		}
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-navigation-editor",
 	"style": "wp-block-navigation"
 }
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 7e95275d3fe7dd..81b8a6a1253cff 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -421,10 +421,6 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	 */
 	$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
 	$is_responsive_menu           = isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
-	$should_load_view_script      = ! wp_script_is( 'wp-block-navigation-view' ) && ( $is_responsive_menu || $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] );
-	if ( $should_load_view_script ) {
-		wp_enqueue_script( 'wp-block-navigation-view' );
-	}
 
 	// Register @alpine/focus plugin
 	wp_register_script(
diff --git a/packages/block-library/src/navigation/view.js b/packages/block-library/src/navigation/view.js
deleted file mode 100644
index 19805a44ae4ae2..00000000000000
--- a/packages/block-library/src/navigation/view.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Open on click functionality.
-function closeSubmenus( element ) {
-	element
-		.querySelectorAll( '[aria-expanded="true"]' )
-		.forEach( function ( toggle ) {
-			toggle.setAttribute( 'aria-expanded', 'false' );
-		} );
-}
-
-function toggleSubmenuOnClick( event ) {
-	const buttonToggle = event.target.closest( '[aria-expanded]' );
-	const isSubmenuOpen = buttonToggle.getAttribute( 'aria-expanded' );
-
-	if ( isSubmenuOpen === 'true' ) {
-		closeSubmenus( buttonToggle.closest( '.wp-block-navigation-item' ) );
-	} else {
-		// Close all sibling submenus.
-		const parentElement = buttonToggle.closest(
-			'.wp-block-navigation-item'
-		);
-		const navigationParent = buttonToggle.closest(
-			'.wp-block-navigation__submenu-container, .wp-block-navigation__container, .wp-block-page-list'
-		);
-		navigationParent
-			.querySelectorAll( '.wp-block-navigation-item' )
-			.forEach( function ( child ) {
-				if ( child !== parentElement ) {
-					closeSubmenus( child );
-				}
-			} );
-		// Open submenu.
-		buttonToggle.setAttribute( 'aria-expanded', 'true' );
-	}
-}
-
-// Necessary for some themes such as TT1 Blocks, where
-// scripts could be loaded before the body.
-window.addEventListener( 'load', () => {
-	const submenuButtons = document.querySelectorAll(
-		'.wp-block-navigation-submenu__toggle'
-	);
-
-	submenuButtons.forEach( function ( button ) {
-		button.addEventListener( 'click', toggleSubmenuOnClick );
-	} );
-
-	// Close on click outside.
-	document.addEventListener( 'click', function ( event ) {
-		const navigationBlocks = document.querySelectorAll(
-			'.wp-block-navigation'
-		);
-		navigationBlocks.forEach( function ( block ) {
-			if ( ! block.contains( event.target ) ) {
-				closeSubmenus( block );
-			}
-		} );
-	} );
-	// Close on focus outside or escape key.
-	document.addEventListener( 'keyup', function ( event ) {
-		const submenuBlocks = document.querySelectorAll(
-			'.wp-block-navigation-item.has-child'
-		);
-		submenuBlocks.forEach( function ( block ) {
-			if ( ! block.contains( event.target ) ) {
-				closeSubmenus( block );
-			} else if ( event.key === 'Escape' ) {
-				const toggle = block.querySelector( '[aria-expanded="true"]' );
-				closeSubmenus( block );
-				// Focus the submenu trigger so focus does not get trapped in the closed submenu.
-				toggle?.focus();
-			}
-		} );
-	} );
-} );

From 31871e88d41403ea0c62cf71038cb617723319f2 Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Fri, 23 Sep 2022 09:43:06 +0200
Subject: [PATCH 8/9] Fix linting errors

---
 packages/block-library/src/navigation/index.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 81b8a6a1253cff..8ec4fb74b3e2c2 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -422,23 +422,23 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
 	$is_responsive_menu           = isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
 
-	// Register @alpine/focus plugin
+	// Register @alpine/focus plugin.
 	wp_register_script(
 		'AlpineJS_focus',
 		'https://unpkg.com/@alpinejs/focus@3.10.3/dist/cdn.min.js',
 		array(),
 		null,
-		true // Load it in the footer
+		true // Load it in the footer.
 	);
 	wp_enqueue_script( 'AlpineJS_focus' );
 
-	// Register Alpine
+	// Register Alpine.
 	wp_register_script(
 		'AlpineJS',
 		'https://unpkg.com/alpinejs@3.10.3/dist/cdn.min.js',
-		array('AlpineJS_focus'),
+		array( 'AlpineJS_focus' ),
 		null,
-		true // Load it in the footer
+		true // Load it in the footer.
 	);
 	wp_enqueue_script( 'AlpineJS' );
 

From df54ee4fa440e748f0ee23e0b1c054e4f347cf2d Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Fri, 23 Sep 2022 11:13:14 +0200
Subject: [PATCH 9/9] Fix more linting errors

---
 .../block-library/src/navigation-submenu/index.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/navigation-submenu/index.php b/packages/block-library/src/navigation-submenu/index.php
index 74828651a5f23a..f1cf1e8e9cb6a1 100644
--- a/packages/block-library/src/navigation-submenu/index.php
+++ b/packages/block-library/src/navigation-submenu/index.php
@@ -157,13 +157,13 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
-			'class' => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) .
+			'class'               => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) .
 			( $open_on_click ? ' open-on-click' : '' ) . ( $open_on_hover_and_click ? ' open-on-hover-click' : '' ) .
 			( $is_active ? ' current-menu-item' : '' ),
-			'style' => $style_attribute,
-			'x-data' => '{open: false}',
-			'x-on:click.outside' => 'open = false',
-			'x-on:keydown.escape' => 'open = false'
+			'style'               => $style_attribute,
+			'x-data'              => '{open: false}',
+			'x-on:click.outside'  => 'open = false',
+			'x-on:keydown.escape' => 'open = false',
 		)
 	);