@pathscale/ui 2.4.0 → 2.6.0

package/dist/components/radio/Radio.generated.js

@@ -1,144 +1,128 @@
-import { createComponent, insert, memo, 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 "./Radio.css";
-import { Show, splitProps, useContext } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { Show, omit, useContext } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { RadioGroupContext } from "../radio-group/context.js";
 import { CLASSES, componentRecipe } from "./Radio.recipe.js";
 import { resolveState } from "../vocabulary.js";
-var _tmpl$ = /*#__PURE__*/ template("<span data-slot=label>"), _tmpl$2 = /*#__PURE__*/ template("<span>"), _tmpl$3 = /*#__PURE__*/ template("<label><input><span><span>");
+var _tmpl$ = /*#__PURE__*/ template("<span data-slot=label>"), _tmpl$2 = /*#__PURE__*/ template("<span>"), _tmpl$3 = /*#__PURE__*/ template("<span><!><!>"), _tmpl$4 = /*#__PURE__*/ template("<label><input><span><span>");
 const invokeEventHandler = (handler, event)=>{
     if ("function" == typeof handler) return void handler(event);
     if (Array.isArray(handler) && "function" == typeof handler[0]) handler[0](handler[1], event);
 };
 const __solidLayoutRadio = (_stable, p)=>{
     const group = useContext(RadioGroupContext);
-    const [local, others] = splitProps(p, [
-        "class",
-        "children",
-        "description",
-        "indicator",
-        "state",
-        "issues",
-        "disabled",
-        "checked",
-        "value",
-        "name",
-        "onChange",
-        "dataTheme",
-        "aria-invalid"
-    ]);
-    const value = ()=>null != local.value ? String(local.value) : void 0;
+    const others = omit(p, "class", "children", "description", "indicator", "state", "issues", "disabled", "checked", "value", "name", "onChange", "dataTheme", "aria-invalid");
+    const value = ()=>null != p.value ? String(p.value) : void 0;
     const isGrouped = ()=>Boolean(group && void 0 !== value());
-    const isSelected = ()=>isGrouped() ? group?.value() === value() : Boolean(local.checked);
-    const isDisabled = ()=>Boolean("disabled" === local.state) || Boolean(local.disabled) || Boolean(group?.isDisabled());
-    const isInvalid = ()=>Boolean("invalid" === resolveState(local.state, local.issues)) || Boolean(local["aria-invalid"]) || Boolean(group?.isInvalid());
-    const name = ()=>local.name ?? group?.name();
-    const ariaInvalid = ()=>local["aria-invalid"] ?? (isInvalid() ? true : void 0);
-    const hasContent = ()=>null != local.children || null != local.description;
+    const isSelected = ()=>isGrouped() ? group?.value() === value() : Boolean(p.checked);
+    const isDisabled = ()=>Boolean("disabled" === p.state) || Boolean(p.disabled) || Boolean(group?.isDisabled());
+    const isInvalid = ()=>Boolean("invalid" === resolveState(p.state, p.issues)) || Boolean(p["aria-invalid"]) || Boolean(group?.isInvalid());
+    const name = ()=>p.name ?? group?.name();
+    const ariaInvalid = ()=>p["aria-invalid"] ?? (isInvalid() ? true : void 0);
+    const hasContent = ()=>null != p.children || null != p.description;
     const handleChange = (event)=>{
-        invokeEventHandler(local.onChange, event);
+        invokeEventHandler(p.onChange, event);
         if (event.defaultPrevented) return;
         if (event.currentTarget.checked && group && void 0 !== value()) group.selectValue(value(), event);
     };
-    return (()=>{
-        var _el$ = _tmpl$3(), _el$2 = _el$.firstChild, _el$3 = _el$2.nextSibling, _el$4 = _el$3.firstChild;
-        spread(_el$, mergeProps(()=>({
-                class: twMerge(CLASSES.base, isDisabled() && CLASSES.flag.disabled, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "radio",
-            get ["data-selected"] () {
-                return isSelected() ? "true" : "false";
-            },
-            get ["data-disabled"] () {
-                return isDisabled() ? "true" : "false";
-            },
-            get ["data-invalid"] () {
-                return isInvalid() ? "true" : "false";
-            },
-            get ["aria-disabled"] () {
-                return isDisabled() ? "true" : "false";
-            }
-        }), false, true);
-        spread(_el$2, mergeProps(others, {
-            type: "radio",
-            get value () {
-                return local.value;
-            },
-            get name () {
-                return name();
-            },
-            get checked () {
-                return memo(()=>!!isGrouped())() ? isSelected() : local.checked;
-            },
-            get disabled () {
-                return isDisabled();
-            }
-        }, ()=>({
-                class: CLASSES.slot.input
-            }), {
-            "data-slot": "radio-input",
-            get ["aria-invalid"] () {
-                return ariaInvalid();
-            },
-            onChange: handleChange
-        }), false, false);
-        spread(_el$3, mergeProps(()=>({
-                class: CLASSES.slot.control
-            }), {
-            "data-slot": "radio-control",
-            "aria-hidden": "true"
-        }), false, true);
-        spread(_el$4, mergeProps(()=>({
-                class: CLASSES.slot.indicator
-            }), {
-            "data-slot": "radio-indicator"
-        }), false, true);
-        insert(_el$4, ()=>local.indicator);
-        insert(_el$, createComponent(Show, {
-            get when () {
-                return hasContent();
-            },
-            get children () {
-                var _el$5 = _tmpl$2();
-                spread(_el$5, mergeProps(()=>({
-                        class: CLASSES.slot.content
-                    }), {
-                    "data-slot": "radio-content"
-                }), false, true);
-                insert(_el$5, createComponent(Show, {
-                    get when () {
-                        return local.children;
-                    },
-                    get children () {
-                        var _el$6 = _tmpl$();
-                        insert(_el$6, ()=>local.children);
-                        return _el$6;
-                    }
-                }), null);
-                insert(_el$5, createComponent(Show, {
-                    get when () {
-                        return local.description;
-                    },
-                    get children () {
-                        var _el$7 = _tmpl$2();
-                        spread(_el$7, mergeProps(()=>({
-                                class: CLASSES.slot.description
-                            }), {
-                            "data-slot": "description"
-                        }), false, true);
-                        insert(_el$7, ()=>local.description);
-                        return _el$7;
-                    }
-                }), null);
-                return _el$5;
-            }
-        }), null);
-        return _el$;
-    })();
+    var _el$ = _tmpl$4(), _el$2 = _el$.firstChild, _el$3 = _el$2.nextSibling, _el$4 = _el$3.firstChild;
+    spread(_el$, mergeProps(()=>({
+            class: twMerge(CLASSES.base, isDisabled() && CLASSES.flag.disabled, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "radio",
+        get ["data-selected"] () {
+            return isSelected() ? "true" : "false";
+        },
+        get ["data-disabled"] () {
+            return isDisabled() ? "true" : "false";
+        },
+        get ["data-invalid"] () {
+            return isInvalid() ? "true" : "false";
+        },
+        get ["aria-disabled"] () {
+            return isDisabled() ? "true" : "false";
+        }
+    }), true);
+    spread(_el$2, mergeProps(others, {
+        type: "radio",
+        get value () {
+            return p.value;
+        },
+        get name () {
+            return name();
+        },
+        get checked () {
+            return isGrouped() ? isSelected() : p.checked;
+        },
+        get disabled () {
+            return isDisabled();
+        }
+    }, ()=>({
+            class: CLASSES.slot.input
+        }), {
+        "data-slot": "radio-input",
+        get ["aria-invalid"] () {
+            return ariaInvalid() ? "true" : "false";
+        },
+        onChange: handleChange
+    }), false);
+    spread(_el$3, mergeProps(()=>({
+            class: CLASSES.slot.control
+        }), {
+        "data-slot": "radio-control",
+        "aria-hidden": "true"
+    }), true);
+    spread(_el$4, mergeProps(()=>({
+            class: CLASSES.slot.indicator
+        }), {
+        "data-slot": "radio-indicator"
+    }), true);
+    insert(_el$4, ()=>p.indicator);
+    insert(_el$, createComponent(Show, {
+        get when () {
+            return hasContent();
+        },
+        get children () {
+            var _el$5 = _tmpl$3(), _el$8 = _el$5.firstChild, _el$9 = _el$8.nextSibling;
+            spread(_el$5, mergeProps(()=>({
+                    class: CLASSES.slot.content
+                }), {
+                "data-slot": "radio-content"
+            }), true);
+            insert(_el$5, createComponent(Show, {
+                get when () {
+                    return p.children;
+                },
+                get children () {
+                    var _el$6 = _tmpl$();
+                    insert(_el$6, ()=>p.children);
+                    return _el$6;
+                }
+            }), _el$8);
+            insert(_el$5, createComponent(Show, {
+                get when () {
+                    return p.description;
+                },
+                get children () {
+                    var _el$7 = _tmpl$2();
+                    spread(_el$7, mergeProps(()=>({
+                            class: CLASSES.slot.description
+                        }), {
+                        "data-slot": "description"
+                    }), true);
+                    insert(_el$7, ()=>p.description);
+                    return _el$7;
+                }
+            }), _el$9);
+            return _el$5;
+        }
+    }), null);
+    return _el$;
 };
 const Radio = defineComponent({
     recipe: componentRecipe,

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

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

package/dist/components/radio-group/RadioGroup.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./RadioGroup.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State, Issue } from "../vocabulary";
 export type RadioGroupOrientation = "vertical" | "horizontal";
 export type RadioGroupVariant = "primary" | "secondary";

package/dist/components/radio-group/RadioGroup.generated.js

@@ -1,59 +1,41 @@
-import { createComponent, insert, mergeProps, setAttribute, 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 "./RadioGroup.css";
-import { Show, createSignal, createUniqueId, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { Show, createSignal, createUniqueId, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { RadioGroupContext } from "./context.js";
 import { CLASSES, componentRecipe } from "./RadioGroup.recipe.js";
 import { resolveState } from "../vocabulary.js";
-var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<div><div>");
+var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<div><!><div></div><!>");
 const __solidLayoutRadioGroup = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "value",
-        "defaultValue",
-        "onChange",
-        "name",
-        "state",
-        "disabled",
-        "issues",
-        "orientation",
-        "variant",
-        "label",
-        "description",
-        "errorMessage",
-        "dataTheme",
-        "aria-describedby",
-        "aria-labelledby"
-    ]);
+    const others = omit(p, "children", "class", "value", "defaultValue", "onChange", "name", "state", "disabled", "issues", "orientation", "variant", "label", "description", "errorMessage", "dataTheme", "aria-describedby", "aria-labelledby");
     const baseId = createUniqueId();
     const generatedName = `${baseId}-radio-group`;
-    const [internalValue, setInternalValue] = createSignal(local.defaultValue);
+    const [internalValue, setInternalValue] = createSignal(p.defaultValue);
     const labelId = `${baseId}-label`;
     const descriptionId = `${baseId}-description`;
     const errorId = `${baseId}-error`;
-    const orientation = ()=>local.orientation ?? "vertical";
-    const variant = ()=>local.variant ?? "primary";
-    const isControlled = ()=>void 0 !== local.value;
-    const selectedValue = ()=>isControlled() ? local.value : internalValue();
-    const isDisabled = ()=>Boolean("disabled" === local.state) || Boolean(local.disabled);
-    const isInvalid = ()=>Boolean("invalid" === resolveState(local.state, local.issues));
-    const name = ()=>local.name ?? generatedName;
+    const orientation = ()=>p.orientation ?? "vertical";
+    const variant = ()=>p.variant ?? "primary";
+    const isControlled = ()=>void 0 !== p.value;
+    const selectedValue = ()=>isControlled() ? p.value : internalValue();
+    const isDisabled = ()=>Boolean("disabled" === p.state) || Boolean(p.disabled);
+    const isInvalid = ()=>Boolean("invalid" === resolveState(p.state, p.issues));
+    const name = ()=>p.name ?? generatedName;
     const handleChange = (nextValue)=>{
         if (nextValue === selectedValue()) return;
         if (!isControlled()) setInternalValue(nextValue);
-        local.onChange?.(nextValue);
+        p.onChange?.(nextValue);
     };
     const describedBy = ()=>{
         const ids = [
-            local["aria-describedby"]
+            p["aria-describedby"]
         ];
-        if (local.description) ids.push(descriptionId);
-        if (local.errorMessage) ids.push(errorId);
+        if (p.description) ids.push(descriptionId);
+        if (p.errorMessage) ids.push(errorId);
         return ids.filter(Boolean).join(" ") || void 0;
     };
-    const labelledBy = ()=>local["aria-labelledby"] ?? (local.label ? labelId : void 0);
+    const labelledBy = ()=>p["aria-labelledby"] ?? (p.label ? labelId : void 0);
     const contextValue = {
         name,
         value: selectedValue,
@@ -64,10 +46,10 @@ const __solidLayoutRadioGroup = (_stable, p)=>{
             handleChange(value);
         }
     };
-    return createComponent(RadioGroupContext.Provider, {
+    return createComponent(RadioGroupContext, {
         value: contextValue,
         get children () {
-            var _el$ = _tmpl$2(), _el$4 = _el$.firstChild;
+            var _el$ = _tmpl$2(), _el$6 = _el$.firstChild, _el$4 = _el$6.nextSibling, _el$7 = _el$4.nextSibling;
             spread(_el$, mergeProps(others, {
                 role: "radiogroup",
                 get ["aria-invalid"] () {
@@ -80,7 +62,7 @@ const __solidLayoutRadioGroup = (_stable, p)=>{
                     return describedBy();
                 },
                 get ["data-theme"] () {
-                    return local.dataTheme;
+                    return p.dataTheme;
                 },
                 "data-slot": "radio-group",
                 get ["data-orientation"] () {
@@ -96,37 +78,39 @@ const __solidLayoutRadioGroup = (_stable, p)=>{
                     return isInvalid() ? "true" : "false";
                 }
             }, ()=>({
-                    class: twMerge(CLASSES.base, CLASSES.orientation[orientation()], CLASSES.variant[variant()], isDisabled() && CLASSES.flag.disabled, isInvalid() && CLASSES.flag.invalid, local.class)
-                })), false, true);
+                    class: twMerge(CLASSES.base, CLASSES.orientation[orientation()], CLASSES.variant[variant()], isDisabled() && CLASSES.flag.disabled, isInvalid() && CLASSES.flag.invalid, p.class)
+                })), true);
             insert(_el$, createComponent(Show, {
                 get when () {
-                    return local.label;
+                    return p.label;
                 },
                 get children () {
                     var _el$2 = _tmpl$();
-                    setAttribute(_el$2, "id", labelId);
-                    spread(_el$2, mergeProps(()=>({
+                    spread(_el$2, mergeProps({
+                        id: labelId
+                    }, ()=>({
                             class: CLASSES.slot.label
                         }), {
                         "data-slot": "label"
-                    }), false, true);
-                    insert(_el$2, ()=>local.label);
+                    }), true);
+                    insert(_el$2, ()=>p.label);
                     return _el$2;
                 }
-            }), _el$4);
+            }), _el$6);
             insert(_el$, createComponent(Show, {
                 get when () {
-                    return local.description;
+                    return p.description;
                 },
                 get children () {
                     var _el$3 = _tmpl$();
-                    setAttribute(_el$3, "id", descriptionId);
-                    spread(_el$3, mergeProps(()=>({
+                    spread(_el$3, mergeProps({
+                        id: descriptionId
+                    }, ()=>({
                             class: CLASSES.slot.description
                         }), {
                         "data-slot": "description"
-                    }), false, true);
-                    insert(_el$3, ()=>local.description);
+                    }), true);
+                    insert(_el$3, ()=>p.description);
                     return _el$3;
                 }
             }), _el$4);
@@ -134,24 +118,25 @@ const __solidLayoutRadioGroup = (_stable, p)=>{
                     class: CLASSES.slot.items
                 }), {
                 "data-slot": "radio-group-items"
-            }), false, true);
-            insert(_el$4, ()=>local.children);
+            }), true);
+            insert(_el$4, ()=>p.children);
             insert(_el$, createComponent(Show, {
                 get when () {
-                    return local.errorMessage;
+                    return p.errorMessage;
                 },
                 get children () {
                     var _el$5 = _tmpl$();
-                    setAttribute(_el$5, "id", errorId);
-                    spread(_el$5, mergeProps(()=>({
+                    spread(_el$5, mergeProps({
+                        id: errorId
+                    }, ()=>({
                             class: CLASSES.slot.error
                         }), {
                         "data-slot": "error-message"
-                    }), false, true);
-                    insert(_el$5, ()=>local.errorMessage);
+                    }), true);
+                    insert(_el$5, ()=>p.errorMessage);
                     return _el$5;
                 }
-            }), null);
+            }), _el$7);
             return _el$;
         }
     });

package/dist/components/radio-group/RadioGroup.recipe.d.ts

@@ -19,7 +19,7 @@ export declare const CLASSES: {
         readonly invalid: "radio-group--invalid";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "radio-group";
     readonly slots: {
         readonly description: {};

package/dist/components/radio-group/context.d.ts

@@ -6,4 +6,4 @@ export type RadioGroupContextValue = {
     isInvalid: Accessor<boolean>;
     selectValue: (value: string, event: Event) => void;
 };
-export declare const RadioGroupContext: import("solid-js").Context<RadioGroupContextValue | undefined>;
+export declare const RadioGroupContext: import("solid-js").Context<RadioGroupContextValue>;

package/dist/components/range-calendar/RangeCalendar.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./RangeCalendar.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import { type ControlledDateRangeValue } from "../../hooks/date";
 import { type CalendarWeekdayFormat } from "../calendar";
 import type { UIBaseProps, State } from "../vocabulary";