@pathscale/ui 2.4.0 → 2.6.0

package/dist/components/kbd/Kbd.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 "./Kbd.css";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./Kbd.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<kbd>"), _tmpl$2 = /*#__PURE__*/ template("<abbr>"), _tmpl$3 = /*#__PURE__*/ template("<span>");
 const kbdKeysMap = {
@@ -54,33 +54,25 @@ const kbdKeysLabelMap = {
     alt: "Alt"
 };
 const __solidLayoutKbdRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class",
-        "dataTheme",
-        "style",
-        "children",
-        "variant"
-    ]);
-    const variant = ()=>local.variant ?? "default";
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.base, CLASSES.variant[variant()], local.class)
-            }), {
-            "data-slot": "kbd",
-            get ["data-variant"] () {
-                return variant();
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const others = omit(p, "class", "dataTheme", "style", "children", "variant");
+    const variant = ()=>p.variant ?? "default";
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.base, CLASSES.variant[variant()], p.class)
+        }), {
+        "data-slot": "kbd",
+        get ["data-variant"] () {
+            return variant();
+        },
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const KbdRoot = defineComponent({
     recipe: componentRecipe,
@@ -88,35 +80,27 @@ const KbdRoot = defineComponent({
     embedded: true
 });
 const __solidLayoutKbdAbbr = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class",
-        "dataTheme",
-        "style",
-        "keyValue",
-        "title"
-    ]);
-    return (()=>{
-        var _el$2 = _tmpl$2();
-        spread(_el$2, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.abbr, local.class)
-            }), {
-            get title () {
-                return local.title ?? kbdKeysLabelMap[local.keyValue];
-            },
-            "data-slot": "kbd-abbr",
-            get ["data-key"] () {
-                return local.keyValue;
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$2, ()=>kbdKeysMap[local.keyValue]);
-        return _el$2;
-    })();
+    const others = omit(p, "class", "dataTheme", "style", "keyValue", "title");
+    var _el$2 = _tmpl$2();
+    spread(_el$2, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.slot.abbr, p.class)
+        }), {
+        get title () {
+            return p.title ?? kbdKeysLabelMap[p.keyValue];
+        },
+        "data-slot": "kbd-abbr",
+        get ["data-key"] () {
+            return p.keyValue;
+        },
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$2, ()=>kbdKeysMap[p.keyValue]);
+    return _el$2;
 };
 const KbdAbbr = defineComponent({
     recipe: componentRecipe,
@@ -124,28 +108,21 @@ const KbdAbbr = defineComponent({
     embedded: true
 });
 const __solidLayoutKbdContent = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "class",
-        "dataTheme",
-        "style",
-        "children"
-    ]);
-    return (()=>{
-        var _el$3 = _tmpl$3();
-        spread(_el$3, mergeProps(others, ()=>({
-                class: twMerge(CLASSES.slot.content, local.class)
-            }), {
-            "data-slot": "kbd-content",
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        insert(_el$3, ()=>local.children);
-        return _el$3;
-    })();
+    const others = omit(p, "class", "dataTheme", "style", "children");
+    var _el$3 = _tmpl$3();
+    spread(_el$3, mergeProps(others, ()=>({
+            class: twMerge(CLASSES.slot.content, p.class)
+        }), {
+        "data-slot": "kbd-content",
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        }
+    }), true);
+    insert(_el$3, ()=>p.children);
+    return _el$3;
 };
 const KbdContent = defineComponent({
     recipe: componentRecipe,

package/dist/components/kbd/Kbd.recipe.d.ts

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

package/dist/components/label/Label.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Label.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { UIBaseProps, State, Issue } from "../vocabulary";
 export type LabelRootProps = Omit<JSX.LabelHTMLAttributes<HTMLLabelElement>, "for"> & UIBaseProps & {
     for?: string;

package/dist/components/label/Label.generated.js

@@ -1,58 +1,46 @@
-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 "./Label.css";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import { CLASSES, componentRecipe } from "./Label.recipe.js";
 import { resolveState } from "../vocabulary.js";
 var _tmpl$ = /*#__PURE__*/ template("<label>");
 const __solidLayoutLabelRoot = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "style",
-        "for",
-        "htmlFor",
-        "required",
-        "state",
-        "issues"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(others, {
-            get ["for"] () {
-                return local.for ?? local.htmlFor;
-            },
-            get ["class"] () {
-                return twMerge(CLASSES.base, local.required && CLASSES.flag.required, "disabled" === local.state && CLASSES.flag.disabled, "invalid" === resolveState(local.state, local.issues) && CLASSES.flag.invalid, local.class);
-            },
-            "data-slot": "label",
-            get ["data-required"] () {
-                return local.required ? "true" : void 0;
-            },
-            get ["data-disabled"] () {
-                return "disabled" === local.state ? "true" : void 0;
-            },
-            get ["data-invalid"] () {
-                return "invalid" === resolveState(local.state, local.issues) ? "true" : void 0;
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            },
-            get ["aria-disabled"] () {
-                return "disabled" === local.state ? "true" : void 0;
-            },
-            get ["aria-invalid"] () {
-                return "invalid" === resolveState(local.state, local.issues) ? "true" : void 0;
-            }
-        }), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const others = omit(p, "children", "class", "dataTheme", "style", "for", "htmlFor", "required", "state", "issues");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(others, {
+        get ["for"] () {
+            return p.for ?? p.htmlFor;
+        },
+        get ["class"] () {
+            return twMerge(CLASSES.base, p.required && CLASSES.flag.required, "disabled" === p.state && CLASSES.flag.disabled, "invalid" === resolveState(p.state, p.issues) && CLASSES.flag.invalid, p.class);
+        },
+        "data-slot": "label",
+        get ["data-required"] () {
+            return p.required ? "true" : void 0;
+        },
+        get ["data-disabled"] () {
+            return "disabled" === p.state ? "true" : void 0;
+        },
+        get ["data-invalid"] () {
+            return "invalid" === resolveState(p.state, p.issues) ? "true" : void 0;
+        },
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        get style () {
+            return p.style;
+        },
+        get ["aria-disabled"] () {
+            return "disabled" === p.state ? "true" : void 0;
+        },
+        get ["aria-invalid"] () {
+            return "invalid" === resolveState(p.state, p.issues) ? "true" : void 0;
+        }
+    }), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const LabelRoot = defineComponent({
     recipe: componentRecipe,

package/dist/components/label/Label.recipe.d.ts

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

package/dist/components/language-switcher/LanguageSwitcher.generated.js

@@ -1,40 +1,30 @@
-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 "./LanguageSwitcher.css";
-import { For, Show, splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { For, Show, omit } from "solid-js";
+import { twMerge } from "../../lib/twMerge.js";
 import dropdown from "../dropdown/index.js";
 import icon from "../icon/index.js";
 import { CLASSES, componentRecipe } from "./LanguageSwitcher.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<span>");
 const __solidLayoutLanguageSwitcher = (_stable, p)=>{
-    const [local, others] = splitProps(p, [
-        "i18n",
-        "class",
-        "style",
-        "aria-label",
-        "currentLanguageLabel",
-        "optionsLabel",
-        "loadingLabel",
-        "align",
-        "onLanguageChange"
-    ]);
-    const currentLanguageName = ()=>local.i18n.languageNames[local.i18n.locale];
-    const isSelected = (lang)=>local.i18n.locale === lang;
+    const others = omit(p, "i18n", "class", "style", "aria-label", "currentLanguageLabel", "optionsLabel", "loadingLabel", "align", "onLanguageChange");
+    const currentLanguageName = ()=>p.i18n.languageNames[p.i18n.locale];
+    const isSelected = (lang)=>p.i18n.locale === lang;
     const handleSelect = async (lang)=>{
-        await local.i18n.setLocale(lang);
-        local.onLanguageChange?.(lang);
+        await p.i18n.setLocale(lang);
+        p.onLanguageChange?.(lang);
     };
-    const classes = ()=>twMerge(CLASSES.base, local.class);
+    const classes = ()=>twMerge(CLASSES.base, p.class);
     return createComponent(dropdown.Root, mergeProps(others, ()=>({
             class: classes()
         }), {
         get style () {
-            return local.style;
+            return p.style;
         },
         role: void 0,
         get ["aria-label"] () {
-            return local["aria-label"] ?? "Language selector";
+            return p["aria-label"] ?? "Language selector";
         },
         get children () {
             return [
@@ -42,12 +32,12 @@ const __solidLayoutLanguageSwitcher = (_stable, p)=>{
                         class: CLASSES.trigger
                     }), {
                     get ["aria-label"] () {
-                        return `${local.currentLanguageLabel ?? "Current language"}: ${currentLanguageName()}`;
+                        return `${p.currentLanguageLabel ?? "Current language"}: ${currentLanguageName()}`;
                     },
                     get children () {
                         return createComponent(Show, {
                             get when () {
-                                return !local.i18n.isLoading;
+                                return !p.i18n.isLoading;
                             },
                             get fallback () {
                                 return createComponent(icon, mergeProps({
@@ -58,7 +48,7 @@ const __solidLayoutLanguageSwitcher = (_stable, p)=>{
                                     width: 16,
                                     height: 16,
                                     get ["aria-label"] () {
-                                        return local.loadingLabel ?? "Loading language";
+                                        return p.loadingLabel ?? "Loading language";
                                     }
                                 }));
                             },
@@ -68,8 +58,8 @@ const __solidLayoutLanguageSwitcher = (_stable, p)=>{
                                         class: CLASSES.locale
                                     }), {
                                     "aria-hidden": "true"
-                                }), false, true);
-                                insert(_el$, ()=>local.i18n.locale.toUpperCase());
+                                }), true);
+                                insert(_el$, ()=>p.i18n.locale.toUpperCase());
                                 return _el$;
                             }
                         });
@@ -79,15 +69,15 @@ const __solidLayoutLanguageSwitcher = (_stable, p)=>{
                         class: CLASSES.menu
                     }), {
                     get align () {
-                        return local.align;
+                        return p.align;
                     },
                     get ["aria-label"] () {
-                        return local.optionsLabel ?? "Language options";
+                        return p.optionsLabel ?? "Language options";
                     },
                     get children () {
                         return createComponent(For, {
                             get each () {
-                                return local.i18n.languages;
+                                return p.i18n.languages;
                             },
                             children: (lang)=>createComponent(dropdown.Item, mergeProps({
                                     onClick: ()=>handleSelect(lang.code)

package/dist/components/language-switcher/LanguageSwitcher.recipe.d.ts

@@ -7,7 +7,7 @@ export declare const CLASSES: {
     readonly item: "language-switcher__item";
     readonly itemSelected: "language-switcher__item--selected";
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "language-switcher";
     readonly slots: {
         readonly root: {};

package/dist/components/language-switcher/createI18n.d.ts

@@ -1,4 +1,5 @@
-import { type JSX, type FlowComponent } from "solid-js";
+import { type FlowComponent } from "solid-js";
+import type { JSX } from "@solidjs/web";
 export interface Language {
     code: string;
     name: string;
@@ -84,14 +85,14 @@ export interface I18nStore {
  * <p>Current: {i18n.locale}</p>
  *
  * // Initialize on app mount
- * onMount(() => i18n.init());
+ * onSettled(() => i18n.init());
  * ```
  */
 export declare function createI18n(options: I18nOptions): I18nStore;
 export interface I18nContextValue {
     i18n: I18nStore;
 }
-export declare const I18nContext: import("solid-js").Context<I18nContextValue | undefined>;
+export declare const I18nContext: import("solid-js").Context<I18nContextValue>;
 export declare function useI18n(): I18nStore;
 export interface I18nProviderProps {
     i18n: I18nStore;

package/dist/components/language-switcher/createI18n.js

@@ -1,4 +1,4 @@
-import { createComponent } from "solid-js/web";
+import { createComponent } from "@solidjs/web";
 import { createContext, createSignal, useContext } from "solid-js";
 function getNestedValue(obj, path) {
     const keys = path.split(".");
@@ -72,7 +72,7 @@ function useI18n() {
     if (!context) throw new Error("useI18n must be used within an I18nProvider");
     return context.i18n;
 }
-const I18nProvider = (props)=>createComponent(I18nContext.Provider, {
+const I18nProvider = (props)=>createComponent(I18nContext, {
         get value () {
             return {
                 i18n: props.i18n

package/dist/components/link/Link.generated.d.ts

@@ -1,6 +1,7 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Link.css";
-import { type Component, type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
+import { type Component } from "solid-js";
 import type { UIBaseProps, State } from "../vocabulary";
 export type LinkVariant = "default";
 export type LinkUnderline = "always" | "hover" | "none";