@pathscale/ui 2.5.0 → 2.6.1

package/dist/components/menu/MenuItem.generated.js

@@ -1,11 +1,19 @@
-import { createComponent, effect, insert, memo, mergeProps, setAttribute, spread, template, use } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { createContext, createEffect, createMemo, createUniqueId, onCleanup, splitProps, useContext } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { createComponent, effect, insert, memo, mergeProps, ref, setAttribute, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { createContext, createEffect, createMemo, createUniqueId, omit, onCleanup, useContext } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { MenuContext } from "./context.js";
 import { CLASSES, componentRecipe } from "./Menu.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<div>"), _tmpl$2 = /*#__PURE__*/ template("<span>"), _tmpl$3 = /*#__PURE__*/ template('<svg aria-hidden=true data-slot=menu-item-indicator--dot fill=currentColor fill-rule=evenodd role=presentation viewBox="0 0 16 16"xmlns=http://www.w3.org/2000/svg><path clip-rule=evenodd d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"fill-rule=evenodd>'), _tmpl$4 = /*#__PURE__*/ template('<svg aria-hidden=true data-slot=menu-item-indicator--checkmark fill=none role=presentation stroke=currentColor stroke-dasharray=22 stroke-linecap=round stroke-linejoin=round stroke-width=2 viewBox="0 0 17 18"><polyline points="1 9 7 14 15 4">'), _tmpl$5 = /*#__PURE__*/ template('<svg aria-hidden=true fill=none role=presentation viewBox="0 0 16 16"stroke=currentColor stroke-width=1.5 stroke-linecap=round stroke-linejoin=round><path d="M6 3.5L10 8l-4 4.5">');
-const MenuItemStateContext = createContext();
+var _tmpl$ = /*#__PURE__*/ template("<div>"), _tmpl$2 = /*#__PURE__*/ template("<span>"), _tmpl$3 = /*#__PURE__*/ template('<svg aria-hidden=true data-slot=menu-item-indicator--dot fill=currentColor fill-rule=evenodd role=presentation viewBox="0 0 16 16"><path clip-rule=evenodd d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"fill-rule=evenodd>'), _tmpl$4 = /*#__PURE__*/ template('<svg aria-hidden=true data-slot=menu-item-indicator--checkmark fill=none role=presentation stroke=currentColor stroke-dasharray=22 stroke-linecap=round stroke-linejoin=round stroke-width=2 viewBox="0 0 17 18"><polyline points="1 9 7 14 15 4">'), _tmpl$5 = /*#__PURE__*/ template('<svg aria-hidden=true fill=none role=presentation viewBox="0 0 16 16"stroke=currentColor stroke-width=1.5 stroke-linecap=round stroke-linejoin=round><path d="M6 3.5L10 8l-4 4.5">');
+const MenuItemStateContext = createContext({
+    renderState: ()=>({
+            isSelected: false,
+            isFocused: false,
+            isDisabled: false,
+            hasSubmenu: false,
+            selectionMode: "none"
+        })
+});
 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);
@@ -20,71 +28,52 @@ const extractTextValue = (nodes)=>{
 const __solidLayoutMenuItemRoot = (_stable, p)=>{
     const menu = useContext(MenuContext);
     const fallbackKey = createUniqueId();
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "style",
-        "id",
-        "textValue",
-        "variant",
-        "state",
-        "disabled",
-        "hasSubmenu",
-        "onAction",
-        "onClick",
-        "onKeyDown",
-        "onFocus",
-        "onBlur",
-        "ref",
-        "tabIndex",
-        "role"
-    ]);
+    const others = omit(p, "children", "class", "dataTheme", "style", "id", "textValue", "variant", "state", "disabled", "hasSubmenu", "onAction", "onClick", "onKeyDown", "onFocus", "onBlur", "ref", "tabindex", "role");
     let itemRef;
     const key = createMemo(()=>{
-        if (null != local.id) return String(local.id);
-        if (local.textValue) return toSlug(local.textValue);
-        const staticChildren = "function" == typeof local.children ? [] : [
-            local.children
+        if (null != p.id) return String(p.id);
+        if (p.textValue) return toSlug(p.textValue);
+        const staticChildren = "function" == typeof p.children ? [] : [
+            p.children
         ];
         const textValue = extractTextValue(staticChildren);
         if (textValue) return toSlug(textValue);
         return fallbackKey;
     });
-    const variant = ()=>local.variant ?? "default";
+    const variant = ()=>p.variant ?? "default";
     const selectionMode = ()=>menu?.selectionMode() ?? "none";
     const isSelected = ()=>menu?.isSelected(key()) ?? false;
     const isFocused = ()=>menu?.focusedKey() === key();
-    const isDisabled = ()=>menu?.isItemDisabled(key(), Boolean("disabled" === local.state) || Boolean(local.disabled)) ?? (Boolean("disabled" === local.state) || Boolean(local.disabled));
+    const isDisabled = ()=>menu?.isItemDisabled(key(), Boolean("disabled" === p.state) || Boolean(p.disabled)) ?? (Boolean("disabled" === p.state) || Boolean(p.disabled));
     const renderState = createMemo(()=>({
             isSelected: isSelected(),
             isFocused: isFocused(),
             isDisabled: isDisabled(),
-            hasSubmenu: Boolean(local.hasSubmenu),
+            hasSubmenu: Boolean(p.hasSubmenu),
             selectionMode: selectionMode()
         }));
     const resolvedRole = ()=>{
-        if (local.role) return local.role;
+        if (p.role) return p.role;
         if ("multiple" === selectionMode()) return "menuitemcheckbox";
         if ("single" === selectionMode()) return "menuitemradio";
         return "menuitem";
     };
     const resolvedTabIndex = ()=>{
-        if (void 0 !== local.tabIndex) return local.tabIndex;
+        if (void 0 !== p.tabindex) return p.tabindex;
         if (!menu) return isDisabled() ? -1 : 0;
         return menu.getItemTabIndex(key(), isDisabled());
     };
     const handleActivate = (event)=>{
         if (event.defaultPrevented || isDisabled()) return;
         menu?.activateKey(key(), event);
-        local.onAction?.(key());
+        p.onAction?.(key());
     };
     const handleClick = (event)=>{
-        invokeEventHandler(local.onClick, event);
+        invokeEventHandler(p.onClick, event);
         handleActivate(event);
     };
     const handleKeyDown = (event)=>{
-        invokeEventHandler(local.onKeyDown, event);
+        invokeEventHandler(p.onKeyDown, event);
         if (event.defaultPrevented || isDisabled()) return;
         if ("ArrowDown" === event.key || "ArrowRight" === event.key) {
             event.preventDefault();
@@ -112,12 +101,12 @@ const __solidLayoutMenuItemRoot = (_stable, p)=>{
         }
     };
     const handleFocus = (event)=>{
-        invokeEventHandler(local.onFocus, event);
+        invokeEventHandler(p.onFocus, event);
         if (event.defaultPrevented) return;
         menu?.setFocusedKey(key());
     };
     const handleBlur = (event)=>{
-        invokeEventHandler(local.onBlur, event);
+        invokeEventHandler(p.onBlur, event);
         if (event.defaultPrevented) return;
         if (menu?.focusedKey() === key()) menu.setFocusedKey(void 0);
     };
@@ -125,7 +114,7 @@ const __solidLayoutMenuItemRoot = (_stable, p)=>{
         if (!menu || !itemRef) return;
         menu.registerItem({
             key: key(),
-            disabled: Boolean("disabled" === local.state) || Boolean(local.disabled),
+            disabled: Boolean("disabled" === p.state) || Boolean(p.disabled),
             ref: itemRef
         });
     });
@@ -133,35 +122,35 @@ const __solidLayoutMenuItemRoot = (_stable, p)=>{
         if (!menu) return;
         menu.unregisterItem(key());
     });
-    return createComponent(MenuItemStateContext.Provider, {
+    return createComponent(MenuItemStateContext, {
         value: {
             renderState
         },
         get children () {
             var _el$ = _tmpl$();
-            use((node)=>{
-                itemRef = node;
-                if ("function" == typeof local.ref) local.ref(node);
-            }, _el$);
+            ref(()=>(node)=>{
+                    itemRef = node;
+                    if ("function" == typeof p.ref) p.ref(node);
+                }, _el$);
             spread(_el$, mergeProps(others, {
                 get role () {
                     return resolvedRole();
                 },
-                get tabIndex () {
+                get tabindex () {
                     return resolvedTabIndex();
                 },
                 get ["aria-selected"] () {
-                    return memo(()=>"none" === selectionMode())() ? void 0 : isSelected() ? "true" : "false";
+                    return "none" === selectionMode() ? void 0 : isSelected() ? "true" : "false";
                 },
                 get ["aria-checked"] () {
-                    return memo(()=>"none" === selectionMode())() ? void 0 : isSelected() ? "true" : "false";
+                    return "none" === selectionMode() ? void 0 : isSelected() ? "true" : "false";
                 },
                 get ["aria-disabled"] () {
                     return isDisabled() ? "true" : void 0;
                 },
                 "data-slot": "menu-item",
                 get ["data-theme"] () {
-                    return local.dataTheme;
+                    return p.dataTheme;
                 },
                 get ["data-disabled"] () {
                     return isDisabled() ? "true" : "false";
@@ -173,7 +162,7 @@ const __solidLayoutMenuItemRoot = (_stable, p)=>{
                     return isFocused() ? "true" : "false";
                 },
                 get ["data-has-submenu"] () {
-                    return local.hasSubmenu ? "true" : void 0;
+                    return p.hasSubmenu ? "true" : void 0;
                 },
                 get ["data-selection-mode"] () {
                     return selectionMode();
@@ -182,19 +171,19 @@ const __solidLayoutMenuItemRoot = (_stable, p)=>{
                     return key();
                 }
             }, ()=>({
-                    class: twMerge(CLASSES.Item.base, CLASSES.Item.variant[variant()], local.class)
+                    class: twMerge(CLASSES.Item.base, CLASSES.Item.variant[variant()], p.class)
                 }), {
                 get style () {
-                    return local.style;
+                    return p.style;
                 },
                 onClick: handleClick,
                 onKeyDown: handleKeyDown,
                 onFocus: handleFocus,
                 onBlur: handleBlur
-            }), false, true);
+            }), true);
             insert(_el$, (()=>{
-                var _c$ = memo(()=>"function" == typeof local.children);
-                return ()=>_c$() ? local.children(renderState()) : local.children;
+                var _c$ = memo(()=>"function" == typeof p.children);
+                return ()=>_c$() ? p.children(renderState()) : p.children;
             })());
             return _el$;
         }
@@ -207,13 +196,7 @@ const MenuItemRoot = defineComponent({
 });
 const __solidLayoutMenuItemIndicator = (_stable, p)=>{
     const context = useContext(MenuItemStateContext);
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "style",
-        "type"
-    ]);
+    const others = omit(p, "children", "class", "dataTheme", "style", "type");
     const renderState = ()=>context?.renderState() ?? {
             isSelected: false,
             isFocused: false,
@@ -221,38 +204,38 @@ const __solidLayoutMenuItemIndicator = (_stable, p)=>{
             hasSubmenu: false,
             selectionMode: "none"
         };
-    const type = ()=>local.type ?? "checkmark";
-    return (()=>{
-        var _el$2 = _tmpl$2();
-        spread(_el$2, mergeProps(others, {
-            "aria-hidden": "true",
-            "data-slot": "menu-item-indicator",
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get ["data-type"] () {
-                return type();
-            },
-            get ["data-visible"] () {
-                return renderState().isSelected ? "true" : void 0;
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.ItemIndicator.base, local.class)
-            }), {
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$2, (()=>{
-            var _c$2 = memo(()=>"function" == typeof local.children);
-            return ()=>_c$2() ? local.children(renderState()) : memo(()=>!!local.children)() ? local.children : memo(()=>"dot" === type())() ? _tmpl$3() : (()=>{
-                    var _el$4 = _tmpl$4();
-                    effect(()=>setAttribute(_el$4, "stroke-dashoffset", String(renderState().isSelected ? 44 : 66)));
-                    return _el$4;
-                })();
-        })());
-        return _el$2;
-    })();
+    const type = ()=>p.type ?? "checkmark";
+    var _el$2 = _tmpl$2();
+    spread(_el$2, mergeProps(others, {
+        "aria-hidden": "true",
+        "data-slot": "menu-item-indicator",
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get ["data-type"] () {
+            return type();
+        },
+        get ["data-visible"] () {
+            return renderState().isSelected ? "true" : void 0;
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.ItemIndicator.base, p.class)
+        }), {
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$2, (()=>{
+        var _c$2 = memo(()=>"function" == typeof p.children);
+        return ()=>_c$2() ? p.children(renderState()) : memo(()=>!!p.children)() ? p.children : memo(()=>"dot" === type())() ? _tmpl$3() : (()=>{
+                var _el$4 = _tmpl$4();
+                effect(()=>String(renderState().isSelected ? 44 : 66), (_v$)=>{
+                    setAttribute(_el$4, "stroke-dashoffset", _v$);
+                });
+                return _el$4;
+            })();
+    })());
+    return _el$2;
 };
 const MenuItemIndicator = defineComponent({
     recipe: componentRecipe,
@@ -261,31 +244,24 @@ const MenuItemIndicator = defineComponent({
 });
 const __solidLayoutMenuItemSubmenuIndicator = (_stable, p)=>{
     const context = useContext(MenuItemStateContext);
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "style"
-    ]);
+    const others = omit(p, "children", "class", "dataTheme", "style");
     if (!context?.renderState().hasSubmenu) return null;
-    return (()=>{
-        var _el$5 = _tmpl$2();
-        spread(_el$5, mergeProps(others, {
-            "aria-hidden": "true",
-            "data-slot": "submenu-indicator",
-            get ["data-theme"] () {
-                return local.dataTheme;
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.ItemIndicator.base, CLASSES.ItemIndicator.submenu, local.class)
-            }), {
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$5, ()=>local.children ?? _tmpl$5());
-        return _el$5;
-    })();
+    var _el$5 = _tmpl$2();
+    spread(_el$5, mergeProps(others, {
+        "aria-hidden": "true",
+        "data-slot": "submenu-indicator",
+        get ["data-theme"] () {
+            return p.dataTheme;
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.ItemIndicator.base, CLASSES.ItemIndicator.submenu, p.class)
+        }), {
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$5, ()=>p.children ?? _tmpl$5());
+    return _el$5;
 };
 const MenuItemSubmenuIndicator = defineComponent({
     recipe: componentRecipe,

package/dist/components/menu/MenuSection.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 MenuSectionRootProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & UIBaseProps & {
     children?: JSX.Element;

package/dist/components/menu/MenuSection.generated.js

@@ -1,53 +1,44 @@
-import { createComponent, insert, mergeProps, spread, template } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { Show, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { createComponent, insert, mergeProps, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
+import { Show, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./Menu.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<div>");
+var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<div><!><!>");
 const __solidLayoutMenuSectionRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "style",
-        "title",
-        "role"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$2();
-        spread(_el$, mergeProps(others, {
-            get role () {
-                return local.role ?? "group";
-            },
-            "data-slot": "menu-section",
-            get ["data-theme"] () {
-                return local.dataTheme;
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.Section.base, local.class)
-            }), {
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$, createComponent(Show, {
-            get when () {
-                return local.title;
-            },
-            get children () {
-                var _el$2 = _tmpl$();
-                spread(_el$2, mergeProps(()=>({
-                        class: CLASSES.Section.title
-                    }), {
-                    "data-slot": "heading"
-                }), false, true);
-                insert(_el$2, ()=>local.title);
-                return _el$2;
-            }
-        }), null);
-        insert(_el$, ()=>local.children, null);
-        return _el$;
-    })();
+    const others = omit(p, "children", "class", "dataTheme", "style", "title", "role");
+    var _el$ = _tmpl$2(), _el$3 = _el$.firstChild, _el$4 = _el$3.nextSibling;
+    spread(_el$, mergeProps(others, {
+        get role () {
+            return p.role ?? "group";
+        },
+        "data-slot": "menu-section",
+        get ["data-theme"] () {
+            return p.dataTheme;
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.Section.base, p.class)
+        }), {
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$, createComponent(Show, {
+        get when () {
+            return p.title;
+        },
+        get children () {
+            var _el$2 = _tmpl$();
+            spread(_el$2, mergeProps(()=>({
+                    class: CLASSES.Section.title
+                }), {
+                "data-slot": "heading"
+            }), true);
+            insert(_el$2, ()=>p.title);
+            return _el$2;
+        }
+    }), _el$3);
+    insert(_el$, ()=>p.children, _el$4);
+    return _el$;
 };
 const MenuSectionRoot = defineComponent({
     recipe: componentRecipe,

package/dist/components/menu/context.d.ts

@@ -23,4 +23,4 @@ export type MenuContextValue = {
     focusNext: (direction: 1 | -1) => void;
     focusBoundary: (target: MenuFocusTarget) => void;
 };
-export declare const MenuContext: import("solid-js").Context<MenuContextValue | undefined>;
+export declare const MenuContext: import("solid-js").Context<MenuContextValue>;

package/dist/components/metal-border/MetalBorder.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./MetalBorder.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps } from "../vocabulary";
 import { type PresetName, type PresetTheme } from "./engine";
 export type MetalBorderPreset = PresetName;