From 6da7865a77e9fdd12ccb669bd4408fa5fd4c925e Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 19 Mar 2024 10:56:46 +0100
Subject: [PATCH] FIX: Regressed scroll-lock after mobile menu close (#26232)

---
 .../app/components/glimmer-site-header.gjs    |  1 +
 .../tests/acceptance/mobile-pan-test.js       | 46 +++++++++----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs b/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs
index ddaa54f25a8..8e83e52ee4a 100644
--- a/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs
+++ b/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs
@@ -356,6 +356,7 @@ export default class GlimmerSiteHeader extends Component {
     menuPanels.forEach((panel) => {
       if (this._swipeEvents.shouldCloseMenu(e, this._swipeMenuOrigin)) {
         this._animateClosing(e, panel, this._swipeMenuOrigin);
+        scrollLock(false);
       } else {
         this._animateOpening(panel, e);
       }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js
index 95a0093fa58..7c01219bcf2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-pan-test.js
@@ -1,10 +1,5 @@
 import { click, triggerEvent, visit } from "@ember/test-helpers";
-import {
-  acceptance,
-  chromeTest,
-  count,
-  exists,
-} from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, chromeTest } from "discourse/tests/helpers/qunit-helpers";
 
 async function triggerSwipeStart(touchTarget) {
   const emberTesting = document.querySelector("#ember-testing-container");
@@ -69,11 +64,15 @@ async function triggerSwipeEnd({ x, y, touchTarget }) {
 // new Touch() isn't available in Firefox, so this is skipped there
 acceptance("Mobile - menu swipes", function (needs) {
   needs.mobileView();
-  needs.user();
+  needs.user({
+    glimmer_header_enabled: true,
+  });
 
   chromeTest("swipe to close hamburger", async function (assert) {
     await visit("/");
-    await click(".hamburger-dropdown");
+    await click(".hamburger-dropdown button");
+
+    assert.dom(document.documentElement).hasClass(/scroll-lock/);
 
     const touchTarget = document.querySelector(".panel-body");
     let swipe = await triggerSwipeStart(touchTarget);
@@ -81,17 +80,17 @@ acceptance("Mobile - menu swipes", function (needs) {
     await triggerSwipeMove(swipe);
     await triggerSwipeEnd(swipe);
 
-    assert.ok(
-      !exists(".panel-body"),
-      "it should close hamburger on a left swipe"
-    );
+    assert
+      .dom(".panel-body")
+      .doesNotExist("it closes hamburger on a left swipe");
+    assert.dom(document.documentElement).doesNotHaveClass(/scroll-lock/);
   });
 
   chromeTest(
     "swipe back and flick to re-open hamburger",
     async function (assert) {
       await visit("/");
-      await click(".hamburger-dropdown");
+      await click(".hamburger-dropdown button");
 
       const touchTarget = document.querySelector(".panel-body");
       let swipe = await triggerSwipeStart(touchTarget);
@@ -101,17 +100,17 @@ acceptance("Mobile - menu swipes", function (needs) {
       await triggerSwipeMove(swipe);
       await triggerSwipeEnd(swipe);
 
-      assert.strictEqual(
-        count(".panel-body"),
-        1,
-        "it should re-open hamburger on a right swipe"
-      );
+      assert
+        .dom(".panel-body")
+        .exists({ count: 1 }, "it re-opens hamburger on a right swipe");
     }
   );
 
   chromeTest("swipe to user menu", async function (assert) {
     await visit("/");
-    await click("#current-user");
+    await click("#current-user button");
+
+    assert.dom(document.documentElement).hasClass(/scroll-lock/);
 
     const touchTarget = document.querySelector(".panel-body");
     let swipe = await triggerSwipeStart(touchTarget);
@@ -119,9 +118,10 @@ acceptance("Mobile - menu swipes", function (needs) {
     await triggerSwipeMove(swipe);
     await triggerSwipeEnd(swipe);
 
-    assert.ok(
-      !exists(".panel-body"),
-      "it should close user menu on a left swipe"
-    );
+    assert
+      .dom(".panel-body")
+      .doesNotExist("it closes user menu on a left swipe");
+
+    assert.dom(document.documentElement).doesNotHaveClass(/scroll-lock/);
   });
 });