@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/link/Link.generated.js

@@ -1,73 +1,59 @@
-import { insert, memo, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { claimElement, insert, mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./Link.css";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./Link.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<a>"), _tmpl$2 = /*#__PURE__*/ template("<span>"), _tmpl$3 = /*#__PURE__*/ template('<svg><path d="M7 1H11V5M11 1L5 7"stroke=currentColor stroke-width=1.5 stroke-linecap=round stroke-linejoin=round></path><path d="M10 7.5V9.5C10 10.3284 9.32843 11 8.5 11H2.5C1.67157 11 1 10.3284 1 9.5V3.5C1 2.67157 1.67157 2 2.5 2H4.5"stroke=currentColor stroke-width=1.5 stroke-linecap=round stroke-linejoin=round>');
 const ensureExternalRel = (value)=>{
-    const relTokens = new Set((value ?? "").split(/\s+/).filter(Boolean));
+    const relTokens = new Set(("string" == typeof value ? value : "").split(/\s+/).filter(Boolean));
     relTokens.add("noopener");
     relTokens.add("noreferrer");
     return Array.from(relTokens).join(" ");
 };
 const __solidLayoutLinkRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "href",
-        "class",
-        "dataTheme",
-        "style",
-        "variant",
-        "underline",
-        "isExternal",
-        "state",
-        "target",
-        "rel",
-        "tabIndex"
-    ]);
-    const variant = ()=>local.variant ?? "default";
-    const underline = ()=>local.underline ?? "always";
-    const isDisabled = ()=>Boolean("disabled" === local.state);
-    const isExternal = ()=>Boolean(local.isExternal);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, {
-            get href () {
-                return memo(()=>!!isDisabled())() ? void 0 : local.href;
-            },
-            get target () {
-                return memo(()=>!!isExternal())() ? "_blank" : local.target;
-            },
-            get rel () {
-                return memo(()=>!!isExternal())() ? ensureExternalRel(local.rel) : local.rel;
-            },
-            get tabIndex () {
-                return memo(()=>!!isDisabled())() ? -1 : local.tabIndex;
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.base, CLASSES.variant[variant()], CLASSES.underline[underline()], isExternal() && CLASSES.flag.external, isDisabled() && CLASSES.flag.disabled, local.class)
-            }), {
-            "data-slot": "link",
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get ["data-external"] () {
-                return isExternal() ? "true" : "false";
-            },
-            get ["data-disabled"] () {
-                return isDisabled() ? "true" : "false";
-            },
-            get ["aria-disabled"] () {
-                return isDisabled() ? "true" : void 0;
-            },
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const others = omit(p, "children", "href", "class", "dataTheme", "style", "variant", "underline", "isExternal", "state", "target", "rel", "tabindex");
+    const variant = ()=>p.variant ?? "default";
+    const underline = ()=>p.underline ?? "always";
+    const isDisabled = ()=>Boolean("disabled" === p.state);
+    const isExternal = ()=>Boolean(p.isExternal);
+    var _el$ = _tmpl$();
+    claimElement(_el$);
+    spread(_el$, mergeProps(others, {
+        get href () {
+            return isDisabled() ? void 0 : p.href;
+        },
+        get target () {
+            return isExternal() ? "_blank" : p.target;
+        },
+        get rel () {
+            return isExternal() ? ensureExternalRel(p.rel) : p.rel;
+        },
+        get tabindex () {
+            return isDisabled() ? -1 : p.tabindex;
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.base, CLASSES.variant[variant()], CLASSES.underline[underline()], isExternal() && CLASSES.flag.external, isDisabled() && CLASSES.flag.disabled, p.class)
+        }), {
+        "data-slot": "link",
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get ["data-external"] () {
+            return isExternal() ? "true" : "false";
+        },
+        get ["data-disabled"] () {
+            return isDisabled() ? "true" : "false";
+        },
+        get ["aria-disabled"] () {
+            return isDisabled() ? "true" : void 0;
+        },
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const LinkRoot = defineComponent({
     recipe: componentRecipe,
@@ -75,44 +61,36 @@ const LinkRoot = defineComponent({
     embedded: true
 });
 const __solidLayoutLinkIcon = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class",
-        "children",
-        "dataTheme",
-        "style"
-    ]);
-    const hasCustomIcon = ()=>null != local.children;
-    return (()=>{
-        var _el$2 = _tmpl$2();
-        spread(_el$2, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.icon, local.class)
-            }), {
-            "data-slot": "link-icon",
-            get ["data-default-icon"] () {
-                return hasCustomIcon() ? "false" : "true";
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$2, ()=>local.children ?? (()=>{
-                var _el$3 = _tmpl$3();
-                spread(_el$3, mergeProps(()=>({
-                        class: CLASSES.slot.iconDefault
-                    }), {
-                    "data-slot": "link-default-icon",
-                    viewBox: "0 0 12 12",
-                    fill: "none",
-                    xmlns: "http://www.w3.org/2000/svg",
-                    "aria-hidden": "true"
-                }), true, true);
-                return _el$3;
-            })());
-        return _el$2;
-    })();
+    const others = omit(p, "class", "children", "dataTheme", "style");
+    const hasCustomIcon = ()=>null != p.children;
+    var _el$2 = _tmpl$2();
+    spread(_el$2, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.slot.icon, p.class)
+        }), {
+        "data-slot": "link-icon",
+        get ["data-default-icon"] () {
+            return hasCustomIcon() ? "false" : "true";
+        },
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$2, ()=>p.children ?? (()=>{
+            var _el$3 = _tmpl$3();
+            spread(_el$3, mergeProps(()=>({
+                    class: CLASSES.slot.iconDefault
+                }), {
+                "data-slot": "link-default-icon",
+                viewBox: "0 0 12 12",
+                fill: "none",
+                "aria-hidden": "true"
+            }), true);
+            return _el$3;
+        })());
+    return _el$2;
 };
 const LinkIcon = defineComponent({
     recipe: componentRecipe,

package/dist/components/link/Link.recipe.d.ts

@@ -17,7 +17,7 @@ export declare const CLASSES: {
         readonly iconDefault: "link__icon-default";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "link";
     readonly slots: {
         readonly link: {};

package/dist/components/list-box/ListBox.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./ListBox.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State } from "../vocabulary";
 import { type ListBoxSelectionMode, type ListBoxVariant } from "./context";
 export type ListBoxRootProps<T = unknown> = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children" | "onChange"> & UIBaseProps & {

package/dist/components/list-box/ListBox.generated.js

@@ -1,8 +1,8 @@
-import { createComponent, insert, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { createComponent, insert, mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./ListBox.css";
-import { For, createMemo, createSignal, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { For, createMemo, createSignal, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./ListBox.recipe.js";
 import { ListBoxContext } from "./context.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
@@ -24,35 +24,16 @@ const invokeEventHandler = (handler, event)=>{
     if (Array.isArray(handler) && "function" == typeof handler[0]) handler[0](handler[1], event);
 };
 const __solidLayoutListBoxRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "style",
-        "items",
-        "renderEmpty",
-        "variant",
-        "selectionMode",
-        "selectedKeys",
-        "defaultSelectedKeys",
-        "disabledKeys",
-        "disallowEmptySelection",
-        "onSelectionChange",
-        "onAction",
-        "state",
-        "disabled",
-        "role",
-        "onKeyDown"
-    ]);
-    const [internalSelectedKeys, setInternalSelectedKeys] = createSignal(normalizeKeys(local.defaultSelectedKeys));
+    const others = omit(p, "children", "class", "dataTheme", "style", "items", "renderEmpty", "variant", "selectionMode", "selectedKeys", "defaultSelectedKeys", "disabledKeys", "disallowEmptySelection", "onSelectionChange", "onAction", "state", "disabled", "role", "onKeyDown");
+    const [internalSelectedKeys, setInternalSelectedKeys] = createSignal(normalizeKeys(p.defaultSelectedKeys));
     const [focusedKey, setFocusedKey] = createSignal();
     const [registeredItems, setRegisteredItems] = createSignal([]);
-    const variant = ()=>local.variant ?? "default";
-    const selectionMode = ()=>local.selectionMode ?? "none";
-    const isControlled = ()=>void 0 !== local.selectedKeys;
-    const isDisabled = ()=>Boolean("disabled" === local.state) || Boolean(local.disabled);
-    const selectedKeys = createMemo(()=>isControlled() ? normalizeKeys(local.selectedKeys) : internalSelectedKeys());
-    const disabledKeys = createMemo(()=>normalizeKeys(local.disabledKeys));
+    const variant = ()=>p.variant ?? "default";
+    const selectionMode = ()=>p.selectionMode ?? "none";
+    const isControlled = ()=>void 0 !== p.selectedKeys;
+    const isDisabled = ()=>Boolean("disabled" === p.state) || Boolean(p.disabled);
+    const selectedKeys = createMemo(()=>isControlled() ? normalizeKeys(p.selectedKeys) : internalSelectedKeys());
+    const disabledKeys = createMemo(()=>normalizeKeys(p.disabledKeys));
     const getEnabledItems = ()=>registeredItems().filter((item)=>!item.disabled && !disabledKeys().has(item.key) && !isDisabled());
     const focusItem = (item)=>{
         if (!item) return;
@@ -81,27 +62,27 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
     };
     const updateSelection = (nextKeys)=>{
         if (!isControlled()) setInternalSelectedKeys(nextKeys);
-        local.onSelectionChange?.(nextKeys);
+        p.onSelectionChange?.(nextKeys);
     };
     const activateKey = (key, event)=>{
         if (event.defaultPrevented || isDisabled()) return;
         if (disabledKeys().has(key)) return;
-        if ("none" === selectionMode()) return void local.onAction?.(key);
+        if ("none" === selectionMode()) return void p.onAction?.(key);
         const current = selectedKeys();
         if ("single" === selectionMode()) {
             if (!(1 === current.size && current.has(key))) updateSelection(new Set([
                 key
             ]));
-            local.onAction?.(key);
+            p.onAction?.(key);
             return;
         }
         const next = new Set(current);
         if (next.has(key)) {
-            if (local.disallowEmptySelection && 1 === next.size) return void local.onAction?.(key);
+            if (p.disallowEmptySelection && 1 === next.size) return void p.onAction?.(key);
             next.delete(key);
         } else next.add(key);
         updateSelection(next);
-        local.onAction?.(key);
+        p.onAction?.(key);
     };
     const registerItem = (item)=>{
         setRegisteredItems((current)=>sortItemsByDomOrder([
@@ -127,7 +108,7 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
         return -1;
     };
     const handleKeyDown = (event)=>{
-        invokeEventHandler(local.onKeyDown, event);
+        invokeEventHandler(p.onKeyDown, event);
         if (event.defaultPrevented) return;
         if (event.target !== event.currentTarget) return;
         if ("ArrowDown" === event.key || "ArrowRight" === event.key) {
@@ -148,15 +129,15 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
         }
     };
     const renderChildren = ()=>{
-        const isItemRenderer = "function" == typeof local.children && local.children.length > 0;
-        const resolvedStaticChildren = "function" == typeof local.children ? isItemRenderer ? null : local.children() : local.children ?? null;
-        if (local.items) {
-            if (0 === local.items.length) return local.renderEmpty?.() ?? null;
+        const isItemRenderer = "function" == typeof p.children && p.children.length > 0;
+        const resolvedStaticChildren = "function" == typeof p.children ? isItemRenderer ? null : p.children() : p.children ?? null;
+        if (p.items) {
+            if (0 === p.items.length) return p.renderEmpty?.() ?? null;
             if (isItemRenderer) {
-                const renderItem = local.children;
+                const renderItem = p.children;
                 return createComponent(For, {
                     get each () {
-                        return local.items;
+                        return p.items;
                     },
                     children: (item)=>renderItem(item)
                 });
@@ -164,7 +145,7 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
         }
         return resolvedStaticChildren;
     };
-    return createComponent(ListBoxContext.Provider, {
+    return createComponent(ListBoxContext, {
         value: {
             variant,
             selectionMode,
@@ -186,7 +167,7 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
             var _el$ = _tmpl$();
             spread(_el$, mergeProps(others, {
                 get role () {
-                    return local.role ?? "listbox";
+                    return p.role ?? "listbox";
                 },
                 get ["aria-multiselectable"] () {
                     return "multiple" === selectionMode() ? "true" : void 0;
@@ -196,7 +177,7 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
                 },
                 "data-slot": "listbox",
                 get ["data-theme"] () {
-                    return local.dataTheme;
+                    return p.dataTheme;
                 },
                 get ["data-selection-mode"] () {
                     return selectionMode();
@@ -205,13 +186,13 @@ const __solidLayoutListBoxRoot = (_stable, p)=>{
                     return isDisabled() ? "true" : "false";
                 },
                 get ["class"] () {
-                    return twMerge(CLASSES.Root.base, CLASSES.Root.variant[variant()], local.class);
+                    return twMerge(CLASSES.Root.base, CLASSES.Root.variant[variant()], p.class);
                 },
                 get style () {
-                    return local.style;
+                    return p.style;
                 },
                 onKeyDown: handleKeyDown
-            }), false, true);
+            }), true);
             insert(_el$, renderChildren);
             return _el$;
         }

package/dist/components/list-box/ListBox.recipe.d.ts

@@ -21,7 +21,7 @@ export declare const CLASSES: {
         readonly title: "list-box-section__title";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "list-box";
     readonly slots: {
         readonly heading: {};

package/dist/components/list-box/ListBoxItem.generated.d.ts

@@ -1,5 +1,5 @@
 import type { Component as __LayoutComponent } from "solid-js";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State } from "../vocabulary";
 import { type ListBoxVariant } from "./context";
 type ListBoxItemRenderProps = {