@pathscale/ui 2.5.0 → 2.6.0

package/dist/components/combo-box/ComboBox.recipe.d.ts

@@ -40,7 +40,7 @@ export declare const CLASSES: {
         readonly end: "combo-box__icon--end";
     };
 };
-export declare const componentRecipe: import("solid-layouts").Recipe<{
+export declare const componentRecipe: import("solid-layouts/solid-2").Recipe<{
     readonly component: "combo-box";
     readonly slots: {
         readonly combobox: {};

package/dist/components/composer/Composer.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./Composer.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { ChangeReason, Issue, Radius, Size, State, UIBaseProps, Variant } from "../vocabulary";
 export type ComposerProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "onChange" | "onSubmit" | "children"> & UIBaseProps & {
     value?: string;

package/dist/components/composer/Composer.generated.js

@@ -1,11 +1,11 @@
-import { createComponent, effect, insert, mergeProps, setAttribute, spread, template, use } from "solid-js/web";
-import { defineComponent } from "solid-layouts/application-boundary";
+import { createComponent, effect, insert, mergeProps, ref, setAttribute, spread, template } from "@solidjs/web";
+import { defineComponent } from "solid-layouts/solid-2/application-boundary";
 import "./Composer.css";
-import { For, Show, createEffect, createSignal, onMount } from "solid-js";
+import { For, Show, createEffect, createSignal, onSettled } from "solid-js";
 import { isInvalid, resolveState } from "../vocabulary.js";
 import { composer } from "./Composer.recipe.js";
 import { afterValueLands, autosize, boundsFromRows, isSubmittable, newAutosizeMemo, shouldSubmit, viewportHeight } from "./Composer.interactions.js";
-var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<ul>"), _tmpl$3 = /*#__PURE__*/ template("<div><textarea></textarea><div><button>"), _tmpl$4 = /*#__PURE__*/ template("<li>");
+var _tmpl$ = /*#__PURE__*/ template("<span>"), _tmpl$2 = /*#__PURE__*/ template("<ul>"), _tmpl$3 = /*#__PURE__*/ template("<div><textarea></textarea><div><!><!><button>"), _tmpl$4 = /*#__PURE__*/ template("<li>");
 const __solidLayoutComposerLayout = (_stable, p)=>{
     const [internal, setInternal] = createSignal(p.defaultValue ?? "");
     const value = ()=>p.value ?? internal();
@@ -18,7 +18,7 @@ const __solidLayoutComposerLayout = (_stable, p)=>{
         const bounds = boundsFromRows(p.minRows ?? 1, p.maxRows ?? 8, viewportHeight(p.viewportHeight));
         p.onHeightChange?.(autosize(field, bounds, memo));
     };
-    onMount(()=>{
+    onSettled(()=>{
         if (p.autofocus) field?.focus();
         measure();
     });
@@ -37,113 +37,113 @@ const __solidLayoutComposerLayout = (_stable, p)=>{
         p.onSubmit?.(message);
         if (void 0 === p.value) setInternal("");
     };
-    return (()=>{
-        var _el$ = _tmpl$3(), _el$2 = _el$.firstChild, _el$3 = _el$2.nextSibling, _el$7 = _el$3.firstChild;
-        spread(_el$, mergeProps(()=>_stable.slot.root, {
-            get ["data-state"] () {
-                return state();
-            }
-        }), false, true);
-        var _ref$ = field;
-        "function" == typeof _ref$ ? use(_ref$, _el$2) : field = _el$2;
-        spread(_el$2, mergeProps(()=>_stable.slot.field, {
-            get name () {
-                return p.name;
-            },
-            get value () {
-                return value();
-            },
-            get rows () {
-                return p.minRows ?? 1;
-            },
-            get placeholder () {
-                return p.placeholder;
-            },
-            get disabled () {
-                return "disabled" === p.state;
-            },
-            get ["aria-invalid"] () {
-                return isInvalid(p.issues) ? "true" : void 0;
-            },
-            onInput: (event)=>{
-                write(event.currentTarget.value, "input");
-                measure();
-            },
-            onPaste: ()=>afterValueLands(measure),
-            onKeyDown: (event)=>{
-                if (!shouldSubmit(event, false !== p.submitOnEnter)) return;
-                event.preventDefault();
-                submit();
-            }
-        }), false, false);
-        spread(_el$3, mergeProps(()=>_stable.slot.toolbar), false, true);
-        insert(_el$3, createComponent(Show, {
-            get when () {
-                return p.lead;
-            },
-            get children () {
-                var _el$4 = _tmpl$();
-                spread(_el$4, mergeProps(()=>_stable.slot.lead), false, true);
-                insert(_el$4, ()=>p.lead);
-                return _el$4;
-            }
-        }), _el$7);
-        insert(_el$3, createComponent(Show, {
-            get when () {
-                return p.hint;
-            },
-            get children () {
-                var _el$5 = _tmpl$();
-                spread(_el$5, mergeProps(()=>_stable.slot.hint), false, true);
-                insert(_el$5, ()=>p.hint);
-                return _el$5;
-            }
-        }), _el$7);
-        insert(_el$3, createComponent(Show, {
-            get when () {
-                return p.trail;
-            },
-            get children () {
-                var _el$6 = _tmpl$();
-                spread(_el$6, mergeProps(()=>_stable.slot.trail), false, true);
-                insert(_el$6, ()=>p.trail);
-                return _el$6;
-            }
-        }), _el$7);
-        spread(_el$7, mergeProps(()=>_stable.slot.submit, {
-            type: "button",
-            onClick: submit,
-            get disabled () {
-                return busy() || !isSubmittable(value());
-            },
-            get ["data-loading"] () {
-                return "loading" === p.state ? "true" : "false";
-            }
-        }), false, true);
-        insert(_el$7, ()=>p.submitLabel ?? "Send");
-        insert(_el$, createComponent(Show, {
-            get when () {
-                return p.issues?.length;
-            },
-            get children () {
-                var _el$8 = _tmpl$2();
-                spread(_el$8, mergeProps(()=>_stable.slot.issues), false, true);
-                insert(_el$8, createComponent(For, {
-                    get each () {
-                        return p.issues;
-                    },
-                    children: (issue)=>(()=>{
-                            var _el$9 = _tmpl$4();
-                            insert(_el$9, ()=>issue.message ?? issue.code);
-                            effect(()=>setAttribute(_el$9, "data-severity", issue.severity ?? "error"));
-                            return _el$9;
-                        })()
-                }));
-                return _el$8;
-            }
-        }), null);
-        return _el$;
-    })();
+    var _el$ = _tmpl$3(), _el$2 = _el$.firstChild, _el$3 = _el$2.nextSibling, _el$8 = _el$3.firstChild, _el$9 = _el$8.nextSibling, _el$7 = _el$9.nextSibling;
+    spread(_el$, mergeProps(()=>_stable.slot.root, {
+        get ["data-state"] () {
+            return state();
+        }
+    }), true);
+    var _ref$ = field;
+    "function" == typeof _ref$ || Array.isArray(_ref$) ? ref(()=>_ref$, _el$2) : field = _el$2;
+    spread(_el$2, mergeProps(()=>_stable.slot.field, {
+        get name () {
+            return p.name;
+        },
+        get value () {
+            return value();
+        },
+        get rows () {
+            return p.minRows ?? 1;
+        },
+        get placeholder () {
+            return p.placeholder;
+        },
+        get disabled () {
+            return "disabled" === p.state;
+        },
+        get ["aria-invalid"] () {
+            return isInvalid(p.issues) ? "true" : void 0;
+        },
+        onInput: (event)=>{
+            write(event.currentTarget.value, "input");
+            measure();
+        },
+        onPaste: ()=>afterValueLands(measure),
+        onKeyDown: (event)=>{
+            if (!shouldSubmit(event, false !== p.submitOnEnter)) return;
+            event.preventDefault();
+            submit();
+        }
+    }), false);
+    spread(_el$3, mergeProps(()=>_stable.slot.toolbar), true);
+    insert(_el$3, createComponent(Show, {
+        get when () {
+            return p.lead;
+        },
+        get children () {
+            var _el$4 = _tmpl$();
+            spread(_el$4, mergeProps(()=>_stable.slot.lead), true);
+            insert(_el$4, ()=>p.lead);
+            return _el$4;
+        }
+    }), _el$8);
+    insert(_el$3, createComponent(Show, {
+        get when () {
+            return p.hint;
+        },
+        get children () {
+            var _el$5 = _tmpl$();
+            spread(_el$5, mergeProps(()=>_stable.slot.hint), true);
+            insert(_el$5, ()=>p.hint);
+            return _el$5;
+        }
+    }), _el$9);
+    insert(_el$3, createComponent(Show, {
+        get when () {
+            return p.trail;
+        },
+        get children () {
+            var _el$6 = _tmpl$();
+            spread(_el$6, mergeProps(()=>_stable.slot.trail), true);
+            insert(_el$6, ()=>p.trail);
+            return _el$6;
+        }
+    }), _el$7);
+    spread(_el$7, mergeProps(()=>_stable.slot.submit, {
+        type: "button",
+        onClick: submit,
+        get disabled () {
+            return busy() || !isSubmittable(value());
+        },
+        get ["data-loading"] () {
+            return "loading" === p.state ? "true" : "false";
+        }
+    }), true);
+    insert(_el$7, ()=>p.submitLabel ?? "Send");
+    insert(_el$, createComponent(Show, {
+        get when () {
+            return p.issues?.length;
+        },
+        get children () {
+            var _el$0 = _tmpl$2();
+            spread(_el$0, mergeProps(()=>_stable.slot.issues), true);
+            insert(_el$0, createComponent(For, {
+                get each () {
+                    return p.issues;
+                },
+                children: (issue)=>(()=>{
+                        var _el$1 = _tmpl$4();
+                        insert(_el$1, ()=>issue.message ?? issue.code);
+                        effect(()=>issue.severity ?? "error", (_v$)=>{
+                            setAttribute(_el$1, "data-severity", _v$);
+                        });
+                        return _el$1;
+                    })()
+            }));
+            return _el$0;
+        }
+    }), null);
+    return _el$;
 };
 const ComposerLayout = defineComponent({
     recipe: composer,

package/dist/components/composer/Composer.recipe.d.ts

@@ -11,7 +11,7 @@
  * eight repositories hand-rolling Enter handling. Usage said one site; the
  * roadmap says every site, because support.cafe chat is going on all of them.
  */
-export declare const composer: import("solid-layouts").Recipe<{
+export declare const composer: import("solid-layouts/solid-2").Recipe<{
     readonly component: "composer";
     readonly element: "div";
     readonly slots: {

package/dist/components/data-grid/DataGrid.generated.d.ts

@@ -1,6 +1,6 @@
 import type { Component as __LayoutComponent } from "solid-js";
 import "./DataGrid.css";
-import { type JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { Flavor, Size, UIBaseProps, Width } from "../vocabulary";
 import type { DataGridModel, DataGridRow, DataGridSort } from "./createDataGrid";
 export type DataGridBorders = "none" | "rows" | "cols" | "both";

package/dist/components/data-grid/DataGrid.generated.js

@@ -1,77 +1,60 @@
-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 "./DataGrid.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 button_0 from "../button/index.js";
 import checkbox_0 from "../checkbox/index.js";
 import { SortIcon, TableBody, TableCell, TableColumn, TableContent, TableFooter, TableHeader, TableRoot, TableRow, TableScrollContainer } from "../table/index.js";
 import { cellContent, columnSpan, formatCell, rangeLabel, readInputValue, searchPlaceholder } from "./DataGrid.interactions.js";
 import { CLASSES, componentRecipe } from "./DataGrid.recipe.js";
-var _tmpl$ = /*#__PURE__*/ template("<div>"), _tmpl$2 = /*#__PURE__*/ template("<caption>"), _tmpl$3 = /*#__PURE__*/ template("<span>"), _tmpl$4 = /*#__PURE__*/ template("<label><span></span><input>");
+var _tmpl$ = /*#__PURE__*/ template("<div>"), _tmpl$2 = /*#__PURE__*/ template("<caption>"), _tmpl$3 = /*#__PURE__*/ template("<span>"), _tmpl$4 = /*#__PURE__*/ template("<label><span></span><input>"), _tmpl$5 = /*#__PURE__*/ template("<span><!><!>");
 const __solidLayoutDataGrid = (_stable, p)=>{
-    const [local, rest] = splitProps(p, [
-        "model",
-        "borders",
-        "striping",
-        "sticky",
-        "interactive",
-        "size",
-        "width",
-        "flavor",
-        "caption",
-        "empty",
-        "renderExpanded",
-        "onSortChange",
-        "onPageChange",
-        "onSelectionChange",
-        "class",
-        "dataTheme"
-    ]);
-    const borders = ()=>local.borders ?? "rows";
-    const striping = ()=>local.striping ?? "none";
-    const sticky = ()=>local.sticky ?? "none";
-    const size = ()=>local.size ?? "md";
-    const searchable = ()=>local.model.visibleColumns().filter((column)=>column.searchable);
-    const selects = ()=>"none" !== local.model.selectionMode();
-    const paginates = ()=>local.model.pageSize() > 0;
-    const span = ()=>columnSpan(local.model.visibleColumns().length, selects());
+    const rest = omit(p, "model", "borders", "striping", "sticky", "interactive", "size", "width", "flavor", "caption", "empty", "renderExpanded", "onSortChange", "onPageChange", "onSelectionChange", "class", "dataTheme");
+    const borders = ()=>p.borders ?? "rows";
+    const striping = ()=>p.striping ?? "none";
+    const sticky = ()=>p.sticky ?? "none";
+    const size = ()=>p.size ?? "md";
+    const searchable = ()=>p.model.visibleColumns().filter((column)=>column.searchable);
+    const selects = ()=>"none" !== p.model.selectionMode();
+    const paginates = ()=>p.model.pageSize() > 0;
+    const span = ()=>columnSpan(p.model.visibleColumns().length, selects());
     const allOnPageSelected = ()=>{
-        const rows = local.model.pageRows();
+        const rows = p.model.pageRows();
         if (0 === rows.length) return false;
-        return rows.every((row, index)=>local.model.isSelected(row, index));
+        return rows.every((row, index)=>p.model.isSelected(row, index));
     };
     const changeSort = (descriptor)=>{
-        local.model.sortByColumn(descriptor.column);
-        local.onSortChange?.(local.model.sort());
+        p.model.sortByColumn(descriptor.column);
+        p.onSortChange?.(p.model.sort());
     };
     const changePage = (page)=>{
-        local.model.switchPage(page);
-        local.onPageChange?.(local.model.page());
+        p.model.switchPage(page);
+        p.onPageChange?.(p.model.page());
     };
     const changeSelection = (row, index)=>{
-        local.model.toggleCheck(row, index);
-        local.onSelectionChange?.(local.model.selectedIds());
+        p.model.toggleCheck(row, index);
+        p.onSelectionChange?.(p.model.selectedIds());
     };
     const changeSelectAll = (selected)=>{
-        local.model.toggleCheckAll(selected);
-        local.onSelectionChange?.(local.model.selectedIds());
+        p.model.toggleCheckAll(selected);
+        p.onSelectionChange?.(p.model.selectedIds());
     };
     return createComponent(TableRoot, mergeProps(()=>({
-            class: twMerge(CLASSES.root, CLASSES.borders[borders()], CLASSES.striping[striping()], CLASSES.sticky[sticky()], CLASSES.size[size()], local.interactive ? CLASSES.interactive : void 0, local.class)
+            class: twMerge(CLASSES.root, CLASSES.borders[borders()], CLASSES.striping[striping()], CLASSES.sticky[sticky()], CLASSES.size[size()], p.interactive ? CLASSES.interactive : void 0, p.class)
         }), {
         get ["data-theme"] () {
-            return local.dataTheme;
+            return p.dataTheme;
         },
         "data-slot": "data-grid",
         get ["data-flavor"] () {
-            return local.flavor;
+            return p.flavor;
         },
         get ["data-width"] () {
-            return local.width;
+            return p.width;
         },
         get ["data-selection"] () {
-            return local.model.selectionMode();
+            return p.model.selectionMode();
         }
     }, rest, {
         get children () {
@@ -86,7 +69,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                 class: CLASSES.toolbar
                             }), {
                             "data-slot": "data-grid-toolbar"
-                        }), false, true);
+                        }), true);
                         insert(_el$, createComponent(For, {
                             get each () {
                                 return searchable();
@@ -97,23 +80,23 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                             class: CLASSES.search
                                         }), {
                                         "data-slot": "data-grid-search"
-                                    }), false, true);
+                                    }), true);
                                     spread(_el$5, mergeProps(()=>({
                                             class: CLASSES.searchLabel
-                                        })), false, true);
+                                        })), true);
                                     insert(_el$5, ()=>searchPlaceholder(column.label));
                                     spread(_el$6, mergeProps(()=>({
                                             class: CLASSES.searchInput
                                         }), {
                                         type: "search",
                                         get value () {
-                                            return local.model.queries()[column.name] ?? "";
+                                            return p.model.queries()[column.name] ?? "";
                                         },
                                         get placeholder () {
                                             return searchPlaceholder(column.label);
                                         },
-                                        onInput: (event)=>local.model.searchColumn(column.name, readInputValue(event))
-                                    }), false, false);
+                                        onInput: (event)=>p.model.searchColumn(column.name, readInputValue(event))
+                                    }), false);
                                     return _el$4;
                                 })()
                         }));
@@ -124,18 +107,18 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                     get children () {
                         return createComponent(TableContent, {
                             get sortDescriptor () {
-                                return local.model.sort() ?? void 0;
+                                return p.model.sort() ?? void 0;
                             },
                             onSortChange: changeSort,
                             get children () {
                                 return [
                                     createComponent(Show, {
                                         get when () {
-                                            return local.caption;
+                                            return p.caption;
                                         },
                                         get children () {
                                             var _el$2 = _tmpl$2();
-                                            insert(_el$2, ()=>local.caption);
+                                            insert(_el$2, ()=>p.caption);
                                             return _el$2;
                                         }
                                     }),
@@ -168,7 +151,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                         }),
                                                         createComponent(For, {
                                                             get each () {
-                                                                return local.model.visibleColumns();
+                                                                return p.model.visibleColumns();
                                                             },
                                                             children: (column)=>createComponent(TableColumn, mergeProps({
                                                                     get id () {
@@ -189,11 +172,11 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                         } : void 0;
                                                                     },
                                                                     children: (state)=>(()=>{
-                                                                            var _el$7 = _tmpl$3();
+                                                                            var _el$7 = _tmpl$5(), _el$8 = _el$7.firstChild, _el$9 = _el$8.nextSibling;
                                                                             spread(_el$7, mergeProps(()=>({
                                                                                     class: CLASSES.headerButton
-                                                                                })), false, true);
-                                                                            insert(_el$7, ()=>column.label, null);
+                                                                                })), true);
+                                                                            insert(_el$7, ()=>column.label, _el$8);
                                                                             insert(_el$7, createComponent(Show, {
                                                                                 get when () {
                                                                                     return column.sortable;
@@ -205,7 +188,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                                         }
                                                                                     });
                                                                                 }
-                                                                            }), null);
+                                                                            }), _el$9);
                                                                             return _el$7;
                                                                         })()
                                                                 }))
@@ -220,12 +203,12 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                             return [
                                                 createComponent(For, {
                                                     get each () {
-                                                        return local.model.groupedRows();
+                                                        return p.model.groupedRows();
                                                     },
                                                     children: (group)=>[
                                                             createComponent(Show, {
                                                                 get when () {
-                                                                    return local.model.groupBy();
+                                                                    return p.model.groupBy();
                                                                 },
                                                                 get children () {
                                                                     return createComponent(TableRow, mergeProps(()=>({
@@ -234,7 +217,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                         "data-slot": "data-grid-group-row",
                                                                         get children () {
                                                                             return createComponent(TableCell, {
-                                                                                get colSpan () {
+                                                                                get colspan () {
                                                                                     return span();
                                                                                 },
                                                                                 get children () {
@@ -252,7 +235,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                 children: (row, index)=>[
                                                                         createComponent(TableRow, {
                                                                             get ["data-selected"] () {
-                                                                                return local.model.isSelected(row, index()) ? "true" : void 0;
+                                                                                return p.model.isSelected(row, index()) ? "true" : void 0;
                                                                             },
                                                                             get children () {
                                                                                 return [
@@ -268,7 +251,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                                                     return createComponent(checkbox_0, {
                                                                                                         "aria-label": "Select row",
                                                                                                         get checked () {
-                                                                                                            return local.model.isSelected(row, index());
+                                                                                                            return p.model.isSelected(row, index());
                                                                                                         },
                                                                                                         onChange: ()=>changeSelection(row, index())
                                                                                                     });
@@ -278,7 +261,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                                     }),
                                                                                     createComponent(For, {
                                                                                         get each () {
-                                                                                            return local.model.visibleColumns();
+                                                                                            return p.model.visibleColumns();
                                                                                         },
                                                                                         children: (column)=>createComponent(TableCell, mergeProps(()=>({
                                                                                                     class: CLASSES.cell
@@ -299,17 +282,17 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                         }),
                                                                         createComponent(Show, {
                                                                             get when () {
-                                                                                return local.renderExpanded;
+                                                                                return p.renderExpanded;
                                                                             },
                                                                             get children () {
                                                                                 return createComponent(TableRow, {
                                                                                     get children () {
                                                                                         return createComponent(TableCell, {
-                                                                                            get colSpan () {
+                                                                                            get colspan () {
                                                                                                 return span();
                                                                                             },
                                                                                             get children () {
-                                                                                                return local.renderExpanded?.(row);
+                                                                                                return p.renderExpanded?.(row);
                                                                                             }
                                                                                         });
                                                                                     }
@@ -322,13 +305,13 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                 }),
                                                 createComponent(Show, {
                                                     get when () {
-                                                        return 0 === local.model.pageRows().length;
+                                                        return 0 === p.model.pageRows().length;
                                                     },
                                                     get children () {
                                                         return createComponent(TableRow, {
                                                             get children () {
                                                                 return createComponent(TableCell, mergeProps({
-                                                                    get colSpan () {
+                                                                    get colspan () {
                                                                         return span();
                                                                     }
                                                                 }, ()=>({
@@ -336,7 +319,7 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                                                     }), {
                                                                     "data-slot": "data-grid-empty",
                                                                     get children () {
-                                                                        return local.empty ?? "No rows";
+                                                                        return p.empty ?? "No rows";
                                                                     }
                                                                 }));
                                                             }
@@ -366,8 +349,8 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                         var _el$3 = _tmpl$3();
                                         spread(_el$3, mergeProps(()=>({
                                                 class: CLASSES.pageStatus
-                                            })), false, true);
-                                        insert(_el$3, ()=>rangeLabel(local.model.page(), local.model.pageSize(), local.model.total()));
+                                            })), true);
+                                        insert(_el$3, ()=>rangeLabel(p.model.page(), p.model.pageSize(), p.model.total()));
                                         return _el$3;
                                     })(),
                                     createComponent(button_0, {
@@ -375,9 +358,9 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                         size: "sm",
                                         "aria-label": "Previous page",
                                         get state () {
-                                            return 0 === local.model.page() ? "disabled" : "default";
+                                            return 0 === p.model.page() ? "disabled" : "default";
                                         },
-                                        onClick: ()=>changePage(local.model.page() - 1),
+                                        onClick: ()=>changePage(p.model.page() - 1),
                                         children: "Previous"
                                     }),
                                     createComponent(button_0, {
@@ -385,9 +368,9 @@ const __solidLayoutDataGrid = (_stable, p)=>{
                                         size: "sm",
                                         "aria-label": "Next page",
                                         get state () {
-                                            return local.model.page() >= local.model.pageCount() - 1 ? "disabled" : "default";
+                                            return p.model.page() >= p.model.pageCount() - 1 ? "disabled" : "default";
                                         },
-                                        onClick: ()=>changePage(local.model.page() + 1),
+                                        onClick: ()=>changePage(p.model.page() + 1),
                                         children: "Next"
                                     })
                                 ];

package/dist/components/data-grid/DataGrid.interactions.d.ts

@@ -5,7 +5,7 @@ export declare const columnSpan: (visible: number, hasSelection: boolean) => num
 export declare const pageLabel: (page: number, pageCount: number) => string;
 export declare const rangeLabel: (page: number, pageSize: number, total: number) => string;
 export declare const searchPlaceholder: (label: string) => string;
-export declare const cellContent: <Row extends DataGridRow>(column: DataGridColumn<Row>, row: Row, index: number) => string | number | boolean | Node | import("solid-js").JSX.ArrayElement | null | undefined;
+export declare const cellContent: <Row extends DataGridRow>(column: DataGridColumn<Row>, row: Row, index: number) => string | number | boolean | import("solid-js/types/types.js").RenderedElement | Node | import("@solidjs/web").JSX.ArrayElement | null | undefined;
 export declare const readInputValue: (event: {
     currentTarget: HTMLInputElement;
 }) => string;