From f52da4f46329ca590e5f3f8623a4b4cfa0cad549 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Sat, 27 Apr 2024 22:21:04 +0200
Subject: [PATCH] Small UI fixes

---
 src/browser/base/content/ZenSidebarManager.mjs | 11 ++++++++---
 src/browser/base/content/zen-scripts.inc.xhtml |  9 +++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs
index 15efb0848..547b2c012 100644
--- a/src/browser/base/content/ZenSidebarManager.mjs
+++ b/src/browser/base/content/ZenSidebarManager.mjs
@@ -1,5 +1,5 @@
 
-export var gZenBrowserManagerSidebar = {
+var gZenBrowserManagerSidebar = {
   _sidebarElement: null,
   _currentPanel: null,
   _hasRegisteredPinnedClickOutside: false,
@@ -51,7 +51,7 @@ export var gZenBrowserManagerSidebar = {
       return;
     }
     let target = event.target;
-    if (target.closest("#zen-sidebar-web-panel") || target.closest("#zen-sidebar-panels-wrapper")) {
+    if (target.closest("#zen-sidebar-web-panel") || target.closest("#zen-sidebar-panels-wrapper") || target.closest("zenWebPanelContextMenu")) {
       return;
     }
     this.close();
@@ -66,6 +66,7 @@ export var gZenBrowserManagerSidebar = {
       this.sidebarElement.removeAttribute("hidden");
     } else {
       this.sidebarElement.setAttribute("hidden", "true");
+      this._closeSidebarPanel();
       return;
     }
 
@@ -341,7 +342,9 @@ export var gZenBrowserManagerSidebar = {
     delete data.data[this.contextTab];
     data.index = data.index.filter(id => id !== this.contextTab);
     let browser = this._getBrowserById(this.contextTab);
-    browser.remove();
+    if (browser) {
+      browser.remove();
+    }
     this._closeSidebarPanel();
     Services.prefs.setStringPref("zen.sidebar.data", JSON.stringify(data));
   },
@@ -352,3 +355,5 @@ export var gZenBrowserManagerSidebar = {
     this._closeSidebarPanel();
   },
 };
+
+gZenBrowserManagerSidebar.init();
diff --git a/src/browser/base/content/zen-scripts.inc.xhtml b/src/browser/base/content/zen-scripts.inc.xhtml
index 272b9cd78..295e97aa3 100644
--- a/src/browser/base/content/zen-scripts.inc.xhtml
+++ b/src/browser/base/content/zen-scripts.inc.xhtml
@@ -1,8 +1,5 @@
 <script type="text/javascript">
-document.addEventListener("DOMContentLoaded", () => {
-  import("chrome://browser/content/ZenSidebarManager.mjs").then(({ gZenBrowserManagerSidebar }) => {
-      gZenBrowserManagerSidebar.init();
-      window.gZenBrowserManagerSidebar = gZenBrowserManagerSidebar
-  });
-});
+window.addEventListener("DOMContentLoaded", () => {
+  Services.scriptloader.loadSubScript("chrome://browser/content/ZenSidebarManager.mjs");
+}, { once: true });
 </script>
\ No newline at end of file