@shoper/phoenix_design_system 1.11.11-2 → 1.11.11-20

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

@@ -15,7 +15,6 @@ var behavior_subject = require('../../../core/classes/behavior_subject/behavior_
 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 when = require('../../../../../../external/lit/external/lit-html/directives/when.js');
 var search_constants = require('./search_constants.js');
 
@@ -23,11 +22,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     constructor() {
         super(...arguments);
         this.view = search_constants.DEFAULT_VIEW;
-        this._id = v4['default']();
-        this._searchContentContainerId = v4['default']();
         this._searchResultsRef = ref_js.createRef();
         this._searchHistoryRef = ref_js.createRef();
-        this._searchMessageRef = ref_js.createRef();
         this._shouldShowHistory = false;
         this._shouldShowResults = false;
         this._shouldShowMessage = false;
@@ -37,225 +33,84 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         this._historyContext = new behavior_subject.BehaviorSubject({
             showLoadMore: false
         });
-        this._activeItemId = `${this._id}-1`;
+        this._activeItemId = -1;
         this._translations = {};
-        this._containerRole = 'grid';
         this._bindKeys = (ev) => {
+            var _a;
             switch (ev.key) {
                 case 'ArrowDown':
                     ev.preventDefault();
-                    this._handleForwardListFocus();
+                    this._focusOutsideActiveItemsForward();
+                    this._scroll(search_constants.SCROLL_DIRECTIONS.down);
                     break;
                 case 'ArrowUp':
                     ev.preventDefault();
-                    this._handleBackwardListFocus();
-                    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();
+                    this._focusOutsideActiveItemsBackward();
+                    this._scroll(search_constants.SCROLL_DIRECTIONS.up);
                     break;
                 case 'Enter':
                     ev.preventDefault();
-                    if (this._activeItemId === `${this._id}-1` || !this._shouldShowResults)
+                    if (this._activeItemId === -1 || !this._shouldShowResults)
                         return;
                     this._handleChooseSearchItem();
                     break;
                 case 'Escape':
                     ev.preventDefault();
-                    if (this._shouldShowHistory || this._shouldShowHistory || this._shouldShowResults) {
-                        this._inputField.focus();
+                    this._inputField.blur();
+                    this._resetSearchView();
+                    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_constants.SEARCH_CLASS_NAMES.searchBar}`);
+                        searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(search_constants.SEARCH_CLASS_NAMES.outline);
                         this._resetSearchView();
+                        document.removeEventListener('keyup', this._bindKeys);
                     }
-                    else {
-                        this._inputField.value = '';
-                    }
-                    break;
-                case 'End':
-                    ev.preventDefault();
-                    this._handleFocusOnInputWithCaretEnd();
-                    break;
-                case 'Home':
-                    ev.preventDefault();
-                    this._handleFocusOnInputWithCaretStart();
-                    break;
-                case 'Backspace':
-                    this._handleMoveToInputField();
-                    break;
-                default:
-                    const isAWriteableCharacter = ev.key.length === 1;
-                    if (isAWriteableCharacter)
-                        this._handleWriteableCharacter(ev);
                     break;
             }
         };
-        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_constants.SEARCH_CLASS_NAMES.searchBar}`);
-                searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(search_constants.SEARCH_CLASS_NAMES.outline);
-                this._resetSearchView();
-                document.removeEventListener('keydown', this._bindKeys);
-                document.addEventListener('keyup', this._handleSearchTabNavigation);
-                this._focusOnNextElementAfterSearchInput(ev);
-            }
-        };
-        this._focusOnPreviousElementBeforeSearchInput = async (ev) => {
-            ev.preventDefault();
-            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);
-            this._resetSearchView();
-            document.removeEventListener('keydown', this._bindKeys);
-            document.addEventListener('keyup', this._handleSearchTabNavigation);
-            utilities.UiDomUtils.getPreviousFocusableElement(this._inputField).focus();
-        };
-        this._focusOnNextElementAfterSearchInput = async (ev) => {
-            ev.preventDefault();
-            utilities.UiDomUtils.getNextFocusableElement(this._inputField).focus();
-        };
-        this._preventScrollingOnSearchContentBrowsing = (ev) => {
+        this._focusOutsideActiveItemsForward = () => {
             var _a;
-            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 containers = [
-                this._searchHistoryRef.value,
-                this._searchResultsRef.value,
-                this._searchMessageRef.value
-            ];
-            const $searchItemsContainer = containers.find(container => container && !utilities.UiDomUtils.isElementEmpty(container));
-            if (!$searchItemsContainer)
-                return;
-            const isActiveElementAGridSearchItem = (_b = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.getAttribute('data-search-item-id')) === null || _b === void 0 ? void 0 : _b.includes('grid');
-            const $listSearchItems = utilities.UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
-                const searchItemId = $el.getAttribute('data-search-item-id');
-                const isListSearchItem = !!searchItemId && !searchItemId.includes('grid');
-                const isGridSearchItem = !!searchItemId && searchItemId.includes('grid');
-                return isActiveElementAGridSearchItem ? isGridSearchItem : isListSearchItem;
-            });
-            this._handleForwardFocus($listSearchItems);
-        };
-        this._handleForwardGridFocus = () => {
-            const containers = [
-                this._searchHistoryRef.value,
-                this._searchResultsRef.value,
-                this._searchMessageRef.value
-            ];
-            const $searchItemsContainer = containers.find(container => container && !utilities.UiDomUtils.isElementEmpty(container));
+            const $activeElement = document.activeElement;
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
             if (!$searchItemsContainer)
                 return;
-            const $gridSearchItems = utilities.UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+            const $searchItems = utilities.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._setActiveItemId((_a = $nextSearchItemElement.getAttribute('data-search-item-id')) !== null && _a !== void 0 ? _a : `${this._id}-1`);
+            this._activeItemId = (_a = Number($nextSearchItemElement.getAttribute('data-search-item-id'))) !== null && _a !== void 0 ? _a : -1;
         };
-        this._handleMoveToInputField = () => {
-            const isFocusedOnSearchInput = document.activeElement === this._inputField;
-            if (isFocusedOnSearchInput)
-                return;
-            this._inputField.focus();
-        };
-        this._handleBackwardListFocus = () => {
-            var _a, _b;
-            const containers = [
-                this._searchHistoryRef.value,
-                this._searchResultsRef.value,
-                this._searchMessageRef.value
-            ];
-            const $searchItemsContainer = containers.find(container => container && !utilities.UiDomUtils.isElementEmpty(container));
-            if (!$searchItemsContainer)
-                return;
-            const isActiveElementAGridSearchItem = (_b = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.getAttribute('data-search-item-id')) === null || _b === void 0 ? void 0 : _b.includes('grid');
-            const $listSearchItems = utilities.UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
-                const searchItemId = $el.getAttribute('data-search-item-id');
-                const isListSearchItem = !!searchItemId && !searchItemId.includes('grid');
-                const isGridSearchItem = !!searchItemId && searchItemId.includes('grid');
-                return isActiveElementAGridSearchItem ? isGridSearchItem : isListSearchItem;
-            });
-            this._handleBackwardFocus($listSearchItems);
-        };
-        this._handleBackwardGridFocus = () => {
-            const containers = [
-                this._searchHistoryRef.value,
-                this._searchResultsRef.value,
-                this._searchMessageRef.value
-            ];
-            const $searchItemsContainer = containers.find(container => container && !utilities.UiDomUtils.isElementEmpty(container));
+        this._focusOutsideActiveItemsBackward = () => {
+            var _a;
+            const $activeElement = document.activeElement;
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
             if (!$searchItemsContainer)
                 return;
-            const $gridSearchItems = utilities.UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+            const $searchItems = utilities.UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
                 return !!$el.getAttribute('data-search-item-id');
             });
-            this._handleBackwardFocus($gridSearchItems);
-        };
-        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._setActiveItemId((_a = $previousSearchItemElement.getAttribute('data-search-item-id')) !== null && _a !== void 0 ? _a : `${this._id}-1`);
-        };
-        this._setActiveItemId = (newActiveItemId) => {
-            this._activeItemId = newActiveItemId;
-            if (document.activeElement !== this._inputField) {
-                this._inputField.setAttribute('aria-activedescendant', this._activeItemId);
-            }
+            this._activeItemId = (_a = Number($previousSearchItemElement.getAttribute('data-search-item-id'))) !== null && _a !== void 0 ? _a : -1;
         };
-        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) {
-                this._inputField.value = `${this._inputField.value}${ev.key}`;
+        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;
             }
+            return searchItemsCount;
         };
         this._hideSuggesterOnClickOutside = (ev) => {
             const outsideClick = typeof ev.composedPath === 'function' && !ev.composedPath().includes(this);
@@ -270,12 +125,6 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
                 ? this.classList.remove(search_constants.SEARCH_CLASS_NAMES.mobileOpened)
                 : this.classList.add(search_constants.SEARCH_CLASS_NAMES.mobileOpened);
         };
-        this._preventSubmitOnSearchClear = (ev) => {
-            const $searchClear = this.querySelector(search_constants.SEARCH_COMPONENT_NAMES.clearButton);
-            if (ev.key === 'Enter' && ev.target === $searchClear) {
-                ev.preventDefault();
-            }
-        };
     }
     async connectedCallback() {
         super.connectedCallback();
@@ -314,9 +163,7 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     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 context_provider_controller.ContextProviderController(this);
@@ -325,11 +172,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     _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;
@@ -348,17 +192,11 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     }
     _setupListeners() {
         this.addEventListener(search_constants.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(`$${this._searchContentContainerId}`))
-                return;
             const searchBar = this.querySelector(`.${search_constants.SEARCH_CLASS_NAMES.searchBar}`);
             searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.add(search_constants.SEARCH_CLASS_NAMES.outline);
-            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);
+            const shouldShowMessage = ev.detail.searchPhrase !== '';
+            this._updateSearchView(ev.detail.searchPhrase, shouldShowMessage, false);
+            document.addEventListener('keyup', this._bindKeys);
         });
         this.addEventListener(search_constants.SEARCH_CUSTOM_EVENT_NAMES.keyup, (ev) => {
             const shouldShowMessage = ev.detail.searchPhrase !== '';
@@ -369,7 +207,7 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
             this._updateSearchView('', false);
         });
         this.addEventListener(search_constants.SEARCH_CUSTOM_EVENT_NAMES.submit, () => {
-            if (this._activeItemId !== `${this._id}-1`)
+            if (this._activeItemId !== -1)
                 return;
             if (this._inputField.value === '') {
                 this._updateSearchView(this._inputField.value, true);
@@ -393,12 +231,10 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         });
         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._setActiveItemId(`${this._id}-1`);
-        this._inputField.setAttribute('aria-activedescendant', '');
+        this._activeItemId = -1;
         this._displaySuggester(searchPhrase);
         if (!shouldUpdateSearchPhrase)
             return;
@@ -436,36 +272,42 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     _handleToggleHistoryAndResults({ shouldShowHistory, shouldShowResults }) {
         this._shouldShowHistory = shouldShowHistory;
         this._shouldShowResults = shouldShowResults;
-        this._toggleSearchInputAttributes(shouldShowHistory, shouldShowResults);
-        this._toggleSearchContainerAttributes(shouldShowHistory, shouldShowResults);
+        this._toggleSearchInputAria(shouldShowHistory, shouldShowResults);
     }
-    _toggleSearchInputAttributes(shouldShowHistory, shouldShowResults) {
+    _toggleSearchInputAria(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);
-            $input.setAttribute('aria-haspopup', 'grid');
-        }
-        if (shouldShowResults) {
+        if (shouldShowResults)
             $input.setAttribute('aria-label', this.settings.suggesterGuideAriaLabel);
-            this._inputField.removeAttribute('aria-haspopup');
-        }
     }
-    _toggleSearchContainerAttributes(shouldShowHistory, shouldShowResults) {
-        if (shouldShowHistory) {
-            this._containerRole = 'grid';
+    _scroll(direction) {
+        const searchContainer = this.querySelector(`.${search_constants.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 === search_constants.SCROLL_DIRECTIONS.up) {
+            top = searchContainer.scrollTop == 0 ? 0 : searchContainer.scrollTop + 30 - activeItemHeight;
+        }
+        else {
+            top = searchContainer.scrollTop == maxScrollTop ? maxScrollTop : activeItemHeight + searchContainer.scrollTop - 30;
+        }
+        if (this._activeItemId === this._getSearchItemsCount() - 1) {
+            top = maxScrollTop;
         }
-        if (shouldShowResults) {
-            this._containerRole = 'listbox';
+        if (this._activeItemId === 0) {
+            top = 0;
         }
+        searchContainer === null || searchContainer === void 0 ? void 0 : searchContainer.scrollTo({ top, behavior: 'smooth' });
     }
     _handleChooseSearchItem() {
         const activeSearchItem = this.querySelector(`[data-search-item-id="${this._activeItemId}"]`);
@@ -476,12 +318,11 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     }
     _resetSearchView() {
         this._shouldShowMessage = false;
-        this._setActiveItemId(`${this._id}-1`);
+        this._activeItemId = -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);
         this._hideHistorySuggestionsAndResults();
-        document.removeEventListener('keydown', this._bindKeys);
-        document.addEventListener('keyup', this._handleSearchTabNavigation);
+        document.removeEventListener('keyup', this._bindKeys);
     }
     _submitSearchPhrase(searchPhrase) {
         this._dispatchEventWithSearchPhrase(search_constants.SEARCH_CUSTOM_EVENT_NAMES.searchPhraseSubmitted, searchPhrase);
@@ -516,48 +357,33 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
                 <div class="labeled-icon__signature">${this._translations.search}</div>
             </div>
 
-            ${when.when(this._isSuggesterLayerVisible(), () => lit.html `
-                    <div
-                        class="${search_constants.SEARCH_CLASS_NAMES.container}"
-                        id="${this._searchContentContainerId}"
-                        role="${this._containerRole}"
-                    >
-                        ${when.when(this._shouldShowMessage, () => lit.html `<h-search-message
-                                ${ref_js.ref(this._searchMessageRef)}
+            ${when.when(this._isSuggesterLayerVisible(), () => lit.html `<div class="${search_constants.SEARCH_CLASS_NAMES.container}">
+                    ${when.when(this._shouldShowMessage, () => lit.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>`)}
+                    ${when.when(this._shouldShowHistory, () => lit.html `<h-search-history
+                                ${ref_js.ref(this._searchHistoryRef)}
                                 .history="${this._historyLimitedContent}"
-                                .results="${this._searchResults}"
                                 .translations="${this._translations}"
+                                active-item-id="${this._activeItemId}"
+                                module-instance-id="${this.moduleInstanceId}"
+                            ></h-search-history>`)}
+                    ${when.when(this._shouldShowResults, () => lit.html `<h-search-results
+                                ${ref_js.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}"
                                 module-instance-id="${this.moduleInstanceId}"
-                            ></h-search-message>`)}
-                        ${when.when(this._shouldShowHistory, () => lit.html `<h-search-history
-                                    ${ref_js.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>`)}
-                        ${when.when(this._shouldShowResults, () => lit.html `<h-search-results
-                                    ${ref_js.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>
-                `, () => lit.html `
-                <div
-                    class="${search_constants.SEARCH_CLASS_NAMES.container}"
-                    id="${this._searchContentContainerId}"
-                    role="${this._containerRole}"
-                    hidden
-                ></div>`)}
+                            ></h-search-results>`)}
+                </div>`)}
         `;
     }
 };
@@ -611,16 +437,12 @@ tslib_es6.__decorate([
 ], exports.HSearch.prototype, "_historyContext", void 0);
 tslib_es6.__decorate([
     decorators.state(),
-    tslib_es6.__metadata("design:type", String)
+    tslib_es6.__metadata("design:type", Number)
 ], exports.HSearch.prototype, "_activeItemId", void 0);
 tslib_es6.__decorate([
     decorators.state(),
     tslib_es6.__metadata("design:type", Object)
 ], exports.HSearch.prototype, "_translations", void 0);
-tslib_es6.__decorate([
-    decorators.state(),
-    tslib_es6.__metadata("design:type", String)
-], exports.HSearch.prototype, "_containerRole", void 0);
 exports.HSearch = tslib_es6.__decorate([
     phoenix_custom_element.phoenixCustomElement(search_constants.SEARCH_COMPONENT_NAMES.search)
 ], exports.HSearch);

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,mBAAmB,qEAA6E;AAChG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,mBAAmB,qEAA6E;AAChG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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

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

package/build/cjs/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;AACA;AACA;AACA;AACA,wBAAwB,qDAAyD;AACjF;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mBAAmB,2EAAmF;AACtG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;AACA;AACA;AACA,mBAAmB,2EAAmF;AACtG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/history/search_history.js

@@ -11,6 +11,7 @@ var icon_constants = require('../../../../icon/icon_constants.js');
 var observer = require('../../../../../core/classes/observer/observer.js');
 var context_consumer_controller = require('../../../../../core/context/context_consumer_controller.js');
 var ref_js = require('lit-html/directives/ref.js');
+var v4 = require('../../../../../../../../external/uuid/dist/esm-browser/v4.js');
 var when = require('../../../../../../../../external/lit/external/lit-html/directives/when.js');
 var search_constants = require('../../search_constants.js');
 var repeat = require('../../../../../../../../external/lit/external/lit-html/directives/repeat.js');
@@ -19,6 +20,7 @@ exports.HSearchHistory = class HSearchHistory extends phoenix_light_lit_element.
     constructor() {
         super(...arguments);
         this.buttonRef = ref_js.createRef();
+        this._loadMoreButtonId = v4['default']();
         this.history = [];
         this.translations = {};
     }
@@ -45,33 +47,23 @@ exports.HSearchHistory = class HSearchHistory extends phoenix_light_lit_element.
         return when.when((_a = this.history) === null || _a === void 0 ? void 0 : _a.length, () => lit.html `<h3 class="${search_constants.SEARCH_CLASS_NAMES.headline}">${this.translations.searchHistory}</h3>
 
                 <ul>
-                    ${repeat.repeat(this.history, (historyElement, index) => lit.html `
-                        <li
-                            class="
-                                ${search_constants.SEARCH_CLASS_NAMES.item}
-                                ${`${this.searchId}${index}` === this.activeItemId ? search_constants.SEARCH_CLASS_NAMES.itemActive : ''}
-                            "
-                            role="row"
+                    ${repeat.repeat(this.history, (historyElement, index) => lit.html ` <li
+                            class="${search_constants.SEARCH_CLASS_NAMES.item} ${index === this.activeItemId ? search_constants.SEARCH_CLASS_NAMES.itemActive : ''}"
                         >
                             <h-search-history-select
                                 item-label="${historyElement.label}"
                                 class="${search_constants.SEARCH_CLASS_NAMES.historySelect}"
                                 data-suggested-value="${historyElement.label}"
-                                data-search-item-id="${this.searchId}${index}"
+                                data-search-item-id="${index}"
                                 module-instance-id="${this.moduleInstanceId}"
                                 aria-label=${this.translations.historyAriaLabel ? `${this.translations.historyAriaLabel} ${historyElement.label}` : undefined}
-                                role="gridcell"
                             >
                                 <h-icon icon-name="icon-clock"></h-icon>
 
                                 <span class="${search_constants.SEARCH_CLASS_NAMES.historyItemValue}">${historyElement.label}</span>
                             </h-search-history-select>
 
-                            <h-search-history-remove
-                                data-search-item-id="${this.searchId}${index}-grid"
-                                item-id="${historyElement.id}"
-                                role="gridcell"
-                            >
+                            <h-search-history-remove item-id="${historyElement.id}">
                                 <h-icon
                                     icon-name="icon-x"
                                     clickable=${true}
@@ -84,7 +76,7 @@ exports.HSearchHistory = class HSearchHistory extends phoenix_light_lit_element.
 
                 <h-search-history-load-more
                     class="${search_constants.SEARCH_CLASS_NAMES.historyLoadMore}"
-                    data-search-item-id="${this.searchId}-loadmore"
+                    data-search-item-id="${this._loadMoreButtonId}"
                     ${ref_js.ref(this.buttonRef)}
                 >
                     ${this.translations.loadMore}
@@ -96,13 +88,9 @@ tslib_es6.__decorate([
     tslib_es6.__metadata("design:type", Array)
 ], exports.HSearchHistory.prototype, "history", void 0);
 tslib_es6.__decorate([
-    decorators.property({ type: String, attribute: 'active-item-id' }),
-    tslib_es6.__metadata("design:type", String)
+    decorators.property({ type: Number, attribute: 'active-item-id' }),
+    tslib_es6.__metadata("design:type", Number)
 ], exports.HSearchHistory.prototype, "activeItemId", void 0);
-tslib_es6.__decorate([
-    decorators.property({ type: String, attribute: 'search-id' }),
-    tslib_es6.__metadata("design:type", String)
-], exports.HSearchHistory.prototype, "searchId", void 0);
 tslib_es6.__decorate([
     decorators.property({ type: Object }),
     tslib_es6.__metadata("design:type", Object)

package/build/cjs/packages/phoenix/src/components/form/search/subcomponents/history/search_history.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;AACA;AACA;AACA;AACA,mBAAmB,2EAAmF;AACtG;AACA,qBAAqB,6EAAqF;AAC1G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;AACA;AACA;AACA;AACA,iBAAiB,8DAAkE;AACnF,mBAAmB,2EAAmF;AACtG;AACA,qBAAqB,6EAAqF;AAC1G;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}