@shoper/phoenix_design_system 1.11.13 → 1.11.14

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

@@ -11,15 +11,19 @@ import { BehaviorSubject } from '../../../core/classes/behavior_subject/behavior
 import { createRef, ref } from 'lit-html/directives/ref.js';
 import { ContextProviderController } from '../../../core/context/context_provider_controller.js';
 import { BREAKPOINTS } from '../../../global_constants.js';
+import v4 from '../../../../../../external/uuid/dist/esm-browser/v4.js';
 import { when as n } from '../../../../../../external/lit/external/lit-html/directives/when.js';
-import { DEFAULT_VIEW, SEARCH_CLASS_NAMES, SCROLL_DIRECTIONS, SEARCH_CONFIGURATION, SEARCH_COMPONENT_NAMES, SEARCH_CONTEXT_NAMES, SEARCH_CUSTOM_EVENT_NAMES } from './search_constants.js';
+import { DEFAULT_VIEW, SEARCH_CLASS_NAMES, SEARCH_COMPONENT_NAMES, SEARCH_CONFIGURATION, SEARCH_CONTEXT_NAMES, SEARCH_CUSTOM_EVENT_NAMES } from './search_constants.js';
 
 let HSearch = class HSearch extends PhoenixLightLitElement {
     constructor() {
         super(...arguments);
         this.view = DEFAULT_VIEW;
+        this._id = v4();
+        this._searchContentContainerId = v4();
         this._searchResultsRef = createRef();
         this._searchHistoryRef = createRef();
+        this._searchMessageRef = createRef();
         this._shouldShowHistory = false;
         this._shouldShowResults = false;
         this._shouldShowMessage = false;
@@ -29,84 +33,225 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         this._historyContext = new BehaviorSubject({
             showLoadMore: false
         });
-        this._activeItemId = -1;
+        this._activeItemId = `${this._id}-1`;
         this._translations = {};
+        this._containerRole = 'grid';
         this._bindKeys = (ev) => {
-            var _a;
             switch (ev.key) {
                 case 'ArrowDown':
                     ev.preventDefault();
-                    this._focusOutsideActiveItemsForward();
-                    this._scroll(SCROLL_DIRECTIONS.down);
+                    this._handleForwardListFocus();
                     break;
                 case 'ArrowUp':
-                    ev.preventDefault();
-                    this._focusOutsideActiveItemsBackward();
-                    this._scroll(SCROLL_DIRECTIONS.up);
+                    this._handleBackwardListFocus(ev);
+                    break;
+                case 'ArrowLeft':
+                    if (this._containerRole === 'grid') {
+                        ev.preventDefault();
+                        this._handleBackwardGridFocus();
+                    }
+                    if (this._containerRole === 'listbox')
+                        this._handleMoveToInputField();
+                    break;
+                case 'ArrowRight':
+                    if (this._containerRole === 'grid') {
+                        ev.preventDefault();
+                        this._handleForwardGridFocus();
+                    }
+                    if (this._containerRole === 'listbox')
+                        this._handleMoveToInputField();
                     break;
                 case 'Enter':
                     ev.preventDefault();
-                    if (this._activeItemId === -1 || !this._shouldShowResults)
+                    if (this._activeItemId === `${this._id}-1` || !this._shouldShowResults)
                         return;
                     this._handleChooseSearchItem();
                     break;
                 case 'Escape':
                     ev.preventDefault();
-                    this._inputField.blur();
-                    this._resetSearchView();
+                    if (this._shouldShowHistory || this._shouldShowHistory || this._shouldShowResults) {
+                        this._inputField.focus();
+                        this._shouldShowMessage = false;
+                        this._hideHistorySuggestionsAndResults();
+                    }
+                    else {
+                        this._inputField.value = '';
+                    }
+                    break;
+                case 'End':
+                    ev.preventDefault();
+                    this._handleFocusOnInputWithCaretEnd();
+                    break;
+                case 'Home':
+                    ev.preventDefault();
+                    this._handleFocusOnInputWithCaretStart();
+                    break;
+                case 'Backspace':
+                    this._handleMoveToInputField();
                     break;
                 case 'Tab':
-                    const isFocusedOnSearchInput = !!((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.matches('input[type="search"]'));
-                    if (!isFocusedOnSearchInput) {
-                        const searchBar = this.querySelector(`.${SEARCH_CLASS_NAMES.searchBar}`);
-                        searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(SEARCH_CLASS_NAMES.outline);
-                        this._resetSearchView();
-                        document.removeEventListener('keyup', this._bindKeys);
-                    }
+                    const isFocusedOnSearchInput = document.activeElement === this._inputField;
+                    if (!isFocusedOnSearchInput)
+                        ev.preventDefault();
+                    break;
+                default:
+                    const isAWriteableCharacter = ev.key.length === 1;
+                    if (isAWriteableCharacter)
+                        this._handleWriteableCharacter(ev);
                     break;
             }
         };
-        this._focusOutsideActiveItemsForward = () => {
+        this._handleSearchTabNavigation = (ev) => {
+            if (ev.key !== 'Tab')
+                return;
+            const isFocusedOnSearchInput = document.activeElement === this._inputField;
+            if (ev.shiftKey && !isFocusedOnSearchInput) {
+                this._focusOnPreviousElementBeforeSearchInput(ev);
+                return;
+            }
+            if (!isFocusedOnSearchInput) {
+                const searchBar = this.querySelector(`.${SEARCH_CLASS_NAMES.searchBar}`);
+                searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(SEARCH_CLASS_NAMES.outline);
+                this._resetSearchView();
+                this._removeSearchKeyboardNavigation();
+                this._focusOnNextElementAfterSearchInput(ev);
+            }
+        };
+        this._focusOnPreviousElementBeforeSearchInput = async (ev) => {
+            ev.preventDefault();
+            const searchBar = this.querySelector(`.${SEARCH_CLASS_NAMES.searchBar}`);
+            searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(SEARCH_CLASS_NAMES.outline);
+            this._resetSearchView();
+            this._removeSearchKeyboardNavigation();
+            UiDomUtils.getPreviousFocusableElement(this._inputField).focus();
+        };
+        this._focusOnNextElementAfterSearchInput = async (ev) => {
+            ev.preventDefault();
+            UiDomUtils.getNextFocusableElement(this._inputField).focus();
+        };
+        this._preventScrollingOnSearchContentBrowsing = (ev) => {
             var _a;
-            const $activeElement = document.activeElement;
-            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            const hasArrowBeenPressed = ev.key === "ArrowUp" || ev.key === "ArrowDown";
+            const hasHomeOrEndBeenPressed = ev.key === "Home" || ev.key === "End";
+            const hasSearchContainerParent = !!((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.closest('.search__container'));
+            if ((hasArrowBeenPressed || hasHomeOrEndBeenPressed) && hasSearchContainerParent) {
+                ev.preventDefault();
+            }
+        };
+        this._handleForwardListFocus = () => {
+            var _a, _b;
+            const $searchItemsContainer = this._findSearchItemsContainer();
             if (!$searchItemsContainer)
                 return;
-            const $searchItems = UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+            const isActiveElementASearchItem = !!((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.getAttribute('data-search-item-id'));
+            const isActiveElementAGridSearchItem = isActiveElementASearchItem && !!((_b = document.activeElement) === null || _b === void 0 ? void 0 : _b.getAttribute('data-search-grid-item'));
+            const $listSearchItems = this._findListSearchItems($searchItemsContainer, isActiveElementAGridSearchItem);
+            this._handleForwardFocus($listSearchItems);
+        };
+        this._handleForwardGridFocus = () => {
+            const $searchItemsContainer = this._findSearchItemsContainer();
+            if (!$searchItemsContainer)
+                return;
+            const $gridSearchItems = UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
                 return !!$el.getAttribute('data-search-item-id');
             });
+            this._handleForwardFocus($gridSearchItems);
+        };
+        this._handleForwardFocus = ($searchItems) => {
+            var _a;
+            const $activeElement = document.activeElement;
             const indexOfCurrentElement = $searchItems.indexOf($activeElement);
             const indexOfNextElement = indexOfCurrentElement === $searchItems.length - 1 ? 0 : indexOfCurrentElement + 1;
             const $nextSearchItemElement = $searchItems[indexOfNextElement];
             $nextSearchItemElement.focus();
-            this._activeItemId = (_a = Number($nextSearchItemElement.getAttribute('data-search-item-id'))) !== null && _a !== void 0 ? _a : -1;
+            this._setActiveItemId((_a = $nextSearchItemElement.getAttribute('data-search-item-id')) !== null && _a !== void 0 ? _a : `${this._id}-1`);
         };
-        this._focusOutsideActiveItemsBackward = () => {
-            var _a;
-            const $activeElement = document.activeElement;
-            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+        this._handleMoveToInputField = () => {
+            const isFocusedOnSearchInput = document.activeElement === this._inputField;
+            if (isFocusedOnSearchInput)
+                return;
+            this._inputField.focus();
+        };
+        this._handleBackwardListFocus = (ev) => {
+            var _a, _b;
+            const isFocusedOnSearchInput = document.activeElement === this._inputField;
+            const hasPopup = this._shouldShowHistory || this._shouldShowHistory || this._shouldShowResults;
+            if (isFocusedOnSearchInput || !hasPopup)
+                return;
+            ev.preventDefault();
+            const $searchItemsContainer = this._findSearchItemsContainer();
+            if (!$searchItemsContainer)
+                return;
+            const isActiveElementASearchItem = !!((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.getAttribute('data-search-item-id'));
+            const isActiveElementAGridSearchItem = isActiveElementASearchItem && !!((_b = document.activeElement) === null || _b === void 0 ? void 0 : _b.getAttribute('data-search-grid-item'));
+            const $listSearchItems = this._findListSearchItems($searchItemsContainer, isActiveElementAGridSearchItem);
+            this._handleBackwardFocus($listSearchItems);
+        };
+        this._findListSearchItems = ($searchItemsContainer, shouldFindGridList) => {
+            return UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+                const searchItemId = $el.getAttribute('data-search-item-id');
+                const isListSearchItem = !!searchItemId && !$el.getAttribute('data-search-grid-item');
+                const isGridSearchItem = !!searchItemId && $el.getAttribute('data-search-grid-item');
+                return shouldFindGridList ? isGridSearchItem : isListSearchItem;
+            });
+        };
+        this._handleBackwardGridFocus = () => {
+            const $searchItemsContainer = this._findSearchItemsContainer();
             if (!$searchItemsContainer)
                 return;
-            const $searchItems = UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+            const $gridSearchItems = UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
                 return !!$el.getAttribute('data-search-item-id');
             });
+            this._handleBackwardFocus($gridSearchItems);
+        };
+        this._findSearchItemsContainer = () => {
+            const containers = [
+                this._searchHistoryRef.value,
+                this._searchResultsRef.value,
+                this._searchMessageRef.value
+            ];
+            return containers.find(container => container && !UiDomUtils.isElementEmpty(container));
+        };
+        this._handleBackwardFocus = ($searchItems) => {
+            var _a;
+            const $activeElement = document.activeElement;
             const indexOfCurrentElement = $searchItems.indexOf($activeElement);
             const indexOfPreviousElement = indexOfCurrentElement === 0 ? $searchItems.length - 1 : indexOfCurrentElement - 1;
             const $previousSearchItemElement = $searchItems[indexOfPreviousElement];
             $previousSearchItemElement.focus();
-            this._activeItemId = (_a = Number($previousSearchItemElement.getAttribute('data-search-item-id'))) !== null && _a !== void 0 ? _a : -1;
+            this._setActiveItemId((_a = $previousSearchItemElement.getAttribute('data-search-item-id')) !== null && _a !== void 0 ? _a : `${this._id}-1`);
         };
-        this._getSearchItemsCount = () => {
-            if (this._shouldShowHistory)
-                return this._historyLimitedContent.length;
-            let searchItemsCount = this._searchResults.products.length +
-                this._searchResults.categories.length +
-                this._searchResults.suggestions.length +
-                this._searchResults.producers.length;
-            if (this._searchResults.products.length && this._searchResults.suggestions.length) {
-                searchItemsCount += 1;
+        this._setActiveItemId = (newActiveItemId) => {
+            this._activeItemId = newActiveItemId;
+            if (document.activeElement !== this._inputField) {
+                this._inputField.setAttribute('aria-activedescendant', this._activeItemId);
+            }
+        };
+        this._removeSearchKeyboardNavigation = () => {
+            document.removeEventListener('keydown', this._bindKeys);
+            document.removeEventListener('keyup', this._handleSearchTabNavigation);
+        };
+        this._handleFocusOnInputWithCaretEnd = () => {
+            const isFocusedOnSearchInput = document.activeElement === this._inputField;
+            if (isFocusedOnSearchInput)
+                return;
+            this._inputField.focus();
+            const endPosition = this._inputField.value.length;
+            this._inputField.setSelectionRange(endPosition, endPosition);
+        };
+        this._handleFocusOnInputWithCaretStart = () => {
+            this._inputField.focus();
+            this._inputField.setSelectionRange(0, 0);
+        };
+        this._handleWriteableCharacter = (ev) => {
+            const isFocusedOnSearchInput = document.activeElement === this._inputField;
+            if (isFocusedOnSearchInput)
+                return;
+            this._inputField.focus();
+            const isAPrintableCharacter = ev.key.match(/\P{C}/u);
+            if (ev.key.length !== 1 || !isAPrintableCharacter) {
+                ev.preventDefault();
             }
-            return searchItemsCount;
         };
         this._hideSuggesterOnClickOutside = (ev) => {
             const outsideClick = typeof ev.composedPath === 'function' && !ev.composedPath().includes(this);
@@ -121,6 +266,12 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
                 ? this.classList.remove(SEARCH_CLASS_NAMES.mobileOpened)
                 : this.classList.add(SEARCH_CLASS_NAMES.mobileOpened);
         };
+        this._preventSubmitOnSearchClear = (ev) => {
+            const $searchClear = this.querySelector(SEARCH_COMPONENT_NAMES.clearButton);
+            if (ev.key === 'Enter' && ev.target === $searchClear) {
+                ev.preventDefault();
+            }
+        };
     }
     async connectedCallback() {
         super.connectedCallback();
@@ -159,7 +310,9 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     disconnectedCallback() {
         super.disconnectedCallback();
         document.removeEventListener('click', this._hideSuggesterOnClickOutside);
+        document.removeEventListener('keydown', this._preventScrollingOnSearchContentBrowsing);
         window.removeEventListener('resize', this._switchTypeOfSearchView);
+        this._searchForm.removeEventListener('keydown', this._preventSubmitOnSearchClear);
     }
     _setupContext() {
         this._historyContextProvider = new ContextProviderController(this);
@@ -168,8 +321,11 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     _setupInitialSearchPhrase() {
         var _a;
         const searchInput = this.querySelector('input[type="search"]');
+        const searchForm = this.closest('form');
         if (searchInput)
             this._inputField = searchInput;
+        if (searchForm)
+            this._searchForm = searchForm;
         if (!((_a = this._inputField) === null || _a === void 0 ? void 0 : _a.value))
             return;
         this._searchPhrase = this._inputField.value;
@@ -188,11 +344,17 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     }
     _setupListeners() {
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.focusin, (ev) => {
+            var _a, _b, _c;
+            const $target = (_a = ev.detail) === null || _a === void 0 ? void 0 : _a.relatedTarget;
+            if ($target === null || $target === void 0 ? void 0 : $target.closest(`[id="${this._searchContentContainerId}"]`))
+                return;
             const searchBar = this.querySelector(`.${SEARCH_CLASS_NAMES.searchBar}`);
             searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.add(SEARCH_CLASS_NAMES.outline);
-            const shouldShowMessage = ev.detail.searchPhrase !== '';
-            this._updateSearchView(ev.detail.searchPhrase, shouldShowMessage, false);
-            document.addEventListener('keyup', this._bindKeys);
+            const shouldShowMessage = ((_b = ev.detail) === null || _b === void 0 ? void 0 : _b.searchPhrase) !== '';
+            this._updateSearchView(((_c = ev.detail) === null || _c === void 0 ? void 0 : _c.searchPhrase) || '', shouldShowMessage, false);
+            document.addEventListener('keydown', this._bindKeys);
+            document.addEventListener('keyup', this._handleSearchTabNavigation);
+            document.addEventListener('keydown', this._preventScrollingOnSearchContentBrowsing);
         });
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.keyup, (ev) => {
             const shouldShowMessage = ev.detail.searchPhrase !== '';
@@ -203,7 +365,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
             this._updateSearchView('', false);
         });
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.submit, () => {
-            if (this._activeItemId !== -1)
+            if (this._activeItemId !== `${this._id}-1`)
                 return;
             if (this._inputField.value === '') {
                 this._updateSearchView(this._inputField.value, true);
@@ -227,10 +389,12 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         });
         document.addEventListener('click', this._hideSuggesterOnClickOutside);
         window.addEventListener('resize', this._switchTypeOfSearchView);
+        this._searchForm.addEventListener('keydown', this._preventSubmitOnSearchClear);
     }
     _updateSearchView(searchPhrase, shouldShowMessage, shouldUpdateSearchPhrase = true) {
         this._shouldShowMessage = shouldShowMessage;
-        this._activeItemId = -1;
+        this._setActiveItemId(`${this._id}-1`);
+        this._inputField.setAttribute('aria-activedescendant', '');
         this._displaySuggester(searchPhrase);
         if (!shouldUpdateSearchPhrase)
             return;
@@ -268,57 +432,58 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     _handleToggleHistoryAndResults({ shouldShowHistory, shouldShowResults }) {
         this._shouldShowHistory = shouldShowHistory;
         this._shouldShowResults = shouldShowResults;
-        this._toggleSearchInputAria(shouldShowHistory, shouldShowResults);
+        this._toggleSearchInputAttributes(shouldShowHistory, shouldShowResults);
+        this._toggleSearchContainerAttributes(shouldShowHistory, shouldShowResults);
     }
-    _toggleSearchInputAria(shouldShowHistory, shouldShowResults) {
+    _toggleSearchInputAttributes(shouldShowHistory, shouldShowResults) {
         var _a;
         const $input = (_a = this._searchInput) === null || _a === void 0 ? void 0 : _a.input;
         if (!$input)
             return;
         if (!shouldShowHistory && !shouldShowResults) {
             $input.removeAttribute('aria-label');
+            $input.setAttribute('aria-activedescendant', '');
             return;
         }
         $input.setAttribute('aria-expanded', 'true');
-        if (shouldShowHistory)
+        if (shouldShowHistory) {
             $input.setAttribute('aria-label', this.settings.historyGuideAriaLabel);
-        if (shouldShowResults)
-            $input.setAttribute('aria-label', this.settings.suggesterGuideAriaLabel);
-    }
-    _scroll(direction) {
-        const searchContainer = this.querySelector(`.${SEARCH_CLASS_NAMES.container}`);
-        const maxScrollTop = searchContainer.scrollHeight - searchContainer.clientHeight;
-        const activeItem = this.querySelector(`[data-search-item-id="${this._activeItemId}"]`);
-        const activeItemHeight = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.getBoundingClientRect().height) || 0;
-        let top;
-        if (direction === SCROLL_DIRECTIONS.up) {
-            top = searchContainer.scrollTop == 0 ? 0 : searchContainer.scrollTop + 30 - activeItemHeight;
+            $input.setAttribute('aria-haspopup', 'grid');
         }
-        else {
-            top = searchContainer.scrollTop == maxScrollTop ? maxScrollTop : activeItemHeight + searchContainer.scrollTop - 30;
+        if (shouldShowResults) {
+            $input.setAttribute('aria-label', this.settings.suggesterGuideAriaLabel);
+            this._inputField.removeAttribute('aria-haspopup');
         }
-        if (this._activeItemId === this._getSearchItemsCount() - 1) {
-            top = maxScrollTop;
+    }
+    _toggleSearchContainerAttributes(shouldShowHistory, shouldShowResults) {
+        if (shouldShowHistory) {
+            this._containerRole = 'grid';
         }
-        if (this._activeItemId === 0) {
-            top = 0;
+        if (shouldShowResults) {
+            this._containerRole = 'listbox';
         }
-        searchContainer === null || searchContainer === void 0 ? void 0 : searchContainer.scrollTo({ top, behavior: 'smooth' });
     }
     _handleChooseSearchItem() {
-        const activeSearchItem = this.querySelector(`[data-search-item-id="${this._activeItemId}"]`);
-        const elementToClick = activeSearchItem.dataset.suggestedValue
-            ? activeSearchItem
-            : activeSearchItem.querySelector('a');
-        elementToClick.click();
+        const $activeSearchItem = this.querySelector(`[data-search-item-id="${this._activeItemId}"]`);
+        if (!$activeSearchItem)
+            return;
+        const $linkElement = $activeSearchItem.querySelector('a');
+        const $suggestedElement = $linkElement || $activeSearchItem;
+        const $elementToClick = $activeSearchItem.dataset.suggestedValue ? $suggestedElement : $linkElement;
+        if (!$elementToClick) {
+            $activeSearchItem.click();
+        }
+        else {
+            $elementToClick.click();
+        }
     }
     _resetSearchView() {
         this._shouldShowMessage = false;
-        this._activeItemId = -1;
+        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);
         this._hideHistorySuggestionsAndResults();
-        document.removeEventListener('keyup', this._bindKeys);
+        this._removeSearchKeyboardNavigation();
     }
     _submitSearchPhrase(searchPhrase) {
         this._dispatchEventWithSearchPhrase(SEARCH_CUSTOM_EVENT_NAMES.searchPhraseSubmitted, searchPhrase);
@@ -353,33 +518,48 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
                 <div class="labeled-icon__signature">${this._translations.search}</div>
             </div>
 
-            ${n(this._isSuggesterLayerVisible(), () => html `<div class="${SEARCH_CLASS_NAMES.container}">
-                    ${n(this._shouldShowMessage, () => html `<h-search-message
-                            .history="${this._historyLimitedContent}"
-                            .results="${this._searchResults}"
-                            .translations="${this._translations}"
-                            search-phrase="${this._searchPhrase}"
-                            module-instance-id="${this.moduleInstanceId}"
-                        ></h-search-message>`)}
-                    ${n(this._shouldShowHistory, () => html `<h-search-history
-                                ${ref(this._searchHistoryRef)}
+            ${n(this._isSuggesterLayerVisible(), () => html `
+                    <div
+                        class="${SEARCH_CLASS_NAMES.container}"
+                        id="${this._searchContentContainerId}"
+                        role="${this._containerRole}"
+                    >
+                        ${n(this._shouldShowMessage, () => html `<h-search-message
+                                ${ref(this._searchMessageRef)}
                                 .history="${this._historyLimitedContent}"
-                                .translations="${this._translations}"
-                                active-item-id="${this._activeItemId}"
-                                module-instance-id="${this.moduleInstanceId}"
-                            ></h-search-history>`)}
-                    ${n(this._shouldShowResults, () => html `<h-search-results
-                                ${ref(this._searchResultsRef)}
                                 .results="${this._searchResults}"
-                                search-phrase="${this._searchPhrase}"
-                                .settings="${this.settings}"
-                                locale="${this.locale}"
-                                view="${this.view}"
                                 .translations="${this._translations}"
-                                active-item-id="${this._activeItemId}"
+                                search-phrase="${this._searchPhrase}"
                                 module-instance-id="${this.moduleInstanceId}"
-                            ></h-search-results>`)}
-                </div>`)}
+                            ></h-search-message>`)}
+                        ${n(this._shouldShowHistory, () => html `<h-search-history
+                                    ${ref(this._searchHistoryRef)}
+                                    .history="${this._historyLimitedContent}"
+                                    .translations="${this._translations}"
+                                    active-item-id="${this._activeItemId}"
+                                    search-id="${this._id}"
+                                    module-instance-id="${this.moduleInstanceId}"
+                                ></h-search-history>`)}
+                        ${n(this._shouldShowResults, () => html `<h-search-results
+                                    ${ref(this._searchResultsRef)}
+                                    .results="${this._searchResults}"
+                                    search-phrase="${this._searchPhrase}"
+                                    .settings="${this.settings}"
+                                    locale="${this.locale}"
+                                    view="${this.view}"
+                                    .translations="${this._translations}"
+                                    active-item-id="${this._activeItemId}"
+                                    search-id="${this._id}"
+                                    module-instance-id="${this.moduleInstanceId}"
+                                ></h-search-results>`)}
+                    </div>
+                `, () => html `
+                <div
+                    class="${SEARCH_CLASS_NAMES.container}"
+                    id="${this._searchContentContainerId}"
+                    role="${this._containerRole}"
+                    hidden
+                ></div>`)}
         `;
     }
 };
@@ -433,12 +613,16 @@ __decorate([
 ], HSearch.prototype, "_historyContext", void 0);
 __decorate([
     state(),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], HSearch.prototype, "_activeItemId", void 0);
 __decorate([
     state(),
     __metadata("design:type", Object)
 ], HSearch.prototype, "_translations", void 0);
+__decorate([
+    state(),
+    __metadata("design:type", String)
+], HSearch.prototype, "_containerRole", void 0);
 HSearch = __decorate([
     phoenixCustomElement(SEARCH_COMPONENT_NAMES.search)
 ], HSearch);

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

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,+CAAmD;AAC1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAA0B,qEAA6E;AACvG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,+CAAmD;AAC1F;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,wDAA4D;AAC3E,0BAA0B,qEAA6E;AACvG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

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

@@ -87,3 +87,7 @@ export declare type THandleToggleHistoryAndResults = {
     shouldShowHistory: boolean;
     shouldShowResults: boolean;
 };
+export declare type TSearchFocusInEventDetail = {
+    searchPhrase: string;
+    relatedTarget: EventTarget | null;
+};

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

@@ -1,4 +1,4 @@
-import { TemplateResult } from 'lit';
+import { PropertyValues, TemplateResult } from 'lit';
 import { PhoenixLightLitElement } from "../../../../../core/phoenix_light_lit_element/phoenix_light_lit_element";
 export declare class HSearchClear extends PhoenixLightLitElement {
     private _btnController;
@@ -11,6 +11,7 @@ export declare class HSearchClear extends PhoenixLightLitElement {
     constructor();
     connectedCallback(): void;
     private _handleClearButtonOnPhraseEnter;
+    protected updated(_changedProperties: PropertyValues): void;
     private _dispatchClearEvent;
     private _searchContextSetup;
     disconnectedCallback(): void;

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

@@ -32,6 +32,11 @@ let HSearchClear = class HSearchClear extends PhoenixLightLitElement {
         this.addEventListener('click', this._dispatchClearEvent);
         document.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.keyup, this._handleClearButtonOnPhraseEnter);
     }
+    updated(_changedProperties) {
+        super.updated(_changedProperties);
+        const newTabIndex = this._shouldShow ? '0' : '-1';
+        this.setAttribute('tabindex', newTabIndex);
+    }
     async _searchContextSetup() {
         try {
             this._searchContextConsumer = new ContextConsumerController(this);

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

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,qDAAyD;AAChG;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAA0B,2EAAmF;AAC7G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;AACA;AACA;AACA,0BAA0B,2EAAmF;AAC7G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/history/search_history.d.ts

@@ -8,9 +8,9 @@ export declare class HSearchHistory extends PhoenixLightLitElement {
     private _historyContext$;
     private _historyContextObserver;
     buttonRef: Ref<HSearchHistoryLoadMore>;
-    private _loadMoreButtonId;
     history: TSearchHistoryItem[];
-    activeItemId: number;
+    activeItemId: string;
+    searchId: string;
     translations: Record<string, string>;
     moduleInstanceId: string;
     connectedCallback(): Promise<void>;