From 96b27074616daf4a2c7cd318ab13324463d200b8 Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Wed, 12 Jul 2023 23:38:55 -0400
Subject: [PATCH 1/9] fix(menu): menu is enabled in ssr hydration

---
 core/src/components/menu/menu.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 56c6e3a919f..3e6d1b6dc20 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -188,11 +188,6 @@ export class Menu implements ComponentInterface, MenuI {
       this.type = config.get('menuType', 'overlay');
     }
 
-    if (!Build.isBrowser) {
-      this.disabled = true;
-      return;
-    }
-
     const content = this.contentId !== undefined ? document.getElementById(this.contentId) : null;
 
     if (content === null) {

From a8e86a7699adcc2812fcf00420abd0a4804b7d1a Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Wed, 12 Jul 2023 23:41:35 -0400
Subject: [PATCH 2/9] chore: smoke test

---
 core/src/components/menu/menu.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 3e6d1b6dc20..6f4308b4220 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -188,6 +188,11 @@ export class Menu implements ComponentInterface, MenuI {
       this.type = config.get('menuType', 'overlay');
     }
 
+    if (!Build.isBrowser) {
+      // this.disabled = true;
+      return;
+    }
+
     const content = this.contentId !== undefined ? document.getElementById(this.contentId) : null;
 
     if (content === null) {

From 6b79224efb40b8936e61361fa6250d1df794e6e1 Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Thu, 13 Jul 2023 00:10:25 -0400
Subject: [PATCH 3/9] chore: prevent disabling menu during ssr

---
 core/src/components/menu/menu.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 6f4308b4220..c1726550f7f 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -705,8 +705,10 @@ export class Menu implements ComponentInterface, MenuI {
       this.forceClosing();
     }
 
-    if (!this.disabled) {
-      menuController._setActiveMenu(this);
+    if (!Build.isServer) {
+      if (!this.disabled) {
+        menuController._setActiveMenu(this);
+      }
     }
     assert(!this.isAnimating, 'can not be animating');
   }

From 4fb5a2657c729e757a9bcf018fcfd849bae9955f Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 17 Jul 2023 14:26:44 -0400
Subject: [PATCH 4/9] fix: prevent setting active menu to removed menu node

---
 core/src/components/menu/menu.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index c1726550f7f..1703dda0f05 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -705,11 +705,16 @@ export class Menu implements ComponentInterface, MenuI {
       this.forceClosing();
     }
 
-    if (!Build.isServer) {
-      if (!this.disabled) {
-        menuController._setActiveMenu(this);
-      }
+    if (document.contains(this.el)) {
+      /**
+       * Only set the active menu if the menu element is
+       * present in the DOM. Otherwise if it was destructively
+       * re-hydrated (through Angular Universal), then ignore
+       * setting the removed node as the active menu.
+       */
+      menuController._setActiveMenu(this);
     }
+
     assert(!this.isAnimating, 'can not be animating');
   }
 

From 6959f93933bfe9d29e8dce504949d507691d3b93 Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 17 Jul 2023 15:27:44 -0400
Subject: [PATCH 5/9] chore: clean-up

---
 core/src/components/menu/menu.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 1703dda0f05..21934dcc1a9 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -189,7 +189,6 @@ export class Menu implements ComponentInterface, MenuI {
     }
 
     if (!Build.isBrowser) {
-      // this.disabled = true;
       return;
     }
 

From c653065cb0de29eea835cdefdefa5f1827f32e5c Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 17 Jul 2023 15:50:23 -0400
Subject: [PATCH 6/9] test: allow activating different menu from same side

---
 core/src/components/menu/test/basic/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/components/menu/test/basic/index.html b/core/src/components/menu/test/basic/index.html
index af0074a4cbd..49efc273127 100644
--- a/core/src/components/menu/test/basic/index.html
+++ b/core/src/components/menu/test/basic/index.html
@@ -129,6 +129,7 @@
     <script>
       async function openStart() {
         // Open the menu by menu-id
+        await menuController.enable(false, 'custom-menu');
         await menuController.enable(true, 'start-menu');
         await menuController.open('start-menu');
       }
@@ -140,6 +141,7 @@
 
       async function openCustom() {
         // Open the menu by menu-id
+        await menuController.enable(false, 'start-menu');
         await menuController.enable(true, 'custom-menu');
         await menuController.open('custom-menu');
       }

From f2fd828f74b31dd92d6272b4048ed9b24e3395d4 Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 17 Jul 2023 16:28:48 -0400
Subject: [PATCH 7/9] chore: re-add disabled check

---
 core/src/components/menu/menu.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 21934dcc1a9..13536bbdccd 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -711,7 +711,9 @@ export class Menu implements ComponentInterface, MenuI {
        * re-hydrated (through Angular Universal), then ignore
        * setting the removed node as the active menu.
        */
-      menuController._setActiveMenu(this);
+      if (!this.disabled) {
+        menuController._setActiveMenu(this);
+      }
     }
 
     assert(!this.isAnimating, 'can not be animating');

From d16532b21c60eb3e3dfcbde127ef9132dbf1b0ff Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 17 Jul 2023 16:29:06 -0400
Subject: [PATCH 8/9] chore: revert test change

---
 core/src/components/menu/test/basic/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/components/menu/test/basic/index.html b/core/src/components/menu/test/basic/index.html
index 49efc273127..af0074a4cbd 100644
--- a/core/src/components/menu/test/basic/index.html
+++ b/core/src/components/menu/test/basic/index.html
@@ -129,7 +129,6 @@
     <script>
       async function openStart() {
         // Open the menu by menu-id
-        await menuController.enable(false, 'custom-menu');
         await menuController.enable(true, 'start-menu');
         await menuController.open('start-menu');
       }
@@ -141,7 +140,6 @@
 
       async function openCustom() {
         // Open the menu by menu-id
-        await menuController.enable(false, 'start-menu');
         await menuController.enable(true, 'custom-menu');
         await menuController.open('custom-menu');
       }

From 5437b79fadabffecbc57ffc875ec0269abb0bb7d Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 17 Jul 2023 17:13:34 -0400
Subject: [PATCH 9/9] refactor: use doc util

---
 core/src/components/menu/menu.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 13536bbdccd..c010e72d2de 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -1,6 +1,7 @@
 import type { ComponentInterface, EventEmitter } from '@stencil/core';
 import { Build, Component, Element, Event, Host, Listen, Method, Prop, State, Watch, h } from '@stencil/core';
 import { getTimeGivenProgression } from '@utils/animation/cubic-bezier';
+import { doc } from '@utils/browser';
 import { GESTURE_CONTROLLER } from '@utils/gesture';
 import type { Attributes } from '@utils/helpers';
 import { inheritAriaAttributes, assert, clamp, isEndSide as isEnd } from '@utils/helpers';
@@ -704,7 +705,7 @@ export class Menu implements ComponentInterface, MenuI {
       this.forceClosing();
     }
 
-    if (document.contains(this.el)) {
+    if (doc?.contains(this.el)) {
       /**
        * Only set the active menu if the menu element is
        * present in the DOM. Otherwise if it was destructively