@shoper/phoenix_design_system 1.11.10-0 → 1.11.10-10

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

@@ -97,7 +97,6 @@ exports.HFilePicker = class HFilePicker extends phoenix_light_lit_element.Phoeni
                       control-id="${this.controlId}"
                       label-text="${this.labelText}"
                       label-icon-name="${ifDefined_js.ifDefined(this.labelIconName)}"
-                      focus-priority
                   />`
             : lit.nothing}
             ${((_b = this._file) === null || _b === void 0 ? void 0 : _b.name)

package/build/cjs/packages/phoenix/src/components/form/file_picker/file_picker.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,oBAAoB,0CAA8C;AAClE;AACA,iBAAiB,wDAA4D;AAC7E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,oBAAoB,0CAA8C;AAClE;AACA,iBAAiB,wDAA4D;AAC7E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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

@@ -5,14 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib_es6 = require('../../../../../../external/tslib/tslib.es6.js');
 var lit = require('lit');
 var decorators = require('lit/decorators');
+var utilities = require('@dreamcommerce/utilities');
 var phoenix_light_lit_element = require('../../../core/phoenix_light_lit_element/phoenix_light_lit_element.js');
 var phoenix_custom_element = require('../../../core/decorators/phoenix_custom_element.js');
 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 behavior_subject = require('../../../core/classes/behavior_subject/behavior_subject.js');
+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');
 
@@ -20,6 +23,10 @@ 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._shouldShowHistory = false;
         this._shouldShowResults = false;
         this._shouldShowMessage = false;
@@ -29,25 +36,36 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         this._historyContext = new behavior_subject.BehaviorSubject({
             showLoadMore: false
         });
-        this._activeItemId = -1;
+        this._activeItemId = `${this._id}-1`;
         this._translations = {};
+        this._containerRole = 'grid';
         this._bindKeys = (ev) => {
-            var _a;
-            const searchItemsCount = this._getSearchItemsCount();
             switch (ev.key) {
                 case 'ArrowDown':
                     ev.preventDefault();
-                    this._activeItemId = this._activeItemId === searchItemsCount - 1 ? 0 : this._activeItemId + 1;
-                    this._scroll(search_constants.SCROLL_DIRECTIONS.down);
+                    this._handleForwardListFocus();
                     break;
                 case 'ArrowUp':
                     ev.preventDefault();
-                    this._activeItemId = this._activeItemId === 0 || this._activeItemId === -1 ? searchItemsCount - 1 : this._activeItemId - 1;
-                    this._scroll(search_constants.SCROLL_DIRECTIONS.up);
+                    this._handleBackwardListFocus();
+                    break;
+                case 'ArrowLeft':
+                    ev.preventDefault();
+                    if (this._containerRole === 'grid')
+                        this._handleBackwardGridFocus();
+                    if (this._containerRole === 'listbox')
+                        this._handleMoveToInputFieldOnArrowLeft();
+                    break;
+                case 'ArrowRight':
+                    ev.preventDefault();
+                    if (this._containerRole === 'grid')
+                        this._handleForwardGridFocus();
+                    if (this._containerRole === 'listbox')
+                        this._handleMoveToInputFieldOnArrowRight();
                     break;
                 case 'Enter':
                     ev.preventDefault();
-                    if (this._activeItemId === -1)
+                    if (this._activeItemId === `${this._id}-1` || !this._shouldShowResults)
                         return;
                     this._handleChooseSearchItem();
                     break;
@@ -56,28 +74,138 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
                     this._inputField.blur();
                     this._resetSearchView();
                     break;
+                case 'End':
+                    ev.preventDefault();
+                    this._handleFocusOnInputWithMarkerEnd();
+                    break;
+                case 'Home':
+                    ev.preventDefault();
+                    this._handleFocusOnInputWithMarkerStart();
+                    break;
                 case 'Tab':
-                    const isFocusedOnSearchInput = !!((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.matches('input[type="search"]'));
+                    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('keyup', this._bindKeys);
+                        this._focusOnNextElementAfterSearchInput(ev);
                     }
                     break;
             }
         };
-        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._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('keyup', this._bindKeys);
+            utilities.UiDomUtils.getPreviousFocusableElement(this._inputField).focus();
+        };
+        this._focusOnNextElementAfterSearchInput = async (ev) => {
+            ev.preventDefault();
+            utilities.UiDomUtils.getNextFocusableElement(this._inputField).focus();
+        };
+        this._preventScrollingOnSearchContentBrowsing = (ev) => {
+            var _a;
+            const hasArrowBeenPressed = ev.key === "ArrowUp" || ev.key === "ArrowDown";
+            const hasSearchContainerParent = !!((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.closest('.search__container'));
+            if (hasArrowBeenPressed && hasSearchContainerParent) {
+                ev.preventDefault();
             }
-            return searchItemsCount;
+        };
+        this._handleForwardListFocus = () => {
+            var _a, _b;
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            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 $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            if (!$searchItemsContainer)
+                return;
+            const $gridSearchItems = 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._handleMoveToInputFieldOnArrowLeft = () => {
+            this._inputField.focus();
+            const currentPosition = this._inputField.selectionStart || 0;
+            const newPosition = Math.max(currentPosition - 1, 0);
+            this._inputField.setSelectionRange(newPosition, newPosition);
+        };
+        this._handleMoveToInputFieldOnArrowRight = () => {
+            this._inputField.focus();
+            const currentPosition = this._inputField.selectionStart || 0;
+            const newPosition = Math.max(currentPosition - 1, 0);
+            this._inputField.setSelectionRange(newPosition, newPosition);
+        };
+        this._handleBackwardListFocus = () => {
+            var _a, _b;
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            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 $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            if (!$searchItemsContainer)
+                return;
+            const $gridSearchItems = 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;
+            this._inputField.setAttribute('aria-activedescendant', this._activeItemId);
+        };
+        this._handleFocusOnInputWithMarkerEnd = () => {
+            this._inputField.focus();
+            const endPosition = this._inputField.value.length;
+            this._inputField.setSelectionRange(endPosition, endPosition);
+        };
+        this._handleFocusOnInputWithMarkerStart = () => {
+            this._inputField.focus();
+            this._inputField.setSelectionRange(0, 0);
         };
         this._hideSuggesterOnClickOutside = (ev) => {
             const outsideClick = typeof ev.composedPath === 'function' && !ev.composedPath().includes(this);
@@ -99,10 +227,21 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         try {
             this._searchContextConsumer = new context_consumer_controller.ContextConsumerController(this);
             this._searchContext$ = await this._searchContextConsumer.consumeAsync(this.moduleInstanceId);
+            const ariaTranslations = {
+                historyGuideAriaLabel: this.settings.historyGuideAriaLabel,
+                suggesterGuideAriaLabel: this.settings.suggesterGuideAriaLabel,
+                historyItemAriaLabel: this.settings.historyItemAriaLabel,
+                suggesterItemAriaLabel: this.settings.suggesterItemAriaLabel,
+                suggesterProductItemAriaLabel: this.settings.suggesterProductItemAriaLabel,
+                suggesterProducerItemAriaLabel: this.settings.suggesterProducerItemAriaLabel
+            };
             this._searchContextObserver = new observer.Observer((searchData) => {
                 this._searchResults = searchData.results;
                 this._searchHistory = searchData.history;
-                this._translations = searchData.translations;
+                this._translations = {
+                    ...searchData.translations,
+                    ...ariaTranslations
+                };
                 this._searchPhrase = searchData.searchPhrase;
                 this._historyContext.notify({ showLoadMore: this._searchHistory.length > search_constants.SEARCH_CONFIGURATION.historyContentLimit });
                 this._historyLimitedContent = this._searchHistory.slice(0, search_constants.SEARCH_CONFIGURATION.historyContentLimit);
@@ -153,6 +292,7 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
             const shouldShowMessage = ev.detail.searchPhrase !== '';
             this._updateSearchView(ev.detail.searchPhrase, shouldShowMessage, false);
             document.addEventListener('keyup', this._bindKeys);
+            document.addEventListener('keydown', this._preventScrollingOnSearchContentBrowsing);
         });
         this.addEventListener(search_constants.SEARCH_CUSTOM_EVENT_NAMES.keyup, (ev) => {
             const shouldShowMessage = ev.detail.searchPhrase !== '';
@@ -163,7 +303,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 !== -1)
+            if (this._activeItemId !== `${this._id}-1`)
                 return;
             if (this._inputField.value === '') {
                 this._updateSearchView(this._inputField.value, true);
@@ -190,7 +330,8 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     }
     _updateSearchView(searchPhrase, shouldShowMessage, shouldUpdateSearchPhrase = true) {
         this._shouldShowMessage = shouldShowMessage;
-        this._activeItemId = -1;
+        this._setActiveItemId(`${this._id}-1`);
+        this._inputField.setAttribute('aria-activedescendant', this._activeItemId);
         this._displaySuggester(searchPhrase);
         if (!shouldUpdateSearchPhrase)
             return;
@@ -208,36 +349,56 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
         }
     }
     _displayHistorySuggestions() {
-        this._shouldShowHistory = true;
-        this._shouldShowResults = false;
+        this._handleToggleHistoryAndResults({
+            shouldShowHistory: true,
+            shouldShowResults: false
+        });
     }
     _hideHistorySuggestionsAndResults() {
-        this._shouldShowHistory = false;
-        this._shouldShowResults = false;
+        this._handleToggleHistoryAndResults({
+            shouldShowHistory: false,
+            shouldShowResults: false
+        });
     }
     _displayResults() {
-        this._shouldShowHistory = false;
-        this._shouldShowResults = true;
+        this._handleToggleHistoryAndResults({
+            shouldShowHistory: false,
+            shouldShowResults: true
+        });
     }
-    _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;
+    _handleToggleHistoryAndResults({ shouldShowHistory, shouldShowResults }) {
+        this._shouldShowHistory = shouldShowHistory;
+        this._shouldShowResults = shouldShowResults;
+        this._toggleSearchInputAttributes(shouldShowHistory, shouldShowResults);
+        this._toggleSearchContainerAttributes(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;
         }
-        else {
-            top = searchContainer.scrollTop == maxScrollTop ? maxScrollTop : activeItemHeight + searchContainer.scrollTop - 30;
+        $input.setAttribute('aria-expanded', 'true');
+        if (shouldShowHistory) {
+            $input.setAttribute('aria-label', this.settings.historyGuideAriaLabel);
+            $input.setAttribute('aria-haspopup', 'grid');
         }
-        if (this._activeItemId === this._getSearchItemsCount() - 1) {
-            top = maxScrollTop;
+        if (shouldShowResults) {
+            $input.setAttribute('aria-label', this.settings.suggesterGuideAriaLabel);
+            this._inputField.removeAttribute('aria-haspopup');
         }
-        if (this._activeItemId === 0) {
-            top = 0;
+    }
+    _toggleSearchContainerAttributes(shouldShowHistory, shouldShowResults) {
+        if (shouldShowHistory) {
+            this._containerRole = 'grid';
+        }
+        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}"]`);
@@ -248,7 +409,7 @@ exports.HSearch = class HSearch extends phoenix_light_lit_element.PhoenixLightLi
     }
     _resetSearchView() {
         this._shouldShowMessage = false;
-        this._activeItemId = -1;
+        this._setActiveItemId(`${this._id}-1`);
         const searchBar = this.querySelector(`.${search_constants.SEARCH_CLASS_NAMES.searchBar}`);
         searchBar === null || searchBar === void 0 ? void 0 : searchBar.classList.remove(search_constants.SEARCH_CLASS_NAMES.outline);
         this._hideHistorySuggestionsAndResults();
@@ -287,31 +448,47 @@ 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}">
-                    ${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
+            ${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
                                 .history="${this._historyLimitedContent}"
-                                .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
                                 .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>`)}
+                        ${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>`)}
         `;
     }
 };
@@ -365,12 +542,16 @@ tslib_es6.__decorate([
 ], exports.HSearch.prototype, "_historyContext", void 0);
 tslib_es6.__decorate([
     decorators.state(),
-    tslib_es6.__metadata("design:type", Number)
+    tslib_es6.__metadata("design:type", String)
 ], 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,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;"}
+{"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;"}

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

@@ -27,7 +27,7 @@ const SEARCH_CUSTOM_EVENT_NAMES = {
     clear: 'clearSearchPhrase',
     submit: 'submitSearchPhrase',
     close: 'close',
-    search: 'search',
+    search: 'performSearch',
     updateSearchPhrase: 'updateSearchPhrase',
     focusin: 'searchFocusIn',
     keyup: 'searchKeyUp'

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

@@ -32,6 +32,11 @@ 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;"}
+{"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;"}

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

@@ -45,22 +45,33 @@ 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} ${index === this.activeItemId ? search_constants.SEARCH_CLASS_NAMES.itemActive : ''}"
+                    ${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"
                         >
                             <h-search-history-select
                                 item-label="${historyElement.label}"
                                 class="${search_constants.SEARCH_CLASS_NAMES.historySelect}"
                                 data-suggested-value="${historyElement.label}"
-                                data-search-item-id="${index}"
+                                data-search-item-id="${this.searchId}${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 item-id="${historyElement.id}">
+                            <h-search-history-remove
+                                data-search-item-id="${this.searchId}${index}-grid"
+                                item-id="${historyElement.id}"
+                                role="gridcell"
+                            >
                                 <h-icon
                                     icon-name="icon-x"
                                     clickable=${true}
@@ -71,7 +82,11 @@ exports.HSearchHistory = class HSearchHistory extends phoenix_light_lit_element.
                         </li>`)}
                 </ul>
 
-                <h-search-history-load-more class="${search_constants.SEARCH_CLASS_NAMES.historyLoadMore}" ${ref_js.ref(this.buttonRef)}>
+                <h-search-history-load-more
+                    class="${search_constants.SEARCH_CLASS_NAMES.historyLoadMore}"
+                    data-search-item-id="${this.searchId}-loadmore"
+                    ${ref_js.ref(this.buttonRef)}
+                >
                     ${this.translations.loadMore}
                 </h-search-history-load-more>`);
     }
@@ -81,9 +96,13 @@ tslib_es6.__decorate([
     tslib_es6.__metadata("design:type", Array)
 ], exports.HSearchHistory.prototype, "history", void 0);
 tslib_es6.__decorate([
-    decorators.property({ type: Number, attribute: 'active-item-id' }),
-    tslib_es6.__metadata("design:type", Number)
+    decorators.property({ type: String, attribute: 'active-item-id' }),
+    tslib_es6.__metadata("design:type", String)
 ], 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;"}
+{"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;"}