@smilodon/core 1.0.8 → 1.0.10

package/dist/index.umd.js

@@ -2268,24 +2268,33 @@
                     });
                     this._optionsContainer.appendChild(header);
                     group.options.forEach(item => {
-                        this._renderSingleOption(item, getValue, getLabel);
+                        // Find original index for correct ID generation and selection
+                        const index = this._state.loadedItems.indexOf(item);
+                        if (index !== -1) {
+                            this._renderSingleOption(item, index, getValue, getLabel);
+                        }
                     });
                 });
             }
             else {
                 // Normal rendering (flat list or filtered)
-                const itemsToRender = query
-                    ? this._state.loadedItems.filter((item) => {
+                let hasRenderedItems = false;
+                this._state.loadedItems.forEach((item, index) => {
+                    // Apply filter if query exists
+                    if (query) {
                         try {
                             const label = String(getLabel(item)).toLowerCase();
-                            return label.includes(query);
+                            if (!label.includes(query))
+                                return;
                         }
                         catch (e) {
-                            return false;
+                            return;
                         }
-                    })
-                    : this._state.loadedItems;
-                if (itemsToRender.length === 0 && !this._state.isBusy) {
+                    }
+                    hasRenderedItems = true;
+                    this._renderSingleOption(item, index, getValue, getLabel);
+                });
+                if (!hasRenderedItems && !this._state.isBusy) {
                     const empty = document.createElement('div');
                     empty.className = 'empty-state';
                     if (query) {
@@ -2296,11 +2305,6 @@
                     }
                     this._optionsContainer.appendChild(empty);
                 }
-                else {
-                    itemsToRender.forEach((item) => {
-                        this._renderSingleOption(item, getValue, getLabel);
-                    });
-                }
             }
             // Append Busy Indicator if busy
             if (this._state.isBusy && this._config.busyBucket.enabled) {
@@ -2323,26 +2327,26 @@
                 this._addLoadMoreTrigger();
             }
         }
-        _renderSingleOption(item, getValue, getLabel) {
+        _renderSingleOption(item, index, getValue, getLabel) {
             const option = document.createElement('div');
             option.className = 'option';
+            option.id = `${this._uniqueId}-option-${index}`;
             const value = getValue(item);
             const label = getLabel(item);
             option.textContent = label;
             option.dataset.value = String(value);
+            option.dataset.index = String(index); // Also useful for debugging/selectors
             // Check if selected using selectedItems map
-            const isSelected = Array.from(this._state.selectedItems.values()).some(selectedItem => {
-                const selectedValue = getValue(selectedItem);
-                return selectedValue === value;
-            });
+            const isSelected = this._state.selectedIndices.has(index);
             if (isSelected) {
                 option.classList.add('selected');
+                option.setAttribute('aria-selected', 'true');
+            }
+            else {
+                option.setAttribute('aria-selected', 'false');
             }
             option.addEventListener('click', () => {
-                const index = this._state.loadedItems.indexOf(item);
-                if (index !== -1) {
-                    this._selectOption(index);
-                }
+                this._selectOption(index);
             });
             this._optionsContainer.appendChild(option);
         }