@shoper/phoenix_design_system 1.18.32 → 1.18.34-0

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

@@ -19,16 +19,24 @@ var modal_constants = require('../../modal/modal_constants.js');
 var sheet_constants = require('../../sheet/sheet_constants.js');
 var when = require('../../../../../../external/lit-html/directives/when.js');
 var search_constants = require('./search_constants.js');
+var focus_trap_strategy_constants = require('../../../controllers/focus_trap_controller/strategies/focus_trap_strategy_constants.js');
+var focus_trap_controller = require('../../../controllers/focus_trap_controller/focus_trap_controller.js');
 
 exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLitElement {
     constructor() {
         super(...arguments);
         this.view = search_constants.DEFAULT_VIEW;
+        this.isSearchFocusTrapFixEnabled = false;
         this.displayMode = 'dropdown';
         this._togglerElement = null;
+        this._mobileDialogOpener = null;
         this._id = v4['default']();
         this._openSearchButtonAriaLabelId = `${this._id}-open-search-button-aria-label`;
         this._searchContentContainerId = v4['default']();
+        this.mobileFocusTrapController = new focus_trap_controller.FocusTrapController(this, {
+            mode: focus_trap_strategy_constants.FOCUS_TRAP_STRATEGY_TYPES.cyclic,
+            getContainer: () => this
+        });
         this._searchResultsRef = ref_js.createRef();
         this._searchHistoryRef = ref_js.createRef();
         this._searchMessageRef = ref_js.createRef();
@@ -314,6 +322,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
             if (window.innerWidth > global_constants.BREAKPOINTS.sm) {
                 const hasBeenOpened = this.classList.contains(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
                 this.classList.remove(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
+                if (this.isSearchFocusTrapFixEnabled)
+                    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');
@@ -329,6 +339,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         };
         this._openMobileView = () => {
             this.classList.add(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
+            if (this.isSearchFocusTrapFixEnabled)
+                this._activateMobileDialog();
         };
         this._isSuggesterLayerVisible = () => {
             var _a;
@@ -349,8 +361,21 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
                 document.removeEventListener('focusin', this._resetSearchOnFocusOutside);
             }
         };
+        this._activateMobileDialog = () => {
+            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._handleOpenSearch = () => {
             this.classList.add(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
+            if (this.isSearchFocusTrapFixEnabled)
+                this._activateMobileDialog();
             const shouldShowMessage = this._searchPhrase !== '';
             this._updateSearchView(this._searchPhrase, shouldShowMessage, false);
             const $searchInput = this.querySelector(`
@@ -359,7 +384,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
             $searchInput === null || $searchInput === void 0 ? void 0 : $searchInput.focus();
         };
         this._handleOpenSearchWithKeyboard = (ev) => {
-            if (ev.code !== 'Enter')
+            const isRepeated = this.isSearchFocusTrapFixEnabled ? ev.repeat : false;
+            if (ev.code !== 'Enter' || isRepeated)
                 return;
             ev.preventDefault();
             this._handleOpenSearch();
@@ -368,6 +394,12 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     async connectedCallback() {
         super.connectedCallback();
         this._setupContext();
+        this._searchInput = this.querySelector(search_constants.SEARCH_COMPONENT_NAMES.searchInput);
+        if (this.isSearchFocusTrapFixEnabled) {
+            this._setupInitialSearchPhrase();
+            this._setupListeners();
+            this._setupToggler();
+        }
         try {
             this._searchContextConsumer = new context_consumer_controller.ContextConsumerController(this);
             this._searchContext$ = await this._searchContextConsumer.consumeAsync(this.moduleInstanceId);
@@ -396,10 +428,12 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         catch (_a) {
             console.error('Search context is not provided');
         }
-        this._searchInput = this.querySelector(search_constants.SEARCH_COMPONENT_NAMES.searchInput);
-        this._setupInitialSearchPhrase();
-        this._setupListeners();
-        this._setupToggler();
+        if (!this.isSearchFocusTrapFixEnabled) {
+            this._searchInput = this.querySelector(search_constants.SEARCH_COMPONENT_NAMES.searchInput);
+            this._setupInitialSearchPhrase();
+            this._setupListeners();
+            this._setupToggler();
+        }
     }
     disconnectedCallback() {
         var _a;
@@ -470,8 +504,12 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         this.addEventListener(search_constants.SEARCH_CUSTOM_EVENT_NAMES.submit, this._handleSubmitForm);
         this.addEventListener(search_constants.SEARCH_CUSTOM_EVENT_NAMES.close, () => {
             this.classList.remove(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
+            if (this.isSearchFocusTrapFixEnabled)
+                this._deactivateMobileDialog();
             this._resetSearchView();
             this._removeSearchKeyboardNavigation();
+            if (this.isSearchFocusTrapFixEnabled)
+                requestAnimationFrame(() => { var _a; return (_a = this._mobileDialogOpener) === null || _a === void 0 ? void 0 : _a.focus(); });
         });
         this.addEventListener(search_constants.SEARCH_CUSTOM_EVENT_NAMES.loadMoreHistoryItems, () => {
             const contentLength = this._searchHistory.length;
@@ -578,8 +616,15 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         this._setActiveItemId(`${this._id}-1`);
         const searchBar = this.querySelector(`.${search_constants.SEARCH_CLASS_NAMES.searchBar}`);
         searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(search_constants.SEARCH_CLASS_NAMES.outline);
-        if (this.displayMode === 'dropdown')
-            this._hideHistorySuggestionsAndResults();
+        if (this.displayMode === 'dropdown') {
+            const isMobileViewOpen = this.classList.contains(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
+            if (isMobileViewOpen) {
+                this._displaySuggester(this._searchPhrase);
+            }
+            else {
+                this._hideHistorySuggestionsAndResults();
+            }
+        }
     }
     _submitSearchPhrase(searchPhrase) {
         this._dispatchEventWithSearchPhrase(search_constants.SEARCH_CUSTOM_EVENT_NAMES.searchPhraseSubmitted, searchPhrase);
@@ -589,13 +634,23 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         if (!this._togglerElement)
             return;
         this._togglerElement.addEventListener('click', this._handleOpenSearch);
-        this._togglerElement.addEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        if (this.isSearchFocusTrapFixEnabled) {
+            this._togglerElement.addEventListener('keydown', this._handleOpenSearchWithKeyboard);
+        }
+        else {
+            this._togglerElement.addEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        }
     }
     _teardownToggler() {
         if (!this._togglerElement)
             return;
         this._togglerElement.removeEventListener('click', this._handleOpenSearch);
-        this._togglerElement.removeEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        if (this.isSearchFocusTrapFixEnabled) {
+            this._togglerElement.removeEventListener('keydown', this._handleOpenSearchWithKeyboard);
+        }
+        else {
+            this._togglerElement.removeEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        }
     }
     render() {
         super.render();
@@ -652,6 +707,10 @@ tslib_es6.__decorate([
     decorators.property({ type: String }),
     tslib_es6.__metadata("design:type", String)
 ], exports.HSearch.prototype, "locale", void 0);
+tslib_es6.__decorate([
+    decorators.property({ type: Boolean, attribute: 'is-search-focus-trap-fix-enabled' }),
+    tslib_es6.__metadata("design:type", Boolean)
+], exports.HSearch.prototype, "isSearchFocusTrapFixEnabled", void 0);
 tslib_es6.__decorate([
     decorators.property({ type: String, attribute: 'display-mode' }),
     tslib_es6.__metadata("design:type", String)

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

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB,wDAA4D;AAC7E;AACA;AACA,mBAAmB,wDAA4D;AAC/E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB,wDAA4D;AAC7E;AACA;AACA,mBAAmB,wDAA4D;AAC/E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/form/search/subcomponents/buttons/search_clear.js

@@ -16,7 +16,7 @@ var search_constants = require('../../search_constants.js');
 exports.HSearchClear = class HSearchClear extends phoenix_light_lit_element.PhoenixLightLitElement {
     constructor() {
         super();
-        this.isSearchClearFixFlagEnabled = false;
+        this.isSearchFixesFlagEnabled = false;
         this._shouldShow = false;
         this._isRequestPending = false;
         this._$searchInput = null;
@@ -29,7 +29,7 @@ exports.HSearchClear = class HSearchClear extends phoenix_light_lit_element.Phoe
         this._handleSearchClear = () => {
             var _a;
             this._dispatchClearEvent();
-            if (this.isSearchClearFixFlagEnabled) {
+            if (this.isSearchFixesFlagEnabled) {
                 this._updateClearButtonVisibility('');
                 (_a = this._$searchInput) === null || _a === void 0 ? void 0 : _a.focus();
             }
@@ -49,7 +49,7 @@ exports.HSearchClear = class HSearchClear extends phoenix_light_lit_element.Phoe
         this._searchContextSetup();
         const $search = this.closest(search_constants.SEARCH_COMPONENT_NAMES.search);
         this._$searchInput = (_a = $search === null || $search === void 0 ? void 0 : $search.querySelector('input[type="search"]')) !== null && _a !== void 0 ? _a : null;
-        if (this.isSearchClearFixFlagEnabled) {
+        if (this.isSearchFixesFlagEnabled) {
             this._updateClearButtonVisibility((_c = (_b = this._$searchInput) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : '');
         }
         this.addEventListener('click', this._handleSearchClear);
@@ -100,9 +100,9 @@ tslib_es6.__decorate([
     tslib_es6.__metadata("design:type", String)
 ], exports.HSearchClear.prototype, "moduleInstanceId", void 0);
 tslib_es6.__decorate([
-    decorators.property({ type: Boolean, attribute: 'is-search-clear-fix-flag-enabled' }),
+    decorators.property({ type: Boolean, attribute: 'is-search-fixes-flag-enabled' }),
     tslib_es6.__metadata("design:type", Boolean)
-], exports.HSearchClear.prototype, "isSearchClearFixFlagEnabled", void 0);
+], exports.HSearchClear.prototype, "isSearchFixesFlagEnabled", void 0);
 tslib_es6.__decorate([
     decorators.state(),
     tslib_es6.__metadata("design:type", Boolean)

package/build/cjs/packages/phoenix/src/components/form/search/subcomponents/input/search_input.js

@@ -13,7 +13,8 @@ var search_constants = require('../../search_constants.js');
 exports.HSearchInput = class HSearchInput extends phoenix_light_lit_element.PhoenixLightLitElement {
     constructor() {
         super(...arguments);
-        this.isSearchClearFixFlagEnabled = false;
+        this.isSearchFocusTrapFixEnabled = false;
+        this.isSearchFixesFlagEnabled = false;
         this._isSearchPhraseCleared = false;
         this._setupAttributes = () => {
             var _a, _b, _c, _d;
@@ -39,7 +40,9 @@ exports.HSearchInput = class HSearchInput extends phoenix_light_lit_element.Phoe
     }
     firstUpdated(props) {
         super.firstUpdated(props);
-        this._setupInitialValue();
+        if (!this.isSearchFixesFlagEnabled) {
+            this._setupInitialValue();
+        }
     }
     _setupInitialValue() {
         const searchQueryRegExp = /\/searchquery\/([^/]{1,})/;
@@ -73,7 +76,7 @@ exports.HSearchInput = class HSearchInput extends phoenix_light_lit_element.Phoe
                 }
             });
         });
-        if (this.isSearchClearFixFlagEnabled) {
+        if (this.isSearchFocusTrapFixEnabled || this.isSearchFixesFlagEnabled) {
             this.input.addEventListener('keydown', (ev) => {
                 if (ev.key !== 'Enter' || ev.repeat)
                     return;
@@ -161,9 +164,13 @@ tslib_es6.__decorate([
     tslib_es6.__metadata("design:type", String)
 ], exports.HSearchInput.prototype, "moduleInstanceId", void 0);
 tslib_es6.__decorate([
-    decorators.property({ type: Boolean, attribute: 'is-search-clear-fix-flag-enabled' }),
+    decorators.property({ type: Boolean, attribute: 'is-search-focus-trap-fix-enabled' }),
+    tslib_es6.__metadata("design:type", Boolean)
+], exports.HSearchInput.prototype, "isSearchFocusTrapFixEnabled", void 0);
+tslib_es6.__decorate([
+    decorators.property({ type: Boolean, attribute: 'is-search-fixes-flag-enabled' }),
     tslib_es6.__metadata("design:type", Boolean)
-], exports.HSearchInput.prototype, "isSearchClearFixFlagEnabled", void 0);
+], exports.HSearchInput.prototype, "isSearchFixesFlagEnabled", void 0);
 tslib_es6.__decorate([
     decorators.state(),
     tslib_es6.__metadata("design:type", Boolean)

package/build/cjs/packages/phoenix/src/components/form/search/subcomponents/input/search_input.js.map

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

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

@@ -0,0 +1,44 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib_es6 = require('../../../../../external/tslib/tslib.es6.js');
+require('lit');
+var cyclic_focus_trap_strategy = require('./strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy.js');
+var focus_trap_strategy_constants = require('./strategies/focus_trap_strategy_constants.js');
+
+var _a, _FocusTrapController_strategy, _FocusTrapController_createStrategy;
+class FocusTrapController {
+    constructor(host, props) {
+        _FocusTrapController_strategy.set(this, void 0);
+        tslib_es6.__classPrivateFieldSet(this, _FocusTrapController_strategy, tslib_es6.__classPrivateFieldGet(FocusTrapController, _a, "m", _FocusTrapController_createStrategy).call(FocusTrapController, props), "f");
+        host.addController(this);
+    }
+    get strategy() {
+        return tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_strategy, "f");
+    }
+    hostConnected() {
+        tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_strategy, "f").attach();
+    }
+    hostDisconnected() {
+        tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_strategy, "f").detach();
+    }
+    activate() {
+        tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_strategy, "f").activate();
+    }
+    deactivate() {
+        tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_strategy, "f").deactivate();
+    }
+    getFocusableElements(container) {
+        return tslib_es6.__classPrivateFieldGet(this, _FocusTrapController_strategy, "f").getFocusableElements(container);
+    }
+}
+_a = FocusTrapController, _FocusTrapController_strategy = new WeakMap(), _FocusTrapController_createStrategy = function _FocusTrapController_createStrategy(props) {
+    switch (props.mode) {
+        case focus_trap_strategy_constants.FOCUS_TRAP_STRATEGY_TYPES.cyclic: return new cyclic_focus_trap_strategy.CyclicFocusTrapStrategy(props);
+        default: return new cyclic_focus_trap_strategy.CyclicFocusTrapStrategy(props);
+    }
+};
+
+exports.FocusTrapController = FocusTrapController;
+//# sourceMappingURL=focus_trap_controller.js.map

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

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

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

@@ -0,0 +1,66 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utilities = require('@dreamcommerce/utilities');
+
+class BaseFocusTrapStrategy {
+    constructor(getContainer) {
+        this.getContainer = getContainer;
+        this.active = false;
+        this.noAutofocus = false;
+        this._handleKeyDown = (ev) => {
+            if (!this.active || ev.code !== 'Tab')
+                return;
+            const container = this.getContainer();
+            if (!container)
+                return;
+            const focusableElements = this.getFocusableElements(container);
+            if (focusableElements.length === 0)
+                return;
+            const $target = ev.target;
+            if (ev.shiftKey) {
+                if ($target === focusableElements[0]) {
+                    ev.preventDefault();
+                    focusableElements[focusableElements.length - 1].focus();
+                }
+            }
+            else {
+                if ($target === focusableElements[focusableElements.length - 1]) {
+                    ev.preventDefault();
+                    focusableElements[0].focus();
+                }
+            }
+        };
+    }
+    attach() {
+        document.addEventListener('keydown', this._handleKeyDown);
+    }
+    detach() {
+        document.removeEventListener('keydown', this._handleKeyDown);
+    }
+    activate() {
+        this.active = true;
+    }
+    deactivate() {
+        this.active = false;
+    }
+    getFocusableElements(container) {
+        return utilities.UiDomUtils.getFocusableElements(container).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);
+    }
+}
+
+exports.BaseFocusTrapStrategy = BaseFocusTrapStrategy;
+//# sourceMappingURL=base_focus_trap_strategy.js.map

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

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

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

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var base_focus_trap_strategy = require('../base_focus_trap_strategy.js');
+
+class CyclicFocusTrapStrategy extends base_focus_trap_strategy.BaseFocusTrapStrategy {
+    constructor({ getContainer }) {
+        super(getContainer);
+    }
+}
+
+exports.CyclicFocusTrapStrategy = CyclicFocusTrapStrategy;
+//# sourceMappingURL=cyclic_focus_trap_strategy.js.map

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

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

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

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const FOCUS_TRAP_STRATEGY_TYPES = {
+    cyclic: 'cyclic'
+};
+
+exports.FOCUS_TRAP_STRATEGY_TYPES = FOCUS_TRAP_STRATEGY_TYPES;
+//# sourceMappingURL=focus_trap_strategy_constants.js.map

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

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

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

@@ -1,10 +1,12 @@
 import { TemplateResult } from 'lit';
 import { PhoenixLightLitElement } from "../../../core/phoenix_light_lit_element/phoenix_light_lit_element";
 import type { TSearchDisplayMode, TSearchSettings } from "./search_types";
+import { FocusTrapController } from "../../../controllers/focus_trap_controller/focus_trap_controller";
 export declare class HSearch extends PhoenixLightLitElement {
     settings: TSearchSettings;
     view: string;
     locale: string;
+    isSearchFocusTrapFixEnabled: boolean;
     displayMode: TSearchDisplayMode;
     moduleInstanceId: string;
     private _historyContextProvider;
@@ -15,9 +17,11 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _inputField;
     private _searchForm;
     private _togglerElement;
+    private _mobileDialogOpener;
     private _id;
     private _openSearchButtonAriaLabelId;
     private _searchContentContainerId;
+    mobileFocusTrapController: FocusTrapController;
     private _searchResultsRef;
     private _searchHistoryRef;
     private _searchMessageRef;
@@ -79,6 +83,8 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _isSuggesterLayerVisible;
     private _preventSubmitOnSearchClear;
     private _resetSearchOnFocusOutside;
+    private _activateMobileDialog;
+    private _deactivateMobileDialog;
     private _handleOpenSearch;
     private _handleOpenSearchWithKeyboard;
     private _setupToggler;

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

@@ -15,16 +15,24 @@ 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';
 import { DEFAULT_VIEW, SEARCH_CLASS_NAMES, SEARCH_COMPONENT_NAMES, SEARCH_CONFIGURATION, SEARCH_CONTEXT_NAMES, SEARCH_CUSTOM_EVENT_NAMES } from './search_constants.js';
+import { FOCUS_TRAP_STRATEGY_TYPES } from '../../../controllers/focus_trap_controller/strategies/focus_trap_strategy_constants.js';
+import { FocusTrapController } from '../../../controllers/focus_trap_controller/focus_trap_controller.js';
 
 let HSearch = class HSearch extends PhoenixLightLitElement {
     constructor() {
         super(...arguments);
         this.view = DEFAULT_VIEW;
+        this.isSearchFocusTrapFixEnabled = 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(this, {
+            mode: FOCUS_TRAP_STRATEGY_TYPES.cyclic,
+            getContainer: () => this
+        });
         this._searchResultsRef = createRef();
         this._searchHistoryRef = createRef();
         this._searchMessageRef = createRef();
@@ -310,6 +318,8 @@ 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);
+                if (this.isSearchFocusTrapFixEnabled)
+                    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');
@@ -325,6 +335,8 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         };
         this._openMobileView = () => {
             this.classList.add(SEARCH_CLASS_NAMES.mobileOpened);
+            if (this.isSearchFocusTrapFixEnabled)
+                this._activateMobileDialog();
         };
         this._isSuggesterLayerVisible = () => {
             var _a;
@@ -345,8 +357,21 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
                 document.removeEventListener('focusin', this._resetSearchOnFocusOutside);
             }
         };
+        this._activateMobileDialog = () => {
+            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._handleOpenSearch = () => {
             this.classList.add(SEARCH_CLASS_NAMES.mobileOpened);
+            if (this.isSearchFocusTrapFixEnabled)
+                this._activateMobileDialog();
             const shouldShowMessage = this._searchPhrase !== '';
             this._updateSearchView(this._searchPhrase, shouldShowMessage, false);
             const $searchInput = this.querySelector(`
@@ -355,7 +380,8 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
             $searchInput === null || $searchInput === void 0 ? void 0 : $searchInput.focus();
         };
         this._handleOpenSearchWithKeyboard = (ev) => {
-            if (ev.code !== 'Enter')
+            const isRepeated = this.isSearchFocusTrapFixEnabled ? ev.repeat : false;
+            if (ev.code !== 'Enter' || isRepeated)
                 return;
             ev.preventDefault();
             this._handleOpenSearch();
@@ -364,6 +390,12 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     async connectedCallback() {
         super.connectedCallback();
         this._setupContext();
+        this._searchInput = this.querySelector(SEARCH_COMPONENT_NAMES.searchInput);
+        if (this.isSearchFocusTrapFixEnabled) {
+            this._setupInitialSearchPhrase();
+            this._setupListeners();
+            this._setupToggler();
+        }
         try {
             this._searchContextConsumer = new ContextConsumerController(this);
             this._searchContext$ = await this._searchContextConsumer.consumeAsync(this.moduleInstanceId);
@@ -392,10 +424,12 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         catch (_a) {
             console.error('Search context is not provided');
         }
-        this._searchInput = this.querySelector(SEARCH_COMPONENT_NAMES.searchInput);
-        this._setupInitialSearchPhrase();
-        this._setupListeners();
-        this._setupToggler();
+        if (!this.isSearchFocusTrapFixEnabled) {
+            this._searchInput = this.querySelector(SEARCH_COMPONENT_NAMES.searchInput);
+            this._setupInitialSearchPhrase();
+            this._setupListeners();
+            this._setupToggler();
+        }
     }
     disconnectedCallback() {
         var _a;
@@ -466,8 +500,12 @@ 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);
+            if (this.isSearchFocusTrapFixEnabled)
+                this._deactivateMobileDialog();
             this._resetSearchView();
             this._removeSearchKeyboardNavigation();
+            if (this.isSearchFocusTrapFixEnabled)
+                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;
@@ -574,8 +612,15 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         this._setActiveItemId(`${this._id}-1`);
         const searchBar = this.querySelector(`.${SEARCH_CLASS_NAMES.searchBar}`);
         searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(SEARCH_CLASS_NAMES.outline);
-        if (this.displayMode === 'dropdown')
-            this._hideHistorySuggestionsAndResults();
+        if (this.displayMode === 'dropdown') {
+            const isMobileViewOpen = this.classList.contains(SEARCH_CLASS_NAMES.mobileOpened);
+            if (isMobileViewOpen) {
+                this._displaySuggester(this._searchPhrase);
+            }
+            else {
+                this._hideHistorySuggestionsAndResults();
+            }
+        }
     }
     _submitSearchPhrase(searchPhrase) {
         this._dispatchEventWithSearchPhrase(SEARCH_CUSTOM_EVENT_NAMES.searchPhraseSubmitted, searchPhrase);
@@ -585,13 +630,23 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         if (!this._togglerElement)
             return;
         this._togglerElement.addEventListener('click', this._handleOpenSearch);
-        this._togglerElement.addEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        if (this.isSearchFocusTrapFixEnabled) {
+            this._togglerElement.addEventListener('keydown', this._handleOpenSearchWithKeyboard);
+        }
+        else {
+            this._togglerElement.addEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        }
     }
     _teardownToggler() {
         if (!this._togglerElement)
             return;
         this._togglerElement.removeEventListener('click', this._handleOpenSearch);
-        this._togglerElement.removeEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        if (this.isSearchFocusTrapFixEnabled) {
+            this._togglerElement.removeEventListener('keydown', this._handleOpenSearchWithKeyboard);
+        }
+        else {
+            this._togglerElement.removeEventListener('keyup', this._handleOpenSearchWithKeyboard);
+        }
     }
     render() {
         super.render();
@@ -648,6 +703,10 @@ __decorate([
     property({ type: String }),
     __metadata("design:type", String)
 ], HSearch.prototype, "locale", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'is-search-focus-trap-fix-enabled' }),
+    __metadata("design:type", Boolean)
+], HSearch.prototype, "isSearchFocusTrapFixEnabled", void 0);
 __decorate([
     property({ type: String, attribute: 'display-mode' }),
     __metadata("design:type", String)

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,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;"}
+{"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,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;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/subcomponents/buttons/search_clear.d.ts

@@ -3,7 +3,7 @@ import { PhoenixLightLitElement } from "../../../../../core/phoenix_light_lit_el
 export declare class HSearchClear extends PhoenixLightLitElement {
     private _btnController;
     moduleInstanceId: string;
-    isSearchClearFixFlagEnabled: boolean;
+    isSearchFixesFlagEnabled: boolean;
     private _shouldShow;
     private _isRequestPending;
     private _searchContextConsumer;

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

@@ -12,7 +12,7 @@ import { SEARCH_CUSTOM_EVENT_NAMES, SEARCH_COMPONENT_NAMES, SEARCH_CLASS_NAMES,
 let HSearchClear = class HSearchClear extends PhoenixLightLitElement {
     constructor() {
         super();
-        this.isSearchClearFixFlagEnabled = false;
+        this.isSearchFixesFlagEnabled = false;
         this._shouldShow = false;
         this._isRequestPending = false;
         this._$searchInput = null;
@@ -25,7 +25,7 @@ let HSearchClear = class HSearchClear extends PhoenixLightLitElement {
         this._handleSearchClear = () => {
             var _a;
             this._dispatchClearEvent();
-            if (this.isSearchClearFixFlagEnabled) {
+            if (this.isSearchFixesFlagEnabled) {
                 this._updateClearButtonVisibility('');
                 (_a = this._$searchInput) === null || _a === void 0 ? void 0 : _a.focus();
             }
@@ -45,7 +45,7 @@ let HSearchClear = class HSearchClear extends PhoenixLightLitElement {
         this._searchContextSetup();
         const $search = this.closest(SEARCH_COMPONENT_NAMES.search);
         this._$searchInput = (_a = $search === null || $search === void 0 ? void 0 : $search.querySelector('input[type="search"]')) !== null && _a !== void 0 ? _a : null;
-        if (this.isSearchClearFixFlagEnabled) {
+        if (this.isSearchFixesFlagEnabled) {
             this._updateClearButtonVisibility((_c = (_b = this._$searchInput) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : '');
         }
         this.addEventListener('click', this._handleSearchClear);
@@ -96,9 +96,9 @@ __decorate([
     __metadata("design:type", String)
 ], HSearchClear.prototype, "moduleInstanceId", void 0);
 __decorate([
-    property({ type: Boolean, attribute: 'is-search-clear-fix-flag-enabled' }),
+    property({ type: Boolean, attribute: 'is-search-fixes-flag-enabled' }),
     __metadata("design:type", Boolean)
-], HSearchClear.prototype, "isSearchClearFixFlagEnabled", void 0);
+], HSearchClear.prototype, "isSearchFixesFlagEnabled", void 0);
 __decorate([
     state(),
     __metadata("design:type", Boolean)

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

@@ -3,7 +3,8 @@ import { PropertyValues } from 'lit';
 export declare class HSearchInput extends PhoenixLightLitElement {
     input: HTMLInputElement | null;
     moduleInstanceId: string;
-    isSearchClearFixFlagEnabled: boolean;
+    isSearchFocusTrapFixEnabled: boolean;
+    isSearchFixesFlagEnabled: boolean;
     private _isSearchPhraseCleared;
     connectedCallback(): void;
     firstUpdated(props: PropertyValues): void;

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

@@ -9,7 +9,8 @@ import { SEARCH_CLASS_NAMES, SEARCH_CUSTOM_EVENT_NAMES, SEARCH_COMPONENT_NAMES }
 let HSearchInput = class HSearchInput extends PhoenixLightLitElement {
     constructor() {
         super(...arguments);
-        this.isSearchClearFixFlagEnabled = false;
+        this.isSearchFocusTrapFixEnabled = false;
+        this.isSearchFixesFlagEnabled = false;
         this._isSearchPhraseCleared = false;
         this._setupAttributes = () => {
             var _a, _b, _c, _d;
@@ -35,7 +36,9 @@ let HSearchInput = class HSearchInput extends PhoenixLightLitElement {
     }
     firstUpdated(props) {
         super.firstUpdated(props);
-        this._setupInitialValue();
+        if (!this.isSearchFixesFlagEnabled) {
+            this._setupInitialValue();
+        }
     }
     _setupInitialValue() {
         const searchQueryRegExp = /\/searchquery\/([^/]{1,})/;
@@ -69,7 +72,7 @@ let HSearchInput = class HSearchInput extends PhoenixLightLitElement {
                 }
             });
         });
-        if (this.isSearchClearFixFlagEnabled) {
+        if (this.isSearchFocusTrapFixEnabled || this.isSearchFixesFlagEnabled) {
             this.input.addEventListener('keydown', (ev) => {
                 if (ev.key !== 'Enter' || ev.repeat)
                     return;
@@ -157,9 +160,13 @@ __decorate([
     __metadata("design:type", String)
 ], HSearchInput.prototype, "moduleInstanceId", void 0);
 __decorate([
-    property({ type: Boolean, attribute: 'is-search-clear-fix-flag-enabled' }),
+    property({ type: Boolean, attribute: 'is-search-focus-trap-fix-enabled' }),
+    __metadata("design:type", Boolean)
+], HSearchInput.prototype, "isSearchFocusTrapFixEnabled", void 0);
+__decorate([
+    property({ type: Boolean, attribute: 'is-search-fixes-flag-enabled' }),
     __metadata("design:type", Boolean)
-], HSearchInput.prototype, "isSearchClearFixFlagEnabled", void 0);
+], HSearchInput.prototype, "isSearchFixesFlagEnabled", void 0);
 __decorate([
     state(),
     __metadata("design:type", Boolean)

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

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,qDAAyD;AAChG;AACA;AACA;AACA;AACA,uBAAuB,qDAAyD;AAChF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,qDAAyD;AAChG;AACA;AACA;AACA;AACA,uBAAuB,qDAAyD;AAChF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/controllers/focus_trap_controller/focus_trap_controller.d.ts

@@ -0,0 +1,13 @@
+import { ReactiveController, ReactiveControllerHost } from 'lit';
+import type { TFocusTrapProps } from './focus_trap_controller_types';
+import { IBaseFocusTrapStrategy } from './strategies/base_focus_trap_strategy_types';
+export declare class FocusTrapController implements ReactiveController {
+    #private;
+    constructor(host: ReactiveControllerHost, props: TFocusTrapProps);
+    get strategy(): IBaseFocusTrapStrategy;
+    hostConnected(): void;
+    hostDisconnected(): void;
+    activate(): void;
+    deactivate(): void;
+    getFocusableElements(container: HTMLElement): HTMLElement[];
+}

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

@@ -0,0 +1,40 @@
+import { __classPrivateFieldSet, __classPrivateFieldGet } from '../../../../../external/tslib/tslib.es6.js';
+import 'lit';
+import { CyclicFocusTrapStrategy } from './strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy.js';
+import { FOCUS_TRAP_STRATEGY_TYPES } from './strategies/focus_trap_strategy_constants.js';
+
+var _a, _FocusTrapController_strategy, _FocusTrapController_createStrategy;
+class FocusTrapController {
+    constructor(host, props) {
+        _FocusTrapController_strategy.set(this, void 0);
+        __classPrivateFieldSet(this, _FocusTrapController_strategy, __classPrivateFieldGet(FocusTrapController, _a, "m", _FocusTrapController_createStrategy).call(FocusTrapController, props), "f");
+        host.addController(this);
+    }
+    get strategy() {
+        return __classPrivateFieldGet(this, _FocusTrapController_strategy, "f");
+    }
+    hostConnected() {
+        __classPrivateFieldGet(this, _FocusTrapController_strategy, "f").attach();
+    }
+    hostDisconnected() {
+        __classPrivateFieldGet(this, _FocusTrapController_strategy, "f").detach();
+    }
+    activate() {
+        __classPrivateFieldGet(this, _FocusTrapController_strategy, "f").activate();
+    }
+    deactivate() {
+        __classPrivateFieldGet(this, _FocusTrapController_strategy, "f").deactivate();
+    }
+    getFocusableElements(container) {
+        return __classPrivateFieldGet(this, _FocusTrapController_strategy, "f").getFocusableElements(container);
+    }
+}
+_a = FocusTrapController, _FocusTrapController_strategy = new WeakMap(), _FocusTrapController_createStrategy = function _FocusTrapController_createStrategy(props) {
+    switch (props.mode) {
+        case FOCUS_TRAP_STRATEGY_TYPES.cyclic: return new CyclicFocusTrapStrategy(props);
+        default: return new CyclicFocusTrapStrategy(props);
+    }
+};
+
+export { FocusTrapController };
+//# sourceMappingURL=focus_trap_controller.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,+DAA+D,4CAAgD;AAC/G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/controllers/focus_trap_controller/focus_trap_controller_types.d.ts

@@ -0,0 +1,6 @@
+import { TCyclicFocusTrapStrategyProps } from './strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy_types';
+import { FOCUS_TRAP_STRATEGY_TYPES } from './strategies/focus_trap_strategy_constants';
+export declare type TCyclicFocusTrapProps = TCyclicFocusTrapStrategyProps & {
+    mode: typeof FOCUS_TRAP_STRATEGY_TYPES.cyclic;
+};
+export declare type TFocusTrapProps = TCyclicFocusTrapProps;

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/focus_trap_controller_types.js

@@ -0,0 +1,3 @@
+import './strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy_types';
+import './strategies/focus_trap_strategy_constants';
+//# sourceMappingURL=focus_trap_controller_types.js.map

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/focus_trap_controller_types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"focus_trap_controller_types.js","sourceRoot":"","sources":["../../../../../../../src/controllers/focus_trap_controller/focus_trap_controller_types.ts"],"names":[],"mappings":"AAAA,OAA8C,0EAA0E,CAAC;AACzH,OAA0C,4CAA4C,CAAC"}

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/base_focus_trap_strategy.d.ts

@@ -0,0 +1,14 @@
+import { IBaseFocusTrapStrategy } from './base_focus_trap_strategy_types';
+export declare abstract class BaseFocusTrapStrategy implements IBaseFocusTrapStrategy {
+    protected readonly getContainer: () => HTMLElement | undefined;
+    protected active: boolean;
+    noAutofocus: boolean;
+    constructor(getContainer: () => HTMLElement | undefined);
+    attach(): void;
+    detach(): void;
+    activate(): void;
+    deactivate(): void;
+    getFocusableElements(container: HTMLElement): HTMLElement[];
+    protected _handleKeyDown: (ev: KeyboardEvent) => void;
+    private _isElementTrulyFocusable;
+}

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/base_focus_trap_strategy.js

@@ -0,0 +1,62 @@
+import { UiDomUtils } from '@dreamcommerce/utilities';
+
+class BaseFocusTrapStrategy {
+    constructor(getContainer) {
+        this.getContainer = getContainer;
+        this.active = false;
+        this.noAutofocus = false;
+        this._handleKeyDown = (ev) => {
+            if (!this.active || ev.code !== 'Tab')
+                return;
+            const container = this.getContainer();
+            if (!container)
+                return;
+            const focusableElements = this.getFocusableElements(container);
+            if (focusableElements.length === 0)
+                return;
+            const $target = ev.target;
+            if (ev.shiftKey) {
+                if ($target === focusableElements[0]) {
+                    ev.preventDefault();
+                    focusableElements[focusableElements.length - 1].focus();
+                }
+            }
+            else {
+                if ($target === focusableElements[focusableElements.length - 1]) {
+                    ev.preventDefault();
+                    focusableElements[0].focus();
+                }
+            }
+        };
+    }
+    attach() {
+        document.addEventListener('keydown', this._handleKeyDown);
+    }
+    detach() {
+        document.removeEventListener('keydown', this._handleKeyDown);
+    }
+    activate() {
+        this.active = true;
+    }
+    deactivate() {
+        this.active = false;
+    }
+    getFocusableElements(container) {
+        return UiDomUtils.getFocusableElements(container).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);
+    }
+}
+
+export { BaseFocusTrapStrategy };
+//# sourceMappingURL=base_focus_trap_strategy.js.map

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/base_focus_trap_strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/controllers/focus_trap_controller/strategies/base_focus_trap_strategy_types.d.ts

@@ -0,0 +1,8 @@
+export interface IBaseFocusTrapStrategy {
+    noAutofocus: boolean;
+    attach(): void;
+    detach(): void;
+    activate(): void;
+    deactivate(): void;
+    getFocusableElements(container: HTMLElement): HTMLElement[];
+}

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/base_focus_trap_strategy_types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=base_focus_trap_strategy_types.js.map

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/base_focus_trap_strategy_types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base_focus_trap_strategy_types.js","sourceRoot":"","sources":["../../../../../../../../src/controllers/focus_trap_controller/strategies/base_focus_trap_strategy_types.ts"],"names":[],"mappings":""}

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy.d.ts

@@ -0,0 +1,6 @@
+import { BaseFocusTrapStrategy } from '../base_focus_trap_strategy';
+import { IBaseFocusTrapStrategy } from '../base_focus_trap_strategy_types';
+import { TCyclicFocusTrapStrategyProps } from './cyclic_focus_trap_strategy_types';
+export declare class CyclicFocusTrapStrategy extends BaseFocusTrapStrategy implements IBaseFocusTrapStrategy {
+    constructor({ getContainer }: TCyclicFocusTrapStrategyProps);
+}

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy.js

@@ -0,0 +1,10 @@
+import { BaseFocusTrapStrategy } from '../base_focus_trap_strategy.js';
+
+class CyclicFocusTrapStrategy extends BaseFocusTrapStrategy {
+    constructor({ getContainer }) {
+        super(getContainer);
+    }
+}
+
+export { CyclicFocusTrapStrategy };
+//# sourceMappingURL=cyclic_focus_trap_strategy.js.map

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy.js.map

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

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy_types.d.ts

@@ -0,0 +1,3 @@
+export declare type TCyclicFocusTrapStrategyProps = {
+    getContainer: () => HTMLElement | undefined;
+};

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy_types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cyclic_focus_trap_strategy_types.js.map

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy_types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cyclic_focus_trap_strategy_types.js","sourceRoot":"","sources":["../../../../../../../../../src/controllers/focus_trap_controller/strategies/cyclic_focus_trap_strategy/cyclic_focus_trap_strategy_types.ts"],"names":[],"mappings":""}

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/focus_trap_strategy_constants.d.ts

@@ -0,0 +1,3 @@
+export declare const FOCUS_TRAP_STRATEGY_TYPES: {
+    readonly cyclic: "cyclic";
+};

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/focus_trap_strategy_constants.js

@@ -0,0 +1,6 @@
+const FOCUS_TRAP_STRATEGY_TYPES = {
+    cyclic: 'cyclic'
+};
+
+export { FOCUS_TRAP_STRATEGY_TYPES };
+//# sourceMappingURL=focus_trap_strategy_constants.js.map

package/build/esm/packages/phoenix/src/controllers/focus_trap_controller/strategies/focus_trap_strategy_constants.js.map

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@shoper/phoenix_design_system",
   "packageManager": "yarn@3.2.0",
   "sideEffects": false,
-  "version": "1.18.32",
+  "version": "1.18.34-0",
   "description": "phoenix design system",
   "author": "zefirek",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "@splidejs/splide-extension-auto-scroll": "0.5.3"
   },
   "devDependencies": {
-    "@dreamcommerce/utilities": "^1.23.4-1",
+    "@dreamcommerce/utilities": "^1.23.5",
     "@shoper/jest_config": "^0.0.0",
     "@shoper/tsconfig": "^0.0.0",
     "@splidejs/splide": "4.0.7",