From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 browser/components/tabpreview/tabpreview.mjs | 32 +++++++++-------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

(limited to 'browser/components/tabpreview/tabpreview.mjs')

diff --git a/browser/components/tabpreview/tabpreview.mjs b/browser/components/tabpreview/tabpreview.mjs
index 5256ab22ff..2409c3fa7a 100644
--- a/browser/components/tabpreview/tabpreview.mjs
+++ b/browser/components/tabpreview/tabpreview.mjs
@@ -11,7 +11,6 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
 
 const TAB_PREVIEW_USE_THUMBNAILS_PREF =
   "browser.tabs.cardPreview.showThumbnails";
-const TAB_PREVIEW_DELAY_PREF = "browser.tabs.cardPreview.delayMs";
 
 /**
  * Detailed preview card that displays when hovering a tab
@@ -37,8 +36,7 @@ export default class TabPreview extends MozLitElement {
     XPCOMUtils.defineLazyPreferenceGetter(
       this,
       "_prefPreviewDelay",
-      TAB_PREVIEW_DELAY_PREF,
-      1000
+      "ui.tooltip.delay_ms"
     );
     XPCOMUtils.defineLazyPreferenceGetter(
       this,
@@ -62,8 +60,8 @@ export default class TabPreview extends MozLitElement {
     this.panel.setAttribute("noautofocus", true);
     this.panel.setAttribute("norolluponanchor", true);
     this.panel.setAttribute("consumeoutsideclicks", "never");
+    this.panel.setAttribute("rolluponmousewheel", "true");
     this.panel.setAttribute("level", "parent");
-    this.panel.setAttribute("type", "arrow");
     this.shadowRoot.append(this.panel);
     return this.panel;
   }
@@ -84,9 +82,9 @@ export default class TabPreview extends MozLitElement {
   getPrettyURI(uri) {
     try {
       const url = new URL(uri);
-      return `${url.hostname}${url.pathname}`.replace(/\/+$/, "");
+      return `${url.hostname}`.replace(/^w{3}\./, "");
     } catch {
-      return this.pageURI;
+      return uri;
     }
   }
 
@@ -96,10 +94,6 @@ export default class TabPreview extends MozLitElement {
         this.requestUpdate();
         break;
       }
-      case "wheel": {
-        this.hidePreview();
-        break;
-      }
       case "popuphidden": {
         this.previewHidden();
         break;
@@ -113,29 +107,23 @@ export default class TabPreview extends MozLitElement {
       y: -2,
       isContextMenu: false,
     });
-    window.addEventListener("wheel", this, {
-      capture: true,
-      passive: true,
-    });
     window.addEventListener("TabSelect", this);
     this.panel.addEventListener("popuphidden", this);
   }
 
   hidePreview() {
     this.panel.hidePopup();
-    this.updateComplete.then(() => {
-      /**
-       * @event TabPreview#previewhidden
-       * @type {CustomEvent}
-       */
-      this.dispatchEvent(new CustomEvent("previewhidden"));
-    });
   }
 
   previewHidden() {
-    window.removeEventListener("wheel", this, { capture: true, passive: true });
     window.removeEventListener("TabSelect", this);
     this.panel.removeEventListener("popuphidden", this);
+
+    /**
+     * @event TabPreview#previewhidden
+     * @type {CustomEvent}
+     */
+    this.dispatchEvent(new CustomEvent("previewhidden"));
   }
 
   // compute values derived from tab element
-- 
cgit v1.2.3