@shoper/phoenix_design_system 1.11.10-0 → 1.11.10-1

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

@@ -107,11 +107,13 @@ exports.HSearchSuggestionContent = class HSearchSuggestionContent extends phoeni
                 <ul>
                     ${repeat.repeat(this._suggestionsData, (suggestion, index) => lit.html `<li
                                 @click=${() => this._handleSuggestion(suggestion.suggestionName, suggestion.type)}
-                                class="${search_constants.SEARCH_CLASS_NAMES.item} ${search_constants.SEARCH_CLASS_NAMES.itemHoverable} ${index === this.activeItemId
+                                class="${search_constants.SEARCH_CLASS_NAMES.item} ${search_constants.SEARCH_CLASS_NAMES.itemHoverable} ${String(index) === this.activeItemId
             ? search_constants.SEARCH_CLASS_NAMES.itemActive
             : ''}"
                                 data-suggested-value="${suggestion.suggestionName}"
                                 data-search-item-id="${index}"
+                                aria-label=${this.suggestionAriaLabel ? `${this.suggestionAriaLabel} ${suggestion.suggestionName}` : undefined}
+                                tabindex="0"
                             >
                                 ${when.when(suggestion.type === search_constants.SUGGESTIONS_TYPE.suggestion, () => lit.html ` <span> ${this._getMatchedPhrase(suggestion.suggestionName)} </span>
                                         <h-icon
@@ -134,8 +136,8 @@ exports.HSearchSuggestionContent = class HSearchSuggestionContent extends phoeni
     }
 };
 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.HSearchSuggestionContent.prototype, "activeItemId", void 0);
 tslib_es6.__decorate([
     decorators.property({ type: Object, reflect: true }),
@@ -157,6 +159,10 @@ tslib_es6.__decorate([
     decorators.property({ type: String, attribute: 'module-instance-id' }),
     tslib_es6.__metadata("design:type", String)
 ], exports.HSearchSuggestionContent.prototype, "moduleInstanceId", void 0);
+tslib_es6.__decorate([
+    decorators.property({ type: String }),
+    tslib_es6.__metadata("design:type", String)
+], exports.HSearchSuggestionContent.prototype, "suggestionAriaLabel", void 0);
 tslib_es6.__decorate([
     decorators.state(),
     tslib_es6.__metadata("design:type", String)

package/build/cjs/packages/phoenix/src/components/form/search/subcomponents/results/search_suggestion_content.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,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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/select/select.js

@@ -301,7 +301,7 @@ exports.HSelect = class HSelect extends phoenix_light_lit_element.PhoenixLightLi
                 offset=${this.offset}
                 content-width="full"
             >
-                <h-dropdown-toggler name=${this.controlName} focus-priority> ${this.getSlot(select_constants.SELECT_SLOT_NAMES.toggler)} </h-dropdown-toggler>
+                <h-dropdown-toggler name=${this.controlName}> ${this.getSlot(select_constants.SELECT_SLOT_NAMES.toggler)} </h-dropdown-toggler>
 
                 <h-dropdown-content
                     class="${select_constants.SELECT_CSS_CLASSES.selectContent} ${this.error ? select_constants.SELECT_CSS_CLASSES.selectContentError : ''}"

package/build/cjs/packages/phoenix/src/index.js

@@ -99,10 +99,10 @@ var display_stepper = require('./components/form/input_stepper/display_stepper.j
 var button_stepper = require('./components/form/input_stepper/button_stepper.js');
 var search_constants = require('./components/form/search/search_constants.js');
 var search_input = require('./components/form/search/subcomponents/input/search_input.js');
-var search = require('./components/form/search/search.js');
+var search_results = require('./components/form/search/subcomponents/results/search_results.js');
 var search_history_load_more = require('./components/form/search/subcomponents/history/search_history_load_more.js');
 var search_history = require('./components/form/search/subcomponents/history/search_history.js');
-var search_results = require('./components/form/search/subcomponents/results/search_results.js');
+var search = require('./components/form/search/search.js');
 var search_submit = require('./components/form/search/subcomponents/buttons/search_submit.js');
 var search_clear = require('./components/form/search/subcomponents/buttons/search_clear.js');
 var search_close = require('./components/form/search/subcomponents/buttons/search_close.js');
@@ -592,10 +592,10 @@ Object.defineProperty(exports, 'HSearchInput', {
 		return search_input.HSearchInput;
 	}
 });
-Object.defineProperty(exports, 'HSearch', {
+Object.defineProperty(exports, 'HSearchResults', {
 	enumerable: true,
 	get: function () {
-		return search.HSearch;
+		return search_results.HSearchResults;
 	}
 });
 Object.defineProperty(exports, 'HSearchHistoryLoadMore', {
@@ -610,10 +610,10 @@ Object.defineProperty(exports, 'HSearchHistory', {
 		return search_history.HSearchHistory;
 	}
 });
-Object.defineProperty(exports, 'HSearchResults', {
+Object.defineProperty(exports, 'HSearch', {
 	enumerable: true,
 	get: function () {
-		return search_results.HSearchResults;
+		return search.HSearch;
 	}
 });
 Object.defineProperty(exports, 'HSearchSubmit', {

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

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

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

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA,uCAAuC,+CAAmD;AAC1F;AACA;AACA;AACA;AACA,uBAAuB,0CAA8C;AACrE;AACA,eAAe,wDAA4D;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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,uBAAuB,0CAA8C;AACrE;AACA,eAAe,wDAA4D;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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.d.ts

@@ -12,6 +12,8 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _searchContextObserver;
     private _searchInput;
     private _inputField;
+    private _searchResultsRef;
+    private _searchHistoryRef;
     private _shouldShowHistory;
     private _shouldShowResults;
     private _shouldShowMessage;
@@ -34,9 +36,16 @@ export declare class HSearch extends PhoenixLightLitElement {
     private _displayHistorySuggestions;
     private _hideHistorySuggestionsAndResults;
     private _displayResults;
+    private _handleToggleHistoryAndResults;
+    private _toggleSearchInputAria;
     private _bindKeys;
-    private _getSearchItemsCount;
-    private _scroll;
+    private _preventScrollingOnSearchContentBrowsing;
+    private _handleForwardListFocus;
+    private _handleForwardGridFocus;
+    private _handleForwardFocus;
+    private _handleBackwardListFocus;
+    private _handleBackwardGridFocus;
+    private _handleBackwardFocus;
     private _handleChooseSearchItem;
     private _resetSearchView;
     private _submitSearchPhrase;

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

@@ -1,21 +1,25 @@
 import { __decorate, __metadata } from '../../../../../../external/tslib/tslib.es6.js';
 import { html } from 'lit';
 import { property, state } from 'lit/decorators';
+import { UiDomUtils } from '@dreamcommerce/utilities';
 import { PhoenixLightLitElement } from '../../../core/phoenix_light_lit_element/phoenix_light_lit_element.js';
 import { phoenixCustomElement } from '../../../core/decorators/phoenix_custom_element.js';
 import { ICONS_SIZES } from '../../icon/icon_constants.js';
 import { Observer } from '../../../core/classes/observer/observer.js';
 import { ContextConsumerController } from '../../../core/context/context_consumer_controller.js';
 import { BehaviorSubject } from '../../../core/classes/behavior_subject/behavior_subject.js';
+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 { 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_CONFIGURATION, SEARCH_COMPONENT_NAMES, 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._searchResultsRef = createRef();
+        this._searchHistoryRef = createRef();
         this._shouldShowHistory = false;
         this._shouldShowResults = false;
         this._shouldShowMessage = false;
@@ -25,25 +29,30 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         this._historyContext = new BehaviorSubject({
             showLoadMore: false
         });
-        this._activeItemId = -1;
+        this._activeItemId = '-1';
         this._translations = {};
         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(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(SCROLL_DIRECTIONS.up);
+                    this._handleBackwardListFocus();
+                    break;
+                case 'ArrowLeft':
+                    ev.preventDefault();
+                    this._handleForwardGridFocus();
+                    break;
+                case 'ArrowRight':
+                    ev.preventDefault();
+                    this._handleBackwardGridFocus();
                     break;
                 case 'Enter':
                     ev.preventDefault();
-                    if (this._activeItemId === -1)
+                    if (this._activeItemId === '-1' || !this._shouldShowResults)
                         return;
                     this._handleChooseSearchItem();
                     break;
@@ -63,17 +72,69 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
                     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._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 = () => {
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            if (!$searchItemsContainer)
+                return;
+            const $listSearchItems = UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+                const searchItemId = $el.getAttribute('data-search-item-id');
+                return !!searchItemId && !searchItemId.includes('grid');
+            });
+            this._handleForwardFocus($listSearchItems);
+        };
+        this._handleForwardGridFocus = () => {
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            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 = $nextSearchItemElement.getAttribute('data-search-item-id')) !== null && _a !== void 0 ? _a : '-1';
+        };
+        this._handleBackwardListFocus = () => {
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            if (!$searchItemsContainer)
+                return;
+            const $listSearchItems = UiDomUtils.getFocusableElements($searchItemsContainer).filter(($el) => {
+                const searchItemId = $el.getAttribute('data-search-item-id');
+                return !!searchItemId && !searchItemId.includes('grid');
+            });
+            this._handleBackwardFocus($listSearchItems);
+        };
+        this._handleBackwardGridFocus = () => {
+            const $searchItemsContainer = this._searchHistoryRef.value || this._searchResultsRef.value;
+            if (!$searchItemsContainer)
+                return;
+            const $gridSearchItems = 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._activeItemId = (_a = $previousSearchItemElement.getAttribute('data-search-item-id')) !== null && _a !== void 0 ? _a : '-1';
         };
         this._hideSuggesterOnClickOutside = (ev) => {
             const outsideClick = typeof ev.composedPath === 'function' && !ev.composedPath().includes(this);
@@ -95,10 +156,21 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         try {
             this._searchContextConsumer = new 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((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_CONFIGURATION.historyContentLimit });
                 this._historyLimitedContent = this._searchHistory.slice(0, SEARCH_CONFIGURATION.historyContentLimit);
@@ -149,6 +221,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
             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_CUSTOM_EVENT_NAMES.keyup, (ev) => {
             const shouldShowMessage = ev.detail.searchPhrase !== '';
@@ -159,7 +232,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
             this._updateSearchView('', false);
         });
         this.addEventListener(SEARCH_CUSTOM_EVENT_NAMES.submit, () => {
-            if (this._activeItemId !== -1)
+            if (this._activeItemId !== '-1')
                 return;
             if (this._inputField.value === '') {
                 this._updateSearchView(this._inputField.value, true);
@@ -186,7 +259,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     }
     _updateSearchView(searchPhrase, shouldShowMessage, shouldUpdateSearchPhrase = true) {
         this._shouldShowMessage = shouldShowMessage;
-        this._activeItemId = -1;
+        this._activeItemId = '-1';
         this._displaySuggester(searchPhrase);
         if (!shouldUpdateSearchPhrase)
             return;
@@ -204,36 +277,42 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
         }
     }
     _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_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;
-        }
-        else {
-            top = searchContainer.scrollTop == maxScrollTop ? maxScrollTop : activeItemHeight + searchContainer.scrollTop - 30;
-        }
-        if (this._activeItemId === this._getSearchItemsCount() - 1) {
-            top = maxScrollTop;
-        }
-        if (this._activeItemId === 0) {
-            top = 0;
+    _handleToggleHistoryAndResults({ shouldShowHistory, shouldShowResults }) {
+        this._shouldShowHistory = shouldShowHistory;
+        this._shouldShowResults = shouldShowResults;
+        this._toggleSearchInputAria(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');
+            return;
         }
-        searchContainer === null || searchContainer === void 0 ? void 0 : searchContainer.scrollTo({ top, behavior: 'smooth' });
+        $input.setAttribute('aria-expanded', 'true');
+        if (shouldShowHistory)
+            $input.setAttribute('aria-label', this.settings.historyGuideAriaLabel);
+        if (shouldShowResults)
+            $input.setAttribute('aria-label', this.settings.suggesterGuideAriaLabel);
     }
     _handleChooseSearchItem() {
         const activeSearchItem = this.querySelector(`[data-search-item-id="${this._activeItemId}"]`);
@@ -244,7 +323,7 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
     }
     _resetSearchView() {
         this._shouldShowMessage = false;
-        this._activeItemId = -1;
+        this._activeItemId = '-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();
@@ -292,12 +371,14 @@ let HSearch = class HSearch extends PhoenixLightLitElement {
                             module-instance-id="${this.moduleInstanceId}"
                         ></h-search-message>`)}
                     ${n(this._shouldShowHistory, () => html `<h-search-history
+                                ${ref(this._searchHistoryRef)}
                                 .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}"
@@ -361,7 +442,7 @@ __decorate([
 ], HSearch.prototype, "_historyContext", void 0);
 __decorate([
     state(),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], HSearch.prototype, "_activeItemId", void 0);
 __decorate([
     state(),

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

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

@@ -24,7 +24,7 @@ export declare const SEARCH_CUSTOM_EVENT_NAMES: {
     readonly clear: "clearSearchPhrase";
     readonly submit: "submitSearchPhrase";
     readonly close: "close";
-    readonly search: "search";
+    readonly search: "performSearch";
     readonly updateSearchPhrase: "updateSearchPhrase";
     readonly focusin: "searchFocusIn";
     readonly keyup: "searchKeyUp";

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

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

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

@@ -68,6 +68,12 @@ export declare type TSearchSettings = {
     showProductRate: boolean;
     showProductAvailability: boolean;
     showProductPrice: boolean;
+    historyGuideAriaLabel: string;
+    suggesterGuideAriaLabel: string;
+    historyItemAriaLabel: string;
+    suggesterItemAriaLabel: string;
+    suggesterProductItemAriaLabel: string;
+    suggesterProducerItemAriaLabel: string;
 };
 export declare type TScrollDirection = TEnumLiteralsOf<typeof SCROLL_DIRECTIONS>;
 export declare type TSuggestionType = TEnumLiteralsOf<typeof SUGGESTIONS_TYPE>;
@@ -77,3 +83,7 @@ export declare type TSuggestion = {
     categoryName?: string;
     url?: string;
 };
+export declare type THandleToggleHistoryAndResults = {
+    shouldShowHistory: boolean;
+    shouldShowResults: boolean;
+};

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

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

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

@@ -7,6 +7,7 @@ import { ICONS_SIZES } from '../../../../icon/icon_constants.js';
 import { Observer } from '../../../../../core/classes/observer/observer.js';
 import { ContextConsumerController } from '../../../../../core/context/context_consumer_controller.js';
 import { createRef, ref } from 'lit-html/directives/ref.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 { SEARCH_CONTEXT_NAMES, SEARCH_CLASS_NAMES, SEARCH_COMPONENT_NAMES } from '../../search_constants.js';
 import { repeat as c } from '../../../../../../../../external/lit/external/lit-html/directives/repeat.js';
@@ -15,6 +16,7 @@ let HSearchHistory = class HSearchHistory extends PhoenixLightLitElement {
     constructor() {
         super(...arguments);
         this.buttonRef = createRef();
+        this._loadMoreButtonId = v4();
         this.history = [];
         this.translations = {};
     }
@@ -42,7 +44,7 @@ let HSearchHistory = class HSearchHistory extends PhoenixLightLitElement {
 
                 <ul>
                     ${c(this.history, (historyElement, index) => html ` <li
-                            class="${SEARCH_CLASS_NAMES.item} ${index === this.activeItemId ? SEARCH_CLASS_NAMES.itemActive : ''}"
+                            class="${SEARCH_CLASS_NAMES.item} ${String(index) === this.activeItemId ? SEARCH_CLASS_NAMES.itemActive : ''}"
                         >
                             <h-search-history-select
                                 item-label="${historyElement.label}"
@@ -50,13 +52,14 @@ let HSearchHistory = class HSearchHistory extends PhoenixLightLitElement {
                                 data-suggested-value="${historyElement.label}"
                                 data-search-item-id="${index}"
                                 module-instance-id="${this.moduleInstanceId}"
+                                aria-label=${this.translations.historyAriaLabel ? `${this.translations.historyAriaLabel} ${historyElement.label}` : undefined}
                             >
                                 <h-icon icon-name="icon-clock"></h-icon>
 
                                 <span class="${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="${index}-grid" item-id="${historyElement.id}">
                                 <h-icon
                                     icon-name="icon-x"
                                     clickable=${true}
@@ -67,7 +70,11 @@ let HSearchHistory = class HSearchHistory extends PhoenixLightLitElement {
                         </li>`)}
                 </ul>
 
-                <h-search-history-load-more class="${SEARCH_CLASS_NAMES.historyLoadMore}" ${ref(this.buttonRef)}>
+                <h-search-history-load-more
+                    class="${SEARCH_CLASS_NAMES.historyLoadMore}"
+                    data-search-item-id="${this._loadMoreButtonId}"
+                    ${ref(this.buttonRef)}
+                >
                     ${this.translations.loadMore}
                 </h-search-history-load-more>`);
     }
@@ -77,8 +84,8 @@ __decorate([
     __metadata("design:type", Array)
 ], HSearchHistory.prototype, "history", void 0);
 __decorate([
-    property({ type: Number, attribute: 'active-item-id' }),
-    __metadata("design:type", Number)
+    property({ type: String, attribute: 'active-item-id' }),
+    __metadata("design:type", String)
 ], HSearchHistory.prototype, "activeItemId", void 0);
 __decorate([
     property({ type: Object }),

package/build/esm/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,uCAAuC,qDAAyD;AAChG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,0BAA0B,2EAAmF;AAC7G;AACA,4BAA4B,6EAAqF;AACjH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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;AACA,eAAe,8DAAkE;AACjF,0BAA0B,2EAAmF;AAC7G;AACA,4BAA4B,6EAAqF;AACjH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;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/input/search_input.d.ts

@@ -1,6 +1,6 @@
 import { PhoenixLightLitElement } from "../../../../../core/phoenix_light_lit_element/phoenix_light_lit_element";
 export declare class HSearchInput extends PhoenixLightLitElement {
-    private _input;
+    input: HTMLInputElement | null;
     moduleInstanceId: string;
     private _isSearchPhraseCleared;
     connectedCallback(): void;