@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/progress/Progress.generated.js

@@ -1,112 +1,96 @@
-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 "./Progress.css";
-import { createMemo, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { createMemo, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./Progress.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<div><div><div>"), _tmpl$2 = /*#__PURE__*/ template("<span>");
+var _tmpl$ = /*#__PURE__*/ template("<div><!><div><div>"), _tmpl$2 = /*#__PURE__*/ template("<span>");
 const __solidLayoutProgress = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "value",
-        "minValue",
-        "maxValue",
-        "isIndeterminate",
-        "label",
-        "size",
-        "flavor",
-        "state",
-        "formatValue",
-        "showValue",
-        "class",
-        "dataTheme",
-        "style"
-    ]);
-    const min = ()=>local.minValue ?? 0;
-    const max = ()=>local.maxValue ?? 100;
-    const isIndeterminate = ()=>Boolean(local.isIndeterminate) || void 0 === local.value;
+    const others = omit(p, "value", "minValue", "maxValue", "isIndeterminate", "label", "size", "flavor", "state", "formatValue", "showValue", "class", "dataTheme", "style");
+    const min = ()=>p.minValue ?? 0;
+    const max = ()=>p.maxValue ?? 100;
+    const isIndeterminate = ()=>Boolean(p.isIndeterminate) || void 0 === p.value;
     const percentage = createMemo(()=>{
         if (isIndeterminate()) return 0;
-        const clamped = Math.min(Math.max(local.value ?? 0, min()), max());
+        const clamped = Math.min(Math.max(p.value ?? 0, min()), max());
         return (clamped - min()) / (max() - min()) * 100;
     });
     const valueText = createMemo(()=>{
         if (isIndeterminate()) return "";
-        if (local.formatValue && void 0 !== local.value) return local.formatValue(local.value);
+        if (p.formatValue && void 0 !== p.value) return p.formatValue(p.value);
         return `${Math.round(percentage())}%`;
     });
-    const shouldShowValue = ()=>Boolean(local.showValue);
-    const classes = createMemo(()=>twMerge(CLASSES.base, CLASSES.size[local.size ?? "md"], CLASSES.flavor[local.flavor ?? "accent"] ?? `progress--flavor-${local.flavor ?? "accent"}`, isIndeterminate() && CLASSES.state.indeterminate, "disabled" === local.state && CLASSES.state.disabled, local.class));
-    return (()=>{
-        var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild;
-        spread(_el$, mergeProps(others, {
-            role: "progressbar"
-        }, ()=>({
-                class: classes()
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            },
-            get ["aria-valuenow"] () {
-                return memo(()=>!!isIndeterminate())() ? void 0 : local.value;
-            },
-            get ["aria-valuemin"] () {
-                return min();
-            },
-            get ["aria-valuemax"] () {
-                return max();
-            },
-            get ["aria-valuetext"] () {
-                return memo(()=>!!isIndeterminate())() ? void 0 : valueText();
-            },
-            get ["aria-label"] () {
-                return local.label;
-            },
-            get ["aria-disabled"] () {
-                return "disabled" === local.state ? "true" : void 0;
-            },
-            get ["data-disabled"] () {
-                return "disabled" === local.state ? "true" : void 0;
-            }
-        }), false, true);
-        insert(_el$, (()=>{
-            var _c$ = memo(()=>!!local.label);
-            return ()=>_c$() && (()=>{
-                    var _el$4 = _tmpl$2();
-                    spread(_el$4, mergeProps(()=>({
-                            class: CLASSES.label
-                        })), false, true);
-                    insert(_el$4, ()=>local.label);
-                    return _el$4;
-                })();
-        })(), _el$2);
-        insert(_el$, (()=>{
-            var _c$2 = memo(()=>!!shouldShowValue());
-            return ()=>_c$2() && (()=>{
-                    var _el$5 = _tmpl$2();
-                    spread(_el$5, mergeProps(()=>({
-                            class: CLASSES.output
-                        })), false, true);
-                    insert(_el$5, valueText);
-                    return _el$5;
-                })();
-        })(), _el$2);
-        spread(_el$2, mergeProps(()=>({
-                class: CLASSES.track
-            })), false, true);
-        spread(_el$3, mergeProps(()=>({
-                class: CLASSES.indicator
-            }), {
-            get style () {
-                return memo(()=>!!isIndeterminate())() ? void 0 : {
-                    width: `${percentage()}%`
-                };
-            }
-        }), false, false);
-        return _el$;
-    })();
+    const shouldShowValue = ()=>Boolean(p.showValue);
+    const classes = createMemo(()=>twMerge(CLASSES.base, CLASSES.size[p.size ?? "md"], CLASSES.flavor[p.flavor ?? "accent"] ?? `progress--flavor-${p.flavor ?? "accent"}`, isIndeterminate() && CLASSES.state.indeterminate, "disabled" === p.state && CLASSES.state.disabled, p.class));
+    var _el$ = _tmpl$(), _el$4 = _el$.firstChild, _el$2 = _el$4.nextSibling, _el$3 = _el$2.firstChild;
+    spread(_el$, mergeProps(others, {
+        role: "progressbar"
+    }, ()=>({
+            class: classes()
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        },
+        get ["aria-valuenow"] () {
+            return isIndeterminate() ? void 0 : p.value;
+        },
+        get ["aria-valuemin"] () {
+            return min();
+        },
+        get ["aria-valuemax"] () {
+            return max();
+        },
+        get ["aria-valuetext"] () {
+            return isIndeterminate() ? void 0 : valueText();
+        },
+        get ["aria-label"] () {
+            return p.label;
+        },
+        get ["aria-disabled"] () {
+            return "disabled" === p.state ? "true" : void 0;
+        },
+        get ["data-disabled"] () {
+            return "disabled" === p.state ? "true" : void 0;
+        }
+    }), true);
+    insert(_el$, (()=>{
+        var _c$ = memo(()=>!!p.label);
+        return ()=>_c$() ? (()=>{
+                var _el$5 = _tmpl$2();
+                spread(_el$5, mergeProps(()=>({
+                        class: CLASSES.label
+                    })), true);
+                insert(_el$5, ()=>p.label);
+                return _el$5;
+            })() : p.label;
+    })(), _el$4);
+    insert(_el$, (()=>{
+        var _c$2 = memo(()=>!!shouldShowValue());
+        return ()=>_c$2() ? (()=>{
+                var _el$6 = _tmpl$2();
+                spread(_el$6, mergeProps(()=>({
+                        class: CLASSES.output
+                    })), true);
+                insert(_el$6, valueText);
+                return _el$6;
+            })() : shouldShowValue();
+    })(), _el$2);
+    spread(_el$2, mergeProps(()=>({
+            class: CLASSES.track
+        })), true);
+    spread(_el$3, mergeProps(()=>({
+            class: CLASSES.indicator
+        }), {
+        get style () {
+            return isIndeterminate() ? void 0 : {
+                width: `${percentage()}%`
+            };
+        }
+    }), false);
+    return _el$;
 };
 const Progress = defineComponent({
     recipe: componentRecipe,

package/dist/components/progress/Progress.recipe.d.ts

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

package/dist/components/radial-progress/RadialProgress.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./RadialProgress.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, Flavor, State } from "../vocabulary";
 export type RadialProgressSize = "sm" | "md" | "lg";
 export type RadialProgressColor = "default" | "accent" | "success" | "warning" | "danger";

package/dist/components/radial-progress/RadialProgress.generated.js

@@ -1,8 +1,8 @@
-import { memo, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./RadialProgress.css";
-import { createMemo, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { createMemo, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./RadialProgress.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<span><svg><circle></circle><circle>");
 const STROKE_WIDTH = 4;
@@ -10,100 +10,85 @@ const CENTER = 18;
 const RADIUS = CENTER - STROKE_WIDTH / 2;
 const CIRCUMFERENCE = 2 * Math.PI * RADIUS;
 const __solidLayoutRadialProgress = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "value",
-        "minValue",
-        "maxValue",
-        "isIndeterminate",
-        "size",
-        "flavor",
-        "state",
-        "formatValue",
-        "label",
-        "class",
-        "dataTheme",
-        "style"
-    ]);
-    const min = ()=>local.minValue ?? 0;
-    const max = ()=>local.maxValue ?? 100;
-    const isIndeterminate = ()=>Boolean(local.isIndeterminate) || void 0 === local.value;
+    const others = omit(p, "value", "minValue", "maxValue", "isIndeterminate", "size", "flavor", "state", "formatValue", "label", "class", "dataTheme", "style");
+    const min = ()=>p.minValue ?? 0;
+    const max = ()=>p.maxValue ?? 100;
+    const isIndeterminate = ()=>Boolean(p.isIndeterminate) || void 0 === p.value;
     const percentage = createMemo(()=>{
         if (isIndeterminate()) return 0;
-        const clamped = Math.min(Math.max(local.value ?? 0, min()), max());
+        const clamped = Math.min(Math.max(p.value ?? 0, min()), max());
         return (clamped - min()) / (max() - min()) * 100;
     });
     const valueText = createMemo(()=>{
         if (isIndeterminate()) return "";
-        if (local.formatValue && void 0 !== local.value) return local.formatValue(local.value);
+        if (p.formatValue && void 0 !== p.value) return p.formatValue(p.value);
         return `${Math.round(percentage())}%`;
     });
     const strokeDashoffset = createMemo(()=>CIRCUMFERENCE - percentage() / 100 * CIRCUMFERENCE);
-    const classes = createMemo(()=>twMerge(CLASSES.base, CLASSES.size[local.size ?? "md"], CLASSES.flavor[local.flavor ?? "accent"] ?? `radial-progress--flavor-${local.flavor ?? "accent"}`, isIndeterminate() && CLASSES.state.indeterminate, "disabled" === local.state && CLASSES.state.disabled, local.class));
-    return (()=>{
-        var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$4 = _el$3.nextSibling;
-        spread(_el$, mergeProps(others, {
-            role: "progressbar"
-        }, ()=>({
-                class: classes()
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            },
-            get ["aria-valuenow"] () {
-                return memo(()=>!!isIndeterminate())() ? void 0 : local.value;
-            },
-            get ["aria-valuemin"] () {
-                return min();
-            },
-            get ["aria-valuemax"] () {
-                return max();
-            },
-            get ["aria-valuetext"] () {
-                return memo(()=>!!isIndeterminate())() ? void 0 : valueText();
-            },
-            get ["aria-label"] () {
-                return local.label;
-            },
-            get ["aria-disabled"] () {
-                return "disabled" === local.state ? "true" : void 0;
-            },
-            get ["data-disabled"] () {
-                return "disabled" === local.state ? "true" : void 0;
-            }
-        }), false, true);
-        spread(_el$2, mergeProps(()=>({
-                class: CLASSES.svg
-            }), {
-            fill: "none",
-            viewBox: "0 0 36 36"
-        }), true, true);
-        spread(_el$3, mergeProps(()=>({
-                class: CLASSES.trackCircle
-            }), {
-            cx: 18,
-            cy: 18,
-            r: 16,
-            "stroke-width": 4
-        }), true, false);
-        spread(_el$4, mergeProps(()=>({
-                class: CLASSES.indicator
-            }), {
-            cx: 18,
-            cy: 18,
-            r: 16,
-            "stroke-dasharray": `${CIRCUMFERENCE}`,
-            get ["stroke-dashoffset"] () {
-                return `${isIndeterminate() ? 0.75 * CIRCUMFERENCE : strokeDashoffset()}`;
-            },
-            "stroke-linecap": "round",
-            "stroke-width": 4,
-            transform: "rotate(-90 18 18)"
-        }), true, false);
-        return _el$;
-    })();
+    const classes = createMemo(()=>twMerge(CLASSES.base, CLASSES.size[p.size ?? "md"], CLASSES.flavor[p.flavor ?? "accent"] ?? `radial-progress--flavor-${p.flavor ?? "accent"}`, isIndeterminate() && CLASSES.state.indeterminate, "disabled" === p.state && CLASSES.state.disabled, p.class));
+    var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$4 = _el$3.nextSibling;
+    spread(_el$, mergeProps(others, {
+        role: "progressbar"
+    }, ()=>({
+            class: classes()
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        },
+        get ["aria-valuenow"] () {
+            return isIndeterminate() ? void 0 : p.value;
+        },
+        get ["aria-valuemin"] () {
+            return min();
+        },
+        get ["aria-valuemax"] () {
+            return max();
+        },
+        get ["aria-valuetext"] () {
+            return isIndeterminate() ? void 0 : valueText();
+        },
+        get ["aria-label"] () {
+            return p.label;
+        },
+        get ["aria-disabled"] () {
+            return "disabled" === p.state ? "true" : void 0;
+        },
+        get ["data-disabled"] () {
+            return "disabled" === p.state ? "true" : void 0;
+        }
+    }), true);
+    spread(_el$2, mergeProps(()=>({
+            class: CLASSES.svg
+        }), {
+        fill: "none",
+        viewBox: "0 0 36 36"
+    }), true);
+    spread(_el$3, mergeProps(()=>({
+            class: CLASSES.trackCircle
+        }), {
+        cx: 18,
+        cy: 18,
+        r: 16,
+        "stroke-width": 4
+    }), false);
+    spread(_el$4, mergeProps(()=>({
+            class: CLASSES.indicator
+        }), {
+        cx: 18,
+        cy: 18,
+        r: 16,
+        "stroke-dasharray": `${CIRCUMFERENCE}`,
+        get ["stroke-dashoffset"] () {
+            return `${isIndeterminate() ? 0.75 * CIRCUMFERENCE : strokeDashoffset()}`;
+        },
+        "stroke-linecap": "round",
+        "stroke-width": 4,
+        transform: "rotate(-90 18 18)"
+    }), false);
+    return _el$;
 };
 const RadialProgress = defineComponent({
     recipe: componentRecipe,

package/dist/components/radial-progress/RadialProgress.recipe.d.ts

@@ -23,7 +23,7 @@ export declare const CLASSES: {
         readonly disabled: "radial-progress--disabled";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "radial-progress";
     readonly slots: {
         readonly root: {};

package/dist/components/radio/Radio.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Radio.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State, Issue } from "../vocabulary";
 export type RadioProps = Omit<JSX.InputHTMLAttributes<HTMLInputElement>, "type" | "children"> & UIBaseProps & {
     children?: JSX.Element;