@gjsify/adwaita-web 0.31.0 → 0.32.0

package/src/elements/adw-inline-view-switcher.ts

@@ -1,79 +1,159 @@
 // <adw-inline-view-switcher> — A compact, toolbar-friendly view switcher (the
-// web counterpart of Adw.InlineViewSwitcher). It pairs a toggle-group-style
-// switcher bar with a stack of pages: each declared <adw-view-stack-page> child
-// (with a `title` and/or `icon-name` attribute plus arbitrary content) becomes a
-// toggle in the bar and a panel in the stack, and exactly one page is visible at
-// a time. The toggles can show labels, icons, or both via `display-mode`, just
-// like the native widget's AdwInlineViewSwitcherDisplayMode.
+// web counterpart of Adw.InlineViewSwitcher). Each declared <adw-view-stack-page>
+// child becomes a toggle in a toggle-group-style bar and a panel in the stack,
+// and exactly one page is visible at a time.
+//
+// Everything that decides WHAT to show is HEADLESS and lives in
+// `@gjsify/adwaita-core` (ADR 0004) — including the TWO INDEX SPACES this widget
+// is built on: a hidden page produces NO toggle, so the compacted toggle index
+// and the page index diverge, and libadwaita reconciles them through the
+// `child-index` it stashes on every toggle (adw-inline-view-switcher.c:346,
+// :114-129, :434-453). `buildInlineToggles` carries both indices, so this file
+// never has to reconcile them itself.
+//
+// What the lift fixed here, all of it C-derived:
+//   - hidden pages were not filtered at all, so the two index spaces collapsed
+//     into one and `AdwViewStackPage:visible` had no spelling (:370-378).
+//   - the display-mode default was 'both'; libadwaita's is 'labels' (:657, :715).
+//   - an unrecognised display-mode value REPLACED the current mode with 'both';
+//     `g_return_if_fail (mode <= …_BOTH)` rejects it and keeps the current one
+//     (:819).
+//   - the icons-mode tooltip used the RAW title, so `title="_Files"` showed the
+//     underscore; C strips the mnemonic when use-underline is set (:180-188).
+//   - a page with no icon rendered no icon; C substitutes `image-missing`
+//     (:137-142) in every mode that builds an image at all.
+//   - `active` was CLAMPED into range instead of refused, `notify::display-mode`
+//     was documented but never dispatched, the page query was unscoped (so a
+//     nested switcher lost its pages to the outer one), and the 500 ms
+//     drag-hover auto-switch did not exist (:80, :194-236).
+//
 // Attributes:
-//   active (zero-based index of the visible page, default 0)
-//   display-mode (labels | icons | both, default both) — what the toggles show
-//   flat / round (mirroring the Adw.InlineViewSwitcher `.flat` / `.round` style
-//     classes, which it inherits from Adw.ToggleGroup)
+//   active — zero-based index of the visible PAGE (not of the toggle). Refused,
+//     never clamped, and reflected back to what actually holds.
+//   display-mode — labels | icons | both (default 'labels'). An unrecognised
+//     value is rejected; removing the attribute restores the default.
+//   flat / round — the Adw.ToggleGroup style classes.
+// Page attributes: name, title, icon-name, hidden (= AdwViewStackPage:visible),
+//   use-underline, badge-number, needs-attention.
 // Events:
-//   `notify::active` (CustomEvent, bubbles, `detail = { active }`) when the
-//     visible page changes — mirrors selecting a page in the paired Adw.ViewStack.
-//   `notify::display-mode` (CustomEvent, bubbles, `detail = { displayMode }`)
-//     when the display mode changes — mirrors the Adw.InlineViewSwitcher
-//     `display-mode` GObject property.
-// Reference: refs/libadwaita/src/adw-inline-view-switcher.c (AdwInlineViewSwitcher behaviour)
-// Reference: refs/libadwaita/src/stylesheet/widgets/_toggle-group.scss (inline-view-switcher > toggle-group)
-// Reference: refs/adwaita-web/adwaita-web/scss/_viewswitcher.scss
+//   `notify::active` (CustomEvent, bubbles,
+//     detail = { active, name, toggleIndex, interactive }) on every selection
+//     change, including the auto-pick.
+//   `notify::display-mode` (CustomEvent, bubbles, detail = { displayMode }).
+// Reference: refs/libadwaita/src/adw-inline-view-switcher.c (AdwInlineViewSwitcher)
+// Reference: refs/libadwaita/src/stylesheet/widgets/_toggle-group.scss
 // Copyright (c) 2023 Maximiliano Sandoval / 2024 GNOME Foundation Inc. (libadwaita). LGPLv2.1+.
 // Modifications: Implemented as a Web Component for @gjsify/adwaita-web.
 
-/** The three display modes, mirroring AdwInlineViewSwitcherDisplayMode. */
-const DISPLAY_MODES = ['labels', 'icons', 'both'] as const;
-type DisplayMode = (typeof DISPLAY_MODES)[number];
+import {
+    INLINE_VIEW_SWITCHER_DISPLAY_MODES,
+    VIEW_SWITCHER_NO_SELECTION,
+    ViewSwitcherState,
+    buildInlineToggles,
+    isInlineViewSwitcherDisplayMode,
+    toggleIndexForPage,
+} from '@gjsify/adwaita-core';
+import type {
+    AdwInlineViewSwitcherDisplayMode,
+    AdwViewSwitcherPage,
+    ViewSwitcherStateChange,
+} from '@gjsify/adwaita-core';
+
+import {
+    applyDescription,
+    applyIndicator,
+    createSwitcherIcon,
+    domViewSwitcherScheduler,
+    readSwitcherPage,
+} from './view-switcher-dom.js';
 
 /** A single page. Children of <adw-inline-view-switcher>; consumed at connect time. */
 export class AdwViewStackPage extends HTMLElement {
     static get observedAttributes() {
-        return ['title', 'icon-name'];
+        return ['name', 'title', 'icon-name', 'badge-number', 'needs-attention', 'use-underline'];
     }
 }
 
 export class AdwInlineViewSwitcher extends HTMLElement {
+    private readonly _state = new ViewSwitcherState({ scheduler: domViewSwitcherScheduler });
     private _groupEl!: HTMLDivElement;
     private _pagesEl!: HTMLDivElement;
+    private _panels: HTMLDivElement[] = [];
     private _toggles: HTMLButtonElement[] = [];
-    private _pages: HTMLDivElement[] = [];
-    private _active = 0;
-    private _displayMode: DisplayMode = 'both';
+    private _displayMode: AdwInlineViewSwitcherDisplayMode = 'labels';
     private _initialized = false;
 
     static get observedAttributes() {
         return ['active', 'display-mode', 'flat', 'round'];
     }
 
-    /** Zero-based index of the visible page. */
+    constructor() {
+        super();
+        this._state.subscribe((change) => this._onStateChange(change));
+    }
+
+    /** Zero-based index of the visible PAGE, `-1` when nothing is selected. */
     get active(): number {
-        return this._active;
+        return this._state.selected;
     }
 
     set active(value: number) {
-        this.setAttribute('active', String(value));
+        this._state.setSelected(value);
+        this._reflectActive();
+    }
+
+    /**
+     * Index of the ACTIVE TOGGLE, `-1` when the visible page has none because it
+     * is hidden — the port-safe `GTK_INVALID_LIST_POSITION`
+     * (adw-inline-view-switcher.c:441-446).
+     */
+    get activeToggle(): number {
+        return toggleIndexForPage(this._state.pages, this._state.selected);
     }
 
     /** What the toggles display: 'labels', 'icons' or 'both'. */
-    get displayMode(): DisplayMode {
+    get displayMode(): AdwInlineViewSwitcherDisplayMode {
         return this._displayMode;
     }
 
-    set displayMode(value: DisplayMode) {
+    set displayMode(value: AdwInlineViewSwitcherDisplayMode) {
         this.setAttribute('display-mode', value);
     }
 
+    /** Name of the visible page, `''` when nothing is selected. */
+    get visibleChildName(): string {
+        return this._state.selectedName;
+    }
+
+    set visibleChildName(name: string | null | undefined) {
+        this._state.selectName(name);
+    }
+
+    /** The resolved page records. */
+    get pages(): readonly AdwViewSwitcherPage[] {
+        return this._state.pages;
+    }
+
+    /**
+     * Show or hide a page. Returns whether the SELECTION moved. Rebuilds the
+     * toggle row, because a hidden page has no toggle at all — C reacts to a
+     * page's `notify::visible` with `recreate_toggles`
+     * (adw-inline-view-switcher.c:425, :471-477).
+     */
+    setPageVisible(name: string, visible: boolean): boolean {
+        const moved = this._state.setPageVisible(name, visible);
+        this._rebuildToggles();
+        return moved;
+    }
+
     connectedCallback() {
         if (this._initialized) return;
-        this._initialized = true;
 
-        // Snapshot the declared <adw-view-stack-page> children before we take
-        // over the subtree — their title / icon-name + content become the
-        // rendered toggles and panels.
-        const pages = Array.from(this.querySelectorAll('adw-view-stack-page')) as AdwViewStackPage[];
+        // `:scope >` rather than a subtree scan — `<adw-view-stack>` uses the
+        // same tag for its pages, so an unscoped query adopted a nested stack's.
+        const declared = Array.from(this.querySelectorAll(':scope > adw-view-stack-page')) as HTMLElement[];
+        const declaredActive = this.getAttribute('active');
 
-        // The switcher bar — a toggle-group of one toggle per page.
         this._groupEl = document.createElement('div');
         this._groupEl.className = 'adw-inline-view-switcher-group';
         this._groupEl.setAttribute('role', 'tablist');
@@ -81,140 +161,171 @@ export class AdwInlineViewSwitcher extends HTMLElement {
         this._pagesEl = document.createElement('div');
         this._pagesEl.className = 'adw-inline-view-switcher-pages';
 
-        this._toggles = [];
-        this._pages = [];
-
-        pages.forEach((page, index) => {
-            const title = page.getAttribute('title') ?? '';
-            const icon = (page.getAttribute('icon-name') ?? '').replace(/-symbolic$/, '');
-
-            const toggle = document.createElement('button');
-            toggle.type = 'button';
-            toggle.className = 'adw-inline-view-switcher-toggle';
-            toggle.setAttribute('role', 'tab');
-            // The toggle stores both title + icon; _render() shows the parts the
-            // current display mode calls for (mirrors libadwaita rebuilding the
-            // toggle child on a display-mode change).
-            toggle.dataset.title = title;
-            toggle.dataset.icon = icon;
-
-            const iconEl = document.createElement('span');
-            iconEl.className = `adw-icon${icon ? ` adw-icon--${icon}` : ''} adw-inline-view-switcher-icon`;
-            iconEl.setAttribute('aria-hidden', 'true'); // decorative (mask-image only)
-            toggle.appendChild(iconEl);
-
-            const labelEl = document.createElement('span');
-            labelEl.className = 'adw-inline-view-switcher-label';
-            labelEl.textContent = title;
-            toggle.appendChild(labelEl);
-
-            toggle.addEventListener('click', () => this._selectIndex(index));
-            this._groupEl.appendChild(toggle);
-            this._toggles.push(toggle);
-
-            // The page content area — the declared element's children are moved
-            // into a panel that the switcher toggles visible.
+        this._panels = declared.map((pageEl) => {
             const panel = document.createElement('div');
             panel.className = 'adw-inline-view-switcher-page';
             panel.setAttribute('role', 'tabpanel');
-            for (const child of Array.from(page.childNodes)) panel.appendChild(child);
+            panel.dataset.name = pageEl.getAttribute('name') ?? '';
+            for (const child of Array.from(pageEl.childNodes)) panel.appendChild(child);
             this._pagesEl.appendChild(panel);
-            this._pages.push(panel);
+            return panel;
         });
 
         this.replaceChildren(this._groupEl, this._pagesEl);
 
-        this._active = this._readActiveAttr();
         this._displayMode = this._readDisplayModeAttr();
-        this._render();
+        this._initialized = true;
+
+        this._state.setPages(declared.map((pageEl) => readSwitcherPage(pageEl)));
+        if (declaredActive !== null) {
+            const index = Number.parseInt(declaredActive, 10);
+            if (!Number.isNaN(index)) this._state.setSelected(index, false);
+        }
+        this._rebuildToggles();
+    }
+
+    disconnectedCallback() {
+        this._state.cancelDrag();
     }
 
     attributeChangedCallback(name: string) {
         if (!this._initialized) return;
         if (name === 'active') {
-            const next = this._readActiveAttr();
-            if (next !== this._active) {
-                this._active = next;
-                this._render();
-            }
+            const raw = this.getAttribute('active');
+            const index = raw === null ? Number.NaN : Number.parseInt(raw, 10);
+            if (!Number.isNaN(index)) this._state.setSelected(index);
+            this._reflectActive();
             return;
         }
         if (name === 'display-mode') {
             const next = this._readDisplayModeAttr();
-            if (next !== this._displayMode) {
-                this._displayMode = next;
-                this._render();
-            }
+            if (next === this._displayMode) return;
+            this._displayMode = next;
+            // C rebuilds every toggle's child on a mode change rather than
+            // toggling visibility on the existing ones (:852-854).
+            this._rebuildToggles();
+            this.dispatchEvent(
+                new CustomEvent('notify::display-mode', { bubbles: true, detail: { displayMode: next } }),
+            );
             return;
         }
         // flat / round are styling-only.
-        this._render();
+        this._applyStyleClasses();
     }
 
-    private _readActiveAttr(): number {
-        const raw = Number.parseInt(this.getAttribute('active') ?? '0', 10);
-        if (Number.isNaN(raw)) return 0;
-        const max = Math.max(0, this._pages.length - 1);
-        return Math.min(Math.max(raw, 0), max);
+    private _readDisplayModeAttr(): AdwInlineViewSwitcherDisplayMode {
+        const raw = this.getAttribute('display-mode');
+        if (raw === null) return 'labels';
+        return isInlineViewSwitcherDisplayMode(raw) ? raw : this._displayMode;
     }
 
-    private _readDisplayModeAttr(): DisplayMode {
-        const raw = this.getAttribute('display-mode') ?? 'both';
-        return (DISPLAY_MODES as readonly string[]).includes(raw) ? (raw as DisplayMode) : 'both';
+    /**
+     * Rebuild the toggle row from the derived models. One node per VISIBLE page,
+     * in compacted order — the structural half of `recreate_toggles`. Selection
+     * alone never lands here: `selection_changed_cb` only sets the active toggle
+     * (adw-inline-view-switcher.c:434-453), and rebuilding mid-drag would drop
+     * the dwell the drag has already armed.
+     */
+    private _rebuildToggles(): void {
+        if (!this._initialized) return;
+
+        const models = buildInlineToggles(this._state.pages, this._displayMode);
+        this._groupEl.replaceChildren();
+        this._toggles = models.map((model) => {
+            const toggle = document.createElement('button');
+            toggle.type = 'button';
+            toggle.className = 'adw-inline-view-switcher-toggle';
+            toggle.setAttribute('role', 'tab');
+            // Both index spaces, so a consumer never has to recompute either.
+            toggle.dataset.pageIndex = String(model.pageIndex);
+            toggle.dataset.toggleIndex = String(model.toggleIndex);
+
+            if (model.showIcon) {
+                toggle.appendChild(createSwitcherIcon(model.iconName, 'adw-inline-view-switcher-icon'));
+            }
+            if (model.showLabel) {
+                const label = document.createElement('span');
+                label.className = 'adw-inline-view-switcher-label';
+                label.textContent = model.label;
+                toggle.appendChild(label);
+            }
+
+            const indicator = document.createElement('span');
+            indicator.className = 'adw-inline-view-switcher-indicator';
+            indicator.setAttribute('aria-hidden', 'true');
+            applyIndicator(indicator, model.badgeLabel, model.needsAttention);
+            toggle.appendChild(indicator);
+
+            if (model.tooltip) toggle.title = model.tooltip;
+            // An icon-only toggle has no visible text; the tooltip is also its
+            // accessible name, which is exactly what C's toggle does.
+            if (!model.showLabel) toggle.setAttribute('aria-label', model.tooltip || model.iconName);
+            applyDescription(toggle, model.description);
+
+            toggle.addEventListener('click', () => {
+                this._state.setSelected(model.pageIndex);
+            });
+            toggle.addEventListener('dragenter', () => this._state.dragEnter(model.pageIndex));
+            toggle.addEventListener('dragleave', () => this._state.dragLeave(model.pageIndex));
+
+            this._groupEl.appendChild(toggle);
+            return toggle;
+        });
+
+        this._render();
     }
 
-    private _selectIndex(index: number): void {
-        if (index === this._active) return;
-        this._active = index;
-        // Keep the attribute in sync without re-entering via the guarded
-        // attributeChangedCallback (value already matches, so it no-ops).
-        this.setAttribute('active', String(index));
+    private _onStateChange(change: ViewSwitcherStateChange): void {
         this._render();
-        this.dispatchEvent(new CustomEvent('notify::active', { bubbles: true, detail: { active: index } }));
+        this.dispatchEvent(
+            new CustomEvent('notify::active', {
+                bubbles: true,
+                detail: {
+                    active: change.selected,
+                    name: change.name,
+                    toggleIndex: this.activeToggle,
+                    interactive: change.interactive,
+                },
+            }),
+        );
     }
 
     private _render(): void {
-        this.classList.toggle('flat', this.hasAttribute('flat'));
-        this.classList.toggle('round', this.hasAttribute('round'));
-
-        // The bar carries the active display mode as a class — mirrors
-        // libadwaita's inline-view-switcher > toggle-group.{labels,icons,both}.
-        for (const mode of DISPLAY_MODES) this._groupEl.classList.toggle(mode, mode === this._displayMode);
+        if (!this._initialized) return;
 
-        const showIcon = this._displayMode !== 'labels';
-        const showLabel = this._displayMode !== 'icons';
+        this._applyStyleClasses();
 
-        this._toggles.forEach((toggle, index) => {
-            const isActive = index === this._active;
+        const activeToggle = this.activeToggle;
+        this._toggles.forEach((toggle, toggleIndex) => {
+            const isActive = toggleIndex === activeToggle && activeToggle !== VIEW_SWITCHER_NO_SELECTION;
             toggle.classList.toggle('active', isActive);
             toggle.setAttribute('aria-selected', String(isActive));
             toggle.tabIndex = isActive ? 0 : -1;
-
-            const iconEl = toggle.querySelector('.adw-inline-view-switcher-icon') as HTMLElement | null;
-            const labelEl = toggle.querySelector('.adw-inline-view-switcher-label') as HTMLElement | null;
-            const hasIcon = (toggle.dataset.icon ?? '').length > 0;
-            const title = toggle.dataset.title ?? '';
-
-            if (iconEl) iconEl.hidden = !showIcon || !hasIcon;
-            if (labelEl) labelEl.hidden = !showLabel || title.length === 0;
-
-            // In icons-only mode the toggle has no visible text — surface the
-            // title as an accessible name + a hover tooltip (the native widget
-            // sets the toggle tooltip to the page title in ICONS mode).
-            if (!showLabel && title) {
-                toggle.setAttribute('aria-label', title);
-                toggle.title = title;
-            } else {
-                toggle.removeAttribute('aria-label');
-                toggle.removeAttribute('title');
-            }
         });
 
-        this._pages.forEach((panel, index) => {
-            const isActive = index === this._active;
+        const selected = this._state.selected;
+        this._panels.forEach((panel, index) => {
+            const isActive = index === selected;
             panel.classList.toggle('active-view', isActive);
             panel.hidden = !isActive;
         });
+
+        this._reflectActive();
+    }
+
+    private _applyStyleClasses(): void {
+        this.classList.toggle('flat', this.hasAttribute('flat'));
+        this.classList.toggle('round', this.hasAttribute('round'));
+        // The group carries the display-mode class, mirroring libadwaita's
+        // inline-view-switcher > toggle-group.{labels,icons,both} (:826-850).
+        for (const mode of INLINE_VIEW_SWITCHER_DISPLAY_MODES) {
+            this._groupEl.classList.toggle(mode, mode === this._displayMode);
+        }
+    }
+
+    private _reflectActive(): void {
+        const current = String(this._state.selected);
+        if (this.getAttribute('active') !== current) this.setAttribute('active', current);
     }
 }