fix: Fixed a few things before release, b=(no-bug), c=common, compact-mode, mods, tabs, welcome

src/browser/components/urlbar/UrlbarInput-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..22c2a5040913b7518ea85ed781c9cd499e386a78 100644
+index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..8ae25b8ba4ff4f599e1b5b2c545c681a87a77c58 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -68,6 +68,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -24,7 +24,7 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..22c2a5040913b7518ea85ed781c9cd49
      this.inputField.select();
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
-+    }, 100);
++    }, 1000);
      this._suppressPrimaryAdjustment = false;
    }
  

src/browser/components/urlbar/UrlbarView-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index d5382623595de8daed8cd13ea2eb2de329a4bd92..8e160e0bb5a1cd626753feba2008a24e3bbd84cd 100644
+index d5382623595de8daed8cd13ea2eb2de329a4bd92..3b33e083c40f70a97d153934f2eb6ba73bf986b5 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
 @@ -609,7 +609,7 @@ export class UrlbarView {
@@ -11,3 +11,12 @@ index d5382623595de8daed8cd13ea2eb2de329a4bd92..8e160e0bb5a1cd626753feba2008a24e
          // Try to reuse the cached top-sites context. If it's not cached, then
          // there will be a gap of time between when the input is focused and
          // when the view opens that can be perceived as flicker.
+@@ -2975,7 +2975,7 @@ export class UrlbarView {
+   }
+ 
+   #enableOrDisableRowWrap() {
+-    let wrap = getBoundsWithoutFlushing(this.input.textbox).width < 650;
++    let wrap = false;
+     this.#rows.toggleAttribute("wrap", wrap);
+     this.oneOffSearchButtons.container.toggleAttribute("wrap", wrap);
+   }

src/browser/themes/shared/preferences/zen-preferences.css

@@ -558,20 +558,13 @@ groupbox h2 {
   margin: 15px 0;
 }
 
-.zenThemeMarketplaceItemUninstallButton {
-  margin-left: auto;
-  cursor: pointer;
-}
-
+.zenThemeMarketplaceItemUninstallButton,
 #zenThemeMarketplaceImport {
   margin-left: auto;
   cursor: pointer;
 }
 
-#zenThemeMarketplaceExport {
-  cursor: pointer;
-}
-
+#zenThemeMarketplaceExport,
 #zenThemeMarketplaceCheckForUpdates {
   cursor: pointer;
 }

src/zen/common/styles/zen-urlbar.css

@@ -526,6 +526,10 @@ button.popup-notification-dropmarker {
   margin-right: 0 !important;
 }
 
+.urlbarView:not([action-override='true']) .urlbarView-row[type='switchtab'] .urlbarView-no-wrap {
+  width: 100%;
+}
+
 .urlbarView-row {
   --urlbarView-item-inline-padding: 8px;
   --urlbarView-item-block-padding: 10px;
@@ -540,7 +544,8 @@ button.popup-notification-dropmarker {
   &[selected] {
     background-color: color-mix(in srgb, var(--zen-primary-color) 50%, transparent 50%) !important;
 
-    & * {
+    & *,
+    & .urlbarView-title-separator::before {
       color: white !important;
     }
 

src/zen/compact-mode/ZenCompactMode.mjs

@@ -408,8 +408,13 @@ var gZenCompactModeManager = {
       const onEnter = (event) => {
         if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
         // Dont register the hover if the urlbar is floating and we are hovering over it
-        if (event.target.closest('#urlbar[zen-floating-urlbar]')) return;
         this.clearFlashTimeout('has-hover' + target.id);
+        if (
+          event.target.closest('#urlbar[zen-floating-urlbar]') ||
+          this.sidebar.getAttribute('supress-primary-adjustment') === 'true'
+        ) {
+          return;
+        }
         window.requestAnimationFrame(() => target.setAttribute('zen-has-hover', 'true'));
       };
 
@@ -433,7 +438,11 @@ var gZenCompactModeManager = {
           return;
         }
 
-        if (this.hoverableElements[i].keepHoverDuration && !event.target.querySelector('#urlbar[zen-floating-urlbar]')) {
+        if (
+          this.hoverableElements[i].keepHoverDuration &&
+          !event.target.querySelector('#urlbar[zen-floating-urlbar]') &&
+          !this.sidebar.getAttribute('supress-primary-adjustment') === 'true'
+        ) {
           this.flashElement(target, this.hoverableElements[i].keepHoverDuration, 'has-hover' + target.id, 'zen-has-hover');
         } else {
           this._removeHoverFrames[target.id] = window.requestAnimationFrame(() => target.removeAttribute('zen-has-hover'));

src/zen/compact-mode/zen-compact-mode.css

@@ -43,7 +43,7 @@
       }
 
       #navigator-toolbox {
-        --zen-toolbox-max-width: 64px !important;
+        --zen-toolbox-max-width: 48px !important;
         --zen-compact-float: var(--zen-element-separation);
 
         /* Initial padding for when we are animating */
@@ -76,7 +76,7 @@
       }
 
       &:not([zen-right-side='true']) #navigator-toolbox {
-        left: calc(-1 * var(--actual-zen-sidebar-width));
+        left: calc(-1 * var(--actual-zen-sidebar-width) + 0.1px);
       }
 
       /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
@@ -96,7 +96,7 @@
 
       &[zen-right-side='true'] {
         & #navigator-toolbox:not([animate='true']) {
-          right: calc(-1 * var(--actual-zen-sidebar-width));
+          right: calc(-1 * var(--actual-zen-sidebar-width) + 0.1px);
         }
 
         & .browserSidebarContainer {

src/zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs

@@ -75,7 +75,7 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent {
     console.info('ZenThemeMarketplaceParent: Checking for theme updates');
 
     let updates = [];
-    this._themes = {};
+    this._themes = null;
 
     for (const theme of Object.values(await this.getThemes())) {
       try {

src/zen/tabs/zen-tabs/vertical-tabs.css

@@ -1258,7 +1258,7 @@
   gap: calc(var(--zen-toolbox-padding) - 2px);
   transition:
     max-height 0.3s ease-out,
-    grid-template-rows 0.3s ease-out;
+    grid-template-columns 0.3s ease-out;
   opacity: 1;
   grid-template-columns: repeat(auto-fit, minmax(max(23.7%, 48px), 1fr));
   &[data-hack-type='1'] {
@@ -1272,12 +1272,14 @@
   }
   scrollbar-width: thin;
   min-width: calc(100% + var(--zen-toolbox-padding) * 2);
+  width: calc(100% + var(--zen-toolbox-padding) * 2);
   padding: 0 var(--zen-toolbox-padding);
   display: grid;
 
   &[hidden='true'] {
-    max-width: var(--actual-zen-sidebar-width) !important; /* To still allow essentials to grid the tabs */
-    min-width: var(--actual-zen-sidebar-width) !important;
+    --hidden-essentials-width: calc(var(--actual-zen-sidebar-width) - var(--zen-toolbox-padding) * 2);
+    max-width: var(--hidden-essentials-width) !important; /* To still allow essentials to grid the tabs */
+    min-width: var(--hidden-essentials-width) !important;
   }
 }
 

src/zen/welcome/ZenWelcome.mjs

@@ -455,16 +455,18 @@
             .getElementById('zen-welcome-initial-essentials-browser-sidebar-essentials')
             .querySelectorAll('.tabbrowser-tab[visuallyselected]');
 
-          await PlacesUtils.history.insertMany(
-            [...selectedTabs].map((tab) => ({
-              url: tab.getAttribute('data-url'),
-              visits: [
-                {
-                  transition: PlacesUtils.history.TRANSITIONS.TYPED,
-                },
-              ],
-            }))
-          );
+          if (selectedTabs.length) {
+            await PlacesUtils.history.insertMany(
+              [...selectedTabs].map((tab) => ({
+                url: tab.getAttribute('data-url'),
+                visits: [
+                  {
+                    transition: PlacesUtils.history.TRANSITIONS.TYPED,
+                  },
+                ],
+              }))
+            );
+          }
 
           for (const tab of selectedTabs) {
             const url = tab.getAttribute('data-url');