@pathscale/ui 1.1.65 → 1.1.67

package/dist/components/select/Select.js

@@ -20,7 +20,7 @@ const normalizeSelection = (selectionMode, value)=>{
     entries = Array.isArray(value) ? value : isIterableValue(value) ? Array.from(value) : [
         value
     ];
-    const normalized = entries.map((entry)=>String(entry)).filter((entry, index, source)=>entry.length > 0 && source.indexOf(entry) === index);
+    const normalized = entries.map((entry)=>String(entry)).filter((entry, index, source)=>source.indexOf(entry) === index);
     if ("single" === selectionMode) return normalized.slice(0, 1);
     return normalized;
 };
@@ -69,6 +69,7 @@ const SelectRoot = (props)=>{
     const [internalSelectedKeys, setInternalSelectedKeys] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)(initialSelected);
     const [internalOpen, setInternalOpen] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)(Boolean(local.defaultOpen));
     const [options, setOptions] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)([]);
+    const [optionTextByKey, setOptionTextByKey] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)(new Map());
     const [focusedKey, setFocusedKey] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)();
     const [focusRequest, setFocusRequest] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)(null);
     const [triggerRef, setTriggerRefSignal] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)();
@@ -85,11 +86,7 @@ const SelectRoot = (props)=>{
     const selectedSet = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createMemo)(()=>new Set(selectedKeys()));
     const selectedText = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createMemo)(()=>{
         if (!selectedKeys().length) return "";
-        const optionMap = new Map(options().map((option)=>[
-                option.key,
-                option.textValue
-            ]));
-        return selectedKeys().map((key)=>optionMap.get(key) ?? key).join("multiple" === selectionMode() ? ", " : "");
+        return selectedKeys().map((key)=>optionTextByKey().get(key) ?? key).join("multiple" === selectionMode() ? ", " : "");
     });
     const getEnabledOptions = ()=>options().filter((option)=>!option.disabled);
     const focusOption = (option)=>{
@@ -156,6 +153,12 @@ const SelectRoot = (props)=>{
         });
     };
     const registerOption = (option)=>{
+        setOptionTextByKey((current)=>{
+            if (current.get(option.key) === option.textValue) return current;
+            const next = new Map(current);
+            next.set(option.key, option.textValue);
+            return next;
+        });
         setOptions((current)=>sortOptionsByDomOrder([
                 ...current.filter((entry)=>entry.key !== option.key),
                 option
@@ -434,7 +437,7 @@ const SelectValue = (props)=>{
     ]);
     const placeholder = ()=>ctx?.placeholder() ?? "";
     const text = ()=>ctx?.selectedText() ?? "";
-    const isPlaceholder = ()=>0 === text().length;
+    const isPlaceholder = ()=>(ctx?.selectedKeys().length ?? 0) === 0;
     return (()=>{
         var _el$8 = _tmpl$3();
         (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$8, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, ()=>({
@@ -513,7 +516,8 @@ const SelectPopover = (props)=>{
         "class",
         "className",
         "dataTheme",
-        "style"
+        "style",
+        "onPointerDown"
     ]);
     const overlayPosition = (0, __WEBPACK_EXTERNAL_MODULE__shared_overlayPosition_js_ab299723__.createOverlayPosition)({
         open: ()=>ctx?.open() ?? false,
@@ -537,37 +541,34 @@ const SelectPopover = (props)=>{
             ...overlayStyle
         };
     };
-    return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(__WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.Show, {
-        get when () {
-            return ctx?.open();
-        },
+    return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(__WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.Portal, {
         get children () {
-            return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(__WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.Portal, {
-                get children () {
-                    var _el$10 = _tmpl$();
-                    var _ref$ = ctx?.setPopoverRef;
-                    "function" == typeof _ref$ && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.use)(_ref$, _el$10);
-                    (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$10, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, ()=>({
-                            class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Select_classes_js_98857364__.CLASSES.slot.popover, local.class, local.className)
-                        }), {
-                        get ["data-theme"] () {
-                            return local.dataTheme;
-                        },
-                        "data-slot": "ui-select-popover",
-                        get ["data-open"] () {
-                            return ctx?.open() ? "true" : "false";
-                        },
-                        get ["data-placement"] () {
-                            return overlayPosition.placement();
-                        },
-                        get style () {
-                            return popoverStyle();
-                        }
-                    }), false, true);
-                    (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$10, ()=>local.children);
-                    return _el$10;
+            var _el$10 = _tmpl$();
+            var _ref$ = ctx?.setPopoverRef;
+            "function" == typeof _ref$ && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.use)(_ref$, _el$10);
+            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$10, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, ()=>({
+                    class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Select_classes_js_98857364__.CLASSES.slot.popover, local.class, local.className)
+                }), {
+                get ["data-theme"] () {
+                    return local.dataTheme;
+                },
+                "data-slot": "ui-select-popover",
+                get ["data-open"] () {
+                    return ctx?.open() ? "true" : "false";
+                },
+                get ["data-placement"] () {
+                    return overlayPosition.placement();
+                },
+                get style () {
+                    return popoverStyle();
+                },
+                onPointerDown: (event)=>{
+                    invokeEventHandler(local.onPointerDown, event);
+                    if (!event.defaultPrevented) event.stopPropagation();
                 }
-            });
+            }), false, true);
+            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$10, ()=>local.children);
+            return _el$10;
         }
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pathscale/ui",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "author": "pathscale",
   "repository": {
     "type": "git",