@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/card/Card.generated.d.ts

@@ -1,12 +1,18 @@
 import type { Component as __LayoutComponent } from "solid-js";
+import "../_shared/material.css";
+import type { JSX } from "@solidjs/web";
 import "./Card.css";
-import { type JSX } from "solid-js";
-import type { Flavor, Radius, Space, State, UIBaseProps, Variant } from "../vocabulary";
-export type CardMaterial = "solid" | "glass";
+import type { Flavor, Material, Radius, Space, State, UIBaseProps, Variant } from "../vocabulary";
+/**
+ * @deprecated Use `Material` from the shared vocabulary. Kept as an alias
+ * because it is exported publicly and removing it would break call sites; it
+ * has always had exactly these two members.
+ */
+export type CardMaterial = Material;
 export type CardElevation = "none" | "sm" | "md" | "lg";
 export type CardProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & UIBaseProps & {
     variant?: Variant;
-    material?: CardMaterial;
+    material?: Material;
     elevation?: CardElevation;
     flavor?: Flavor;
     state?: State;

package/dist/components/card/Card.generated.js

@@ -1,12 +1,13 @@
-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 "../_shared/material.css";
 import "./Card.css";
 import { Show } from "solid-js";
 import { card, cardBody, cardFooter, cardHeader } from "./Card.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<div>");
+var _tmpl$ = /*#__PURE__*/ template("<div>"), _tmpl$2 = /*#__PURE__*/ template("<div><!><!><!>");
 const __solidLayoutCardHeaderLayout = (_stable, p)=>(()=>{
         var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>_stable.slot.root), false, true);
+        spread(_el$, mergeProps(()=>_stable.slot.root), true);
         insert(_el$, ()=>_stable.children);
         return _el$;
     })();
@@ -17,7 +18,7 @@ const CardHeaderLayout = defineComponent({
 });
 const __solidLayoutCardBodyLayout = (_stable, p)=>(()=>{
         var _el$2 = _tmpl$();
-        spread(_el$2, mergeProps(()=>_stable.slot.root), false, true);
+        spread(_el$2, mergeProps(()=>_stable.slot.root), true);
         insert(_el$2, ()=>_stable.children);
         return _el$2;
     })();
@@ -28,7 +29,7 @@ const CardBodyLayout = defineComponent({
 });
 const __solidLayoutCardFooterLayout = (_stable, p)=>(()=>{
         var _el$3 = _tmpl$();
-        spread(_el$3, mergeProps(()=>_stable.slot.root), false, true);
+        spread(_el$3, mergeProps(()=>_stable.slot.root), true);
         insert(_el$3, ()=>_stable.children);
         return _el$3;
     })();
@@ -45,51 +46,52 @@ const __solidLayoutCardLayout = (_stable, p)=>{
         event.preventDefault();
         event.currentTarget.click();
     };
-    return (()=>{
-        var _el$4 = _tmpl$();
-        spread(_el$4, mergeProps(()=>_stable.slot.root, {
-            get role () {
-                return p.role ?? (p.isInteractive ? "button" : void 0);
-            },
-            get tabIndex () {
-                return p.tabIndex ?? (p.isInteractive ? 0 : void 0);
-            },
-            onKeyDown: handleKeyDown,
-            get ["data-flavor"] () {
-                return p.flavor ?? "neutral";
-            }
-        }), false, true);
-        insert(_el$4, createComponent(Show, {
-            get when () {
-                return p.header;
-            },
-            get children () {
-                return createComponent(CardHeaderLayout, {
-                    get children () {
-                        return p.header;
-                    }
-                });
-            }
-        }), null);
-        insert(_el$4, createComponent(CardBodyLayout, {
-            get children () {
-                return _stable.children;
-            }
-        }), null);
-        insert(_el$4, createComponent(Show, {
-            get when () {
-                return p.footer;
-            },
-            get children () {
-                return createComponent(CardFooterLayout, {
-                    get children () {
-                        return p.footer;
-                    }
-                });
-            }
-        }), null);
-        return _el$4;
-    })();
+    var _el$4 = _tmpl$2(), _el$5 = _el$4.firstChild, _el$6 = _el$5.nextSibling, _el$7 = _el$6.nextSibling;
+    spread(_el$4, mergeProps(()=>_stable.slot.root, {
+        get role () {
+            return p.role ?? (p.isInteractive ? "button" : void 0);
+        },
+        get tabindex () {
+            return p.tabindex ?? (p.isInteractive ? 0 : void 0);
+        },
+        onKeyDown: handleKeyDown,
+        get ["data-flavor"] () {
+            return p.flavor ?? "neutral";
+        },
+        get ["data-material"] () {
+            return p.material ?? "solid";
+        }
+    }), true);
+    insert(_el$4, createComponent(Show, {
+        get when () {
+            return p.header;
+        },
+        get children () {
+            return createComponent(CardHeaderLayout, {
+                get children () {
+                    return p.header;
+                }
+            });
+        }
+    }), _el$5);
+    insert(_el$4, createComponent(CardBodyLayout, {
+        get children () {
+            return _stable.children;
+        }
+    }), _el$6);
+    insert(_el$4, createComponent(Show, {
+        get when () {
+            return p.footer;
+        },
+        get children () {
+            return createComponent(CardFooterLayout, {
+                get children () {
+                    return p.footer;
+                }
+            });
+        }
+    }), _el$7);
+    return _el$4;
 };
 const CardLayout = defineComponent({
     recipe: card,

package/dist/components/card/Card.recipe.d.ts

@@ -16,7 +16,7 @@
  * Not one call site in 13 apps used any of it — only size (49), tone (7),
  * highlight (6) and interactive (1) — so it is dropped rather than ported.
  */
-export declare const card: import("solid-layouts").Recipe<{
+export declare const card: import("solid-layouts/solid-2").Recipe<{
     readonly component: "card";
     readonly element: "div";
     readonly slots: {
@@ -91,7 +91,7 @@ export declare const card: import("solid-layouts").Recipe<{
  * root, through descendant selectors keyed on `card--padding-*`, so the parts
  * stay in step without needing the root's props.
  */
-export declare const cardHeader: import("solid-layouts").Recipe<{
+export declare const cardHeader: import("solid-layouts/solid-2").Recipe<{
     readonly component: "card-header";
     readonly element: "div";
     readonly slots: {
@@ -100,7 +100,7 @@ export declare const cardHeader: import("solid-layouts").Recipe<{
         };
     };
 }>;
-export declare const cardBody: import("solid-layouts").Recipe<{
+export declare const cardBody: import("solid-layouts/solid-2").Recipe<{
     readonly component: "card-body";
     readonly element: "div";
     readonly slots: {
@@ -109,7 +109,7 @@ export declare const cardBody: import("solid-layouts").Recipe<{
         };
     };
 }>;
-export declare const cardFooter: import("solid-layouts").Recipe<{
+export declare const cardFooter: import("solid-layouts/solid-2").Recipe<{
     readonly component: "card-footer";
     readonly element: "div";
     readonly slots: {

package/dist/components/chatbubble/ChatBubble.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./ChatBubble.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps } from "../vocabulary";
 export type ChatBubbleProps = UIBaseProps & JSX.HTMLAttributes<HTMLDivElement> & {
     end?: boolean;

package/dist/components/chatbubble/ChatBubble.generated.js

@@ -1,8 +1,8 @@
-import { insert, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { insert, mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./ChatBubble.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 ChatBubbleHeader_generated from "./ChatBubbleHeader.generated.js";
 import ChatBubbleTime_generated from "./ChatBubbleTime.generated.js";
 import ChatBubbleAvatar_generated from "./ChatBubbleAvatar.generated.js";
@@ -11,29 +11,22 @@ import ChatBubbleFooter_generated from "./ChatBubbleFooter.generated.js";
 import { CLASSES, componentRecipe } from "./ChatBubble.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutChatBubble = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "end",
-        "dataTheme",
-        "class",
-        "style"
-    ]);
-    const classes = createMemo(()=>twMerge(CLASSES.base, local.end ? CLASSES.align.end : CLASSES.align.start, local.class));
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            }
-        }, ()=>({
-                class: classes()
-            }), {
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$, ()=>others.children);
-        return _el$;
-    })();
+    const others = omit(p, "end", "dataTheme", "class", "style");
+    const classes = createMemo(()=>twMerge(CLASSES.base, p.end ? CLASSES.align.end : CLASSES.align.start, p.class));
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        }
+    }, ()=>({
+            class: classes()
+        }), {
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$, ()=>others.children);
+    return _el$;
 };
 const ChatBubble = defineComponent({
     recipe: componentRecipe,

package/dist/components/chatbubble/ChatBubble.recipe.d.ts

@@ -22,7 +22,7 @@ export declare const CLASSES: {
         readonly info: "chatbubble__message--flavor-info";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "chatbubble";
     readonly slots: {
         readonly root: {};

package/dist/components/chatbubble/ChatBubbleAvatar.generated.js

@@ -1,6 +1,6 @@
-import { createComponent, memo, mergeProps } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { twMerge } from "tailwind-merge";
+import { createComponent, memo, mergeProps } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { twMerge } from "../../lib/twMerge.js";
 import avatar from "../avatar/index.js";
 import { CLASSES, componentRecipe } from "./ChatBubble.recipe.js";
 const __solidLayoutChatBubbleAvatar = (_stable, p)=>createComponent(avatar, mergeProps({
@@ -24,14 +24,14 @@ const __solidLayoutChatBubbleAvatar = (_stable, p)=>createComponent(avatar, merg
         },
         get children () {
             return [
-                memo(()=>memo(()=>!!p.src)() && createComponent(avatar.Image, {
+                memo(()=>memo(()=>!!p.src)() ? createComponent(avatar.Image, {
                         get src () {
                             return p.src;
                         },
                         get alt () {
                             return p.alt;
                         }
-                    })),
+                    }) : p.src),
                 createComponent(avatar.Fallback, {
                     get children () {
                         return p.fallback ?? p.alt?.charAt(0) ?? "?";

package/dist/components/chatbubble/ChatBubbleFooter.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 } from "../vocabulary";
 export type ChatBubbleFooterProps = JSX.HTMLAttributes<HTMLDivElement> & UIBaseProps;
 declare const ChatBubbleFooter: __LayoutComponent<ChatBubbleFooterProps>;

package/dist/components/chatbubble/ChatBubbleFooter.generated.js

@@ -1,20 +1,16 @@
-import { mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./ChatBubble.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutChatBubbleFooter = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.footer, local.class)
-            })), false, false);
-        return _el$;
-    })();
+    const others = omit(p, "class");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.slot.footer, p.class)
+        })), false);
+    return _el$;
 };
 const ChatBubbleFooter = defineComponent({
     recipe: componentRecipe,

package/dist/components/chatbubble/ChatBubbleHeader.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 } from "../vocabulary";
 export type ChatBubbleHeaderProps = JSX.HTMLAttributes<HTMLDivElement> & UIBaseProps;
 declare const ChatBubbleHeader: __LayoutComponent<ChatBubbleHeaderProps>;

package/dist/components/chatbubble/ChatBubbleHeader.generated.js

@@ -1,20 +1,16 @@
-import { mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./ChatBubble.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutChatBubbleHeader = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.header, local.class)
-            })), false, false);
-        return _el$;
-    })();
+    const others = omit(p, "class");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.slot.header, p.class)
+        })), false);
+    return _el$;
 };
 const ChatBubbleHeader = defineComponent({
     recipe: componentRecipe,

package/dist/components/chatbubble/ChatBubbleMessage.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, Flavor } from "../vocabulary";
 export type ChatBubbleMessageProps = JSX.HTMLAttributes<HTMLDivElement> & UIBaseProps & {
     flavor?: Flavor;

package/dist/components/chatbubble/ChatBubbleMessage.generated.js

@@ -1,28 +1,23 @@
-import { mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./ChatBubble.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutChatBubbleMessage = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "flavor",
-        "class"
-    ]);
+    const others = omit(p, "flavor", "class");
     const colorClass = ()=>{
-        if (!local.flavor) return;
-        const f = local.flavor;
+        if (!p.flavor) return;
+        const f = p.flavor;
         return CLASSES.flavor[f] ?? `chatbubble__message--flavor-${f}`;
     };
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, {
-            get ["class"] () {
-                return twMerge(CLASSES.slot.message, colorClass(), local.class);
-            }
-        }), false, false);
-        return _el$;
-    })();
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, {
+        get ["class"] () {
+            return twMerge(CLASSES.slot.message, colorClass(), p.class);
+        }
+    }), false);
+    return _el$;
 };
 const ChatBubbleMessage = defineComponent({
     recipe: componentRecipe,

package/dist/components/chatbubble/ChatBubbleTime.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 } from "../vocabulary";
 export type ChatBubbleTimeProps = JSX.HTMLAttributes<HTMLTimeElement> & UIBaseProps;
 declare const ChatBubbleTime: __LayoutComponent<ChatBubbleTimeProps>;

package/dist/components/chatbubble/ChatBubbleTime.generated.js

@@ -1,20 +1,16 @@
-import { mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./ChatBubble.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<time>");
 const __solidLayoutChatBubbleTime = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.time, local.class)
-            })), false, false);
-        return _el$;
-    })();
+    const others = omit(p, "class");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.slot.time, p.class)
+        })), false);
+    return _el$;
 };
 const ChatBubbleTime = defineComponent({
     recipe: componentRecipe,

package/dist/components/checkbox/Checkbox.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Checkbox.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State, Issue } from "../vocabulary";
 export type CheckboxVariant = "primary" | "secondary";
 export type CheckboxProps = Omit<JSX.InputHTMLAttributes<HTMLInputElement>, "type" | "children"> & UIBaseProps & {