@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/chip/Chip.generated.js

@@ -1,32 +1,21 @@
-import { createComponent, insert, memo, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { createComponent, insert, memo, mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import { clsx } from "clsx";
-import { Show, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { Show, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import "./Chip.css";
 import { CLASSES, componentRecipe } from "./Chip.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<button type=button>");
+var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<button>"), _tmpl$3 = /*#__PURE__*/ template("<span><!><!><!><!>");
 const __solidLayoutChipRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "variant",
-        "flavor",
-        "size",
-        "startIcon",
-        "endIcon",
-        "onRemove",
-        "removeButtonLabel",
-        "state"
-    ]);
+    const others = omit(p, "children", "class", "variant", "flavor", "size", "startIcon", "endIcon", "onRemove", "removeButtonLabel", "state");
     const classes = ()=>{
-        const variant = local.variant ?? "solid";
-        const color = local.flavor ?? "default";
-        const size = local.size ?? "md";
-        return twMerge(clsx(CLASSES.base, CLASSES.variant[variant], CLASSES.flavor[color] ?? `chip--flavor-${color}`, CLASSES.size[size], local.class));
+        const variant = p.variant ?? "solid";
+        const color = p.flavor ?? "default";
+        const size = p.size ?? "md";
+        return twMerge(clsx(CLASSES.base, CLASSES.variant[variant], CLASSES.flavor[color] ?? `chip--flavor-${color}`, CLASSES.size[size], p.class));
     };
     const chipChildren = ()=>{
-        const c = local.children;
+        const c = p.children;
         if ("string" == typeof c || "number" == typeof c) return createComponent(ChipLabel, {
             children: c
         });
@@ -34,90 +23,90 @@ const __solidLayoutChipRoot = (_stable, p)=>{
     };
     const handleRemove = (event)=>{
         event.stopPropagation();
-        local.onRemove?.();
+        p.onRemove?.();
     };
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, ()=>({
-                class: classes()
-            }), {
-            "data-slot": "chip",
-            get ["data-disabled"] () {
-                return "disabled" === local.state ? "true" : "false";
-            },
-            get ["data-removable"] () {
-                return local.onRemove ? "true" : "false";
-            }
-        }), false, true);
-        insert(_el$, createComponent(Show, {
-            get when () {
-                return local.startIcon;
-            },
-            get children () {
-                var _el$2 = _tmpl$();
-                spread(_el$2, mergeProps(()=>({
-                        class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconStart)
-                    }), {
-                    "data-slot": "chip-start-icon"
-                }), false, true);
-                insert(_el$2, ()=>local.startIcon);
-                return _el$2;
-            }
-        }), null);
-        insert(_el$, chipChildren, null);
-        insert(_el$, createComponent(Show, {
-            get when () {
-                return memo(()=>!!local.onRemove)() && local.endIcon;
-            },
-            get children () {
-                var _el$3 = _tmpl$2();
-                spread(_el$3, mergeProps(()=>({
-                        class: CLASSES.slot.remove
-                    }), {
-                    "data-slot": "chip-remove",
-                    get ["aria-label"] () {
-                        return local.removeButtonLabel ?? "Remove";
-                    },
-                    onClick: handleRemove,
-                    get disabled () {
-                        return Boolean("disabled" === local.state);
-                    }
-                }), false, true);
-                insert(_el$3, createComponent(Show, {
-                    get when () {
-                        return local.endIcon;
-                    },
-                    get children () {
-                        var _el$4 = _tmpl$();
-                        spread(_el$4, mergeProps(()=>({
-                                class: CLASSES.slot.removeIcon
-                            }), {
-                            "data-slot": "chip-remove-icon"
-                        }), false, true);
-                        insert(_el$4, ()=>local.endIcon);
-                        return _el$4;
-                    }
-                }));
-                return _el$3;
-            }
-        }), null);
-        insert(_el$, createComponent(Show, {
-            get when () {
-                return memo(()=>!local.onRemove)() && local.endIcon;
-            },
-            get children () {
-                var _el$5 = _tmpl$();
-                spread(_el$5, mergeProps(()=>({
-                        class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconEnd)
-                    }), {
-                    "data-slot": "chip-end-icon"
-                }), false, true);
-                insert(_el$5, ()=>local.endIcon);
-                return _el$5;
-            }
-        }), null);
-        return _el$;
-    })();
+    var _el$ = _tmpl$3(), _el$6 = _el$.firstChild, _el$7 = _el$6.nextSibling, _el$8 = _el$7.nextSibling, _el$9 = _el$8.nextSibling;
+    spread(_el$, mergeProps(others, ()=>({
+            class: classes()
+        }), {
+        "data-slot": "chip",
+        get ["data-disabled"] () {
+            return "disabled" === p.state ? "true" : "false";
+        },
+        get ["data-removable"] () {
+            return p.onRemove ? "true" : "false";
+        }
+    }), true);
+    insert(_el$, createComponent(Show, {
+        get when () {
+            return p.startIcon;
+        },
+        get children () {
+            var _el$2 = _tmpl$();
+            spread(_el$2, mergeProps(()=>({
+                    class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconStart)
+                }), {
+                "data-slot": "chip-start-icon"
+            }), true);
+            insert(_el$2, ()=>p.startIcon);
+            return _el$2;
+        }
+    }), _el$6);
+    insert(_el$, chipChildren, _el$7);
+    insert(_el$, createComponent(Show, {
+        get when () {
+            return memo(()=>!!p.onRemove)() ? p.endIcon : p.onRemove;
+        },
+        get children () {
+            var _el$3 = _tmpl$2();
+            spread(_el$3, mergeProps({
+                type: "button"
+            }, ()=>({
+                    class: CLASSES.slot.remove
+                }), {
+                "data-slot": "chip-remove",
+                get ["aria-label"] () {
+                    return p.removeButtonLabel ?? "Remove";
+                },
+                onClick: handleRemove,
+                get disabled () {
+                    return Boolean("disabled" === p.state);
+                }
+            }), true);
+            insert(_el$3, createComponent(Show, {
+                get when () {
+                    return p.endIcon;
+                },
+                get children () {
+                    var _el$4 = _tmpl$();
+                    spread(_el$4, mergeProps(()=>({
+                            class: CLASSES.slot.removeIcon
+                        }), {
+                        "data-slot": "chip-remove-icon"
+                    }), true);
+                    insert(_el$4, ()=>p.endIcon);
+                    return _el$4;
+                }
+            }));
+            return _el$3;
+        }
+    }), _el$8);
+    insert(_el$, createComponent(Show, {
+        get when () {
+            return memo(()=>!p.onRemove)() && p.endIcon;
+        },
+        get children () {
+            var _el$5 = _tmpl$();
+            spread(_el$5, mergeProps(()=>({
+                    class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconEnd)
+                }), {
+                "data-slot": "chip-end-icon"
+            }), true);
+            insert(_el$5, ()=>p.endIcon);
+            return _el$5;
+        }
+    }), _el$9);
+    return _el$;
 };
 const ChipRoot = defineComponent({
     recipe: componentRecipe,
@@ -125,20 +114,15 @@ const ChipRoot = defineComponent({
     embedded: true
 });
 const __solidLayoutChipLabel = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class"
-    ]);
-    return (()=>{
-        var _el$6 = _tmpl$();
-        spread(_el$6, mergeProps(()=>({
-                class: twMerge(CLASSES.slot.label, local.class)
-            }), {
-            "data-slot": "chip-label"
-        }, others), false, true);
-        insert(_el$6, ()=>local.children);
-        return _el$6;
-    })();
+    const others = omit(p, "children", "class");
+    var _el$0 = _tmpl$();
+    spread(_el$0, mergeProps(()=>({
+            class: twMerge(CLASSES.slot.label, p.class)
+        }), {
+        "data-slot": "chip-label"
+    }, others), true);
+    insert(_el$0, ()=>p.children);
+    return _el$0;
 };
 const ChipLabel = defineComponent({
     recipe: componentRecipe,

package/dist/components/chip/Chip.recipe.d.ts

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

package/dist/components/close-button/CloseButton.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./CloseButton.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State } from "../vocabulary";
 export type CloseButtonVariant = "default";
 export type CloseButtonProps = Omit<JSX.ButtonHTMLAttributes<HTMLButtonElement>, "disabled"> & UIBaseProps & {

package/dist/components/close-button/CloseButton.generated.js

@@ -1,84 +1,70 @@
-import { insert, memo, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { insert, memo, mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./CloseButton.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 "./CloseButton.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<button>"), _tmpl$2 = /*#__PURE__*/ template("<span>");
+var _tmpl$ = /*#__PURE__*/ template("<button><!><!><!>"), _tmpl$2 = /*#__PURE__*/ template("<span>");
 const __solidLayoutCloseButton = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "variant",
-        "state",
-        "isPending",
-        "startIcon",
-        "endIcon",
-        "type",
-        "dataTheme",
-        "style",
-        "aria-label"
-    ]);
-    const variant = ()=>local.variant ?? "default";
-    const disabled = ()=>Boolean("disabled" === local.state) || Boolean(local.isPending);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, {
-            get type () {
-                return local.type ?? "button";
-            },
-            get ["aria-label"] () {
-                return local["aria-label"] ?? "Close";
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.base, CLASSES.variant[variant()], local.class)
-            }), {
-            "data-slot": "close-button",
-            get ["data-pending"] () {
-                return local.isPending ? "true" : "false";
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            },
-            get disabled () {
-                return disabled();
-            },
-            get ["aria-disabled"] () {
-                return disabled() ? "true" : "false";
-            }
-        }), false, true);
-        insert(_el$, (()=>{
-            var _c$ = memo(()=>!!local.startIcon);
-            return ()=>_c$() ? (()=>{
-                    var _el$2 = _tmpl$2();
-                    spread(_el$2, mergeProps(()=>({
-                            class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconStart)
-                        }), {
-                        "data-slot": "close-button-start-icon"
-                    }), false, true);
-                    insert(_el$2, ()=>local.startIcon);
-                    return _el$2;
-                })() : null;
-        })(), null);
-        insert(_el$, ()=>local.children, null);
-        insert(_el$, (()=>{
-            var _c$2 = memo(()=>!!local.endIcon);
-            return ()=>_c$2() ? (()=>{
-                    var _el$3 = _tmpl$2();
-                    spread(_el$3, mergeProps(()=>({
-                            class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconEnd)
-                        }), {
-                        "data-slot": "close-button-end-icon"
-                    }), false, true);
-                    insert(_el$3, ()=>local.endIcon);
-                    return _el$3;
-                })() : null;
-        })(), null);
-        return _el$;
-    })();
+    const others = omit(p, "children", "class", "variant", "state", "isPending", "startIcon", "endIcon", "type", "dataTheme", "style", "aria-label");
+    const variant = ()=>p.variant ?? "default";
+    const disabled = ()=>Boolean("disabled" === p.state) || Boolean(p.isPending);
+    var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.nextSibling, _el$4 = _el$3.nextSibling;
+    spread(_el$, mergeProps(others, {
+        get type () {
+            return p.type ?? "button";
+        },
+        get ["aria-label"] () {
+            return p["aria-label"] ?? "Close";
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.base, CLASSES.variant[variant()], p.class)
+        }), {
+        "data-slot": "close-button",
+        get ["data-pending"] () {
+            return p.isPending ? "true" : "false";
+        },
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        },
+        get disabled () {
+            return disabled();
+        },
+        get ["aria-disabled"] () {
+            return disabled() ? "true" : "false";
+        }
+    }), true);
+    insert(_el$, (()=>{
+        var _c$ = memo(()=>!!p.startIcon);
+        return ()=>_c$() ? (()=>{
+                var _el$5 = _tmpl$2();
+                spread(_el$5, mergeProps(()=>({
+                        class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconStart)
+                    }), {
+                    "data-slot": "close-button-start-icon"
+                }), true);
+                insert(_el$5, ()=>p.startIcon);
+                return _el$5;
+            })() : null;
+    })(), _el$2);
+    insert(_el$, ()=>p.children, _el$3);
+    insert(_el$, (()=>{
+        var _c$2 = memo(()=>!!p.endIcon);
+        return ()=>_c$2() ? (()=>{
+                var _el$6 = _tmpl$2();
+                spread(_el$6, mergeProps(()=>({
+                        class: twMerge(CLASSES.slot.icon, CLASSES.slot.iconEnd)
+                    }), {
+                    "data-slot": "close-button-end-icon"
+                }), true);
+                insert(_el$6, ()=>p.endIcon);
+                return _el$6;
+            })() : null;
+    })(), _el$4);
+    return _el$;
 };
 const CloseButton = defineComponent({
     recipe: componentRecipe,

package/dist/components/close-button/CloseButton.recipe.d.ts

@@ -9,7 +9,7 @@ export declare const CLASSES: {
         readonly iconEnd: "close-button__icon--end";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "close-button";
     readonly slots: {
         readonly "close-button": {};

package/dist/components/collapsible/Collapsible.generated.d.ts

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