From 4e6dc7472482ba211fe1a799c5cc2b5c98c49013 Mon Sep 17 00:00:00 2001
From: trickypr <23250792+trickypr@users.noreply.github.com>
Date: Mon, 25 Dec 2023 15:48:38 +1100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Use=20`xul:arrowscrollbox`?=
 =?UTF-8?q?=20in=20the=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/customizableUI/Tabs.svelte     | 59 +++++++++++++++++--
 .../browser/components/tabs/Tab.svelte        | 15 ++++-
 .../pref/CustomizableUI/Component.svelte      |  5 ++
 src/content/shared/customizableUI/style.ts    |  9 ---
 src/prefs.js                                  |  6 +-
 5 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/src/content/browser/components/customizableUI/Tabs.svelte b/src/content/browser/components/customizableUI/Tabs.svelte
index b066bcd..e759cde 100644
--- a/src/content/browser/components/customizableUI/Tabs.svelte
+++ b/src/content/browser/components/customizableUI/Tabs.svelte
@@ -11,20 +11,69 @@
   import Tab from '@browser/components/tabs/Tab.svelte'
 
   import UiItemBase from './UIItemBase.svelte'
-  import { selectedTabId, tabs } from '@browser/lib/window/tabs'
+  import { openTab, selectedTabId, tabs } from '@browser/lib/window/tabs'
+  import ToolbarButton from '@shared/components/ToolbarButton.svelte'
+  import { onMount } from 'svelte'
 
   export let component: ComponentId & TabsComponent
   export let root: Component
+
+  let overflow = false
+  let arrowBox: HTMLElement
+
+  onMount(() => {
+    arrowBox.addEventListener('overflow', () => (overflow = true))
+    arrowBox.addEventListener('underflow', () => (overflow = false))
+  })
 </script>
 
 <UiItemBase {component} {root} class="tabs" on:drop={(e) => e.preventDefault()}>
-  {#each $tabs as tab (tab.getId())}
-    <Tab {tab} bind:selectedTab={$selectedTabId} />
-  {/each}
+  <xul:arrowscrollbox
+    bind:this={arrowBox}
+    class="tab-container"
+    orient="horizontal"
+    clicktoscroll="true"
+  >
+    {#each $tabs as tab (tab.getId())}
+      <Tab {tab} bind:selectedTab={$selectedTabId} />
+    {/each}
+
+    {#if !overflow}
+      <ToolbarButton on:click={() => openTab()}>
+        <i class="ri-add-line" />
+      </ToolbarButton>
+    {/if}
+  </xul:arrowscrollbox>
+
+  {#if overflow}
+    <ToolbarButton on:click={() => openTab()}>
+      <i class="ri-add-line" />
+    </ToolbarButton>
+  {/if}
 </UiItemBase>
 
 <style>
   :global(.component.tabs) {
-    overflow: scroll;
+    --tab-max-width: 16rem;
+    --tab-min-width: 4rem;
+
+    display: flex;
+    flex-grow: 1;
+    gap: 0.125rem;
+
+    overflow: hidden;
+  }
+
+  :global(.component.tabs .toolbar__button) {
+    margin: 0.25rem 0;
+  }
+
+  .tab-container {
+    display: flex;
+    flex-grow: 1;
+    flex-wrap: nowrap;
+    align-items: center;
+
+    overflow-x: hidden;
   }
 </style>
diff --git a/src/content/browser/components/tabs/Tab.svelte b/src/content/browser/components/tabs/Tab.svelte
index 1e6b2c4..d8f7bf8 100644
--- a/src/content/browser/components/tabs/Tab.svelte
+++ b/src/content/browser/components/tabs/Tab.svelte
@@ -50,6 +50,9 @@
       <img class="tab__icon tab__start-item" src={$icon} alt="favicon" />
     {/if}
     <span>{$title || $uri.asciiSpec}</span>
+
+    <span class="tab__space" />
+
     <button
       class="tab__close"
       on:click={() => closeTab(tab)}
@@ -68,10 +71,15 @@
     margin: 0.25rem 0;
     font-size: 1.25rem;
     border-radius: 0.5rem;
-    max-width: 16rem;
+
+    height: 2rem;
+    max-width: var(--tab-max-width);
+    min-width: var(--tab-min-width);
 
     display: flex;
     align-items: center;
+    flex-grow: 100;
+    flex-shrink: 100;
 
     cursor: default;
   }
@@ -128,6 +136,11 @@
     width: 1.5rem;
   }
 
+  .tab__space {
+    flex-grow: 1;
+    flex-shrink: 1;
+  }
+
   .drop-indicator {
     width: 1px;
   }
diff --git a/src/content/settings/components/pref/CustomizableUI/Component.svelte b/src/content/settings/components/pref/CustomizableUI/Component.svelte
index 0f3eff5..29f5707 100644
--- a/src/content/settings/components/pref/CustomizableUI/Component.svelte
+++ b/src/content/settings/components/pref/CustomizableUI/Component.svelte
@@ -152,4 +152,9 @@
   .component.root {
     height: 100%;
   }
+
+  .component.tabs {
+    display: flex;
+    gap: 0.125rem;
+  }
 </style>
diff --git a/src/content/shared/customizableUI/style.ts b/src/content/shared/customizableUI/style.ts
index 58d3c5e..b32d2f3 100644
--- a/src/content/shared/customizableUI/style.ts
+++ b/src/content/shared/customizableUI/style.ts
@@ -69,13 +69,6 @@ function getOmniboxStyle(
   `
 }
 
-function getTabsStyle(): string {
-  return `
-    display:flex;
-    gap: 0.125rem;
-  `
-}
-
 function getIconButtonStyle(): string {
   return `
     display: flex;
@@ -97,8 +90,6 @@ export function getComponentStyle(
       return getSpacer(component, parentOrientation)
     case 'omnibox':
       return getOmniboxStyle(parentOrientation, preview)
-    case 'tabs':
-      return getTabsStyle()
     case 'icon':
       return getIconButtonStyle()
     default:
diff --git a/src/prefs.js b/src/prefs.js
index 2485117..08bbfde 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -20,11 +20,7 @@ pref(
 );
 pref(
   'browser.uiCustomization.state',
-  '{"type":"block","direction":"vertical","content":[{"type":"block","direction":"horizontal","size":{"type":"content"},"content":[{"type":"tabs"},{"type":"icon","icon":"add-line"}],"color":"base"},{"type":"block","direction":"horizontal","size":{"type":"content"},"content":[{"type":"icon","icon":"arrow-left-line"},{"type":"icon","icon":"refresh-line"},{"type":"icon","icon":"arrow-right-line"},{"type":"spacer","grow":1},{"type":"omnibox"},{"type":"spacer","grow":1},{"type":"icon","icon":"menu-line"}],"color":"surface-0"},{"type":"browser"}],"size":{"type":"grow","value":1},"color":"base"}'
-);
-pref(
-  'browser.uiCustomization.state',
-  '{"type":"block","direction":"vertical","content":[{"type":"block","direction":"horizontal","size":{"type":"content"},"content":[{"type":"tabs"},{"type":"icon","icon":"add-line"}],"color":"base"},{"type":"block","direction":"horizontal","size":{"type":"content"},"content":[{"type":"icon","icon":"arrow-left-line"},{"type":"icon","icon":"refresh-line"},{"type":"icon","icon":"arrow-right-line"},{"type":"spacer","grow":1},{"type":"omnibox"},{"type":"spacer","grow":1},{"type":"icon","icon":"menu-line"}],"color":"surface-0"},{"type":"browser"}],"size":{"type":"grow","value":1},"color":"base"}'
+  '{"type":"block","direction":"vertical","content":[{"type":"block","direction":"horizontal","size":{"type":"content"},"content":[{"type":"tabs"}],"color":"base"},{"type":"block","direction":"horizontal","size":{"type":"content"},"content":[{"type":"icon","icon":"arrow-left-line"},{"type":"icon","icon":"refresh-line"},{"type":"icon","icon":"arrow-right-line"},{"type":"spacer","grow":1},{"type":"omnibox"},{"type":"spacer","grow":1},{"type":"icon","icon":"menu-line"}],"color":"surface-0"},{"type":"browser"}],"size":{"type":"grow","value":1},"color":"base"}'
 );
 
 // Default keybinds