Bug 1866503 - closing menupopups/panels inside panelviews in temporary PanelUI panels should not close those panels, r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D194632

Author: gijsk

browser/components/customizableui/content/panelUI.js

@@ -457,7 +457,11 @@ const PanelUI = {
       viewNode.classList.add("cui-widget-panelview", "PanelUI-subView");
 
       let viewShown = false;
-      let panelRemover = () => {
+      let panelRemover = event => {
+        // Avoid bubbled events triggering the panel closing.
+        if (event.target != tempPanel) {
+          return;
+        }
         viewNode.classList.remove("cui-widget-panelview");
         if (viewShown) {
           CustomizableUI.removePanelCloseListeners(tempPanel);

browser/components/customizableui/test/browser.toml

@@ -320,6 +320,8 @@ tags = "fullscreen"
 
 ["browser_panel_locationSpecific.js"]
 
+["browser_panel_menulist.js"]
+
 ["browser_panel_toggle.js"]
 
 ["browser_proton_moreTools_panel.js"]

browser/components/customizableui/test/browser_panel_menulist.js

@@ -0,0 +1,46 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const kViewID = "panelview-with-menulist";
+
+/**
+ * When there's a menulist inside a panelview, closing it shouldn't close the panel.
+ */
+add_task(async function test_closing_menulist_should_not_close_panel() {
+  let viewCache = document.getElementById("appMenu-viewCache");
+  let panelview = document.createXULElement("panelview");
+  panelview.id = kViewID;
+  let menulist = document.createXULElement("menulist");
+  let popup = document.createXULElement("menupopup");
+  for (let item of ["one", "two"]) {
+    let menuitem = document.createXULElement("menuitem");
+    menuitem.id = `menuitem-${item}`;
+    menuitem.setAttribute("label", item);
+    popup.append(menuitem);
+  }
+  menulist.append(popup);
+  panelview.append(menulist);
+  viewCache.append(panelview);
+  await PanelUI.showSubView(kViewID, PanelUI.menuButton);
+  let panel = panelview.closest("panel");
+
+  registerCleanupFunction(async () => {
+    if (panel && panel.state != "closed") {
+      let panelGone = BrowserTestUtils.waitForPopupEvent(panel, "hidden");
+      panel.hidePopup();
+      await panelGone;
+    }
+    panelview.remove();
+  });
+
+  let shown = BrowserTestUtils.waitForPopupEvent(popup, "shown");
+  menulist.openMenu(true);
+  await shown;
+  let hidden = BrowserTestUtils.waitForPopupEvent(popup, "hidden");
+  popup.activateItem(popup.firstElementChild);
+  await hidden;
+
+  Assert.equal(panel?.state, "open", "Panel should still be open.");
+});

toolkit/content/aboutNetError.mjs

@@ -10,6 +10,11 @@ import {
   pemToDER,
 } from "chrome://global/content/certviewer/certDecoder.mjs";
 
+window.addEventListener("load", console.log);
+window.addEventListener("load", console.log, true);
+document.addEventListener("load", console.log);
+document.addEventListener("load", console.log, true);
+
 const formatter = new Intl.DateTimeFormat();
 
 const HOST_NAME = getHostName();

toolkit/content/globalOverlay.js

@@ -7,6 +7,8 @@ function closeWindow(aClose, aPromptFunction, aSource) {
     "resource://gre/modules/AppConstants.sys.mjs"
   );
 
+  console.error("Hello from closeWindow");
+
   // Closing the last window doesn't quit the application on OS X.
   if (AppConstants.platform != "macosx") {
     var windowCount = 0;