@smilodon/core 1.4.0 → 1.4.1

package/dist/index.umd.js

@@ -1832,6 +1832,7 @@
             this._pendingFirstRenderMark = false;
             this._pendingSearchRenderMark = false;
             this._rangeAnchorIndex = null;
+            this._customOptionBoundElements = new WeakSet();
             this._shadow = this.attachShadow({ mode: 'open' });
             this._uniqueId = `enhanced-select-${Math.random().toString(36).substr(2, 9)}`;
             this._rendererHelpers = this._buildRendererHelpers();
@@ -3698,24 +3699,37 @@
             if (!optionEl.hasAttribute('tabindex')) {
                 optionEl.tabIndex = -1;
             }
-            if (!meta.disabled) {
+            if (!this._customOptionBoundElements.has(optionEl)) {
                 optionEl.addEventListener('click', (e) => {
-                    e.stopPropagation(); // Prevent duplicate handling by delegation
+                    e.stopPropagation();
+                    const current = e.currentTarget;
+                    if (current.getAttribute('aria-disabled') === 'true')
+                        return;
+                    const parsedIndex = Number(current.dataset.index);
+                    if (!Number.isFinite(parsedIndex))
+                        return;
                     const mouseEvent = e;
-                    this._selectOption(meta.index, {
+                    this._selectOption(parsedIndex, {
                         shiftKey: mouseEvent.shiftKey,
                         toggleKey: mouseEvent.ctrlKey || mouseEvent.metaKey,
                     });
                 });
                 optionEl.addEventListener('keydown', (e) => {
-                    if (e.key === 'Enter' || e.key === ' ') {
-                        e.preventDefault();
-                        this._selectOption(meta.index, {
-                            shiftKey: e.shiftKey,
-                            toggleKey: e.ctrlKey || e.metaKey,
-                        });
-                    }
+                    if (e.key !== 'Enter' && e.key !== ' ')
+                        return;
+                    const current = e.currentTarget;
+                    if (current.getAttribute('aria-disabled') === 'true')
+                        return;
+                    const parsedIndex = Number(current.dataset.index);
+                    if (!Number.isFinite(parsedIndex))
+                        return;
+                    e.preventDefault();
+                    this._selectOption(parsedIndex, {
+                        shiftKey: e.shiftKey,
+                        toggleKey: e.ctrlKey || e.metaKey,
+                    });
                 });
+                this._customOptionBoundElements.add(optionEl);
             }
             return optionEl;
         }