@zanichelli/albe-web-components 19.2.1-RC → 19.2.2

package/dist/collection/components/z-select/index.js

@@ -1,12 +1,9 @@
 import { h } from "@stencil/core";
 import { ControlSize, KeyboardCode, ListDividerType, ListSize } from "../../beans";
-import { boolean, getClickedElement, getElementTree, randomId } from "../../utils/utils";
+import { boolean, getClickedElement, getElementTree, getPlainText, randomId } from "../../utils/utils";
 export class ZSelect {
     constructor() {
-        this.flattenedList = [];
         this.itemsList = [];
-        this.itemIdKeyMap = {};
-        this.resetKey = -1;
         this.htmlid = `id-${randomId()}`;
         this.items = [];
         this.name = undefined;
@@ -37,9 +34,6 @@ export class ZSelect {
         this.itemsList = this.getInitialItemsArray();
         this.selectedItem = this.findSelectedItem(this.itemsList);
     }
-    getFocusedItemHandler(e) {
-        this.focusedItemId = e.target.id;
-    }
     /** get the input selected options */
     async getSelectedItem() {
         return this.selectedItem;
@@ -79,7 +73,6 @@ export class ZSelect {
     }
     componentWillRender() {
         this.filterItems(this.searchString);
-        this.updateFlattenedList();
     }
     getInitialItemsArray() {
         return typeof this.items === "string" ? JSON.parse(this.items) : this.items;
@@ -94,6 +87,15 @@ export class ZSelect {
         var _a;
         return (_a = this.selectedItem) === null || _a === void 0 ? void 0 : _a.id;
     }
+    getOptionId(item) {
+        return `${this.htmlid}_key_${item.id}`;
+    }
+    getResetOptionId() {
+        return `${this.htmlid}_key_reset`;
+    }
+    getItemIdFromOptionId(optionId) {
+        return optionId.replace(`${this.htmlid}_key_`, ``);
+    }
     getGroupedItems() {
         if (!this.itemsList.length) {
             return [];
@@ -105,33 +107,13 @@ export class ZSelect {
             return group;
         }, {}));
     }
-    updateFlattenedList() {
-        let orderedItems;
-        if (this.hasGroupItems) {
-            orderedItems = this.getGroupedItems()
-                .map((item) => item[1])
-                .flat();
-        }
-        else {
-            orderedItems = this.itemsList;
-        }
-        this.flattenedList = this.flattenTreeItems(orderedItems);
-        this.itemIdKeyMap = {};
-        this.flattenedList.forEach(({ item, key }) => {
-            this.itemIdKeyMap[item.id] = key;
-        });
-    }
-    getPlainText(html) {
-        const doc = new DOMParser().parseFromString(html, "text/html");
-        return doc.body.textContent || "";
-    }
     filterItems(searchString) {
         let prevList = this.mapSelectedItemToItemsArray();
         if (!(searchString === null || searchString === void 0 ? void 0 : searchString.length)) {
             this.itemsList = prevList;
             return;
         }
-        prevList = prevList.map((item) => (Object.assign(Object.assign({}, item), { name: this.getPlainText(item.name) })));
+        prevList = prevList.map((item) => (Object.assign(Object.assign({}, item), { name: getPlainText(item.name) })));
         if (this.hasTreeItems) {
             this.itemsList = this.filterTree(prevList, searchString, false);
         }
@@ -153,7 +135,7 @@ export class ZSelect {
             const match = item.name.toUpperCase().includes(searchString.toUpperCase());
             const newItem = Object.assign({}, item);
             if (newItem.children && newItem.children.length > 0) {
-                newItem.children = this.filterTree(newItem.children.map((item) => (Object.assign(Object.assign({}, item), { name: this.getPlainText(item.name) }))), searchString, match);
+                newItem.children = this.filterTree(newItem.children.map((item) => (Object.assign(Object.assign({}, item), { name: getPlainText(item.name) }))), searchString, match);
             }
             if (match) {
                 newItem.name = this.getHighlightedText(newItem.name, searchString);
@@ -227,83 +209,76 @@ export class ZSelect {
             this.searchString = null;
         }
     }
-    flattenTreeItems(items) {
-        const flatItems = [];
-        let index = 0;
-        const flatten = (subItems, disabledAncestor) => {
-            subItems.forEach((itm) => {
-                const isDisabled = itm.disabled || disabledAncestor;
-                flatItems.push({ item: Object.assign(Object.assign({}, itm), { disabled: isDisabled }), key: index++ });
-                if (itm.children && itm.children.length > 0) {
-                    flatten(itm.children, isDisabled);
+    handleResetClick() {
+        this.selectedItem = null;
+        this.searchString = null;
+        this.focusedItemId = "";
+        this.emitResetSelect();
+        this.toggleSelectUl();
+    }
+    handleInputKeyDown(e) {
+        switch (e.code) {
+            case KeyboardCode.ENTER:
+            case KeyboardCode.SPACE:
+                if (this.focusedItemId) {
+                    if (this.focusedItemId === this.getResetOptionId()) {
+                        this.handleResetClick();
+                    }
+                    else {
+                        const itemId = this.getItemIdFromOptionId(this.focusedItemId);
+                        const item = this.itemsList.find((e) => e.id === itemId) || null;
+                        if (item) {
+                            this.selectedItem = item;
+                            this.emitOptionSelect();
+                            this.toggleSelectUl();
+                        }
+                    }
                 }
-            });
-        };
-        if (items) {
-            flatten(items);
+                break;
+            case KeyboardCode.ARROW_DOWN:
+            case KeyboardCode.ARROW_UP:
+                this.arrowsSelectNav(e);
+                break;
         }
-        return flatItems;
     }
-    arrowsSelectNav(e, idOrReset) {
-        const showResetIcon = this.resetItem && !!this.selectedItem;
+    arrowsSelectNav(e) {
         const arrows = [KeyboardCode.ARROW_DOWN, KeyboardCode.ARROW_UP];
         if (!arrows.includes(e.key)) {
             return;
         }
         e.preventDefault();
         e.stopPropagation();
-        const flatItems = [...this.flattenedList].filter((f) => !f.item.disabled);
-        if (this.resetItem && showResetIcon) {
-            flatItems.unshift({
-                item: { id: "__RESET_ITEM__" },
-                key: this.resetKey,
-            });
-        }
-        if (!flatItems.length) {
+        const currElem = this.focusedItemId ? this.host.querySelector(`#${this.focusedItemId}`) : null;
+        const options = Array.from(this.host.querySelectorAll('[role="option"]'));
+        if (!options.length) {
             return;
         }
-        let currentIndex;
-        if (typeof idOrReset === "number") {
-            currentIndex = flatItems.findIndex((f) => f.key === idOrReset);
-        }
-        else {
-            const k = this.itemIdKeyMap[idOrReset];
-            currentIndex = flatItems.findIndex((f) => f.key === k);
-        }
+        const currElemIndex = currElem ? options.indexOf(currElem) : null;
+        const firstElemIndex = 0;
+        const lastElemIndex = options.length - 1;
         if (!this.isOpen) {
             this.toggleSelectUl();
-            if (currentIndex > -1) {
-                this.focusSelectItem(flatItems[currentIndex].key);
+            if (this.selectedItem) {
+                this.focusSelectItem(this.getOptionId(this.selectedItem));
                 return;
             }
         }
-        const lastIndex = flatItems.length - 1;
-        let newIndex = currentIndex;
-        if (e.key === KeyboardCode.ARROW_DOWN) {
-            do {
-                if (newIndex === lastIndex) {
-                    return;
-                }
-                newIndex = newIndex + 1;
-            } while (flatItems[newIndex].item.disabled);
+        let nextElem = null;
+        if (e.code === KeyboardCode.ARROW_DOWN) {
+            nextElem =
+                currElemIndex === null ? options[firstElemIndex] : options[currElemIndex + 1] || options[lastElemIndex];
         }
-        else {
-            do {
-                if (newIndex <= 0) {
-                    return;
-                }
-                newIndex = newIndex - 1;
-            } while (flatItems[newIndex].item.disabled);
+        else if (e.code === KeyboardCode.ARROW_UP) {
+            nextElem =
+                currElemIndex === null ? options[lastElemIndex] : options[currElemIndex - 1] || options[firstElemIndex];
         }
-        this.focusSelectItem(flatItems[newIndex].key);
+        this.focusSelectItem(nextElem.id);
     }
-    focusSelectItem(key) {
-        const elemId = `${this.htmlid}_key_${key}`;
-        const elem = this.host.querySelector(`#${elemId}`);
-        if (elem) {
-            this.focusedItemId = elemId;
-            elem.focus();
-        }
+    focusSelectItem(optionId) {
+        this.focusedItemId = optionId;
+        const elem = this.host.querySelector(`#${optionId}`);
+        // @ts-expect-error 'container' does not exist in type 'ScrollIntoViewOptions'
+        elem.scrollIntoView({ block: "nearest", container: "nearest" });
     }
     toggleSelectUl(selfFocusOnClose = false) {
         var _a;
@@ -356,35 +331,33 @@ export class ZSelect {
         if (!this.itemsList.length) {
             return;
         }
-        const foundItem = this.itemsList.findIndex((item) => item.name.toLowerCase().charAt(0) === letter.toLowerCase());
-        if (foundItem > -1) {
+        const foundItem = this.itemsList.find((item) => item.name.toLowerCase().charAt(0) === letter.toLowerCase());
+        if (foundItem) {
             if (!this.isOpen) {
                 this.toggleSelectUl();
             }
-            this.focusSelectItem(this.itemIdKeyMap[this.itemsList[foundItem].id]);
+            this.focusSelectItem(this.getOptionId(foundItem));
         }
     }
     renderInput() {
-        return (h("z-input", { class: {
-                "active-select": this.isOpen,
-                "cursor-select": !this.autocomplete,
-            }, id: `${this.htmlid}_input`, htmlid: `${this.htmlid}_select_input`, placeholder: this.placeholder, value: !this.isOpen && this.selectedItem ? this.selectedItem.name.replace(/<[^>]+>/g, "") : null, label: this.label, autocomplete: "off", "aria-label": this.ariaLabel, "html-aria-expanded": this.isOpen ? "true" : "false", "html-aria-controls": `${this.htmlid}_list`, "html-aria-autocomplete": this.hasAutocomplete() ? "list" : "none", "html-aria-activedescendant": this.isOpen ? this.focusedItemId : "", icon: this.isOpen ? "caret-up" : "caret-down", hasclearicon: false, message: false, name: this.name, disabled: this.disabled, readonly: this.readonly || (!this.hasAutocomplete() && this.isOpen), status: this.isOpen ? undefined : this.status, role: "combobox", size: this.size, onClick: (e) => {
-                this.handleInputClick(e);
-            }, onKeyDown: (e) => {
-                const current = this.selectedItem
-                    ? this.itemIdKeyMap[this.selectedItem.id]
-                    : this.resetItem
-                        ? this.resetKey
-                        : "";
-                return this.arrowsSelectNav(e, current);
-            }, onInputChange: (e) => {
-                this.handleInputChange(e);
-            }, onKeyPress: (e) => {
-                if (!this.hasAutocomplete()) {
-                    e.preventDefault();
-                    this.scrollToLetter(e.key);
-                }
-            } }));
+        let value = null;
+        if (this.selectedItem) {
+            value = getPlainText(this.selectedItem.name);
+        }
+        if (this.isOpen && this.searchString !== undefined) {
+            value = this.searchString;
+        }
+        return [
+            h("z-input", { class: {
+                    "active-select": this.isOpen,
+                    "cursor-select": !this.autocomplete,
+                }, id: `${this.htmlid}_input`, htmlid: `${this.htmlid}_select_input`, placeholder: this.placeholder, value: value, label: this.label, autocomplete: "off", "aria-label": this.ariaLabel, icon: this.isOpen ? "caret-up" : "caret-down", hasclearicon: false, message: false, name: this.name, disabled: this.disabled, readonly: this.readonly || (!this.hasAutocomplete() && this.isOpen), status: this.isOpen ? undefined : this.status, size: this.size, role: "combobox", "html-aria-expanded": this.isOpen ? "true" : "false", "html-aria-controls": `${this.htmlid}_list`, "html-aria-activedescendant": this.isOpen ? this.focusedItemId : "", "html-aria-autocomplete": this.hasAutocomplete() ? "list" : undefined, onClick: (e) => this.handleInputClick(e), onKeyDown: (e) => this.handleInputKeyDown(e), onInputChange: (e) => this.handleInputChange(e), onKeyPress: (e) => {
+                    if (!this.hasAutocomplete()) {
+                        e.preventDefault();
+                        this.scrollToLetter(e.key);
+                    }
+                } }),
+        ];
     }
     renderSelectUl() {
         return (h("div", { class: this.isOpen ? "open" : "closed" }, h("div", { class: {
@@ -398,22 +371,22 @@ export class ZSelect {
             } }, this.resetItem && this.renderResetItem(), this.renderSelectUlItems()))));
     }
     renderResetItem() {
+        const hidden = !this.selectedItem || !this.resetItem;
         return (h("z-list-element", { class: {
-                "hide": !this.selectedItem || !this.resetItem,
+                "hide": hidden,
                 "reset-item": true,
                 "reset-item-margin": !this.hasGroupItems,
-            }, clickable: true, disabled: false, dividerType: ListDividerType.ELEMENT, role: "option", "html-tabindex": 0, "aria-selected": "false", id: `${this.htmlid}_key_${this.resetKey}`, size: this.hasTreeItems ? ListSize.MEDIUM : this.listSizeType(), onClickItem: () => {
-                this.selectedItem = null;
-                this.searchString = null;
-                this.emitResetSelect();
-            }, onKeyDown: (e) => this.arrowsSelectNav(e, this.resetKey) }, h("div", { class: {
+            }, clickable: true, disabled: false, dividerType: ListDividerType.ELEMENT, role: hidden ? "presentation" : "option", "html-tabindex": 0, "aria-selected": "false", "aria-label": hidden ? undefined : this.resetItem, id: this.getResetOptionId(), size: this.hasTreeItems ? ListSize.MEDIUM : this.listSizeType(), onClickItem: () => this.handleResetClick() }, h("div", { class: {
                 "reset-item-content": true,
                 "tree-list-reset-item": this.hasTreeItems,
-            } }, h("z-icon", { name: "multiply-circled" }), h("span", null, this.resetItem))));
+                "active": this.focusedItemId === this.getResetOptionId(),
+            }, "aria-hidden": "true" }, h("z-icon", { name: "multiply-circled" }), h("span", null, this.resetItem))));
     }
     renderItem(item, lastItem) {
-        const thisItemKey = this.itemIdKeyMap[item.id];
-        return (h("z-list-element", { clickable: !item.disabled, disabled: item.disabled, dividerType: lastItem ? ListDividerType.HEADER : ListDividerType.ELEMENT, role: "option", "html-tabindex": item.disabled || !this.isOpen || this.focusedItemId !== `${this.htmlid}_key_${thisItemKey}` ? -1 : 0, "aria-selected": item.selected ? "true" : "false", id: `${this.htmlid}_key_${thisItemKey}`, size: this.listSizeType(), onClickItem: () => this.selectItem(item), onKeyDown: (e) => this.arrowsSelectNav(e, thisItemKey) }, h("div", { class: "list-element-container" }, h("div", { class: {
+        return (h("z-list-element", { clickable: !item.disabled, disabled: item.disabled, dividerType: lastItem ? ListDividerType.HEADER : ListDividerType.ELEMENT, role: item.disabled ? "presentation" : "option", "html-tabindex": -1, "aria-selected": item.selected ? "true" : "false", "aria-label": item.disabled ? undefined : getPlainText(item.name), id: this.getOptionId(item), size: this.listSizeType(), onClickItem: () => this.selectItem(item) }, h("div", { class: {
+                "list-element-container": true,
+                "active": this.focusedItemId === this.getOptionId(item),
+            }, "aria-hidden": "true" }, h("div", { class: {
                 "selected": !!item.selected,
                 "list-element-content": true,
             }, innerHTML: item.name }), item.icon && h("z-tag", { icon: item.icon }))));
@@ -448,7 +421,6 @@ export class ZSelect {
     }
     renderTreeItems(item, isLastChild, parentHasSiblings, isTopLevel, disabledAncestor) {
         var _a, _b;
-        const thisItemKey = this.itemIdKeyMap[item.id];
         const isDisabled = item.disabled || disabledAncestor;
         const hasDivider = this.hasGroupItems
             ? undefined
@@ -462,23 +434,17 @@ export class ZSelect {
         return (h("z-list-element", { clickable: !item.disabled, disabled: isDisabled, class: {
                 "grouped-tree-parent-node": this.hasGroupItems && !!((_a = item.children) === null || _a === void 0 ? void 0 : _a.length),
                 "tree-search-item": this.hasGroupItems && isTopLevel && !((_b = item.children) === null || _b === void 0 ? void 0 : _b.length) && !!this.searchString,
-            }, size: this.listSizeType(), dividerType: hasDivider, hasTreeItems: this.hasTreeItems, "html-tabindex": null }, h("div", { id: `${this.htmlid}_key_${thisItemKey}`, role: "option", class: "list-element", tabIndex: !this.isOpen || isDisabled || this.focusedItemId !== `${this.htmlid}_key_${thisItemKey}` ? -1 : 0, onClick: () => this.selectItem(item), onKeyDown: (e) => {
-                this.arrowsSelectNav(e, thisItemKey);
-                if (e.key === KeyboardCode.ENTER) {
-                    this.selectItem(item);
-                }
-            } }, h("span", { class: "item ellipsis" }, h("span", { class: {
+            }, size: this.listSizeType(), dividerType: hasDivider, hasTreeItems: this.hasTreeItems, "html-tabindex": null, role: "presentation" }, h("div", { id: this.getOptionId(item), role: isDisabled ? "presentation" : "option", "aria-label": isDisabled ? undefined : getPlainText(item.name), class: { "list-element": true, "active": this.focusedItemId === this.getOptionId(item) }, onClick: () => this.selectItem(item) }, h("span", { class: "item ellipsis", "aria-hidden": "true" }, h("span", { class: {
                 "item-label": true,
                 "selected": !!item.selected,
-            }, title: item.name, innerHTML: item.name })), item.icon && h("z-tag", { icon: item.icon })), item.children && item.children.length > 0 ? (h("z-list", null, h("div", { class: "children-node" }, item.children.map((child, index, arr) => this.renderTreeItems(child, index === arr.length - 1, arr.length > 1, false, // isTopLevel = false for children
+            }, title: item.name, innerHTML: item.name })), item.icon && h("z-tag", { icon: item.icon })), item.children && item.children.length > 0 ? (h("z-list", { role: "presentation" }, h("div", { class: "children-node" }, item.children.map((child, index, arr) => this.renderTreeItems(child, index === arr.length - 1, arr.length > 1, false, // isTopLevel = false for children
         isDisabled))))) : null));
     }
     renderGroupedTree() {
         const groupedItems = this.getGroupedItems();
         return groupedItems.map(([category, items], index, entries) => {
             const parentHasSiblings = Object.values(groupedItems).some((groupItems) => groupItems.length > 1);
-            // const parentHasSiblings = items.length > 1;
-            return (h("z-list-group", { "divider-type": index === entries.length - 1 ? undefined : ListDividerType.ELEMENT, hasTreeItems: true }, h("span", { class: "body-3-sb z-list-group-title", slot: "header-title" }, category), h("z-list", null, items.map((item, i, arr) => [
+            return (h("z-list-group", { "divider-type": index === entries.length - 1 ? undefined : ListDividerType.ELEMENT, hasTreeItems: true, "aria-labelledby": `${this.htmlid}_tree_${index}` }, h("span", { class: "body-3-sb z-list-group-title", slot: "header-title", id: `${this.htmlid}_tree_${index}`, "aria-hidden": "true" }, category), h("z-list", { role: "presentation" }, items.map((item, i, arr) => [
                 this.renderTreeItems(item, i === arr.length - 1, parentHasSiblings, true, item.disabled),
                 i < arr.length - 1 ? (h("z-divider", { key: `divider-${i}`, style: { zIndex: "100", height: "var(--border-size-small)" } })) : null,
             ])), index !== entries.length - 1 && h("z-divider", { style: { zIndex: "100", height: "var(--border-size-small)" } })));
@@ -488,14 +454,14 @@ export class ZSelect {
         const groupedItems = this.getGroupedItems();
         return groupedItems.map(([key, items], index) => {
             const isLastGroup = groupedItems.length === index + 1;
-            return (h("z-list-group", { "divider-type": ListDividerType.ELEMENT }, h("span", { class: "body-3-sb z-list-group-title", slot: "header-title" }, key), items.map((item, subindex) => {
+            return (h("z-list-group", { "divider-type": ListDividerType.ELEMENT, "aria-labelledby": `${this.htmlid}_group_${index}` }, h("span", { class: "body-3-sb z-list-group-title", slot: "header-title", id: `${this.htmlid}_group_${index}`, "aria-hidden": "true" }, key), items.map((item, subindex) => {
                 const isLastItem = items.length === subindex + 1;
                 return this.renderItem(item, isLastGroup && isLastItem);
             })));
         });
     }
     renderNoSearchResults() {
-        return (h("z-list-element", { class: "no-results", size: this.hasTreeItems ? ListSize.MEDIUM : this.listSizeType(), "html-tabindex": null }, this.noresultslabel));
+        return (h("z-list-element", { class: "no-results", size: this.hasTreeItems ? ListSize.MEDIUM : this.listSizeType(), "html-tabindex": null, role: "presentation" }, this.noresultslabel));
     }
     renderMessage() {
         if (boolean(this.message) === false) {
@@ -504,7 +470,7 @@ export class ZSelect {
         return (h("z-input-message", { message: boolean(this.message) === true ? undefined : this.message, status: this.status, class: this.size, disabled: this.disabled }));
     }
     render() {
-        return (h("div", { key: '7a00d71c47441c98748ff45d90705c0450e668af', class: "select-wrapper" }, this.renderInput(), this.renderSelectUl(), this.renderMessage()));
+        return (h("div", { key: '85aeff414269872f796631044ffcafe9e500d6e6', class: "select-wrapper" }, this.renderInput(), this.renderSelectUl(), this.renderMessage()));
     }
     static get is() { return "z-select"; }
     static get encapsulation() { return "scoped"; }
@@ -985,14 +951,5 @@ export class ZSelect {
                 "methodName": "watchItems"
             }];
     }
-    static get listeners() {
-        return [{
-                "name": "ariaDescendantFocus",
-                "method": "getFocusedItemHandler",
-                "target": undefined,
-                "capture": false,
-                "passive": false
-            }];
-    }
 }
 //# sourceMappingURL=index.js.map