@pathscale/ui 2.5.0 → 2.6.1

package/dist/components/pagination/Pagination.generated.js

@@ -1,10 +1,10 @@
-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 "./Pagination.css";
-import { For, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { For, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./Pagination.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<nav><div>Page <!> of </div><ul><li><button type=button><span aria-hidden=true>‹</span><span>Previous</span></button></li><li><button type=button><span>Next</span><span aria-hidden=true>›"), _tmpl$2 = /*#__PURE__*/ template("<li>"), _tmpl$3 = /*#__PURE__*/ template("<button type=button>"), _tmpl$4 = /*#__PURE__*/ template("<span>…");
+var _tmpl$ = /*#__PURE__*/ template("<nav><div>Page <!> of <!></div><ul><li><button><span aria-hidden=true>‹</span><span>Previous</span></button></li><li><button><span>Next</span><span aria-hidden=true>›"), _tmpl$2 = /*#__PURE__*/ template("<li>"), _tmpl$3 = /*#__PURE__*/ template("<button>"), _tmpl$4 = /*#__PURE__*/ template("<span>…");
 const clampPage = (page, total)=>{
     if (!Number.isFinite(page)) return 1;
     return Math.min(Math.max(1, Math.floor(page)), total);
@@ -43,125 +43,122 @@ const getPaginationTokens = (page, total)=>{
     ];
 };
 const __solidLayoutPagination = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class",
-        "dataTheme",
-        "page",
-        "total",
-        "onChange",
-        "state"
-    ]);
-    const safeTotal = ()=>Math.max(1, Math.floor(local.total || 0));
-    const currentPage = ()=>clampPage(local.page, safeTotal());
+    const others = omit(p, "class", "dataTheme", "page", "total", "onChange", "state");
+    const safeTotal = ()=>Math.max(1, Math.floor(p.total || 0));
+    const currentPage = ()=>clampPage(p.page, safeTotal());
     const tokens = ()=>getPaginationTokens(currentPage(), safeTotal());
-    const disabled = ()=>Boolean("disabled" === local.state);
+    const disabled = ()=>Boolean("disabled" === p.state);
     const handleChange = (nextPage)=>{
         if (disabled()) return;
         const bounded = clampPage(nextPage, safeTotal());
         if (bounded === currentPage()) return;
-        local.onChange(bounded);
+        p.onChange(bounded);
     };
-    return (()=>{
-        var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$5 = _el$3.nextSibling, _el$6 = (_el$5.nextSibling, _el$2.nextSibling), _el$7 = _el$6.firstChild, _el$8 = _el$7.firstChild, _el$9 = _el$7.nextSibling, _el$0 = _el$9.firstChild;
-        spread(_el$, mergeProps(others, {
-            "aria-label": "pagination",
-            role: "navigation"
-        }, ()=>({
-                class: twMerge(CLASSES.base, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "pagination"
-        }), false, true);
-        spread(_el$2, mergeProps(()=>({
-                class: CLASSES.slot.summary
-            }), {
-            "data-slot": "pagination-summary"
-        }), false, true);
-        insert(_el$2, currentPage, _el$5);
-        insert(_el$2, safeTotal, null);
-        spread(_el$6, mergeProps(()=>({
-                class: CLASSES.slot.content
-            }), {
-            "data-slot": "pagination-content"
-        }), false, true);
-        spread(_el$7, mergeProps(()=>({
-                class: CLASSES.slot.item
-            }), {
-            "data-slot": "pagination-item"
-        }), false, true);
-        spread(_el$8, mergeProps(()=>({
-                class: twMerge(CLASSES.slot.link, CLASSES.slot.linkNav)
-            }), {
-            "data-slot": "pagination-previous",
-            onClick: ()=>handleChange(currentPage() - 1),
-            get disabled () {
-                return disabled() || currentPage() <= 1;
-            },
-            "aria-label": "Go to previous page"
-        }), false, true);
-        insert(_el$6, createComponent(For, {
-            get each () {
-                return tokens();
-            },
-            children: (token)=>(()=>{
-                    var _el$1 = _tmpl$2();
-                    spread(_el$1, mergeProps(()=>({
-                            class: CLASSES.slot.item
+    var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$5 = _el$3.nextSibling, _el$4 = _el$5.nextSibling, _el$6 = _el$4.nextSibling, _el$7 = _el$2.nextSibling, _el$8 = _el$7.firstChild, _el$9 = _el$8.firstChild, _el$0 = _el$8.nextSibling, _el$1 = _el$0.firstChild;
+    spread(_el$, mergeProps(others, {
+        "aria-label": "pagination",
+        role: "navigation"
+    }, ()=>({
+            class: twMerge(CLASSES.base, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "pagination"
+    }), true);
+    spread(_el$2, mergeProps(()=>({
+            class: CLASSES.slot.summary
+        }), {
+        "data-slot": "pagination-summary"
+    }), true);
+    insert(_el$2, currentPage, _el$5);
+    insert(_el$2, safeTotal, _el$6);
+    spread(_el$7, mergeProps(()=>({
+            class: CLASSES.slot.content
+        }), {
+        "data-slot": "pagination-content"
+    }), true);
+    spread(_el$8, mergeProps(()=>({
+            class: CLASSES.slot.item
+        }), {
+        "data-slot": "pagination-item"
+    }), true);
+    spread(_el$9, mergeProps({
+        type: "button"
+    }, ()=>({
+            class: twMerge(CLASSES.slot.link, CLASSES.slot.linkNav)
+        }), {
+        "data-slot": "pagination-previous",
+        onClick: ()=>handleChange(currentPage() - 1),
+        get disabled () {
+            return disabled() || currentPage() <= 1;
+        },
+        "aria-label": "Go to previous page"
+    }), true);
+    insert(_el$7, createComponent(For, {
+        get each () {
+            return tokens();
+        },
+        children: (token)=>(()=>{
+                var _el$10 = _tmpl$2();
+                spread(_el$10, mergeProps(()=>({
+                        class: CLASSES.slot.item
+                    }), {
+                    "data-slot": "pagination-item"
+                }), true);
+                insert(_el$10, "number" == typeof token ? (()=>{
+                    var _el$11 = _tmpl$3();
+                    spread(_el$11, mergeProps({
+                        type: "button"
+                    }, ()=>({
+                            class: CLASSES.slot.link
                         }), {
-                        "data-slot": "pagination-item"
-                    }), false, true);
-                    insert(_el$1, "number" == typeof token ? (()=>{
-                        var _el$10 = _tmpl$3();
-                        spread(_el$10, mergeProps(()=>({
-                                class: CLASSES.slot.link
-                            }), {
-                            "data-slot": "pagination-link",
-                            get ["data-active"] () {
-                                return token === currentPage() ? "true" : void 0;
-                            },
-                            get ["aria-current"] () {
-                                return token === currentPage() ? "page" : void 0;
-                            },
-                            "aria-label": `Go to page ${token}`,
-                            get disabled () {
-                                return disabled();
-                            },
-                            onClick: ()=>handleChange(token)
-                        }), false, true);
-                        insert(_el$10, token);
-                        return _el$10;
-                    })() : (()=>{
-                        var _el$11 = _tmpl$4();
-                        spread(_el$11, mergeProps(()=>({
-                                class: CLASSES.slot.ellipsis
-                            }), {
-                            "data-slot": "pagination-ellipsis",
-                            "aria-hidden": "true"
-                        }), false, true);
-                        return _el$11;
-                    })());
-                    return _el$1;
-                })()
-        }), _el$9);
-        spread(_el$9, mergeProps(()=>({
-                class: CLASSES.slot.item
-            }), {
-            "data-slot": "pagination-item"
-        }), false, true);
-        spread(_el$0, mergeProps(()=>({
-                class: twMerge(CLASSES.slot.link, CLASSES.slot.linkNav)
-            }), {
-            "data-slot": "pagination-next",
-            onClick: ()=>handleChange(currentPage() + 1),
-            get disabled () {
-                return disabled() || currentPage() >= safeTotal();
-            },
-            "aria-label": "Go to next page"
-        }), false, true);
-        return _el$;
-    })();
+                        "data-slot": "pagination-link",
+                        get ["data-active"] () {
+                            return token === currentPage() ? "true" : void 0;
+                        },
+                        get ["aria-current"] () {
+                            return token === currentPage() ? "page" : void 0;
+                        },
+                        "aria-label": `Go to page ${token}`,
+                        get disabled () {
+                            return disabled();
+                        },
+                        onClick: ()=>handleChange(token)
+                    }), true);
+                    insert(_el$11, token);
+                    return _el$11;
+                })() : (()=>{
+                    var _el$12 = _tmpl$4();
+                    spread(_el$12, mergeProps(()=>({
+                            class: CLASSES.slot.ellipsis
+                        }), {
+                        "data-slot": "pagination-ellipsis",
+                        "aria-hidden": "true"
+                    }), true);
+                    return _el$12;
+                })());
+                return _el$10;
+            })()
+    }), _el$0);
+    spread(_el$0, mergeProps(()=>({
+            class: CLASSES.slot.item
+        }), {
+        "data-slot": "pagination-item"
+    }), true);
+    spread(_el$1, mergeProps({
+        type: "button"
+    }, ()=>({
+            class: twMerge(CLASSES.slot.link, CLASSES.slot.linkNav)
+        }), {
+        "data-slot": "pagination-next",
+        onClick: ()=>handleChange(currentPage() + 1),
+        get disabled () {
+            return disabled() || currentPage() >= safeTotal();
+        },
+        "aria-label": "Go to next page"
+    }), true);
+    return _el$;
 };
 const Pagination = defineComponent({
     recipe: componentRecipe,

package/dist/components/pagination/Pagination.recipe.d.ts

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

package/dist/components/password-field/PasswordField.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./PasswordField.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps } from "../vocabulary";
 export type PasswordFieldProps = UIBaseProps & {
     id?: string;

package/dist/components/password-field/PasswordField.generated.js

@@ -1,5 +1,5 @@
-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 "./PasswordField.css";
 import { createSignal } from "solid-js";
 import button_0 from "../button/index.js";
@@ -30,62 +30,60 @@ const __solidLayoutPasswordFieldLayout = (_stable, p)=>{
         p.onVisibilityChange?.(nextVisible);
         schedulePasswordFieldRestore(fieldRef, snapshot);
     };
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>_stable.slot.root, {
-            get ["data-visible"] () {
-                return isVisible() ? "true" : "false";
-            }
-        }), false, true);
-        insert(_el$, createComponent(input, mergeProps(()=>createPasswordFieldInputContract({
-                id: p.id,
-                name: p.name,
-                label: p.label,
-                isVisible: isVisible(),
-                placeholder: p.placeholder,
-                required: p.required,
-                autofocus: p.autofocus,
-                autocomplete: p.autocomplete,
-                "aria-describedby": p["aria-describedby"],
-                value: p.value,
-                disabled: p.disabled,
-                invalid: p.invalid,
-                startIcon: p.startIcon,
-                inputClass: p.inputClass
-            }), {
-            ref: setFieldRef,
-            onInput: (event)=>{
-                p.onInput?.(event.currentTarget.value);
-            },
-            onBlur: ()=>p.onBlur?.(),
-            get endIcon () {
-                return createComponent(button_0, mergeProps(()=>_stable.slot.toggle, {
-                    type: "button",
-                    variant: "ghost",
-                    size: "sm",
-                    width: "square",
-                    get state () {
-                        return p.disabled ? "disabled" : "default";
-                    },
-                    onPointerDown: preventPasswordTogglePointerDown,
-                    onClick: toggleVisibility,
-                    get ["aria-label"] () {
-                        return toggleLabel();
-                    },
-                    get ["aria-pressed"] () {
-                        return isVisible();
-                    },
-                    get title () {
-                        return toggleLabel();
-                    },
-                    get children () {
-                        return toggleIcon();
-                    }
-                }));
-            }
-        })));
-        return _el$;
-    })();
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(()=>_stable.slot.root, {
+        get ["data-visible"] () {
+            return isVisible() ? "true" : "false";
+        }
+    }), true);
+    insert(_el$, createComponent(input, mergeProps(()=>createPasswordFieldInputContract({
+            id: p.id,
+            name: p.name,
+            label: p.label,
+            isVisible: isVisible(),
+            placeholder: p.placeholder,
+            required: p.required,
+            autofocus: p.autofocus,
+            autocomplete: p.autocomplete,
+            "aria-describedby": p["aria-describedby"],
+            value: p.value,
+            disabled: p.disabled,
+            invalid: p.invalid,
+            startIcon: p.startIcon,
+            inputClass: p.inputClass
+        }), {
+        ref: setFieldRef,
+        onInput: (event)=>{
+            p.onInput?.(event.currentTarget.value);
+        },
+        onBlur: ()=>p.onBlur?.(),
+        get endIcon () {
+            return createComponent(button_0, mergeProps(()=>_stable.slot.toggle, {
+                type: "button",
+                variant: "ghost",
+                size: "sm",
+                width: "square",
+                get state () {
+                    return p.disabled ? "disabled" : "default";
+                },
+                onPointerDown: preventPasswordTogglePointerDown,
+                onClick: toggleVisibility,
+                get ["aria-label"] () {
+                    return toggleLabel();
+                },
+                get ["aria-pressed"] () {
+                    return isVisible() ? "true" : "false";
+                },
+                get title () {
+                    return toggleLabel();
+                },
+                get children () {
+                    return toggleIcon();
+                }
+            }));
+        }
+    })));
+    return _el$;
 };
 const PasswordFieldLayout = defineComponent({
     recipe: passwordField,

package/dist/components/password-field/PasswordField.interactions.d.ts

@@ -1,4 +1,4 @@
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 /**
  * Pure helpers behind PasswordField's visibility toggle.
  *

package/dist/components/password-field/PasswordField.interactions.js

@@ -1,4 +1,4 @@
-import { twMerge } from "tailwind-merge";
+import { twMerge } from "../../lib/twMerge.js";
 const getPasswordInputType = (isVisible)=>isVisible ? "text" : "password";
 const createPasswordFieldInputContract = (params)=>({
         id: params.id,

package/dist/components/password-field/PasswordField.recipe.d.ts

@@ -1,4 +1,4 @@
-export declare const passwordField: import("solid-layouts").Recipe<{
+export declare const passwordField: import("solid-layouts/solid-2").Recipe<{
     readonly component: "password-field";
     readonly element: "div";
     readonly slots: {

package/dist/components/password-requirements/PasswordRequirements.generated.d.ts

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

package/dist/components/password-requirements/PasswordRequirements.generated.js

@@ -1,5 +1,5 @@
-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 "./PasswordRequirements.css";
 import { For, Show } from "solid-js";
 import icon from "../icon/index.js";
@@ -7,19 +7,19 @@ import { passwordRequirements } from "./PasswordRequirements.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<p>"), _tmpl$2 = /*#__PURE__*/ template("<div><ul>"), _tmpl$3 = /*#__PURE__*/ template("<li><span></span><span>");
 const __solidLayoutPasswordRequirementsLayout = (_stable, p)=>(()=>{
         var _el$ = _tmpl$2(), _el$3 = _el$.firstChild;
-        spread(_el$, mergeProps(()=>_stable.slot.root), false, true);
+        spread(_el$, mergeProps(()=>_stable.slot.root), true);
         insert(_el$, createComponent(Show, {
             get when () {
                 return p.title;
             },
             get children () {
                 var _el$2 = _tmpl$();
-                spread(_el$2, mergeProps(()=>_stable.slot.title), false, true);
+                spread(_el$2, mergeProps(()=>_stable.slot.title), true);
                 insert(_el$2, ()=>p.title);
                 return _el$2;
             }
         }), _el$3);
-        spread(_el$3, mergeProps(()=>_stable.slot.list), false, true);
+        spread(_el$3, mergeProps(()=>_stable.slot.list), true);
         insert(_el$3, createComponent(For, {
             get each () {
                 return p.results;
@@ -33,10 +33,10 @@ const __solidLayoutPasswordRequirementsLayout = (_stable, p)=>(()=>{
                         get ["data-passed"] () {
                             return rule.passed ? "true" : "false";
                         }
-                    }), false, true);
+                    }), true);
                     spread(_el$5, mergeProps(()=>_stable.slot.icon, {
                         "aria-hidden": "true"
-                    }), false, true);
+                    }), true);
                     insert(_el$5, createComponent(Show, {
                         get when () {
                             return memo(()=>!!rule.passed)() ? p.metIcon : p.unmetIcon;
@@ -54,7 +54,7 @@ const __solidLayoutPasswordRequirementsLayout = (_stable, p)=>(()=>{
                             return memo(()=>!!rule.passed)() ? p.metIcon : p.unmetIcon;
                         }
                     }));
-                    spread(_el$6, mergeProps(()=>_stable.slot.message), false, true);
+                    spread(_el$6, mergeProps(()=>_stable.slot.message), true);
                     insert(_el$6, ()=>rule.message);
                     return _el$4;
                 })()

package/dist/components/password-requirements/PasswordRequirements.recipe.d.ts

@@ -1,4 +1,4 @@
-export declare const passwordRequirements: import("solid-layouts").Recipe<{
+export declare const passwordRequirements: import("solid-layouts/solid-2").Recipe<{
     readonly component: "password-requirements";
     readonly element: "div";
     readonly slots: {

package/dist/components/popover/Popover.generated.d.ts

@@ -1,7 +1,8 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Popover.css";
-import { type JSX } from "solid-js";
-import type { UIBaseProps } from "../vocabulary";
+import { type JSX } from "@solidjs/web";
+import "../_shared/material.css";
+import type { Material, UIBaseProps } from "../vocabulary";
 import { type OverlayAnchorRect, type OverlayPlacement } from "../_shared/overlayPosition";
 export type PopoverPlacement = OverlayPlacement;
 export type PopoverAnchorRect = OverlayAnchorRect;
@@ -27,6 +28,8 @@ declare const PopoverTrigger: __LayoutComponent<PopoverTriggerProps>;
 export type PopoverContentProps = UIBaseProps & Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & {
     children: JSX.Element;
     sideOffset?: number;
+    /** What the panel is made of. `solid` by default. */
+    material?: Material;
 };
 declare const PopoverContent: __LayoutComponent<PopoverContentProps>;
 export type PopoverDialogProps = UIBaseProps & Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & {