@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/drawer/Drawer.recipe.d.ts

@@ -88,7 +88,7 @@ export declare const CLASSES: {
         readonly iconEnd: "drawer__close-icon--end";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "drawer";
     readonly slots: {
         readonly "drawer-backdrop": {};

package/dist/components/dropdown/Dropdown.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Dropdown.css";
-import { type JSX } from "solid-js";
+import { type JSX } from "@solidjs/web";
 import { type OverlayPlacement } from "../_shared/overlayPosition";
 type DropdownAlign = "start" | "end";
 type DropdownPlacement = OverlayPlacement;

package/dist/components/dropdown/Dropdown.generated.js

@@ -1,8 +1,8 @@
-import { Portal, createComponent, insert, mergeProps, spread, template, use } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { Portal, createComponent, insert, mergeProps, ref, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./Dropdown.css";
-import { Show, createContext, createEffect, createSignal, createUniqueId, onCleanup, onMount, splitProps, useContext } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { Show, createContext, createEffect, createSignal, createUniqueId, omit, onCleanup, onSettled, useContext } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { createOverlayPosition } from "../_shared/overlayPosition.js";
 import { CLASSES, componentRecipe } from "./Dropdown.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>"), _tmpl$2 = /*#__PURE__*/ template("<button>"), _tmpl$3 = /*#__PURE__*/ template("<div><div>");
@@ -21,36 +21,25 @@ const sortItemsByDomOrder = (items)=>[
         return 0;
     });
 const __solidLayoutDropdownRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "open",
-        "defaultOpen",
-        "onOpenChange",
-        "placement",
-        "autoFlip",
-        "disabled",
-        "dataTheme",
-        "ref"
-    ]);
+    const others = omit(p, "children", "class", "open", "defaultOpen", "onOpenChange", "placement", "autoFlip", "disabled", "dataTheme", "ref");
     const baseId = createUniqueId();
     const triggerId = `${baseId}-trigger`;
     const menuId = `${baseId}-menu`;
-    const [internalOpen, setInternalOpen] = createSignal(Boolean(local.defaultOpen));
+    const [internalOpen, setInternalOpen] = createSignal(Boolean(p.defaultOpen));
     const [items, setItems] = createSignal([]);
     const [focusedKey, setFocusedKey] = createSignal(void 0);
     const [focusRequest, setFocusRequest] = createSignal(null);
     const [triggerRef, setTriggerRefSignal] = createSignal(void 0);
     const [menuRef, setMenuRefSignal] = createSignal(void 0);
     const [rootRef, setRootRefSignal] = createSignal(void 0);
-    const isControlled = ()=>void 0 !== local.open;
-    const isDisabled = ()=>Boolean(local.disabled);
-    const open = ()=>isControlled() ? Boolean(local.open) : internalOpen();
-    const placement = ()=>local.placement ?? "bottom";
-    const autoFlip = ()=>local.autoFlip ?? true;
+    const isControlled = ()=>void 0 !== p.open;
+    const isDisabled = ()=>Boolean(p.disabled);
+    const open = ()=>isControlled() ? Boolean(p.open) : internalOpen();
+    const placement = ()=>p.placement ?? "bottom";
+    const autoFlip = ()=>p.autoFlip ?? true;
     const setRootRef = (el)=>{
         setRootRefSignal(el);
-        if ("function" == typeof local.ref) local.ref(el);
+        if ("function" == typeof p.ref) p.ref(el);
     };
     const setTriggerRef = (el)=>{
         setTriggerRefSignal(el);
@@ -83,7 +72,7 @@ const __solidLayoutDropdownRoot = (_stable, p)=>{
         if (next && isDisabled()) return;
         const current = open();
         if (!isControlled()) setInternalOpen(next);
-        if (current !== next) local.onOpenChange?.(next);
+        if (current !== next) p.onOpenChange?.(next);
         if (!next) {
             setFocusedKey(void 0);
             setFocusRequest(null);
@@ -120,7 +109,7 @@ const __solidLayoutDropdownRoot = (_stable, p)=>{
             if (firstEnabled) setFocusedKey(firstEnabled.key);
         }
     });
-    onMount(()=>{
+    onSettled(()=>{
         const handlePointerDown = (event)=>{
             if (!open()) return;
             const target = event.target;
@@ -134,7 +123,7 @@ const __solidLayoutDropdownRoot = (_stable, p)=>{
             document.removeEventListener("pointerdown", handlePointerDown);
         });
     });
-    return createComponent(DropdownContext.Provider, {
+    return createComponent(DropdownContext, {
         value: {
             open,
             disabled: isDisabled,
@@ -159,19 +148,19 @@ const __solidLayoutDropdownRoot = (_stable, p)=>{
         },
         get children () {
             var _el$ = _tmpl$();
-            use(setRootRef, _el$);
+            ref(()=>setRootRef, _el$);
             spread(_el$, mergeProps(others, ()=>({
-                    class: twMerge(CLASSES.base, local.class)
+                    class: twMerge(CLASSES.base, p.class)
                 }), {
                 get ["data-theme"] () {
-                    return local.dataTheme;
+                    return p.dataTheme;
                 },
                 "data-slot": "dropdown",
                 get ["data-open"] () {
                     return open() ? "true" : "false";
                 }
-            }), false, true);
-            insert(_el$, ()=>local.children);
+            }), true);
+            insert(_el$, ()=>p.children);
             return _el$;
         }
     });
@@ -183,40 +172,32 @@ const DropdownRoot = defineComponent({
 });
 const __solidLayoutDropdownTrigger = (_stable, p)=>{
     const ctx = useContext(DropdownContext);
-    const [local, others] = splitProps(p, [
-        "class",
-        "children",
-        "disabled",
-        "onClick",
-        "onKeyDown",
-        "ref",
-        "type"
-    ]);
-    if (!ctx) return (()=>{
+    const others = omit(p, "class", "children", "disabled", "onClick", "onKeyDown", "ref", "type");
+    if (!ctx) {
         var _el$2 = _tmpl$2();
         spread(_el$2, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.trigger, local.class)
+                class: twMerge(CLASSES.slot.trigger, p.class)
             }), {
             get type () {
-                return local.type ?? "button";
+                return p.type ?? "button";
             }
-        }), false, true);
-        insert(_el$2, ()=>local.children);
+        }), true);
+        insert(_el$2, ()=>p.children);
         return _el$2;
-    })();
-    const isDisabled = ()=>Boolean(local.disabled) || ctx.disabled();
+    }
+    const isDisabled = ()=>Boolean(p.disabled) || ctx.disabled();
     const setRef = (el)=>{
         ctx.setTriggerRef(el);
-        if ("function" == typeof local.ref) local.ref(el);
+        if ("function" == typeof p.ref) p.ref(el);
     };
     const handleClick = (event)=>{
-        invokeEventHandler(local.onClick, event);
+        invokeEventHandler(p.onClick, event);
         if (event.defaultPrevented) return;
         if (isDisabled()) return;
         ctx.toggleOpen();
     };
     const handleKeyDown = (event)=>{
-        invokeEventHandler(local.onKeyDown, event);
+        invokeEventHandler(p.onKeyDown, event);
         if (event.defaultPrevented) return;
         if (isDisabled()) return;
         if ("ArrowDown" === event.key) {
@@ -250,36 +231,34 @@ const __solidLayoutDropdownTrigger = (_stable, p)=>{
             });
         }
     };
-    return (()=>{
-        var _el$3 = _tmpl$2();
-        use(setRef, _el$3);
-        spread(_el$3, mergeProps(others, {
-            get id () {
-                return ctx.triggerId;
-            },
-            get type () {
-                return local.type ?? "button";
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.slot.trigger, local.class)
-            }), {
-            "data-slot": "dropdown-trigger",
-            "aria-haspopup": "menu",
-            get ["aria-expanded"] () {
-                return ctx.open();
-            },
-            get ["aria-controls"] () {
-                return ctx.menuId;
-            },
-            get disabled () {
-                return isDisabled();
-            },
-            onClick: handleClick,
-            onKeyDown: handleKeyDown
-        }), false, true);
-        insert(_el$3, ()=>local.children);
-        return _el$3;
-    })();
+    var _el$3 = _tmpl$2();
+    ref(()=>setRef, _el$3);
+    spread(_el$3, mergeProps(others, {
+        get id () {
+            return ctx.triggerId;
+        },
+        get type () {
+            return p.type ?? "button";
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.slot.trigger, p.class)
+        }), {
+        "data-slot": "dropdown-trigger",
+        "aria-haspopup": "menu",
+        get ["aria-expanded"] () {
+            return ctx.open() ? "true" : "false";
+        },
+        get ["aria-controls"] () {
+            return ctx.menuId;
+        },
+        get disabled () {
+            return isDisabled();
+        },
+        onClick: handleClick,
+        onKeyDown: handleKeyDown
+    }), true);
+    insert(_el$3, ()=>p.children);
+    return _el$3;
 };
 const DropdownTrigger = defineComponent({
     recipe: componentRecipe,
@@ -288,39 +267,29 @@ const DropdownTrigger = defineComponent({
 });
 const __solidLayoutDropdownMenu = (_stable, p)=>{
     const ctx = useContext(DropdownContext);
-    const [local, others] = splitProps(p, [
-        "class",
-        "children",
-        "align",
-        "placement",
-        "autoFlip",
-        "sideOffset",
-        "onKeyDown",
-        "style",
-        "role"
-    ]);
-    if (!ctx) return (()=>{
+    const others = omit(p, "class", "children", "align", "placement", "autoFlip", "sideOffset", "onKeyDown", "style", "role");
+    if (!ctx) {
         var _el$4 = _tmpl$3(), _el$5 = _el$4.firstChild;
         spread(_el$4, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.popover, local.class)
-            })), false, true);
+                class: twMerge(CLASSES.slot.popover, p.class)
+            })), true);
         spread(_el$5, mergeProps(()=>({
                 class: CLASSES.slot.menu
-            })), false, true);
-        insert(_el$5, ()=>local.children);
+            })), true);
+        insert(_el$5, ()=>p.children);
         return _el$4;
-    })();
+    }
     const overlayPosition = createOverlayPosition({
         open: ctx.open,
         triggerRef: ctx.triggerRef,
         overlayRef: ctx.menuRef,
-        placement: ()=>local.placement ?? ctx.placement(),
-        offset: ()=>local.sideOffset ?? 6,
-        autoFlip: ()=>local.autoFlip ?? ctx.autoFlip(),
-        align: ()=>"end" === local.align ? "end" : "start"
+        placement: ()=>p.placement ?? ctx.placement(),
+        offset: ()=>p.sideOffset ?? 6,
+        autoFlip: ()=>p.autoFlip ?? ctx.autoFlip(),
+        align: ()=>"end" === p.align ? "end" : "start"
     });
     const handleKeyDown = (event)=>{
-        invokeEventHandler(local.onKeyDown, event);
+        invokeEventHandler(p.onKeyDown, event);
         if (event.defaultPrevented) return;
         switch(event.key){
             case "ArrowDown":
@@ -354,12 +323,12 @@ const __solidLayoutDropdownMenu = (_stable, p)=>{
     };
     const menuStyle = ()=>{
         const overlayStyle = overlayPosition.style();
-        if ("string" == typeof local.style) return [
-            local.style,
+        if ("string" == typeof p.style) return [
+            p.style,
             Object.entries(overlayStyle).map(([key, value])=>`${key}: ${String(value)}`).join("; ")
         ].filter(Boolean).join("; ");
         return {
-            ...local.style ?? {},
+            ...p.style ?? {},
             ...overlayStyle
         };
     };
@@ -372,23 +341,23 @@ const __solidLayoutDropdownMenu = (_stable, p)=>{
                 get children () {
                     var _el$6 = _tmpl$3(), _el$7 = _el$6.firstChild;
                     var _ref$ = ctx.setMenuRef;
-                    "function" == typeof _ref$ ? use(_ref$, _el$6) : ctx.setMenuRef = _el$6;
+                    "function" == typeof _ref$ || Array.isArray(_ref$) ? ref(()=>_ref$, _el$6) : ctx.setMenuRef = _el$6;
                     spread(_el$6, mergeProps(others, {
                         get id () {
                             return ctx.menuId;
                         }
                     }, ()=>({
-                            class: twMerge(CLASSES.slot.popover, local.class)
+                            class: twMerge(CLASSES.slot.popover, p.class)
                         }), {
                         get role () {
-                            return local.role ?? "menu";
+                            return p.role ?? "menu";
                         },
                         "data-slot": "dropdown-popover",
                         get ["data-open"] () {
                             return ctx.open() ? "true" : "false";
                         },
                         get ["data-align"] () {
-                            return local.align ?? "start";
+                            return p.align ?? "start";
                         },
                         get ["data-placement"] () {
                             return overlayPosition.placement();
@@ -400,13 +369,13 @@ const __solidLayoutDropdownMenu = (_stable, p)=>{
                             return menuStyle();
                         },
                         onKeyDown: handleKeyDown
-                    }), false, true);
+                    }), true);
                     spread(_el$7, mergeProps(()=>({
                             class: CLASSES.slot.menu
                         }), {
                         "data-slot": "dropdown-menu"
-                    }), false, true);
-                    insert(_el$7, ()=>local.children);
+                    }), true);
+                    insert(_el$7, ()=>p.children);
                     return _el$6;
                 }
             });
@@ -420,91 +389,78 @@ const DropdownMenu = defineComponent({
 });
 const __solidLayoutDropdownItem = (_stable, p)=>{
     const ctx = useContext(DropdownContext);
-    const [local, others] = splitProps(p, [
-        "class",
-        "children",
-        "disabled",
-        "closeOnSelect",
-        "onClick",
-        "onMouseEnter",
-        "onFocus",
-        "ref",
-        "role",
-        "type"
-    ]);
+    const others = omit(p, "class", "children", "disabled", "closeOnSelect", "onClick", "onMouseEnter", "onFocus", "ref", "role", "type");
     const itemKey = createUniqueId();
     let itemRef;
     if (ctx) {
-        onMount(()=>{
+        onSettled(()=>{
             if (itemRef) ctx.registerItem({
                 key: itemKey,
                 ref: itemRef,
-                disabled: Boolean(local.disabled)
+                disabled: Boolean(p.disabled)
             });
         });
         onCleanup(()=>{
             ctx.unregisterItem(itemKey);
         });
     }
-    const isDisabled = ()=>Boolean(local.disabled);
+    const isDisabled = ()=>Boolean(p.disabled);
     const setRef = (el)=>{
         itemRef = el;
-        if ("function" == typeof local.ref) local.ref(el);
+        if ("function" == typeof p.ref) p.ref(el);
     };
     const handleClick = (event)=>{
-        invokeEventHandler(local.onClick, event);
+        invokeEventHandler(p.onClick, event);
         if (event.defaultPrevented) return;
         if (isDisabled()) return;
-        if (ctx && (local.closeOnSelect ?? true)) ctx.setOpen(false, {
+        if (ctx && (p.closeOnSelect ?? true)) ctx.setOpen(false, {
             focusTrigger: true
         });
     };
     const handleMouseEnter = (event)=>{
-        invokeEventHandler(local.onMouseEnter, event);
+        invokeEventHandler(p.onMouseEnter, event);
         if (event.defaultPrevented) return;
         if (ctx && !isDisabled()) ctx.setFocusedKey(itemKey);
     };
     const handleFocus = (event)=>{
-        invokeEventHandler(local.onFocus, event);
+        invokeEventHandler(p.onFocus, event);
         if (event.defaultPrevented) return;
         if (ctx && !isDisabled()) ctx.setFocusedKey(itemKey);
     };
-    return (()=>{
-        var _el$8 = _tmpl$2();
-        use(setRef, _el$8);
-        spread(_el$8, mergeProps(others, {
-            get type () {
-                return local.type ?? "button";
-            },
-            get role () {
-                return local.role ?? "menuitem";
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.slot.item, local.class)
-            }), {
-            "data-slot": "menu-item",
-            get ["data-disabled"] () {
-                return isDisabled() ? "true" : "false";
-            },
-            get ["data-focused"] () {
-                return ctx?.focusedKey() === itemKey ? "true" : "false";
-            },
-            get ["aria-disabled"] () {
-                return isDisabled() ? "true" : "false";
-            },
-            get disabled () {
-                return isDisabled();
-            },
-            get tabIndex () {
-                return ctx ? ctx.open() && ctx.focusedKey() === itemKey ? 0 : -1 : 0;
-            },
-            onClick: handleClick,
-            onMouseEnter: handleMouseEnter,
-            onFocus: handleFocus
-        }), false, true);
-        insert(_el$8, ()=>local.children);
-        return _el$8;
-    })();
+    var _el$8 = _tmpl$2();
+    ref(()=>setRef, _el$8);
+    spread(_el$8, mergeProps(others, {
+        get type () {
+            return p.type ?? "button";
+        },
+        get role () {
+            return p.role ?? "menuitem";
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.slot.item, p.class)
+        }), {
+        "data-slot": "menu-item",
+        get ["data-disabled"] () {
+            return isDisabled() ? "true" : "false";
+        },
+        get ["data-focused"] () {
+            return ctx?.focusedKey() === itemKey ? "true" : "false";
+        },
+        get ["aria-disabled"] () {
+            return isDisabled() ? "true" : "false";
+        },
+        get disabled () {
+            return isDisabled();
+        },
+        get tabindex () {
+            return ctx ? ctx.open() && ctx.focusedKey() === itemKey ? 0 : -1 : 0;
+        },
+        onClick: handleClick,
+        onMouseEnter: handleMouseEnter,
+        onFocus: handleFocus
+    }), true);
+    insert(_el$8, ()=>p.children);
+    return _el$8;
 };
 const DropdownItem = defineComponent({
     recipe: componentRecipe,
@@ -512,22 +468,17 @@ const DropdownItem = defineComponent({
     embedded: true
 });
 const __solidLayoutDropdownGroup = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class",
-        "children"
-    ]);
-    return (()=>{
-        var _el$9 = _tmpl$();
-        spread(_el$9, mergeProps(others, {
-            role: "group"
-        }, ()=>({
-                class: twMerge(CLASSES.slot.group, local.class)
-            }), {
-            "data-slot": "dropdown-group"
-        }), false, true);
-        insert(_el$9, ()=>local.children);
-        return _el$9;
-    })();
+    const others = omit(p, "class", "children");
+    var _el$9 = _tmpl$();
+    spread(_el$9, mergeProps(others, {
+        role: "group"
+    }, ()=>({
+            class: twMerge(CLASSES.slot.group, p.class)
+        }), {
+        "data-slot": "dropdown-group"
+    }), true);
+    insert(_el$9, ()=>p.children);
+    return _el$9;
 };
 const DropdownGroup = defineComponent({
     recipe: componentRecipe,
@@ -535,21 +486,17 @@ const DropdownGroup = defineComponent({
     embedded: true
 });
 const __solidLayoutDropdownSeparator = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class"
-    ]);
-    return (()=>{
-        var _el$0 = _tmpl$();
-        spread(_el$0, mergeProps(others, {
-            role: "separator"
-        }, ()=>({
-                class: twMerge(CLASSES.slot.separator, local.class)
-            }), {
-            "data-slot": "separator",
-            "aria-orientation": "horizontal"
-        }), false, false);
-        return _el$0;
-    })();
+    const others = omit(p, "class");
+    var _el$0 = _tmpl$();
+    spread(_el$0, mergeProps(others, {
+        role: "separator"
+    }, ()=>({
+            class: twMerge(CLASSES.slot.separator, p.class)
+        }), {
+        "data-slot": "separator",
+        "aria-orientation": "horizontal"
+    }), false);
+    return _el$0;
 };
 const DropdownSeparator = defineComponent({
     recipe: componentRecipe,

package/dist/components/dropdown/Dropdown.recipe.d.ts

@@ -9,7 +9,7 @@ export declare const CLASSES: {
         readonly separator: "dropdown__separator";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "dropdown";
     readonly slots: {
         readonly dropdown: {};

package/dist/components/empty/Empty.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Empty.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps } from "../vocabulary";
 export type EmptyRootProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & UIBaseProps & {
     children: JSX.Element;