@shoper/phoenix_design_system 1.18.23-0 → 1.18.23-10

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

@@ -16,6 +16,8 @@ var v4 = require('../../../../../external/uuid/dist/esm-browser/v4.js');
 var portal_constants = require('../portal/portal_constants.js');
 var backdrop_controller = require('../backdrop/controller/backdrop_controller.js');
 var click_outside_controller = require('../../controllers/click_outside_controller/click_outside_controller.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');
 var throttle = require('../../../../../external/lodash/throttle.js');
 var relative_position_controller = require('../../controllers/relative_position_controller/relative_position_controller.js');
 
@@ -34,6 +36,11 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
         this.preventFocusTrap = false;
         this.noAutoFocus = false;
         this._backdropController = new backdrop_controller.BackdropController();
+        this._focusTrapController = new focus_trap_controller.FocusTrapController(this, {
+            mode: focus_trap_strategy_constants.FOCUS_TRAP_STRATEGY_TYPES.toggler,
+            getContainer: () => { var _a; return (_a = this.$dropdownContent) !== null && _a !== void 0 ? _a : undefined; },
+            getToggler: () => { var _a; return (_a = this.$dropdownToggler) !== null && _a !== void 0 ? _a : undefined; }
+        });
         this._handleClickOutside = async (target) => {
             var _a, _b;
             if (!this.opened)
@@ -71,6 +78,8 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
                         this._dispatchShowDropdownEvent();
                         (_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.classList.remove(`${dropdown_constants.DROPDOWN_CONTENT_CSS_CLASSES.show}-${this.transition}-start`, `${dropdown_constants.DROPDOWN_CONTENT_CSS_CLASSES.show}-${this.transition}-end`);
                         this._toggleScroll();
+                        if (!this.preventFocusTrap)
+                            this._focusTrapController.activate();
                         resolve();
                     }, transitionDuration);
                 });
@@ -111,6 +120,7 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
                         var _a;
                         (_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.classList.remove(`${dropdown_constants.DROPDOWN_CONTENT_CSS_CLASSES.hide}-${this.transition}-start`, `${dropdown_constants.DROPDOWN_CONTENT_CSS_CLASSES.hide}-${this.transition}-end`);
                         this.opened = false;
+                        this._focusTrapController.deactivate();
                         this._dispatchHideDropdownEvent();
                         resolve();
                     }, transitionDuration);
@@ -141,32 +151,21 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
                 return;
             await this.hide();
         };
-        this._keepFocusWithinDropdownForwards = (ev) => {
-            var _a, _b;
-            if (ev.shiftKey === true || !this.$dropdownContent || !this.opened)
-                return;
-            const $target = ev.target;
-            if (((_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.contains($target)) && this.preventFocusTrap) {
-                this._handleFocusOnNextElementAfterDropdown(ev);
-                return;
-            }
-            if ((_b = this.$dropdownToggler) === null || _b === void 0 ? void 0 : _b.contains($target)) {
-                this._handleFocusFromTogglerForwards(ev);
+        this._handleTabExitForward = (ev) => {
+            if (ev.shiftKey || !this.$dropdownContent || !this.opened || !this.preventFocusTrap)
                 return;
+            if (this.$dropdownContent.contains(ev.target)) {
+                ev.preventDefault();
+                this.hide();
+                utilities.UiDomUtils.getNextFocusableElement(this.$dropdownToggler || this).focus();
             }
-            this._handleFocusFromSentinelEndForwards(ev, $target);
         };
-        this._keepFocusWithinDropdownBackwards = (ev) => {
-            if (!this.opened || !this.$dropdownContent)
+        this._handleTabExitBackward = (ev) => {
+            if (!this.opened || !this.$dropdownContent || !this.preventFocusTrap)
                 return;
-            const $target = ev.target;
-            if (this.preventFocusTrap) {
-                this._handleDefaultFocusFromDropdownBackwards(ev);
-            }
-            else {
-                this._handleFocusFromTogglerBackwards(ev, $target);
-                this._handleFocusFromSentinelStartBackwards(ev, $target);
-            }
+            ev.preventDefault();
+            this.hide();
+            utilities.UiDomUtils.getPreviousFocusableElement(this.$dropdownToggler || this).focus();
         };
         this._hoverToggle = async (ev) => {
             if (window.innerWidth < global_constants.BREAKPOINTS.xs)
@@ -188,7 +187,7 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
         this._focusOnFirstContentElement = () => {
             if (!this.$dropdownContent)
                 return;
-            const $firstFocusableElement = this._getTrulyFocusableElements(this.$dropdownContent)[0];
+            const $firstFocusableElement = this._focusTrapController.getFocusableElements(this.$dropdownContent)[0];
             if ($firstFocusableElement)
                 $firstFocusableElement.focus();
         };
@@ -217,13 +216,13 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
             host: this,
             target: document.body,
             keys: ['tab'],
-            callback: this._keepFocusWithinDropdownForwards
+            callback: this._handleTabExitForward
         });
         new keystrokes_controller.KeystrokesController({
             host: this,
             target: document.body,
             keys: [['shift', 'tab']],
-            callback: this._keepFocusWithinDropdownBackwards,
+            callback: this._handleTabExitBackward,
             containerSelectors: ['h-dropdown', 'h-dropdown-content']
         });
     }
@@ -300,74 +299,6 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
             (_b = this.$dropdownContent) === null || _b === void 0 ? void 0 : _b.classList.add(global_constants.SCROLLABLE_CLASS_NAME);
         }
     }
-    _handleFocusOnNextElementAfterDropdown(ev) {
-        ev.preventDefault();
-        this.hide();
-        utilities.UiDomUtils.getNextFocusableElement(this.$dropdownToggler || this).focus();
-        return;
-    }
-    _handleFocusFromTogglerForwards(ev) {
-        if (!this.$dropdownContent)
-            return;
-        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
-        if (trulyFocusableElements.length === 0)
-            return;
-        ev.preventDefault();
-        trulyFocusableElements[0].focus();
-    }
-    _handleFocusFromSentinelEndForwards(ev, $target) {
-        var _a;
-        if (!this.$dropdownContent)
-            return;
-        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
-        const $lastFocusableElement = trulyFocusableElements.slice(-1)[0];
-        if ($target !== $lastFocusableElement)
-            return;
-        ev.preventDefault();
-        (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
-    }
-    _handleDefaultFocusFromDropdownBackwards(ev) {
-        ev.preventDefault();
-        this.hide();
-        utilities.UiDomUtils.getPreviousFocusableElement(this.$dropdownToggler || this).focus();
-    }
-    _handleFocusFromTogglerBackwards(ev, $target) {
-        var _a;
-        if ($target !== this.$dropdownToggler && !((_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.contains($target)) || !this.$dropdownContent)
-            return;
-        ev.preventDefault();
-        const trulyFocusableElements = this._getTrulyFocusableElements(this.$dropdownContent);
-        if (trulyFocusableElements.length === 0)
-            return;
-        const $lastFocusableElement = trulyFocusableElements.slice(-1)[0];
-        $lastFocusableElement.focus();
-    }
-    _handleFocusFromSentinelStartBackwards(ev, $target) {
-        var _a;
-        if (!this.$dropdownContent)
-            return;
-        const $firstFocusableElement = this._getTrulyFocusableElements(this.$dropdownContent)[0];
-        if ($target !== $firstFocusableElement)
-            return;
-        ev.preventDefault();
-        (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
-    }
-    _getTrulyFocusableElements($container) {
-        const focusableElements = utilities.UiDomUtils.getFocusableElements($container);
-        return focusableElements.filter(($el) => this._isElementTrulyFocusable($el));
-    }
-    _isElementTrulyFocusable($el) {
-        const style = window.getComputedStyle($el);
-        if (style.display === 'none' || style.visibility === 'hidden') {
-            return false;
-        }
-        if ($el.nodeName === 'H-PORTAL')
-            return true;
-        const $parent = $el.parentElement;
-        if (!$parent)
-            return true;
-        return this._isElementTrulyFocusable($parent);
-    }
     _isHoveredWithinDropdown(element) {
         var _a;
         if (element === this)

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

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiB,qDAAyD;AAC1E;AACA;AACA;AACA,uBAAuB,4CAAgD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"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,iBAAiB,qDAAyD;AAC1E;AACA;AACA;AACA;AACA;AACA,uBAAuB,4CAAgD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

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

@@ -16,6 +16,8 @@ var ref_js = require('lit-html/directives/ref.js');
 var context_provider_controller = require('../../../core/context/context_provider_controller.js');
 var global_constants = require('../../../global_constants.js');
 var v4 = require('../../../../../../external/uuid/dist/esm-browser/v4.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');
 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');
@@ -27,11 +29,17 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         this.view = search_constants.DEFAULT_VIEW;
         this.isSearchIconFixEnabled = false;
         this.isSearchUxFixesFlagEnabled = false;
+        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();
@@ -327,6 +335,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');
@@ -342,6 +352,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;
@@ -362,6 +374,19 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
                 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) {
@@ -370,6 +395,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         };
         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(`
@@ -378,7 +405,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();
@@ -387,6 +415,10 @@ 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);
+        this._setupInitialSearchPhrase();
+        this._setupListeners();
+        this.isSearchIconFixEnabled ? this._setupToggler() : this._setupAriaAttributes();
         try {
             this._searchContextConsumer = new context_consumer_controller.ContextConsumerController(this);
             this._searchContext$ = await this._searchContextConsumer.consumeAsync(this.moduleInstanceId);
@@ -415,10 +447,6 @@ 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.isSearchIconFixEnabled ? this._setupToggler() : this._setupAriaAttributes();
     }
     disconnectedCallback() {
         var _a;
@@ -490,8 +518,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.isSearchUxFixesFlagEnabled && 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;
@@ -610,13 +642,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();
@@ -626,7 +668,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
                     tabindex="0"
                     aria-haspopup="dialog"
                     @click=${this._handleOpenSearch}
-                    @keyup=${this._handleOpenSearchWithKeyboard}
+                    @keyup=${this.isSearchFocusTrapFixEnabled ? undefined : this._handleOpenSearchWithKeyboard}
+                    @keydown=${this.isSearchFocusTrapFixEnabled ? this._handleOpenSearchWithKeyboard : undefined}
                 >
                     ${when.when(this._translations.openSearchButtonAriaLabel, () => lit.html `
                             <span id="${this._openSearchButtonAriaLabelId}" class="sr-only">
@@ -696,6 +739,10 @@ tslib_es6.__decorate([
     decorators.property({ type: Boolean, attribute: 'is-search-ux-fixes-flag-enabled' }),
     tslib_es6.__metadata("design:type", Boolean)
 ], exports.HSearch.prototype, "isSearchUxFixesFlagEnabled", 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;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;"}
+{"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;AACA,iBAAiB,wDAA4D;AAC7E;AACA;AACA;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;AACA;AACA;AACA;AACA;AACA;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/input/search_input.js

@@ -72,25 +72,15 @@ exports.HSearchInput = class HSearchInput extends phoenix_light_lit_element.Phoe
                 }
             });
         });
-        this.input.addEventListener('keyup', (ev) => {
-            if (ev.key === 'ArrowUp' || ev.key === 'ArrowDown' || ev.key === 'Escape')
+        this.input.addEventListener('keydown', (ev) => {
+            if (ev.key !== 'Enter' || ev.repeat)
                 return;
-            if (ev.key !== 'Enter') {
-                this.emitCustomEvent(search_constants.SEARCH_CUSTOM_EVENT_NAMES.keyup, {
-                    detail: {
-                        searchPhrase: ev.target.value
-                    }
-                });
-                return;
-            }
             if (this._isSearchPhraseCleared) {
                 this._isSearchPhraseCleared = false;
                 return;
             }
             this.emitCustomEvent(search_constants.SEARCH_CUSTOM_EVENT_NAMES.submit, {
-                detail: {
-                    searchPhrase: ev.target.value
-                }
+                detail: { searchPhrase: ev.target.value }
             });
         });
         this.input.addEventListener('keyup', debounce['default']((ev) => {

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

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

@@ -13,6 +13,8 @@ var ref_js = require('lit-html/directives/ref.js');
 var portal_constants = require('../portal/portal_constants.js');
 var backdrop_constants = require('../backdrop/backdrop_constants.js');
 var backdrop_controller = require('../backdrop/controller/backdrop_controller.js');
+var focus_trap_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');
 var modal_constants = require('./modal_constants.js');
 var modal_close = require('./modal_close.js');
 
@@ -25,6 +27,7 @@ exports.HModal = HModal_1 = class HModal extends phoenix_light_lit_element.Phoen
         this.transition = 'scale';
         this.modalLabel = '';
         this.noAutofocus = false;
+        this.isSearchFocusTrapFixEnabled = false;
         this._firstFocusableElement = undefined;
         this._focusableElements = null;
         this._lastFocusableElement = undefined;
@@ -40,22 +43,35 @@ exports.HModal = HModal_1 = class HModal extends phoenix_light_lit_element.Phoen
                     document.addEventListener('keydown', this._bindCloseOnEsc);
                     document.addEventListener(backdrop_constants.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();
+                    if (this.isSearchFocusTrapFixEnabled) {
+                        this._focusTrapController.activate();
+                    }
+                    else {
+                        if (!this.noAutofocus) {
+                            setTimeout(() => {
+                                var _a;
+                                (_a = this._firstFocusableElement) === null || _a === void 0 ? void 0 : _a.focus();
+                                window.scrollTo(0, scrollY);
+                            }, 0);
+                        }
                     }
                 },
                 false: () => {
                     HModal_1.openModals = HModal_1.openModals.filter((modal) => modal !== this);
                     document.removeEventListener('keydown', this._bindCloseOnEsc);
                     document.removeEventListener(backdrop_constants.BACKDROP_EVENTS.clicked, this.close);
+                    if (this.isSearchFocusTrapFixEnabled)
+                        this._focusTrapController.deactivate();
                 }
             }
         };
         this._backdropController = new backdrop_controller.BackdropController();
+        this._focusTrapController = new focus_trap_controller.FocusTrapController(this, {
+            mode: focus_trap_strategy_constants.FOCUS_TRAP_STRATEGY_TYPES.sentinel,
+            getContainer: () => this._contentRef.value,
+            noAutofocus: this.noAutofocus
+        });
         this._keepFocusWithinModal = (ev) => {
             var _a;
             const isTabPressed = ev.code === 'Tab';
@@ -149,7 +165,8 @@ exports.HModal = HModal_1 = class HModal extends phoenix_light_lit_element.Phoen
     connectedCallback() {
         super.connectedCallback();
         HModal_1._appendModalsPortal();
-        document.addEventListener('keyup', this._keepFocusWithinModal);
+        if (!this.isSearchFocusTrapFixEnabled)
+            document.addEventListener('keyup', this._keepFocusWithinModal);
         document.addEventListener(modal_constants.MODAL_EVENTS.close, this._handleCloseFromCloseComponent);
     }
     disconnectedCallback() {
@@ -158,17 +175,23 @@ exports.HModal = HModal_1 = class HModal extends phoenix_light_lit_element.Phoen
             this.close();
         document.removeEventListener(modal_constants.MODAL_EVENTS.close, this._handleCloseFromCloseComponent);
         document.removeEventListener('keydown', this._bindCloseOnEsc);
-        document.removeEventListener('keyup', this._keepFocusWithinModal);
+        if (!this.isSearchFocusTrapFixEnabled)
+            document.removeEventListener('keyup', this._keepFocusWithinModal);
     }
     firstUpdated(props) {
         super.firstUpdated(props);
-        this._firstFocusableElement = this._focusSentinelStart.value;
-        this._lastFocusableElement = this._focusSentinelEnd.value;
+        if (!this.isSearchFocusTrapFixEnabled) {
+            this._firstFocusableElement = this._focusSentinelStart.value;
+            this._lastFocusableElement = this._focusSentinelEnd.value;
+        }
     }
     updated(changedProps) {
         if (changedProps.has(modal_constants.MODAL_OPENED_PROP)) {
             this._propsChangeStrategies[modal_constants.MODAL_OPENED_PROP][String(this[modal_constants.MODAL_OPENED_PROP])]();
         }
+        if (this.isSearchFocusTrapFixEnabled && changedProps.has('noAutofocus')) {
+            this._focusTrapController.strategy.noAutofocus = this.noAutofocus;
+        }
     }
     _setFocusToFirstFocusableElementInModalOrCloseBtn() {
         if (this.noAutofocus)
@@ -197,7 +220,8 @@ exports.HModal = HModal_1 = class HModal extends phoenix_light_lit_element.Phoen
                 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();
+                    if (!this.isSearchFocusTrapFixEnabled)
+                        this._setFocusToFirstFocusableElementInModalOrCloseBtn();
                     resolve();
                 }, transitionDuration);
             });
@@ -256,6 +280,10 @@ tslib_es6.__decorate([
     decorators_js.property({ type: Boolean, attribute: 'no-autofocus' }),
     tslib_es6.__metadata("design:type", Object)
 ], exports.HModal.prototype, "noAutofocus", void 0);
+tslib_es6.__decorate([
+    decorators_js.property({ type: Boolean, attribute: 'is-search-focus-trap-fix-enabled' }),
+    tslib_es6.__metadata("design:type", Boolean)
+], exports.HModal.prototype, "isSearchFocusTrapFixEnabled", void 0);
 tslib_es6.__decorate([
     decorators_js.state(),
     tslib_es6.__metadata("design:type", Object)

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

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

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

@@ -13,6 +13,8 @@ var ref_js = require('lit-html/directives/ref.js');
 var portal_constants = require('../portal/portal_constants.js');
 var backdrop_constants = require('../backdrop/backdrop_constants.js');
 var backdrop_controller = require('../backdrop/controller/backdrop_controller.js');
+var focus_trap_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');
 var sheet_constants = require('./sheet_constants.js');
 var sheet_close = require('./sheet_close.js');
 
@@ -24,6 +26,7 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
         this.class = '';
         this.transition = 'scale';
         this.sheetLabel = '';
+        this.isSearchFocusTrapFixEnabled = false;
         this._firstFocusableElement = undefined;
         this._focusableElements = null;
         this._lastFocusableElement = undefined;
@@ -39,20 +42,31 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
                     document.addEventListener('keydown', this._bindCloseOnEsc);
                     document.addEventListener(backdrop_constants.BACKDROP_EVENTS.clicked, this.close);
                     this._dispatchSheetOpenedEvent();
-                    setTimeout(() => {
-                        var _a;
-                        (_a = this._firstFocusableElement) === null || _a === void 0 ? void 0 : _a.focus();
-                        window.scrollTo(0, scrollY);
-                    }, 0);
+                    if (this.isSearchFocusTrapFixEnabled) {
+                        this._focusTrapController.activate();
+                    }
+                    else {
+                        setTimeout(() => {
+                            var _a;
+                            (_a = this._firstFocusableElement) === null || _a === void 0 ? void 0 : _a.focus();
+                            window.scrollTo(0, scrollY);
+                        }, 0);
+                    }
                 },
                 false: () => {
                     HSheet_1.openSheets = HSheet_1.openSheets.filter((sheet) => sheet !== this);
                     document.removeEventListener('keydown', this._bindCloseOnEsc);
                     document.removeEventListener(backdrop_constants.BACKDROP_EVENTS.clicked, this.close);
+                    if (this.isSearchFocusTrapFixEnabled)
+                        this._focusTrapController.deactivate();
                 }
             }
         };
         this._backdropController = new backdrop_controller.BackdropController();
+        this._focusTrapController = new focus_trap_controller.FocusTrapController(this, {
+            mode: focus_trap_strategy_constants.FOCUS_TRAP_STRATEGY_TYPES.sentinel,
+            getContainer: () => this._contentRef.value
+        });
         this._keepFocusWithinSheet = (ev) => {
             var _a;
             const isTabPressed = ev.code === 'Tab';
@@ -146,7 +160,8 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
     connectedCallback() {
         super.connectedCallback();
         HSheet_1._appendSheetPortal();
-        document.addEventListener('keyup', this._keepFocusWithinSheet);
+        if (!this.isSearchFocusTrapFixEnabled)
+            document.addEventListener('keyup', this._keepFocusWithinSheet);
         document.addEventListener(sheet_constants.SHEET_EVENTS.close, this._handleCloseFromCloseComponent);
     }
     disconnectedCallback() {
@@ -155,12 +170,15 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
             this.close();
         document.removeEventListener(sheet_constants.SHEET_EVENTS.close, this._handleCloseFromCloseComponent);
         document.removeEventListener('keydown', this._bindCloseOnEsc);
-        document.removeEventListener('keyup', this._keepFocusWithinSheet);
+        if (!this.isSearchFocusTrapFixEnabled)
+            document.removeEventListener('keyup', this._keepFocusWithinSheet);
     }
     firstUpdated(props) {
         super.firstUpdated(props);
-        this._firstFocusableElement = this._focusSentinelStart.value;
-        this._lastFocusableElement = this._focusSentinelEnd.value;
+        if (!this.isSearchFocusTrapFixEnabled) {
+            this._firstFocusableElement = this._focusSentinelStart.value;
+            this._lastFocusableElement = this._focusSentinelEnd.value;
+        }
     }
     updated(changedProps) {
         if (changedProps.has(sheet_constants.SHEET_OPENED_PROP)) {
@@ -192,7 +210,8 @@ exports.HSheet = HSheet_1 = class HSheet extends phoenix_light_lit_element.Phoen
                 setTimeout(() => {
                     var _a;
                     (_a = this._contentRef.value) === null || _a === void 0 ? void 0 : _a.classList.remove(`sheet_show-${this.transition}-start`, `sheet_show-${this.transition}-end`);
-                    this._setFocusToFirstFocusableElementInSheetOrCloseBtn();
+                    if (!this.isSearchFocusTrapFixEnabled)
+                        this._setFocusToFirstFocusableElementInSheetOrCloseBtn();
                     resolve();
                 }, transitionDuration);
             });
@@ -245,6 +264,10 @@ tslib_es6.__decorate([
     decorators_js.property({ type: String, attribute: 'sheet-label' }),
     tslib_es6.__metadata("design:type", Object)
 ], exports.HSheet.prototype, "sheetLabel", void 0);
+tslib_es6.__decorate([
+    decorators_js.property({ type: Boolean, attribute: 'is-search-focus-trap-fix-enabled' }),
+    tslib_es6.__metadata("design:type", Boolean)
+], exports.HSheet.prototype, "isSearchFocusTrapFixEnabled", void 0);
 tslib_es6.__decorate([
     decorators_js.state(),
     tslib_es6.__metadata("design:type", Object)