@shoper/phoenix_design_system 1.11.11-6 → 1.11.11-8

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

@@ -6,8 +6,9 @@ import { property } from '@lit/reactive-element/decorators.js';
 import { KeystrokesController } from '../../controllers/keystrokes_controller/keystrokes_controller.js';
 import { html } from 'lit-html';
 import { BREAKPOINTS, SCROLLABLE_CLASS_NAME } from '../../global_constants.js';
-import { DEFAULT_DROPDOWN_PORTAL_NAME, DROPDOWN_CONTENT_CSS_CLASSES, DROPDOWN_EVENTS, DROPDOWN_CONTAINER_NAME, DROPDOWN_CONTENT_NAME, DROPDOWN_CONTENT_WIDTH, DROPDOWN_TOGGLER_NAME } from './dropdown_constants.js';
+import { DEFAULT_DROPDOWN_PORTAL_NAME, DROPDOWN_CONTENT_CSS_CLASSES, DROPDOWN_EVENTS, DROPDOWN_CONTAINER_NAME, DROPDOWN_CONTENT_WIDTH, DROPDOWN_CONTENT_NAME, DROPDOWN_TOGGLER_NAME } from './dropdown_constants.js';
 import { RELATIVE_POSITION_CONTROLLER_EVENTS, DEFAULT_THROTTLE_WAIT_TIME } from '../../controllers/relative_position_controller/relative_position_controller_constants.js';
+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';
@@ -25,6 +26,8 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
         this.transition = 'direction';
         this.offset = 0;
         this.portalTarget = DEFAULT_DROPDOWN_PORTAL_NAME;
+        this.id = v4();
+        this.preventFocusTrap = false;
         this._backdropController = new BackdropController();
         this._handleClickOutside = async (target) => {
             var _a, _b;
@@ -41,7 +44,7 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
                 return;
             }
             await this.show();
-            UiDomUtils.setFocusToFirstFocusableElementInContainer(this.$dropdownContent);
+            this._focusOnFirstContentElement();
         };
         this.show = async () => {
             if (this.opened)
@@ -132,44 +135,26 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
                 return;
             await this.hide();
         };
-        this._handleForwardFocus = async (ev) => {
-            // if (!this.opened) this._handleFocusOnNextElement(ev);
-            if (!this.opened || ev.shiftKey)
+        this._keepFocusWithinDropdownForwards = (ev) => {
+            if (ev.shiftKey === true || !this.$dropdownContent)
                 return;
-            const $focusableElementsWithinDropdownContent = UiDomUtils.getFocusableElements(this.$dropdownContent).filter((element) => element.closest(DROPDOWN_CONTENT_NAME) === this.$dropdownContent);
-            const doesNotHaveFocusableElementsInsideContent = $focusableElementsWithinDropdownContent.length <= 0 && this.opened;
-            const indexOfCurrentlyFocusedElement = $focusableElementsWithinDropdownContent.indexOf(document.activeElement);
-            const isActiveElementLastFocusableElement = indexOfCurrentlyFocusedElement === $focusableElementsWithinDropdownContent.length - 1;
-            if (doesNotHaveFocusableElementsInsideContent || isActiveElementLastFocusableElement)
-                this._handleFocusOnNextElement(ev);
-        };
-        this._handleFocusOnNextElement = async (ev) => {
-            var _a;
-            ev.preventDefault();
-            const $focusableElements = UiDomUtils.getFocusableElements(document.body);
-            const indexOfDropdownToggler = $focusableElements.indexOf(this.$dropdownToggler);
-            const $nextElementToFocus = (_a = $focusableElements[indexOfDropdownToggler + 1]) !== null && _a !== void 0 ? _a : $focusableElements[0];
-            await this._hideDropdownsSequentially();
-            await this.hide();
-            this._focusOnNextElementAfterToggler($nextElementToFocus);
-        };
-        this._focusOnNextElementAfterToggler = ($elementToFocus) => {
-            var _a;
-            const isTogglerLastChildOfPreviousDropdown = ($elementToFocus === null || $elementToFocus === void 0 ? void 0 : $elementToFocus.closest(DROPDOWN_CONTENT_NAME)) === this.$dropdownContent;
-            if (isTogglerLastChildOfPreviousDropdown) {
-                (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
+            const $target = ev.target;
+            this._handleFocusFromTogglerForwards(ev);
+            if (!$target.contains(document.activeElement) || !this.opened || !this.$dropdownContent)
                 return;
-            }
-            $elementToFocus === null || $elementToFocus === void 0 ? void 0 : $elementToFocus.focus();
+            this._handleFocusFromSentinelEndForwards(ev, $target);
         };
-        this._handleBackwardFocus = async (ev) => {
-            var _a;
-            const $firstFocusableElement = this.$dropdownContent && UiDomUtils.getFocusableElement(this.$dropdownContent);
-            if (document.activeElement !== $firstFocusableElement)
+        this._keepFocusWithinDropdownBackwards = (ev) => {
+            if (!this.opened || !this.$dropdownContent)
                 return;
-            ev.preventDefault();
-            (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
-            await this._hideDropdownsSequentially();
+            const $target = ev.target;
+            if (this.preventFocusTrap) {
+                this._handleDefaultFocusFromDropdownBackwards(ev);
+            }
+            else {
+                this._handleFocusFromTogglerBackwards(ev, $target);
+                this._handleFocusFromSentinelStartBackwards(ev, $target);
+            }
         };
         this._hoverToggle = async (ev) => {
             if (window.innerWidth < BREAKPOINTS.xs)
@@ -181,12 +166,19 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
             const isHoveredWithinDropdown = this._isHoveredWithinDropdown(ev.target);
             if (isHoveredWithinDropdown && !this.opened) {
                 await this.show();
-                UiDomUtils.setFocusToFirstFocusableElementInContainer(this.$dropdownContent);
+                this._focusOnFirstContentElement();
                 return;
             }
             if (!isHoveredWithinDropdown && this.opened)
                 await this._hideDropdownsSequentially();
         };
+        this._focusOnFirstContentElement = () => {
+            if (!this.$dropdownContent)
+                return;
+            const $firstFocusableElement = this._getTrulyFocusableElements(this.$dropdownContent)[0];
+            if ($firstFocusableElement)
+                $firstFocusableElement.focus();
+        };
         this.isOpened = () => this.opened;
         this._positionDropdownContent = () => {
             if (this.contentWidth === DROPDOWN_CONTENT_WIDTH.full)
@@ -212,13 +204,14 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
             host: this,
             target: document.body,
             keys: ['tab'],
-            callback: this._handleForwardFocus
+            callback: this._keepFocusWithinDropdownForwards
         });
         new KeystrokesController({
             host: this,
             target: document.body,
             keys: [['shift', 'tab']],
-            callback: this._handleBackwardFocus
+            callback: this._keepFocusWithinDropdownBackwards,
+            containerSelectors: ['h-dropdown', 'h-dropdown-content']
         });
     }
     async connectedCallback() {
@@ -294,6 +287,77 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
             (_b = this.$dropdownContent) === null || _b === void 0 ? void 0 : _b.classList.add(SCROLLABLE_CLASS_NAME);
         }
     }
+    _handleFocusFromTogglerForwards(ev) {
+        if (!this.$dropdownContent)
+            return;
+        ev.preventDefault();
+        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
+        if (trulyFocusableElements.length === 0)
+            return;
+        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 (this.preventFocusTrap && document.activeElement) {
+            const $nextFocusableElement = UiDomUtils.getNextFocusableElement(document.activeElement);
+            if ($nextFocusableElement === $lastFocusableElement || trulyFocusableElements.length === 1) {
+                ev.preventDefault();
+                this.hide();
+                UiDomUtils.getNextFocusableElement(this.$dropdownToggler || this).focus();
+            }
+            return;
+        }
+        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)
@@ -317,6 +381,8 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
             return;
         if (!this._hasScrollableClassInitially)
             this._hasScrollableClassInitially = this.$dropdownContent.classList.contains(SCROLLABLE_CLASS_NAME);
+        if (!this.preventFocusTrap)
+            this.$dropdownContent.setAttribute('aria-modal', 'true');
     }
     _getDropdownContentWidth() {
         const isMobileResolution = document.documentElement.clientWidth < BREAKPOINTS.xs;
@@ -385,6 +451,14 @@ __decorate([
     property({ type: String, attribute: 'mobile-position' }),
     __metadata("design:type", String)
 ], HDropdown.prototype, "mobilePosition", void 0);
+__decorate([
+    property({ type: String, attribute: 'id', reflect: true }),
+    __metadata("design:type", Object)
+], HDropdown.prototype, "id", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'prevent-focus-trap' }),
+    __metadata("design:type", Object)
+], HDropdown.prototype, "preventFocusTrap", void 0);
 HDropdown = HDropdown_1 = __decorate([
     phoenixCustomElement('h-dropdown'),
     __metadata("design:paramtypes", [])

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;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;"}
+{"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;"}

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

@@ -1,8 +1,6 @@
-import { TemplateResult } from 'lit';
 import { PhoenixLightLitElement } from "../../core/phoenix_light_lit_element/phoenix_light_lit_element";
 export declare class HDropdownContent extends PhoenixLightLitElement {
     name: string;
     constructor();
     connectedCallback(): void;
-    protected render(): TemplateResult;
 }

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

@@ -1,5 +1,4 @@
 import { __decorate, __metadata } from '../../../../../external/tslib/tslib.es6.js';
-import { html } from 'lit';
 import { property } from 'lit/decorators';
 import { PhoenixLightLitElement } from '../../core/phoenix_light_lit_element/phoenix_light_lit_element.js';
 import { phoenixCustomElement } from '../../core/decorators/phoenix_custom_element.js';
@@ -19,10 +18,6 @@ let HDropdownContent = class HDropdownContent extends PhoenixLightLitElement {
             element.setAttribute('role', 'menuitem');
         });
     }
-    render() {
-        super.render();
-        return html ` <div role="dialog">${this.getSlot('content')}</div> `;
-    }
 };
 __decorate([
     property({ type: String }),

package/build/esm/packages/phoenix/src/components/dropdown/dropdown_content.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;AACA;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;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_toggler.d.ts

@@ -6,9 +6,8 @@ export declare class HDropdownToggler extends PhoenixLightLitElement {
     private _$dropdown;
     constructor();
     connectedCallback(): void;
+    private _setupTogglerAria;
     private _dispatchToggleDropdownEventWithKeyboard;
     private _dispatchToggleDropdownEventOnMobile;
     private _dispatchToggleDropdownEvent;
-    private _handleFocusToOpenedDropdown;
-    disconnectedCallback(): void;
 }

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

@@ -1,17 +1,28 @@
 import { __decorate, __metadata } from '../../../../../external/tslib/tslib.es6.js';
 import { property } from 'lit/decorators';
-import { UiDomUtils } from '@dreamcommerce/utilities';
+import '@dreamcommerce/utilities';
 import { PhoenixLightLitElement } from '../../core/phoenix_light_lit_element/phoenix_light_lit_element.js';
 import { phoenixCustomElement } from '../../core/decorators/phoenix_custom_element.js';
 import { BtnController } from '../../controllers/btn_controller/btn_controller.js';
 import { BREAKPOINTS } from '../../global_constants.js';
-import { DROPDOWN_EVENTS, DROPDOWN_CONTENT_NAME, DROPDOWN_CSS_CLASSES, DROPDOWN_CONTAINER_NAME, DROPDOWN_TOGGLE_ON_HOVER_ATTRIBUTE_NAME } from './dropdown_constants.js';
+import { DROPDOWN_CONTAINER_NAME, DROPDOWN_EVENTS, DROPDOWN_CSS_CLASSES, DROPDOWN_TOGGLE_ON_HOVER_ATTRIBUTE_NAME } from './dropdown_constants.js';
 import { ToggleElementAriaController } from '../../controllers/toggle_element_aria_controller/toggle_element_aria_controller.js';
 
 let HDropdownToggler = class HDropdownToggler extends PhoenixLightLitElement {
     constructor() {
         super();
         this.name = '';
+        this._setupTogglerAria = () => {
+            this._$dropdown = this.closest(DROPDOWN_CONTAINER_NAME);
+            if (this._$dropdown.isOpened)
+                this._toggleElementAriaController = new ToggleElementAriaController({
+                    host: this,
+                    initialAriaExpandedValue: this._$dropdown.isOpened()
+                });
+            this.setAttribute('aria-haspopup', 'true');
+            if (this._$dropdown.id)
+                this.setAttribute('aria-controls', this._$dropdown.id);
+        };
         this._dispatchToggleDropdownEventWithKeyboard = (ev) => {
             ev.stopImmediatePropagation();
             this._dispatchToggleDropdownEvent(ev);
@@ -25,18 +36,6 @@ let HDropdownToggler = class HDropdownToggler extends PhoenixLightLitElement {
             ev.preventDefault();
             this.emitCustomEvent(DROPDOWN_EVENTS.toggle);
         };
-        this._handleFocusToOpenedDropdown = async (ev) => {
-            if (ev.target !== this)
-                return;
-            const isOpened = this._$dropdown.isOpened();
-            if (!isOpened)
-                return;
-            const $dropdownContent = document.querySelector(`${DROPDOWN_CONTENT_NAME}[name="${this.name}"]`);
-            if (!$dropdownContent)
-                return;
-            ev.preventDefault();
-            UiDomUtils.setFocusToFirstFocusableElementInContainer($dropdownContent);
-        };
         this.slot = this.hasAttribute('slot') ? this.slot : 'toggler';
         this.className = `${DROPDOWN_CSS_CLASSES.toggler} ${this.className}`;
     }
@@ -44,13 +43,7 @@ let HDropdownToggler = class HDropdownToggler extends PhoenixLightLitElement {
         var _a;
         super.connectedCallback();
         this._btnController = new BtnController(this, this._dispatchToggleDropdownEventWithKeyboard);
-        this._$dropdown = this.closest(DROPDOWN_CONTAINER_NAME);
-        if (this._$dropdown.isOpened)
-            this._toggleElementAriaController = new ToggleElementAriaController({
-                host: this,
-                initialAriaExpandedValue: this._$dropdown.isOpened()
-            });
-        document.addEventListener('keydown', this._handleFocusToOpenedDropdown);
+        this._setupTogglerAria();
         const hasToggleOnHover = (_a = this._$dropdown) === null || _a === void 0 ? void 0 : _a.hasAttribute(DROPDOWN_TOGGLE_ON_HOVER_ATTRIBUTE_NAME);
         if (hasToggleOnHover) {
             this.addEventListener('click', this._dispatchToggleDropdownEventOnMobile);
@@ -58,10 +51,6 @@ let HDropdownToggler = class HDropdownToggler extends PhoenixLightLitElement {
         }
         this.addEventListener('click', this._dispatchToggleDropdownEvent);
     }
-    disconnectedCallback() {
-        super.disconnectedCallback();
-        document.removeEventListener('keydown', this._handleFocusToOpenedDropdown);
-    }
 };
 __decorate([
     property({ type: String, reflect: true }),

package/build/esm/packages/phoenix/src/components/dropdown/dropdown_toggler.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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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

@@ -12,12 +12,8 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _searchContextObserver;
     private _searchInput;
     private _inputField;
-    private _searchForm;
-    private _id;
-    private _searchContentContainerId;
     private _searchResultsRef;
     private _searchHistoryRef;
-    private _searchMessageRef;
     private _shouldShowHistory;
     private _shouldShowResults;
     private _shouldShowMessage;
@@ -28,7 +24,6 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _historyContext;
     private _activeItemId;
     private _translations;
-    private _containerRole;
     connectedCallback(): Promise<void>;
     disconnectedCallback(): void;
     private _setupContext;
@@ -42,31 +37,18 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _hideHistorySuggestionsAndResults;
     private _displayResults;
     private _handleToggleHistoryAndResults;
-    private _toggleSearchInputAttributes;
-    private _toggleSearchContainerAttributes;
+    private _toggleSearchInputAria;
     private _bindKeys;
-    private _handleSearchTabNavigation;
-    private _focusOnPreviousElementBeforeSearchInput;
-    private _focusOnNextElementAfterSearchInput;
-    private _preventScrollingOnSearchContentBrowsing;
-    private _handleForwardListFocus;
-    private _handleForwardGridFocus;
-    private _handleForwardFocus;
-    private _handleMoveToInputField;
-    private _handleBackwardListFocus;
-    private _handleBackwardGridFocus;
-    private _handleBackwardFocus;
+    private _focusOutsideActiveItemsForward;
+    private _focusOutsideActiveItemsBackward;
+    private _getSearchItemsCount;
+    private _scroll;
     private _handleChooseSearchItem;
     private _resetSearchView;
-    private _setActiveItemId;
-    private _handleFocusOnInputWithCaretEnd;
-    private _handleFocusOnInputWithCaretStart;
-    private _handleWriteableCharacter;
     private _submitSearchPhrase;
     private _hideSuggesterOnClickOutside;
     private _switchTypeOfSearchView;
     private _isSuggesterLayerVisible;
-    private _preventSubmitOnSearchClear;
     private _handleOpenSearch;
     private _handleOpenSearchWithKeyboard;
     protected render(): TemplateResult;