@shoper/phoenix_design_system 1.18.23-1 → 1.18.23-2

package/build/cjs/packages/phoenix/src/components/sheet/sheet.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib_es6 = require('../../../../../external/tslib/tslib.es6.js');
-var utilities = require('@dreamcommerce/utilities');
 var phoenix_light_lit_element = require('../../core/phoenix_light_lit_element/phoenix_light_lit_element.js');
 var phoenix_custom_element = require('../../core/decorators/phoenix_custom_element.js');
 var decorators_js = require('@lit/reactive-element/decorators.js');
@@ -13,6 +12,7 @@ var ref_js = require('lit-html/directives/ref.js');
 var portal_constants = require('../portal/portal_constants.js');
 var backdrop_constants = require('../backdrop/backdrop_constants.js');
 var backdrop_controller = require('../backdrop/controller/backdrop_controller.js');
+var focus_trap_controller = require('../../controllers/focus_trap_controller/focus_trap_controller.js');
 var sheet_constants = require('./sheet_constants.js');
 var sheet_close = require('./sheet_close.js');
 
@@ -24,9 +24,6 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
         this.class = '';
         this.transition = 'scale';
         this.sheetLabel = '';
-        this._firstFocusableElement = undefined;
-        this._focusableElements = null;
-        this._lastFocusableElement = undefined;
         this._focusedToggler = null;
         this._contentRef = ref_js.createRef();
         this._focusSentinelStart = ref_js.createRef();
@@ -34,42 +31,25 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
         this._propsChangeStrategies = {
             [sheet_constants.SHEET_OPENED_PROP]: {
                 true: () => {
-                    const scrollY = window.scrollY;
                     HSheet_1.openSheets = [...HSheet_1.openSheets, this];
                     document.addEventListener('keydown', this._bindCloseOnEsc);
                     document.addEventListener(backdrop_constants.BACKDROP_EVENTS.clicked, this.close);
                     this._dispatchSheetOpenedEvent();
-                    setTimeout(() => {
-                        var _a;
-                        (_a = this._firstFocusableElement) === null || _a === void 0 ? void 0 : _a.focus();
-                        window.scrollTo(0, scrollY);
-                    }, 0);
+                    this._focusTrapController.activate();
                 },
                 false: () => {
                     HSheet_1.openSheets = HSheet_1.openSheets.filter((sheet) => sheet !== this);
                     document.removeEventListener('keydown', this._bindCloseOnEsc);
                     document.removeEventListener(backdrop_constants.BACKDROP_EVENTS.clicked, this.close);
+                    this._focusTrapController.deactivate();
                 }
             }
         };
         this._backdropController = new backdrop_controller.BackdropController();
-        this._keepFocusWithinSheet = (ev) => {
-            var _a;
-            const isTabPressed = ev.code === 'Tab';
-            if (isTabPressed && this._contentRef.value) {
-                if (ev.shiftKey) {
-                    if (document.activeElement === this._firstFocusableElement) {
-                        const focusableElements = utilities.UiDomUtils.getFocusableElements(this._contentRef.value);
-                        (_a = focusableElements[focusableElements.length - 1]) === null || _a === void 0 ? void 0 : _a.focus();
-                        ev.preventDefault();
-                    }
-                }
-                else if (document.activeElement === this._lastFocusableElement) {
-                    utilities.UiDomUtils.setFocusToFirstFocusableElementInContainer(this._contentRef.value);
-                    ev.preventDefault();
-                }
-            }
-        };
+        this._focusTrapController = new focus_trap_controller.FocusTrapController({
+            host: this,
+            getContainer: () => this._contentRef.value
+        });
         this._handleCloseFromCloseComponent = async (ev) => {
             var _a;
             ev.stopPropagation();
@@ -130,7 +110,6 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
             });
         };
         this.hidden = true;
-        this._focusableElements = [...this.querySelectorAll(sheet_constants.FOCUSABLE_ELEMENTS_WITHIN_SHEET)];
     }
     static _appendSheetPortal() {
         const $modalsPortalTarget = document.querySelector(`h-portal-target[name="${sheet_constants.SHEETS_PORTAL_NAME}"]`);
@@ -146,7 +125,6 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
     connectedCallback() {
         super.connectedCallback();
         HSheet_1._appendSheetPortal();
-        document.addEventListener('keyup', this._keepFocusWithinSheet);
         document.addEventListener(sheet_constants.SHEET_EVENTS.close, this._handleCloseFromCloseComponent);
     }
     disconnectedCallback() {
@@ -155,28 +133,16 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
             this.close();
         document.removeEventListener(sheet_constants.SHEET_EVENTS.close, this._handleCloseFromCloseComponent);
         document.removeEventListener('keydown', this._bindCloseOnEsc);
-        document.removeEventListener('keyup', this._keepFocusWithinSheet);
     }
     firstUpdated(props) {
         super.firstUpdated(props);
-        this._firstFocusableElement = this._focusSentinelStart.value;
-        this._lastFocusableElement = this._focusSentinelEnd.value;
+        this._focusTrapController.setSentinels(this._focusSentinelStart.value, this._focusSentinelEnd.value);
     }
     updated(changedProps) {
         if (changedProps.has(sheet_constants.SHEET_OPENED_PROP)) {
             this._propsChangeStrategies[sheet_constants.SHEET_OPENED_PROP][String(this[sheet_constants.SHEET_OPENED_PROP])]();
         }
     }
-    _setFocusToFirstFocusableElementInSheetOrCloseBtn() {
-        requestAnimationFrame(() => {
-            if (this._contentRef.value) {
-                const focusableElements = utilities.UiDomUtils.getFocusableElements(this._contentRef.value);
-                if (focusableElements.length > 0) {
-                    focusableElements.length > 1 ? focusableElements[1].focus() : focusableElements[0].focus();
-                }
-            }
-        });
-    }
     async open() {
         this._focusedToggler = document.activeElement;
         return new Promise((resolve) => {
@@ -192,7 +158,7 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
                 setTimeout(() => {
                     var _a;
                     (_a = this._contentRef.value) === null || _a === void 0 ? void 0 : _a.classList.remove(`sheet_show-${this.transition}-start`, `sheet_show-${this.transition}-end`);
-                    this._setFocusToFirstFocusableElementInSheetOrCloseBtn();
+                    this._focusTrapController.focusFirst();
                     resolve();
                 }, transitionDuration);
             });
@@ -245,18 +211,6 @@ tslib_es6.__decorate([
     decorators_js.property({ type: String, attribute: 'sheet-label' }),
     tslib_es6.__metadata("design:type", Object)
 ], exports.HSheet.prototype, "sheetLabel", void 0);
-tslib_es6.__decorate([
-    decorators_js.state(),
-    tslib_es6.__metadata("design:type", Object)
-], exports.HSheet.prototype, "_firstFocusableElement", void 0);
-tslib_es6.__decorate([
-    decorators_js.state(),
-    tslib_es6.__metadata("design:type", Object)
-], exports.HSheet.prototype, "_focusableElements", void 0);
-tslib_es6.__decorate([
-    decorators_js.state(),
-    tslib_es6.__metadata("design:type", Object)
-], exports.HSheet.prototype, "_lastFocusableElement", void 0);
 exports.HSheet = HSheet_1 = tslib_es6.__decorate([
     phoenix_custom_element.phoenixCustomElement('h-sheet'),
     tslib_es6.__metadata("design:paramtypes", [])

package/build/cjs/packages/phoenix/src/components/sheet/sheet.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/sheet/sheet_constants.js

@@ -9,10 +9,8 @@ const SHEET_EVENTS = {
     opened: 'opened',
     closed: 'closed'
 };
-const SHEET_OPENED_PROP = 'opened';
-const FOCUSABLE_ELEMENTS_WITHIN_SHEET = 'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+const SHEET_OPENED_PROP = 'opened';
 
-exports.FOCUSABLE_ELEMENTS_WITHIN_SHEET = FOCUSABLE_ELEMENTS_WITHIN_SHEET;
 exports.SHEETS_PORTAL_NAME = SHEETS_PORTAL_NAME;
 exports.SHEET_EVENTS = SHEET_EVENTS;
 exports.SHEET_OPENED_PROP = SHEET_OPENED_PROP;

package/build/cjs/packages/phoenix/src/components/sheet/sheet_constants.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/controllers/focus_trap_controller/focus_trap_controller.js

@@ -0,0 +1,200 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib_es6 = require('../../../../../external/tslib/tslib.es6.js');
+require('lit');
+var utilities = require('@dreamcommerce/utilities');
+
+var _FocusTrapController_getContainer, _FocusTrapController_getToggler, _FocusTrapController_cyclicKeydown, _FocusTrapController_active, _FocusTrapController_sentinelStart, _FocusTrapController_sentinelEnd;
+class FocusTrapController {
+    constructor({ host, getContainer, noAutofocus = false, getToggler, cyclicKeydown = false }) {
+        _FocusTrapController_getContainer.set(this, void 0);
+        _FocusTrapController_getToggler.set(this, void 0);
+        _FocusTrapController_cyclicKeydown.set(this, void 0);
+        _FocusTrapController_active.set(this, false);
+        _FocusTrapController_sentinelStart.set(this, void 0);
+        _FocusTrapController_sentinelEnd.set(this, void 0);
+        // ─── Sentinel mode ───────────────────────────────────────────────────────
+        this._handleSentinelModeKeyUp = (ev) => {
+            var _a;
+            if (!tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_active, "f") || ev.code !== 'Tab')
+                return;
+            const container = tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getContainer, "f").call(this);
+            if (!container)
+                return;
+            if (ev.shiftKey) {
+                if (document.activeElement === tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_sentinelStart, "f")) {
+                    const focusableElements = this._getFocusableElements(container);
+                    (_a = focusableElements[focusableElements.length - 1]) === null || _a === void 0 ? void 0 : _a.focus();
+                    ev.preventDefault();
+                }
+            }
+            else if (document.activeElement === tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_sentinelEnd, "f")) {
+                utilities.UiDomUtils.setFocusToFirstFocusableElementInContainer(container);
+                ev.preventDefault();
+            }
+        };
+        // ─── Cyclic keydown mode ─────────────────────────────────────────────────
+        //
+        // No sentinel elements. Tab past the last focusable element wraps to the
+        // first; Shift+Tab past the first wraps to the last. Uses keydown +
+        // preventDefault so the browser never moves focus outside the container.
+        this._handleCyclicKeyDown = (ev) => {
+            if (!tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_active, "f") || ev.code !== 'Tab')
+                return;
+            const container = tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getContainer, "f").call(this);
+            if (!container)
+                return;
+            const focusableElements = this._getFocusableElements(container);
+            if (focusableElements.length === 0)
+                return;
+            const $target = ev.target;
+            if (ev.shiftKey) {
+                if ($target === focusableElements[0]) {
+                    ev.preventDefault();
+                    focusableElements[focusableElements.length - 1].focus();
+                }
+            }
+            else {
+                if ($target === focusableElements[focusableElements.length - 1]) {
+                    ev.preventDefault();
+                    focusableElements[0].focus();
+                }
+            }
+        };
+        // ─── Toggler mode ────────────────────────────────────────────────────────
+        //
+        // Cycle: toggler → content[0] → … → content[last] → toggler (and reverse).
+        // Uses keydown + preventDefault so the browser never moves focus on its own.
+        this._handleTogglerModeKeyDown = (ev) => {
+            var _a;
+            if (!tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_active, "f") || ev.code !== 'Tab')
+                return;
+            const container = tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getContainer, "f").call(this);
+            const toggler = (_a = tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getToggler, "f")) === null || _a === void 0 ? void 0 : _a.call(this);
+            if (!container || !toggler)
+                return;
+            const $target = ev.target;
+            const focusableElements = this._getFocusableElements(container);
+            if (ev.shiftKey) {
+                // Shift+Tab on toggler → last content element
+                if (toggler.contains($target)) {
+                    const last = focusableElements[focusableElements.length - 1];
+                    if (!last)
+                        return;
+                    ev.preventDefault();
+                    last.focus();
+                    return;
+                }
+                // Shift+Tab on first content element → toggler
+                if ($target === focusableElements[0]) {
+                    ev.preventDefault();
+                    toggler.focus();
+                }
+            }
+            else {
+                // Tab on toggler → first content element
+                if (toggler.contains($target)) {
+                    const first = focusableElements[0];
+                    if (!first)
+                        return;
+                    ev.preventDefault();
+                    first.focus();
+                    return;
+                }
+                // Tab on last content element → toggler
+                if ($target === focusableElements[focusableElements.length - 1]) {
+                    ev.preventDefault();
+                    toggler.focus();
+                }
+            }
+        };
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_getContainer, getContainer, "f");
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_getToggler, getToggler, "f");
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_cyclicKeydown, cyclicKeydown, "f");
+        this.noAutofocus = noAutofocus;
+        host.addController(this);
+    }
+    hostConnected() {
+        if (tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_cyclicKeydown, "f")) {
+            document.addEventListener('keydown', this._handleCyclicKeyDown);
+        }
+        else if (tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getToggler, "f")) {
+            document.addEventListener('keydown', this._handleTogglerModeKeyDown);
+        }
+        else {
+            document.addEventListener('keyup', this._handleSentinelModeKeyUp);
+        }
+    }
+    hostDisconnected() {
+        if (tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_cyclicKeydown, "f")) {
+            document.removeEventListener('keydown', this._handleCyclicKeyDown);
+        }
+        else if (tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getToggler, "f")) {
+            document.removeEventListener('keydown', this._handleTogglerModeKeyDown);
+        }
+        else {
+            document.removeEventListener('keyup', this._handleSentinelModeKeyUp);
+        }
+    }
+    /** Sentinel mode only: call once in firstUpdated with the two bookend elements. */
+    setSentinels(start, end) {
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_sentinelStart, start, "f");
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_sentinelEnd, end, "f");
+    }
+    activate() {
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_active, true, "f");
+        // Sentinel mode: move focus to sentinelStart to prime the trap.
+        if (!tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getToggler, "f") && !this.noAutofocus) {
+            const scrollY = window.scrollY;
+            setTimeout(() => {
+                var _a;
+                (_a = tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_sentinelStart, "f")) === null || _a === void 0 ? void 0 : _a.focus();
+                window.scrollTo(0, scrollY);
+            }, 0);
+        }
+    }
+    deactivate() {
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_active, false, "f");
+    }
+    /**
+     * Sentinel mode: move focus to the first real interactive element after the
+     * open transition completes (skips sentinelStart at index 0).
+     */
+    focusFirst() {
+        if (this.noAutofocus)
+            return;
+        requestAnimationFrame(() => {
+            const container = tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_getContainer, "f").call(this);
+            if (!container)
+                return;
+            const focusableElements = this._getFocusableElements(container);
+            if (focusableElements.length > 0) {
+                focusableElements.length > 1 ? focusableElements[1].focus() : focusableElements[0].focus();
+            }
+        });
+    }
+    _getFocusableElements(container) {
+        return utilities.UiDomUtils.getFocusableElements(container).filter(($el) => this._isElementTrulyFocusable($el));
+    }
+    getFocusableElements(container) {
+        return this._getFocusableElements(container);
+    }
+    _isElementTrulyFocusable($el) {
+        const style = window.getComputedStyle($el);
+        if (style.display === 'none' || style.visibility === 'hidden') {
+            return false;
+        }
+        if ($el.nodeName === 'H-PORTAL')
+            return true;
+        const $parent = $el.parentElement;
+        if (!$parent)
+            return true;
+        return this._isElementTrulyFocusable($parent);
+    }
+}
+_FocusTrapController_getContainer = new WeakMap(), _FocusTrapController_getToggler = new WeakMap(), _FocusTrapController_cyclicKeydown = new WeakMap(), _FocusTrapController_active = new WeakMap(), _FocusTrapController_sentinelStart = new WeakMap(), _FocusTrapController_sentinelEnd = new WeakMap();
+
+exports.FocusTrapController = FocusTrapController;
+//# sourceMappingURL=focus_trap_controller.js.map

package/build/cjs/packages/phoenix/src/controllers/focus_trap_controller/focus_trap_controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/esm/packages/phoenix/src/components/dropdown/dropdown.d.ts

@@ -26,6 +26,7 @@ export declare class HDropdown extends PhoenixLightLitElement implements IDropdo
     private _dropdownContentChildrenHeight;
     private _hasScrollableClassInitially;
     private _backdropController;
+    private _focusTrapController;
     constructor();
     connectedCallback(): Promise<void>;
     private static _appendDropdownPortal;
@@ -45,14 +46,8 @@ export declare class HDropdown extends PhoenixLightLitElement implements IDropdo
     private _closeDropdownOnEscape;
     private _keepFocusWithinDropdownForwards;
     private _handleFocusOnNextElementAfterDropdown;
-    private _handleFocusFromTogglerForwards;
-    private _handleFocusFromSentinelEndForwards;
     private _keepFocusWithinDropdownBackwards;
     private _handleDefaultFocusFromDropdownBackwards;
-    private _handleFocusFromTogglerBackwards;
-    private _handleFocusFromSentinelStartBackwards;
-    private _getTrulyFocusableElements;
-    private _isElementTrulyFocusable;
     private _hoverToggle;
     private _isHoveredWithinDropdown;
     private _focusOnFirstContentElement;

package/build/esm/packages/phoenix/src/components/dropdown/dropdown.js

@@ -12,6 +12,7 @@ import v4 from '../../../../../external/uuid/dist/esm-browser/v4.js';
 import { PORTAL_TARGET_COMPONENT_NAME, PORTAL_TARGET_NAME_PROP } from '../portal/portal_constants.js';
 import { BackdropController } from '../backdrop/controller/backdrop_controller.js';
 import { ClickOutsideController } from '../../controllers/click_outside_controller/click_outside_controller.js';
+import { FocusTrapController } from '../../controllers/focus_trap_controller/focus_trap_controller.js';
 import throttle_1 from '../../../../../external/lodash/throttle.js';
 import { RelativePositionController } from '../../controllers/relative_position_controller/relative_position_controller.js';
 
@@ -30,6 +31,11 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
         this.preventFocusTrap = false;
         this.noAutoFocus = false;
         this._backdropController = new BackdropController();
+        this._focusTrapController = new FocusTrapController({
+            host: this,
+            getContainer: () => { var _a; return (_a = this.$dropdownContent) !== null && _a !== void 0 ? _a : undefined; },
+            getToggler: () => this.$dropdownToggler
+        });
         this._handleClickOutside = async (target) => {
             var _a, _b;
             if (!this.opened)
@@ -67,6 +73,8 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
                         this._dispatchShowDropdownEvent();
                         (_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.classList.remove(`${DROPDOWN_CONTENT_CSS_CLASSES.show}-${this.transition}-start`, `${DROPDOWN_CONTENT_CSS_CLASSES.show}-${this.transition}-end`);
                         this._toggleScroll();
+                        if (!this.preventFocusTrap)
+                            this._focusTrapController.activate();
                         resolve();
                     }, transitionDuration);
                 });
@@ -107,6 +115,7 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
                         var _a;
                         (_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.classList.remove(`${DROPDOWN_CONTENT_CSS_CLASSES.hide}-${this.transition}-start`, `${DROPDOWN_CONTENT_CSS_CLASSES.hide}-${this.transition}-end`);
                         this.opened = false;
+                        this._focusTrapController.deactivate();
                         this._dispatchHideDropdownEvent();
                         resolve();
                     }, transitionDuration);
@@ -138,31 +147,16 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
             await this.hide();
         };
         this._keepFocusWithinDropdownForwards = (ev) => {
-            var _a, _b;
-            if (ev.shiftKey === true || !this.$dropdownContent || !this.opened)
+            if (ev.shiftKey || !this.$dropdownContent || !this.opened || !this.preventFocusTrap)
                 return;
-            const $target = ev.target;
-            if (((_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.contains($target)) && this.preventFocusTrap) {
+            if (this.$dropdownContent.contains(ev.target)) {
                 this._handleFocusOnNextElementAfterDropdown(ev);
-                return;
             }
-            if ((_b = this.$dropdownToggler) === null || _b === void 0 ? void 0 : _b.contains($target)) {
-                this._handleFocusFromTogglerForwards(ev);
-                return;
-            }
-            this._handleFocusFromSentinelEndForwards(ev, $target);
         };
         this._keepFocusWithinDropdownBackwards = (ev) => {
-            if (!this.opened || !this.$dropdownContent)
+            if (!this.opened || !this.$dropdownContent || !this.preventFocusTrap)
                 return;
-            const $target = ev.target;
-            if (this.preventFocusTrap) {
-                this._handleDefaultFocusFromDropdownBackwards(ev);
-            }
-            else {
-                this._handleFocusFromTogglerBackwards(ev, $target);
-                this._handleFocusFromSentinelStartBackwards(ev, $target);
-            }
+            this._handleDefaultFocusFromDropdownBackwards(ev);
         };
         this._hoverToggle = async (ev) => {
             if (window.innerWidth < BREAKPOINTS.xs)
@@ -184,7 +178,7 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
         this._focusOnFirstContentElement = () => {
             if (!this.$dropdownContent)
                 return;
-            const $firstFocusableElement = this._getTrulyFocusableElements(this.$dropdownContent)[0];
+            const $firstFocusableElement = this._focusTrapController.getFocusableElements(this.$dropdownContent)[0];
             if ($firstFocusableElement)
                 $firstFocusableElement.focus();
         };
@@ -302,68 +296,11 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
         UiDomUtils.getNextFocusableElement(this.$dropdownToggler || this).focus();
         return;
     }
-    _handleFocusFromTogglerForwards(ev) {
-        if (!this.$dropdownContent)
-            return;
-        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
-        if (trulyFocusableElements.length === 0)
-            return;
-        ev.preventDefault();
-        trulyFocusableElements[0].focus();
-    }
-    _handleFocusFromSentinelEndForwards(ev, $target) {
-        var _a;
-        if (!this.$dropdownContent)
-            return;
-        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
-        const $lastFocusableElement = trulyFocusableElements.slice(-1)[0];
-        if ($target !== $lastFocusableElement)
-            return;
-        ev.preventDefault();
-        (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
-    }
     _handleDefaultFocusFromDropdownBackwards(ev) {
         ev.preventDefault();
         this.hide();
         UiDomUtils.getPreviousFocusableElement(this.$dropdownToggler || this).focus();
     }
-    _handleFocusFromTogglerBackwards(ev, $target) {
-        var _a;
-        if ($target !== this.$dropdownToggler && !((_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.contains($target)) || !this.$dropdownContent)
-            return;
-        ev.preventDefault();
-        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
-        if (trulyFocusableElements.length === 0)
-            return;
-        const $lastFocusableElement = trulyFocusableElements.slice(-1)[0];
-        $lastFocusableElement.focus();
-    }
-    _handleFocusFromSentinelStartBackwards(ev, $target) {
-        var _a;
-        if (!this.$dropdownContent)
-            return;
-        const $firstFocusableElement = this._getTrulyFocusableElements(this.$dropdownContent)[0];
-        if ($target !== $firstFocusableElement)
-            return;
-        ev.preventDefault();
-        (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
-    }
-    _getTrulyFocusableElements($container) {
-        const focusableElements = UiDomUtils.getFocusableElements($container);
-        return focusableElements.filter(($el) => this._isElementTrulyFocusable($el));
-    }
-    _isElementTrulyFocusable($el) {
-        const style = window.getComputedStyle($el);
-        if (style.display === 'none' || style.visibility === 'hidden') {
-            return false;
-        }
-        if ($el.nodeName === 'H-PORTAL')
-            return true;
-        const $parent = $el.parentElement;
-        if (!$parent)
-            return true;
-        return this._isElementTrulyFocusable($parent);
-    }
     _isHoveredWithinDropdown(element) {
         var _a;
         if (element === this)

package/build/esm/packages/phoenix/src/components/dropdown/dropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,4CAAgD;AACvF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,qDAAyD;AACxE;AACA;AACA;AACA,uBAAuB,4CAAgD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,4CAAgD;AACvF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,qDAAyD;AACxE;AACA;AACA;AACA;AACA,uBAAuB,4CAAgD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/esm/packages/phoenix/src/components/form/search/search.d.ts

@@ -19,7 +19,9 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _togglerElement;
     private _id;
     private _openSearchButtonAriaLabelId;
+    private _searchIconId;
     private _searchContentContainerId;
+    private _mobileFocusTrapController;
     private _searchResultsRef;
     private _searchHistoryRef;
     private _searchMessageRef;
@@ -81,6 +83,8 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _isSuggesterLayerVisible;
     private _preventSubmitOnSearchClear;
     private _resetSearchOnFocusOutside;
+    private _activateMobileDialog;
+    private _deactivateMobileDialog;
     private _setupAriaAttributes;
     private _handleOpenSearch;
     private _handleOpenSearchWithKeyboard;