@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/table/TableColumn.generated.js

@@ -1,42 +1,33 @@
-import { insert, memo, 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 { insert, 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 { invokeEventHandler, useTableContentContext } from "./Table.context.js";
 import { CLASSES, tableColumnRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<th>");
 const __solidLayoutTableColumn = (_stable, p)=>{
     const contentContext = useTableContentContext();
-    const [local, rest] = splitProps(p, [
-        "id",
-        "allowsSorting",
-        "children",
-        "class",
-        "dataTheme",
-        "onClick",
-        "onKeyDown",
-        "tabIndex"
-    ]);
-    const isSortable = ()=>Boolean(local.allowsSorting);
+    const rest = omit(p, "id", "allowsSorting", "children", "class", "dataTheme", "onClick", "onKeyDown", "tabindex");
+    const isSortable = ()=>Boolean(p.allowsSorting);
     const sortDirection = ()=>{
         const descriptor = contentContext.sortDescriptor();
-        if (!descriptor || descriptor.column !== local.id) return;
+        if (!descriptor || descriptor.column !== p.id) return;
         return descriptor.direction;
     };
     const emitSortChange = ()=>{
         if (!isSortable() || !contentContext.onSortChange) return;
         contentContext.onSortChange({
-            column: local.id,
+            column: p.id,
             direction: "ascending" === sortDirection() ? "descending" : "ascending"
         });
     };
     const handleClick = (event)=>{
-        invokeEventHandler(local.onClick, event);
+        invokeEventHandler(p.onClick, event);
         if (event.defaultPrevented) return;
         emitSortChange();
     };
     const handleKeyDown = (event)=>{
-        invokeEventHandler(local.onKeyDown, event);
+        invokeEventHandler(p.onKeyDown, event);
         if (event.defaultPrevented) return;
         if (!isSortable()) return;
         if ("Enter" !== event.key && " " !== event.key) return;
@@ -44,41 +35,39 @@ const __solidLayoutTableColumn = (_stable, p)=>{
         emitSortChange();
     };
     const renderedChildren = ()=>{
-        if ("function" == typeof local.children) return local.children({
+        if ("function" == typeof p.children) return p.children({
             sortDirection: sortDirection()
         });
-        return local.children;
+        return p.children;
     };
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>({
-                class: twMerge(CLASSES.column, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "table-column",
-            get ["data-column-id"] () {
-                return local.id;
-            },
-            get ["data-allows-sorting"] () {
-                return isSortable() ? "true" : void 0;
-            },
-            get ["data-sort-direction"] () {
-                return sortDirection();
-            },
-            get ["aria-sort"] () {
-                return memo(()=>!!isSortable())() ? sortDirection() ?? "none" : void 0;
-            },
-            get tabIndex () {
-                return memo(()=>!!isSortable())() ? local.tabIndex ?? 0 : local.tabIndex;
-            },
-            onClick: handleClick,
-            onKeyDown: handleKeyDown
-        }, rest), false, true);
-        insert(_el$, renderedChildren);
-        return _el$;
-    })();
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(()=>({
+            class: twMerge(CLASSES.column, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "table-column",
+        get ["data-column-id"] () {
+            return p.id;
+        },
+        get ["data-allows-sorting"] () {
+            return isSortable() ? "true" : void 0;
+        },
+        get ["data-sort-direction"] () {
+            return sortDirection();
+        },
+        get ["aria-sort"] () {
+            return isSortable() ? sortDirection() ?? "none" : void 0;
+        },
+        get tabindex () {
+            return isSortable() ? p.tabindex ?? 0 : p.tabindex;
+        },
+        onClick: handleClick,
+        onKeyDown: handleKeyDown
+    }, rest), true);
+    insert(_el$, renderedChildren);
+    return _el$;
 };
 const TableColumn = defineComponent({
     recipe: tableColumnRecipe,

package/dist/components/table/TableColumnResizer.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 TableColumnResizerProps = JSX.HTMLAttributes<HTMLDivElement> & UIBaseProps;
 declare const TableColumnResizer: __LayoutComponent<TableColumnResizerProps>;

package/dist/components/table/TableColumnResizer.generated.js

@@ -1,37 +1,29 @@
-import { insert, 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 { insert, 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, tableColumnResizerRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutTableColumnResizer = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "role",
-        "aria-orientation"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps({
-            get role () {
-                return local.role ?? "separator";
-            },
-            get ["aria-orientation"] () {
-                return local["aria-orientation"] ?? "vertical";
-            }
-        }, ()=>({
-                class: twMerge(CLASSES.columnResizer, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "table-column-resizer"
-        }, rest), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const rest = omit(p, "children", "class", "dataTheme", "role", "aria-orientation");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps({
+        get role () {
+            return p.role ?? "separator";
+        },
+        get ["aria-orientation"] () {
+            return p["aria-orientation"] ?? "vertical";
+        }
+    }, ()=>({
+            class: twMerge(CLASSES.columnResizer, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "table-column-resizer"
+    }, rest), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const TableColumnResizer = defineComponent({
     recipe: tableColumnResizerRecipe,

package/dist/components/table/TableContent.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";
 import { type TableSortDescriptor } from "./Table.context";
 export type TableContentProps = JSX.HTMLAttributes<HTMLTableElement> & UIBaseProps & {

package/dist/components/table/TableContent.generated.js

@@ -1,42 +1,36 @@
-import { createComponent, insert, 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 { createComponent, insert, 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 { TableContentContext } from "./Table.context.js";
 import { CLASSES, tableContentRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<table>");
 const __solidLayoutTableContent = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "sortDescriptor",
-        "onSortChange"
-    ]);
-    return createComponent(TableContentContext.Provider, {
+    const rest = omit(p, "children", "class", "dataTheme", "sortDescriptor", "onSortChange");
+    return createComponent(TableContentContext, {
         get value () {
             return {
-                sortDescriptor: ()=>local.sortDescriptor,
-                onSortChange: local.onSortChange
+                sortDescriptor: ()=>p.sortDescriptor,
+                onSortChange: p.onSortChange
             };
         },
         get children () {
             var _el$ = _tmpl$();
             spread(_el$, mergeProps(()=>({
-                    class: twMerge(CLASSES.content, local.class)
+                    class: twMerge(CLASSES.content, p.class)
                 }), {
                 get ["data-theme"] () {
-                    return local.dataTheme;
+                    return p.dataTheme;
                 },
                 "data-slot": "table-content",
                 get ["data-sort-column"] () {
-                    return local.sortDescriptor?.column;
+                    return p.sortDescriptor?.column;
                 },
                 get ["data-sort-direction"] () {
-                    return local.sortDescriptor?.direction;
+                    return p.sortDescriptor?.direction;
                 }
-            }, rest), false, true);
-            insert(_el$, ()=>local.children);
+            }, rest), true);
+            insert(_el$, ()=>p.children);
             return _el$;
         }
     });

package/dist/components/table/TableExpandedRow.generated.d.ts

@@ -1,8 +1,8 @@
 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 TableExpandedRowProps = JSX.HTMLAttributes<HTMLTableRowElement> & UIBaseProps & {
-    colSpan: number;
+    colspan: number;
     cellClass?: string;
     cellClassName?: string;
     cellDataTheme?: string;

package/dist/components/table/TableExpandedRow.generated.js

@@ -1,41 +1,33 @@
-import { createComponent, mergeProps } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
-import { splitProps } from "solid-js";
-import { twMerge } from "tailwind-merge";
+import { createComponent, mergeProps } 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, tableExpandedRowRecipe } from "./Table.recipe.js";
 import TableCell_generated from "./TableCell.generated.js";
 import TableRow_generated from "./TableRow.generated.js";
 const __solidLayoutTableExpandedRow = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme",
-        "colSpan",
-        "cellClass",
-        "cellClassName",
-        "cellDataTheme"
-    ]);
+    const rest = omit(p, "children", "class", "dataTheme", "colspan", "cellClass", "cellClassName", "cellDataTheme");
     return createComponent(TableRow_generated, mergeProps(()=>({
-            class: twMerge(CLASSES.expandedRow, local.class)
+            class: twMerge(CLASSES.expandedRow, p.class)
         }), {
         get ["data-theme"] () {
-            return local.dataTheme;
+            return p.dataTheme;
         },
         "data-slot": "table-expanded-row"
     }, rest, {
         get children () {
             return createComponent(TableCell_generated, mergeProps({
-                get colSpan () {
-                    return local.colSpan;
+                get colspan () {
+                    return p.colspan;
                 }
             }, ()=>({
-                    class: twMerge(CLASSES.expandedCell, local.cellClass, local.cellClassName)
+                    class: twMerge(CLASSES.expandedCell, p.cellClass, p.cellClassName)
                 }), {
                 get dataTheme () {
-                    return local.cellDataTheme ?? local.dataTheme;
+                    return p.cellDataTheme ?? p.dataTheme;
                 },
                 get children () {
-                    return local.children;
+                    return p.children;
                 }
             }));
         }

package/dist/components/table/TableFooter.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 TableFooterProps = JSX.HTMLAttributes<HTMLDivElement> & UIBaseProps;
 declare const TableFooter: __LayoutComponent<TableFooterProps>;

package/dist/components/table/TableFooter.generated.js

@@ -1,28 +1,22 @@
-import { insert, 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 { insert, 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, tableFooterRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutTableFooter = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>({
-                class: twMerge(CLASSES.footer, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "table-footer"
-        }, rest), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const rest = omit(p, "children", "class", "dataTheme");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(()=>({
+            class: twMerge(CLASSES.footer, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "table-footer"
+    }, rest), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const TableFooter = defineComponent({
     recipe: tableFooterRecipe,

package/dist/components/table/TableHeader.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 TableHeaderProps = JSX.HTMLAttributes<HTMLTableSectionElement> & UIBaseProps;
 declare const TableHeader: __LayoutComponent<TableHeaderProps>;

package/dist/components/table/TableHeader.generated.js

@@ -1,28 +1,22 @@
-import { insert, 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 { insert, 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, tableHeaderRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<thead>");
 const __solidLayoutTableHeader = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>({
-                class: twMerge(CLASSES.header, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "table-header"
-        }, rest), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const rest = omit(p, "children", "class", "dataTheme");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(()=>({
+            class: twMerge(CLASSES.header, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "table-header"
+    }, rest), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const TableHeader = defineComponent({
     recipe: tableHeaderRecipe,

package/dist/components/table/TableLoadMore.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 TableLoadMoreProps = JSX.HTMLAttributes<HTMLTableRowElement> & UIBaseProps;
 declare const TableLoadMore: __LayoutComponent<TableLoadMoreProps>;

package/dist/components/table/TableLoadMore.generated.js

@@ -1,28 +1,22 @@
-import { insert, 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 { insert, 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, tableLoadMoreRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<tr>");
 const __solidLayoutTableLoadMore = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>({
-                class: twMerge(CLASSES.loadMore, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "table-load-more"
-        }, rest), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const rest = omit(p, "children", "class", "dataTheme");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(()=>({
+            class: twMerge(CLASSES.loadMore, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "table-load-more"
+    }, rest), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const TableLoadMore = defineComponent({
     recipe: tableLoadMoreRecipe,

package/dist/components/table/TableLoadMoreContent.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 TableLoadMoreContentProps = JSX.HTMLAttributes<HTMLDivElement> & UIBaseProps;
 declare const TableLoadMoreContent: __LayoutComponent<TableLoadMoreContentProps>;

package/dist/components/table/TableLoadMoreContent.generated.js

@@ -1,28 +1,22 @@
-import { insert, 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 { insert, 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, tableLoadMoreContentRecipe } from "./Table.recipe.js";
 var _tmpl$ = /*#__PURE__*/ template("<div>");
 const __solidLayoutTableLoadMoreContent = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "children",
-        "class",
-        "dataTheme"
-    ]);
-    return (()=>{
-        var _el$ = _tmpl$();
-        spread(_el$, mergeProps(()=>({
-                class: twMerge(CLASSES.loadMoreContent, local.class)
-            }), {
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            "data-slot": "table-load-more-content"
-        }, rest), false, true);
-        insert(_el$, ()=>local.children);
-        return _el$;
-    })();
+    const rest = omit(p, "children", "class", "dataTheme");
+    var _el$ = _tmpl$();
+    spread(_el$, mergeProps(()=>({
+            class: twMerge(CLASSES.loadMoreContent, p.class)
+        }), {
+        get ["data-theme"] () {
+            return p.dataTheme;
+        },
+        "data-slot": "table-load-more-content"
+    }, rest), true);
+    insert(_el$, ()=>p.children);
+    return _el$;
 };
 const TableLoadMoreContent = defineComponent({
     recipe: tableLoadMoreContentRecipe,

package/dist/components/table/TablePageSize.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 TablePageSizeProps = Omit<JSX.SelectHTMLAttributes<HTMLSelectElement>, "onChange"> & UIBaseProps & {
     value: number;