@shoper/phoenix_design_system 1.18.23-1 → 1.18.23-3

package/build/esm/packages/phoenix/src/components/form/search/search.js

@@ -12,6 +12,7 @@ import { createRef, ref } from 'lit-html/directives/ref.js';
 import { ContextProviderController } from '../../../core/context/context_provider_controller.js';
 import { BREAKPOINTS } from '../../../global_constants.js';
 import v4 from '../../../../../../external/uuid/dist/esm-browser/v4.js';
+import { FocusTrapController } from '../../../controllers/focus_trap_controller/focus_trap_controller.js';
 import { MODAL_EVENTS } from '../../modal/modal_constants.js';
 import { SHEET_EVENTS } from '../../sheet/sheet_constants.js';
 import { when as n } from '../../../../../../external/lit-html/directives/when.js';
@@ -25,9 +26,16 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         this.isSearchUxFixesFlagEnabled = false;
         this.displayMode = 'dropdown';
         this._togglerElement = null;
+        this._mobileDialogOpener = null;
         this._id = v4();
         this._openSearchButtonAriaLabelId = `${this._id}-open-search-button-aria-label`;
         this._searchContentContainerId = v4();
+        this._mobileFocusTrapController = new FocusTrapController({
+            host: this,
+            getContainer: () => this,
+            noAutofocus: true,
+            cyclicKeydown: true
+        });
         this._searchResultsRef = createRef();
         this._searchHistoryRef = createRef();
         this._searchMessageRef = createRef();
@@ -323,6 +331,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
             if (window.innerWidth > BREAKPOINTS.sm) {
                 const hasBeenOpened = this.classList.contains(SEARCH_CLASS_NAMES.mobileOpened);
                 this.classList.remove(SEARCH_CLASS_NAMES.mobileOpened);
+                this._deactivateMobileDialog();
                 if (hasBeenOpened && this.displayMode !== 'dropdown') {
                     const $storefrontSearch = document.querySelector(`h-storefront-search[module-instance-id="${this.moduleInstanceId}"]`);
                     const searchOverlayTriggerName = (_a = $storefrontSearch === null || $storefrontSearch === void 0 ? void 0 : $storefrontSearch.querySelector('[aria-haspopup="dialog"]')) === null || _a === void 0 ? void 0 : _a.getAttribute('name');
@@ -338,6 +347,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         };
         this._openMobileView = () => {
             this.classList.add(SEARCH_CLASS_NAMES.mobileOpened);
+            this._activateMobileDialog();
         };
         this._isSuggesterLayerVisible = () => {
             var _a;
@@ -358,6 +368,19 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
                 document.removeEventListener('focusin', this._resetSearchOnFocusOutside);
             }
         };
+        this._activateMobileDialog = () => {
+            if (this.displayMode !== 'dropdown')
+                return;
+            this._mobileDialogOpener = document.activeElement;
+            this.setAttribute('role', 'dialog');
+            this.setAttribute('aria-modal', 'true');
+            this._mobileFocusTrapController.activate();
+        };
+        this._deactivateMobileDialog = () => {
+            this.removeAttribute('role');
+            this.removeAttribute('aria-modal');
+            this._mobileFocusTrapController.deactivate();
+        };
         this._setupAriaAttributes = () => {
             var _a;
             if (this._translations.openSearchButtonAriaLabel) {
@@ -366,6 +389,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         };
         this._handleOpenSearch = () => {
             this.classList.add(SEARCH_CLASS_NAMES.mobileOpened);
+            this._activateMobileDialog();
             const shouldShowMessage = this._searchPhrase !== '';
             this._updateSearchView(this._searchPhrase, shouldShowMessage, false);
             const $searchInput = this.querySelector(`
@@ -486,8 +510,10 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.submit, this._handleSubmitForm);
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.close, () => {
             this.classList.remove(SEARCH_CLASS_NAMES.mobileOpened);
+            this._deactivateMobileDialog();
             this._resetSearchView();
             this.isSearchUxFixesFlagEnabled && this._removeSearchKeyboardNavigation();
+            requestAnimationFrame(() => { var _a; return (_a = this._mobileDialogOpener) === null || _a === void 0 ? void 0 : _a.focus(); });
         });
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.loadMoreHistoryItems, () => {
             const contentLength = this._searchHistory.length;

package/build/esm/packages/phoenix/src/components/form/search/search.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,+CAAmD;AAC1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,wDAA4D;AAC3E;AACA;AACA,0BAA0B,wDAA4D;AACtF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,+CAAmD;AAC1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,wDAA4D;AAC3E;AACA;AACA;AACA,0BAA0B,wDAA4D;AACtF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/select/select.d.ts

@@ -23,6 +23,7 @@ export declare class HSelect extends PhoenixLightLitElement {
     optionsList?: TSelectOption[];
     noDeselect: boolean;
     assistiveTitleId: string;
+    isDevSelectPlaceholderFlagEnabled: boolean;
     isReactiveSelectionFlagEnabled: boolean;
     translations: Record<string, string>;
     private _selectOptionsId;

package/build/esm/packages/phoenix/src/components/form/select/select.js

@@ -30,6 +30,7 @@ import { SelectTogglerKeyboardController } from './controllers/select_toggler_ke
 
 let HSelect = class HSelect extends PhoenixLightLitElement {
     constructor() {
+        var _a;
         super();
         this.multiple = false;
         this.opened = false;
@@ -38,6 +39,7 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
         this.type = SELECT_TYPES.select;
         this.noDeselect = false;
         this.assistiveTitleId = '';
+        this.isDevSelectPlaceholderFlagEnabled = false;
         this.isReactiveSelectionFlagEnabled = false;
         this.translations = {};
         this._selectOptionsId = v4();
@@ -49,7 +51,6 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
         this._$dropdownContent = createRef();
         this.$dropdownToggler = createRef();
         this._selectContext = new ContextProviderController(this);
-        this.$placeholder = 'Select';
         this._updateOptions = () => {
             const $options = this._getOptions();
             this._$options = $options.reduce((acc, $option) => {
@@ -107,18 +108,28 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
             });
         };
         this._updateLabelAria = (options) => {
-            var _a;
+            var _a, _b;
             if (!this.$searchLabel)
                 return;
             (_a = this.$searchLabel.querySelector(`[id="value-label"]`)) === null || _a === void 0 ? void 0 : _a.remove();
-            const hasValidOptions = options.some((option) => !option.isPlaceholder);
-            if (!hasValidOptions)
-                return;
-            const valueLabelSpan = document.createElement('span');
-            valueLabelSpan.id = 'value-label';
-            valueLabelSpan.className = 'sr-only';
-            valueLabelSpan.textContent = options.reduce((totalSelectedContent, currentOption) => totalSelectedContent + currentOption.content, '');
-            this.$searchLabel.appendChild(valueLabelSpan);
+            if (this.isDevSelectPlaceholderFlagEnabled) {
+                const hasValidOptions = options.some((option) => !option.isPlaceholder);
+                if (!hasValidOptions)
+                    return;
+                const valueLabelSpan = document.createElement('span');
+                valueLabelSpan.id = 'value-label';
+                valueLabelSpan.className = 'sr-only';
+                valueLabelSpan.textContent = options.reduce((totalSelectedContent, currentOption) => totalSelectedContent + currentOption.content, '');
+                this.$searchLabel.appendChild(valueLabelSpan);
+            }
+            else {
+                this.$searchLabel.innerHTML = `
+                ${(_b = this.$searchLabel) === null || _b === void 0 ? void 0 : _b.innerHTML}
+                <span id="value-label" class="sr-only">
+                    ${options.reduce((totalSelectedContent, currentOption) => (totalSelectedContent += currentOption.content), '')}
+                </span>
+            `;
+            }
         };
         this._handleOptionClicked = ({ detail }) => {
             if (!(detail === null || detail === void 0 ? void 0 : detail.$option))
@@ -170,6 +181,8 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
         };
         const $options = Array.from(this.querySelectorAll(SELECT_RELATED_COMPONENTS_NAMES.option));
         $options.forEach(($option) => $option.setAttribute('slot', SELECT_SLOT_NAMES.content));
+        const $placeholderEl = this.querySelector(`[slot="${SELECT_INPUT_PLACEHOLDER_SLOT_NAME}"]`);
+        this.$placeholder = $placeholderEl && ((_a = $placeholderEl.textContent) === null || _a === void 0 ? void 0 : _a.trim()) ? $placeholderEl : 'Select';
         if (this.multiple)
             this.type = SELECT_TYPES.multiple;
     }
@@ -215,7 +228,9 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
         }
         if (changedProperties.has('optionsList')) {
             this._updateOptions();
-            this._addPlaceholderOptionIfNeeded();
+            if (this.isDevSelectPlaceholderFlagEnabled) {
+                this._addPlaceholderOptionIfNeeded();
+            }
         }
         if (this._$optionsList.value) {
             (_a = this.listBoxController) === null || _a === void 0 ? void 0 : _a.hostDisconnected();
@@ -248,7 +263,7 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
         $searchInput ? $searchInput.focus() : $optionToFocus === null || $optionToFocus === void 0 ? void 0 : $optionToFocus.focus();
     }
     connectedCallback() {
-        var _a, _b;
+        var _a;
         super.connectedCallback();
         this.classList.add(SELECT_CSS_CLASSES.select);
         if (!this.searchDisabled) {
@@ -263,12 +278,10 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
         this._selectController.options$.subscribe(this._optionsObserver);
         this._selectedOptionsAriaObserver = new Observer((selectedOptions) => this._updateLabelAria(selectedOptions));
         this._selectController.selectedOptions$.subscribe(this._selectedOptionsAriaObserver);
-        const $placeholderEl = this.querySelector(`[slot="${SELECT_INPUT_PLACEHOLDER_SLOT_NAME}"]`);
-        if ($placeholderEl && ((_b = $placeholderEl.textContent) === null || _b === void 0 ? void 0 : _b.trim())) {
-            this.$placeholder = $placeholderEl;
-        }
         this._updateOptions();
-        this._addPlaceholderOptionIfNeeded();
+        if (this.isDevSelectPlaceholderFlagEnabled) {
+            this._addPlaceholderOptionIfNeeded();
+        }
         this._setupEvents();
     }
     firstUpdated(changedProperties) {
@@ -498,7 +511,9 @@ let HSelect = class HSelect extends PhoenixLightLitElement {
                     <h-select-close-btn class="${SELECT_CSS_CLASSES.selectCloseMobileButton}" @close=${this._closeSelect}></h-select-close-btn>
 
                     <div class=${SELECT_CSS_CLASSES.selectLabel}>
-                        ${(_b = this.$searchLabel) === null || _b === void 0 ? void 0 : _b.cloneNode(true)}
+                        ${this.isDevSelectPlaceholderFlagEnabled
+            ? (_b = this.$searchLabel) === null || _b === void 0 ? void 0 : _b.cloneNode(true)
+            : html `${this._getClonedPlaceholderElement()}`}
                     </div>
 
                     ${isSearchEnabled
@@ -614,6 +629,10 @@ __decorate([
     property({ type: String, attribute: 'assistive-title-id' }),
     __metadata("design:type", String)
 ], HSelect.prototype, "assistiveTitleId", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'is-dev-select-placeholder-flag-enabled' }),
+    __metadata("design:type", Boolean)
+], HSelect.prototype, "isDevSelectPlaceholderFlagEnabled", void 0);
 __decorate([
     property({ type: Boolean, attribute: 'is-reactive-selection-flag-enabled' }),
     __metadata("design:type", Boolean)

package/build/esm/packages/phoenix/src/components/form/select/select.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,+CAAmD;AAC1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,wDAA4D;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,+CAAmD;AAC1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,wDAA4D;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/modal/modal.d.ts

@@ -7,9 +7,6 @@ export declare class HModal extends PhoenixLightLitElement {
     transition: string;
     modalLabel: string;
     noAutofocus: boolean;
-    _firstFocusableElement: HTMLElement | undefined;
-    _focusableElements: HTMLElement[] | null;
-    _lastFocusableElement: HTMLElement | undefined;
     private _focusedToggler;
     private _contentRef;
     private _focusSentinelStart;
@@ -17,6 +14,7 @@ export declare class HModal extends PhoenixLightLitElement {
     private _propsChangeStrategies;
     private static openModals;
     private _backdropController;
+    private _focusTrapController;
     private static _appendModalsPortal;
     static isSomeModalOpen(): boolean;
     constructor();
@@ -24,8 +22,6 @@ export declare class HModal extends PhoenixLightLitElement {
     disconnectedCallback(): void;
     firstUpdated(props: PropertyValues): void;
     updated(changedProps: Map<string, any>): void;
-    private _setFocusToFirstFocusableElementInModalOrCloseBtn;
-    private _keepFocusWithinModal;
     private _handleCloseFromCloseComponent;
     private _bindCloseOnEsc;
     open(): Promise<void>;

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

@@ -1,15 +1,15 @@
 import { __decorate, __metadata } from '../../../../../external/tslib/tslib.es6.js';
-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 { property, state } from '@lit/reactive-element/decorators.js';
+import { property } from '@lit/reactive-element/decorators.js';
 import '@lit/reactive-element';
 import { html } from 'lit-html';
 import { createRef, ref } from 'lit-html/directives/ref.js';
 import { PORTAL_TARGET_COMPONENT_NAME, PORTAL_TARGET_NAME_PROP } from '../portal/portal_constants.js';
 import { BACKDROP_EVENTS } from '../backdrop/backdrop_constants.js';
 import { BackdropController } from '../backdrop/controller/backdrop_controller.js';
-import { MODAL_OPENED_PROP, FOCUSABLE_ELEMENTS_WITHIN_MODAL, MODALS_PORTAL_NAME, MODAL_EVENTS } from './modal_constants.js';
+import { FocusTrapController } from '../../controllers/focus_trap_controller/focus_trap_controller.js';
+import { MODAL_OPENED_PROP, MODALS_PORTAL_NAME, MODAL_EVENTS } from './modal_constants.js';
 import { HModalClose } from './modal_close.js';
 
 var HModal_1;
@@ -21,9 +21,6 @@ let HModal = HModal_1 = class HModal extends PhoenixLightLitElement {
         this.transition = 'scale';
         this.modalLabel = '';
         this.noAutofocus = false;
-        this._firstFocusableElement = undefined;
-        this._focusableElements = null;
-        this._lastFocusableElement = undefined;
         this._focusedToggler = null;
         this._contentRef = createRef();
         this._focusSentinelStart = createRef();
@@ -31,44 +28,26 @@ let HModal = HModal_1 = class HModal extends PhoenixLightLitElement {
         this._propsChangeStrategies = {
             [MODAL_OPENED_PROP]: {
                 true: () => {
-                    const scrollY = window.scrollY;
                     HModal_1.openModals = [...HModal_1.openModals, this];
                     document.addEventListener('keydown', this._bindCloseOnEsc);
                     document.addEventListener(BACKDROP_EVENTS.clicked, this.close);
                     this._dispatchModalOpenedEvent();
-                    if (!this.noAutofocus) {
-                        setTimeout(() => {
-                            var _a;
-                            (_a = this._firstFocusableElement) === null || _a === void 0 ? void 0 : _a.focus();
-                            window.scrollTo(0, scrollY);
-                        }, 0);
-                    }
+                    this._focusTrapController.activate();
                 },
                 false: () => {
                     HModal_1.openModals = HModal_1.openModals.filter((modal) => modal !== this);
                     document.removeEventListener('keydown', this._bindCloseOnEsc);
                     document.removeEventListener(BACKDROP_EVENTS.clicked, this.close);
+                    this._focusTrapController.deactivate();
                 }
             }
         };
         this._backdropController = new BackdropController();
-        this._keepFocusWithinModal = (ev) => {
-            var _a;
-            const isTabPressed = ev.code === 'Tab';
-            if (isTabPressed && this._contentRef.value) {
-                if (ev.shiftKey) {
-                    if (document.activeElement === this._firstFocusableElement) {
-                        const focusableElements = 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) {
-                    UiDomUtils.setFocusToFirstFocusableElementInContainer(this._contentRef.value);
-                    ev.preventDefault();
-                }
-            }
-        };
+        this._focusTrapController = new FocusTrapController({
+            host: this,
+            getContainer: () => this._contentRef.value,
+            noAutofocus: this.noAutofocus
+        });
         this._handleCloseFromCloseComponent = async (ev) => {
             var _a;
             ev.stopPropagation();
@@ -129,7 +108,6 @@ let HModal = HModal_1 = class HModal extends PhoenixLightLitElement {
             });
         };
         this.hidden = true;
-        this._focusableElements = [...this.querySelectorAll(FOCUSABLE_ELEMENTS_WITHIN_MODAL)];
     }
     static _appendModalsPortal() {
         const $modalsPortalTarget = document.querySelector(`h-portal-target[name="${MODALS_PORTAL_NAME}"]`);
@@ -145,7 +123,6 @@ let HModal = HModal_1 = class HModal extends PhoenixLightLitElement {
     connectedCallback() {
         super.connectedCallback();
         HModal_1._appendModalsPortal();
-        document.addEventListener('keyup', this._keepFocusWithinModal);
         document.addEventListener(MODAL_EVENTS.close, this._handleCloseFromCloseComponent);
     }
     disconnectedCallback() {
@@ -154,29 +131,18 @@ let HModal = HModal_1 = class HModal extends PhoenixLightLitElement {
             this.close();
         document.removeEventListener(MODAL_EVENTS.close, this._handleCloseFromCloseComponent);
         document.removeEventListener('keydown', this._bindCloseOnEsc);
-        document.removeEventListener('keyup', this._keepFocusWithinModal);
     }
     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(MODAL_OPENED_PROP)) {
             this._propsChangeStrategies[MODAL_OPENED_PROP][String(this[MODAL_OPENED_PROP])]();
         }
-    }
-    _setFocusToFirstFocusableElementInModalOrCloseBtn() {
-        if (this.noAutofocus)
-            return;
-        requestAnimationFrame(() => {
-            if (this._contentRef.value) {
-                const focusableElements = UiDomUtils.getFocusableElements(this._contentRef.value);
-                if (focusableElements.length > 0) {
-                    focusableElements.length > 1 ? focusableElements[1].focus() : focusableElements[0].focus();
-                }
-            }
-        });
+        if (changedProps.has('noAutofocus')) {
+            this._focusTrapController.noAutofocus = this.noAutofocus;
+        }
     }
     async open() {
         this._focusedToggler = document.activeElement;
@@ -193,7 +159,7 @@ let HModal = HModal_1 = class HModal extends PhoenixLightLitElement {
                 setTimeout(() => {
                     var _a;
                     (_a = this._contentRef.value) === null || _a === void 0 ? void 0 : _a.classList.remove(`modal_show-${this.transition}-start`, `modal_show-${this.transition}-end`);
-                    this._setFocusToFirstFocusableElementInModalOrCloseBtn();
+                    this._focusTrapController.focusFirst();
                     resolve();
                 }, transitionDuration);
             });
@@ -252,18 +218,6 @@ __decorate([
     property({ type: Boolean, attribute: 'no-autofocus' }),
     __metadata("design:type", Object)
 ], HModal.prototype, "noAutofocus", void 0);
-__decorate([
-    state(),
-    __metadata("design:type", Object)
-], HModal.prototype, "_firstFocusableElement", void 0);
-__decorate([
-    state(),
-    __metadata("design:type", Object)
-], HModal.prototype, "_focusableElements", void 0);
-__decorate([
-    state(),
-    __metadata("design:type", Object)
-], HModal.prototype, "_lastFocusableElement", void 0);
 HModal = HModal_1 = __decorate([
     phoenixCustomElement('h-modal'),
     __metadata("design:paramtypes", [])

package/build/esm/packages/phoenix/src/components/modal/modal.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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;"}

package/build/esm/packages/phoenix/src/components/modal/modal_constants.js

@@ -5,8 +5,7 @@ const MODAL_EVENTS = {
     opened: 'opened',
     closed: 'closed'
 };
-const MODAL_OPENED_PROP = 'opened';
-const FOCUSABLE_ELEMENTS_WITHIN_MODAL = 'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+const MODAL_OPENED_PROP = 'opened';
 
-export { FOCUSABLE_ELEMENTS_WITHIN_MODAL, MODALS_PORTAL_NAME, MODAL_EVENTS, MODAL_OPENED_PROP };
+export { MODALS_PORTAL_NAME, MODAL_EVENTS, MODAL_OPENED_PROP };
 //# sourceMappingURL=modal_constants.js.map

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

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

@@ -6,9 +6,6 @@ export declare class HSheet extends PhoenixLightLitElement {
     class: string;
     transition: string;
     sheetLabel: string;
-    _firstFocusableElement: HTMLElement | undefined;
-    _focusableElements: HTMLElement[] | null;
-    _lastFocusableElement: HTMLElement | undefined;
     private _focusedToggler;
     private _contentRef;
     private _focusSentinelStart;
@@ -16,6 +13,7 @@ export declare class HSheet extends PhoenixLightLitElement {
     private _propsChangeStrategies;
     private static openSheets;
     private _backdropController;
+    private _focusTrapController;
     private static _appendSheetPortal;
     static isSomeSheetOpen(): boolean;
     constructor();
@@ -23,8 +21,6 @@ export declare class HSheet extends PhoenixLightLitElement {
     disconnectedCallback(): void;
     firstUpdated(props: PropertyValues): void;
     updated(changedProps: Map<string, any>): void;
-    private _setFocusToFirstFocusableElementInSheetOrCloseBtn;
-    private _keepFocusWithinSheet;
     private _handleCloseFromCloseComponent;
     private _bindCloseOnEsc;
     open(): Promise<void>;

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

@@ -1,15 +1,15 @@
 import { __decorate, __metadata } from '../../../../../external/tslib/tslib.es6.js';
-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 { property, state } from '@lit/reactive-element/decorators.js';
+import { property } from '@lit/reactive-element/decorators.js';
 import '@lit/reactive-element';
 import { html } from 'lit-html';
 import { createRef, ref } from 'lit-html/directives/ref.js';
 import { PORTAL_TARGET_COMPONENT_NAME, PORTAL_TARGET_NAME_PROP } from '../portal/portal_constants.js';
 import { BACKDROP_EVENTS } from '../backdrop/backdrop_constants.js';
 import { BackdropController } from '../backdrop/controller/backdrop_controller.js';
-import { SHEET_OPENED_PROP, FOCUSABLE_ELEMENTS_WITHIN_SHEET, SHEETS_PORTAL_NAME, SHEET_EVENTS } from './sheet_constants.js';
+import { FocusTrapController } from '../../controllers/focus_trap_controller/focus_trap_controller.js';
+import { SHEET_OPENED_PROP, SHEETS_PORTAL_NAME, SHEET_EVENTS } from './sheet_constants.js';
 import { HSheetClose } from './sheet_close.js';
 
 var HSheet_1;
@@ -20,9 +20,6 @@ let HSheet = HSheet_1 = class HSheet extends PhoenixLightLitElement {
         this.class = '';
         this.transition = 'scale';
         this.sheetLabel = '';
-        this._firstFocusableElement = undefined;
-        this._focusableElements = null;
-        this._lastFocusableElement = undefined;
         this._focusedToggler = null;
         this._contentRef = createRef();
         this._focusSentinelStart = createRef();
@@ -30,42 +27,25 @@ let HSheet = HSheet_1 = class HSheet extends PhoenixLightLitElement {
         this._propsChangeStrategies = {
             [SHEET_OPENED_PROP]: {
                 true: () => {
-                    const scrollY = window.scrollY;
                     HSheet_1.openSheets = [...HSheet_1.openSheets, this];
                     document.addEventListener('keydown', this._bindCloseOnEsc);
                     document.addEventListener(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_EVENTS.clicked, this.close);
+                    this._focusTrapController.deactivate();
                 }
             }
         };
         this._backdropController = new 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 = 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) {
-                    UiDomUtils.setFocusToFirstFocusableElementInContainer(this._contentRef.value);
-                    ev.preventDefault();
-                }
-            }
-        };
+        this._focusTrapController = new FocusTrapController({
+            host: this,
+            getContainer: () => this._contentRef.value
+        });
         this._handleCloseFromCloseComponent = async (ev) => {
             var _a;
             ev.stopPropagation();
@@ -126,7 +106,6 @@ let HSheet = HSheet_1 = class HSheet extends PhoenixLightLitElement {
             });
         };
         this.hidden = true;
-        this._focusableElements = [...this.querySelectorAll(FOCUSABLE_ELEMENTS_WITHIN_SHEET)];
     }
     static _appendSheetPortal() {
         const $modalsPortalTarget = document.querySelector(`h-portal-target[name="${SHEETS_PORTAL_NAME}"]`);
@@ -142,7 +121,6 @@ let HSheet = HSheet_1 = class HSheet extends PhoenixLightLitElement {
     connectedCallback() {
         super.connectedCallback();
         HSheet_1._appendSheetPortal();
-        document.addEventListener('keyup', this._keepFocusWithinSheet);
         document.addEventListener(SHEET_EVENTS.close, this._handleCloseFromCloseComponent);
     }
     disconnectedCallback() {
@@ -151,28 +129,16 @@ let HSheet = HSheet_1 = class HSheet extends PhoenixLightLitElement {
             this.close();
         document.removeEventListener(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_OPENED_PROP)) {
             this._propsChangeStrategies[SHEET_OPENED_PROP][String(this[SHEET_OPENED_PROP])]();
         }
     }
-    _setFocusToFirstFocusableElementInSheetOrCloseBtn() {
-        requestAnimationFrame(() => {
-            if (this._contentRef.value) {
-                const focusableElements = 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) => {
@@ -188,7 +154,7 @@ let HSheet = HSheet_1 = class HSheet extends PhoenixLightLitElement {
                 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);
             });
@@ -241,18 +207,6 @@ __decorate([
     property({ type: String, attribute: 'sheet-label' }),
     __metadata("design:type", Object)
 ], HSheet.prototype, "sheetLabel", void 0);
-__decorate([
-    state(),
-    __metadata("design:type", Object)
-], HSheet.prototype, "_firstFocusableElement", void 0);
-__decorate([
-    state(),
-    __metadata("design:type", Object)
-], HSheet.prototype, "_focusableElements", void 0);
-__decorate([
-    state(),
-    __metadata("design:type", Object)
-], HSheet.prototype, "_lastFocusableElement", void 0);
 HSheet = HSheet_1 = __decorate([
     phoenixCustomElement('h-sheet'),
     __metadata("design:paramtypes", [])