@shoper/phoenix_design_system 1.13.0 → 1.14.1-0

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

@@ -1,12 +1,13 @@
 import { __decorate, __metadata } from '../../../../../external/tslib/tslib.es6.js';
 import { html, nothing } from 'lit';
 import { property } from 'lit/decorators';
-import { ArrayUtils } from '@dreamcommerce/utilities';
+import { UiDomUtils, ArrayUtils } from '@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 { KeystrokesController } from '../../controllers/keystrokes_controller/keystrokes_controller.js';
 import 'lit-html';
-import { COLOR_SWATCHES_EVENT_NAMES, COLOR_ITEM_TAG_NAME, COLOR_SWATCHES_CSS_CLASSES, COLOR_SWATCHES_TAG_NAME, COLOR_SWATCHES_HIDDEN_ATTRIBUTE } from './color_swatches_constants.js';
-import { COLOR_ITEM_EVENT_NAMES, COLOR_ITEM_SELECTED_ATTRIBUTE } from './color_item/color_item_constants.js';
+import { COLOR_SWATCHES_EVENT_NAMES, COLOR_ITEM_TAG_NAME, COLOR_SWATCHES_CSS_CLASSES, COLOR_SWATCHES_HIDDEN_ATTRIBUTE } from './color_swatches_constants.js';
+import { COLOR_ITEM_SELECTED_ATTRIBUTE } from './color_item/color_item_constants.js';
 
 let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
     constructor() {
@@ -14,8 +15,87 @@ let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
         this.multiple = false;
         this.selectedColors = [];
         this.showMoreBtnText = 'Pokaż wszystkie kolory';
-        this._handleColorClicked = ({ target }) => {
-            const $colorItem = target;
+        this._setupEvents = () => {
+            if (this.getAttribute('role') === 'group') {
+                this._setupCheckboxGroupEvents();
+            }
+            else {
+                this._setupRadioGroupEvents();
+            }
+        };
+        this._setupCheckboxGroupEvents = () => {
+            this._setupColorClickEvents();
+        };
+        this._setupRadioGroupEvents = () => {
+            document.body.addEventListener('keydown', this._focusOnSelectedColor);
+            this.addEventListener('keydown', this._handleTabNavigation);
+            this.addEventListener('keyup', this._handleRadioNavigation);
+            this._setupColorClickEvents();
+        };
+        this._setupColorClickEvents = () => {
+            if (!this._$colorSwatchesChildren)
+                return;
+            this._$colorSwatchesChildren.forEach(($colorItem) => {
+                $colorItem.addEventListener('click', this._handleColorClicked);
+                new KeystrokesController({
+                    host: this,
+                    keys: [' '],
+                    callback: this._handleColorClicked,
+                    target: $colorItem
+                });
+            });
+        };
+        this._handleColorClicked = (ev) => {
+            ev.preventDefault();
+            const $colorItem = ev.target;
+            if ($colorItem.unclickable)
+                return;
+            this._toggleColorItem($colorItem);
+            this._dispatchColorChangeEvent($colorItem);
+        };
+        this._handleTabNavigation = (ev) => {
+            if (ev.key !== 'Tab')
+                return;
+            ev.preventDefault();
+            if (ev.shiftKey) {
+                const $firstFocusableColor = UiDomUtils.getFocusableElement(this);
+                UiDomUtils.getPreviousFocusableElement($firstFocusableColor).focus();
+                return;
+            }
+            const $LastFocusableColor = UiDomUtils.getLastFocusableElement(this);
+            UiDomUtils.getNextFocusableElement($LastFocusableColor).focus();
+        };
+        this._handleRadioNavigation = (ev) => {
+            const changeToNextKeys = ['ArrowDown', 'ArrowRight'];
+            const changeToPreviousKeys = ['ArrowUp', 'ArrowLeft'];
+            if (!changeToNextKeys.includes(ev.key) && !changeToPreviousKeys.includes(ev.key))
+                return;
+            ev.preventDefault();
+            if (changeToNextKeys.includes(ev.key)) {
+                this._handleChangeToNextColorItem(ev);
+            }
+            if (changeToPreviousKeys.includes(ev.key)) {
+                this._handleChangeToPreviousColorItem(ev);
+            }
+        };
+        this._focusOnSelectedColor = (ev) => {
+            if (ev.key !== 'Tab' || this.multiple)
+                return;
+            if (ev.shiftKey) {
+                const $previousFocusableElement = UiDomUtils.getPreviousFocusableElement(document.activeElement);
+                if (this.contains($previousFocusableElement) && this.selectedColors.length > 0) {
+                    ev.preventDefault();
+                    this.selectedColors[0].focus();
+                }
+                return;
+            }
+            const $nextFocusableElement = UiDomUtils.getNextFocusableElement(document.activeElement);
+            if (this.contains($nextFocusableElement) && this.selectedColors.length > 0) {
+                ev.preventDefault();
+                this.selectedColors[0].focus();
+            }
+        };
+        this._handleColorChange = ($colorItem) => {
             this._toggleColorItem($colorItem);
             this._dispatchColorChangeEvent($colorItem);
         };
@@ -52,6 +132,8 @@ let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
     }
     connectedCallback() {
         super.connectedCallback();
+        this.setAttribute('role', this.multiple ? 'group' : 'radiogroup');
+        this._$colorSwatchesChildren = [...this.children];
         this._setupEvents();
         this._addCssClasses();
         this.numberOfVisibleColors && this._hideItems(this.numberOfVisibleColors);
@@ -64,11 +146,9 @@ let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
         this.classList.add(COLOR_SWATCHES_CSS_CLASSES.colorSwatches);
     }
     _hideItems(numberOfVisibleColors) {
-        var _a;
-        this._$colorSwatchesChildren = (_a = document.querySelector(COLOR_SWATCHES_TAG_NAME)) === null || _a === void 0 ? void 0 : _a.children;
         if (!this._$colorSwatchesChildren)
             return;
-        Array.from(this._$colorSwatchesChildren).forEach(($colorSwatchesChild, index) => {
+        this._$colorSwatchesChildren.forEach(($colorSwatchesChild, index) => {
             if (index > numberOfVisibleColors - 1) {
                 $colorSwatchesChild.setAttribute(COLOR_SWATCHES_HIDDEN_ATTRIBUTE, '');
             }
@@ -79,17 +159,40 @@ let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
             var _a;
             if (!this._$colorSwatchesChildren)
                 return;
-            Array.from(this._$colorSwatchesChildren).forEach(($colorSwatchesChild) => {
+            this._$colorSwatchesChildren.forEach(($colorSwatchesChild) => {
                 $colorSwatchesChild.removeAttribute(COLOR_SWATCHES_HIDDEN_ATTRIBUTE);
             });
             (_a = this.querySelector('h-color-swatches-show-more')) === null || _a === void 0 ? void 0 : _a.setAttribute(COLOR_SWATCHES_HIDDEN_ATTRIBUTE, '');
         });
     }
-    _setupEvents() {
-        this.addEventListener(COLOR_ITEM_EVENT_NAMES.selected, this._handleColorClicked);
+    _handleChangeToNextColorItem({ target }) {
+        const $colorItem = target;
+        const $nextFocusableElement = UiDomUtils.getNextFocusableElement($colorItem);
+        let $nextColorItem;
+        if (!this.contains($nextFocusableElement)) {
+            $nextColorItem = UiDomUtils.getFocusableElement(this);
+        }
+        else {
+            $nextColorItem = $nextFocusableElement;
+        }
+        $nextColorItem.focus();
+        this._handleColorChange($nextColorItem);
+    }
+    _handleChangeToPreviousColorItem({ target }) {
+        const $colorItem = target;
+        const $previousFocusableElement = UiDomUtils.getPreviousFocusableElement($colorItem);
+        let $previousColorItem;
+        if (!this.contains($previousFocusableElement)) {
+            $previousColorItem = UiDomUtils.getLastFocusableElement(this);
+        }
+        else {
+            $previousColorItem = $previousFocusableElement;
+        }
+        $previousColorItem.focus();
+        this._handleColorChange($previousColorItem);
     }
     _toggleColorItem($colorItem) {
-        this.multiple ? this._handleColorClickedForMultipleMode($colorItem) : this._handleColorClickedForSingleMode($colorItem);
+        this.multiple ? this._handleColorClickedForMultipleMode($colorItem) : this._handleColorChangeForSingleMode($colorItem);
     }
     _handleColorClickedForMultipleMode($colorItem) {
         !this._isColorAlreadyExistInArray($colorItem)
@@ -97,17 +200,20 @@ let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
             : this._removeExistingColorFromArray($colorItem);
         this._toggleSelectedAttribute($colorItem);
     }
-    _handleColorClickedForSingleMode($colorItem) {
+    _handleColorChangeForSingleMode($colorItem) {
         const $previouslySelected = this.selectedColors[0];
         this._toggleSelectedAttribute($colorItem);
-        if ($previouslySelected && $previouslySelected !== $colorItem)
+        if ($previouslySelected && $previouslySelected !== $colorItem) {
             $previouslySelected.removeAttribute(COLOR_ITEM_SELECTED_ATTRIBUTE);
+            $previouslySelected.setAttribute('aria-checked', 'false');
+        }
         this.selectedColors = $previouslySelected === $colorItem ? [] : [$colorItem];
     }
     _toggleSelectedAttribute($colorItem) {
         $colorItem.hasAttribute(COLOR_ITEM_SELECTED_ATTRIBUTE)
             ? $colorItem.removeAttribute(COLOR_ITEM_SELECTED_ATTRIBUTE)
             : $colorItem.setAttribute(COLOR_ITEM_SELECTED_ATTRIBUTE, '');
+        $colorItem.setAttribute('aria-checked', 'true');
     }
     _isColorAlreadyExistInArray($colorItem) {
         return this.selectedColors.includes($colorItem);
@@ -116,6 +222,10 @@ let HColorSwatches = class HColorSwatches extends PhoenixLightLitElement {
         const indexOfAlreadyExistingColor = this.selectedColors.indexOf($colorItem);
         this.selectedColors.splice(indexOfAlreadyExistingColor, 1);
     }
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        document.body.removeEventListener('keydown', this._focusOnSelectedColor);
+    }
     render() {
         return html `
             ${this.getSlot('default')}

package/build/esm/packages/phoenix/src/components/color_swatches/color_swatches.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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/color_swatches/color_swatches_constants.js

@@ -1,5 +1,4 @@
 const colorSwatchesBaseCssClass = 'color-swatches';
-const COLOR_SWATCHES_TAG_NAME = 'h-color-swatches';
 const COLOR_ITEM_TAG_NAME = 'h-color-item';
 const COLOR_SWATCHES_CSS_CLASSES = {
     colorSwatches: colorSwatchesBaseCssClass,
@@ -12,5 +11,5 @@ const COLOR_SWATCHES_EVENT_NAMES = {
 };
 const COLOR_SWATCHES_HIDDEN_ATTRIBUTE = 'hidden';
 
-export { COLOR_ITEM_TAG_NAME, COLOR_SWATCHES_CSS_CLASSES, COLOR_SWATCHES_EVENT_NAMES, COLOR_SWATCHES_HIDDEN_ATTRIBUTE, COLOR_SWATCHES_TAG_NAME };
+export { COLOR_ITEM_TAG_NAME, COLOR_SWATCHES_CSS_CLASSES, COLOR_SWATCHES_EVENT_NAMES, COLOR_SWATCHES_HIDDEN_ATTRIBUTE };
 //# sourceMappingURL=color_swatches_constants.js.map

package/build/esm/packages/phoenix/src/components/color_swatches/color_swatches_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;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

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

@@ -15,6 +15,8 @@ export declare class HDropdown extends PhoenixLightLitElement implements IDropdo
     contentWidth: TDropdownContentWidth;
     portalTarget: string;
     mobilePosition: TMobileElementPosition;
+    id: string;
+    preventFocusTrap: boolean;
     $dropdownToggler: HDropdownToggler | null;
     $dropdownContent: HDropdownContent | null;
     $nestedDropdownContentElements?: HDropdownContent[];
@@ -40,12 +42,19 @@ export declare class HDropdown extends PhoenixLightLitElement implements IDropdo
     private _observeScrollToggling;
     private _toggleScroll;
     private _closeDropdownOnEscape;
-    private _handleForwardFocus;
-    private _handleFocusOnNextElement;
-    private _focusOnNextElementAfterToggler;
-    private _handleBackwardFocus;
+    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;
     private _setupInitialDropdownProperties;
     isOpened: () => boolean;
     private _positionDropdownContent;

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,32 @@ 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) => {
+            var _a, _b;
+            if (ev.shiftKey === true || !this.$dropdownContent || !this.opened)
                 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;
+            if (((_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.contains($target)) && this.preventFocusTrap) {
+                this._handleFocusOnNextElementAfterDropdown(ev);
+                return;
+            }
+            if ((_b = this.$dropdownToggler) === null || _b === void 0 ? void 0 : _b.contains($target)) {
+                this._handleFocusFromTogglerForwards(ev);
                 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 +172,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 +210,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 +293,74 @@ let HDropdown = HDropdown_1 = class HDropdown extends PhoenixLightLitElement {
             (_b = this.$dropdownContent) === null || _b === void 0 ? void 0 : _b.classList.add(SCROLLABLE_CLASS_NAME);
         }
     }
+    _handleFocusOnNextElementAfterDropdown(ev) {
+        ev.preventDefault();
+        this.hide();
+        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)
@@ -317,6 +384,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 +454,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;AACA;AACA;AACA;"}

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

@@ -9,6 +9,10 @@ let HDropdownClose = class HDropdownClose extends PhoenixLightLitElement {
     constructor() {
         super();
         this.name = '';
+        this._closeDropdown = () => {
+            const dropdown = document.querySelector(`h-dropdown[name="${this.name}"]`);
+            dropdown === null || dropdown === void 0 ? void 0 : dropdown.hide();
+        };
         this.className = `${DROPDOWN_CSS_CLASSES.close} ${this.className}`;
     }
     connectedCallback() {
@@ -16,10 +20,6 @@ let HDropdownClose = class HDropdownClose extends PhoenixLightLitElement {
         this._btnController = new BtnController(this, this._closeDropdown);
         this.addEventListener('click', this._closeDropdown);
     }
-    async _closeDropdown() {
-        const dropdown = document.querySelector(`h-dropdown[name="${this.name}"]`);
-        await (dropdown === null || dropdown === void 0 ? void 0 : dropdown.hide());
-    }
 };
 __decorate([
     property({ type: String }),

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

@@ -1,8 +1,7 @@
-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;
+    private _setupRole;
 }

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

@@ -1,6 +1,6 @@
 import { __decorate, __metadata } from '../../../../../external/tslib/tslib.es6.js';
-import { html } from 'lit';
 import { property } from 'lit/decorators';
+import { UiDomUtils } from '@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 { DROPDOWN_CSS_CLASSES } from './dropdown_constants.js';
@@ -9,19 +9,22 @@ let HDropdownContent = class HDropdownContent extends PhoenixLightLitElement {
     constructor() {
         super();
         this.name = '';
+        this._setupRole = () => {
+            const $focusableElements = UiDomUtils.getFocusableElements(this);
+            const role = $focusableElements.length < 2 ? 'dialog' : 'menu';
+            this.setAttribute('role', role);
+            if (role === 'menu') {
+                Array.from(this.children).forEach((element) => {
+                    element.setAttribute('role', 'menuitem');
+                });
+            }
+        };
         this.slot = this.hasAttribute('slot') ? this.slot : 'content';
     }
     connectedCallback() {
         super.connectedCallback();
         this.classList.add(DROPDOWN_CSS_CLASSES.content);
-        this.setAttribute('role', 'menu');
-        Array.from(this.children).forEach((element) => {
-            element.setAttribute('role', 'menuitem');
-        });
-    }
-    render() {
-        super.render();
-        return html ` <div role="dialog">${this.getSlot('content')}</div> `;
+        this._setupRole();
     }
 };
 __decorate([

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;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;
 }