From d39f88a7545177f6cad7bc1377c6273b28b3f370 Mon Sep 17 00:00:00 2001
From: Chris Kruining <c.kruining@4dotnet.nl>
Date: Fri, 3 Jan 2025 04:57:05 +0100
Subject: [PATCH] refactor 'rows' -> 'data'

---
 src/components/grid/grid.tsx              | 16 ++++++++--------
 src/components/table/dataset.ts           |  5 ++---
 src/components/table/table.tsx            |  6 +++---
 src/features/file/grid.tsx                |  2 +-
 src/routes/(editor)/experimental/grid.tsx |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/components/grid/grid.tsx b/src/components/grid/grid.tsx
index ad3f036..8d127bc 100644
--- a/src/components/grid/grid.tsx
+++ b/src/components/grid/grid.tsx
@@ -31,30 +31,30 @@ const GridContext = createContext<GridContextType<any>>();
 
 const useGrid = () => useContext(GridContext)!;
 
-type GridProps<T extends Record<string, any>> = { class?: string, groupBy?: keyof T, columns: Column<T>[], rows: DataSet<T>, api?: (api: GridApi<T>) => any };
+type GridProps<T extends Record<string, any>> = { class?: string, groupBy?: keyof T, columns: Column<T>[], data: DataSet<T>, api?: (api: GridApi<T>) => any };
 
 export function Grid<T extends Record<string, any>>(props: GridProps<T>) {
     const [table, setTable] = createSignal<TableApi<T>>();
 
-    const rows = createMemo(() => props.rows);
+    const data = createMemo(() => props.data);
     const columns = createMemo(() => props.columns as TableColumn<T>[]);
-    const mutations = createMemo(() => rows().mutations());
+    const mutations = createMemo(() => data().mutations());
 
     const ctx: GridContextType<T> = {
         mutations,
         selection: createMemo(() => table()?.selection() ?? []),
 
         mutate<K extends keyof T>(row: number, column: K, value: T[K]) {
-            rows().mutate(row, column, value);
+            data().mutate(row, column, value);
         },
 
         remove(indices: number[]) {
-            rows().remove(indices);
+            data().remove(indices);
             table()?.clear();
         },
 
         insert(row: T, at?: number) {
-            rows().insert(row, at);
+            data().insert(row, at);
         },
 
         addColumn(column: keyof T, value: T[keyof T]): void {
@@ -81,7 +81,7 @@ export function Grid<T extends Record<string, any>>(props: GridProps<T>) {
     return <GridContext.Provider value={ctx}>
         <Api api={props.api} table={table()} />
 
-        <Table api={setTable} class={`${css.grid} ${props.class}`} rows={rows()} columns={columns()} selectionMode={SelectionMode.Multiple}>{
+        <Table api={setTable} class={`${css.grid} ${props.class}`} rows={data()} columns={columns()} selectionMode={SelectionMode.Multiple}>{
             cellRenderers()
         }</Table>
     </GridContext.Provider>;
@@ -107,7 +107,7 @@ function Api<T extends Record<string, any>>(props: { api: undefined | ((api: Gri
                 gridContext.insert(row, at);
             },
             addColumn(column: keyof T): void {
-                // gridContext.addColumn(column, value);
+                gridContext.addColumn(column, value);
             },
         };
     });
diff --git a/src/components/table/dataset.ts b/src/components/table/dataset.ts
index 86082b6..e2bb17d 100644
--- a/src/components/table/dataset.ts
+++ b/src/components/table/dataset.ts
@@ -91,6 +91,8 @@ export const createDataSet = <T extends Record<string, any>>(data: T[], initialO
             value = implementation(value as DataSetRowNode<number, T>[]);
         }
 
+        console.log('dataset => nodes', value);
+
         return value as DataSetNode<keyof T, T>[];
     });
 
@@ -101,9 +103,6 @@ export const createDataSet = <T extends Record<string, any>>(data: T[], initialO
         return deepDiff(state.snapshot, state.value).toArray();
     });
 
-    const sorting = createMemo(() => state.sorting);
-    const grouping = createMemo(() => state.grouping);
-
     const set: DataSet<T> = {
         data,
         nodes,
diff --git a/src/components/table/table.tsx b/src/components/table/table.tsx
index 4a35881..1a4ad48 100644
--- a/src/components/table/table.tsx
+++ b/src/components/table/table.tsx
@@ -73,12 +73,12 @@ export function Table<T extends Record<string, any>>(props: TableProps<T>) {
         <SelectionProvider selection={setSelection} multiSelect={props.selectionMode === SelectionMode.Multiple}>
             <Api api={props.api} />
 
-            <InnerTable class={props.class} summary={props.summary} rows={rows()} />
+            <InnerTable class={props.class} summary={props.summary} data={rows()} />
         </SelectionProvider>
     </TableContext.Provider>;
 };
 
-type InnerTableProps<T extends Record<string, any>> = { class?: string, summary?: string, rows: DataSet<T> };
+type InnerTableProps<T extends Record<string, any>> = { class?: string, summary?: string, data: DataSet<T> };
 
 function InnerTable<T extends Record<string, any>>(props: InnerTableProps<T>) {
     const table = useTable<T>();
@@ -97,7 +97,7 @@ function InnerTable<T extends Record<string, any>>(props: InnerTableProps<T>) {
         <Head />
 
         <tbody class={css.main}>
-            <For each={props.rows.nodes() as DataSetNode<number, T>[]}>{
+            <For each={props.data.nodes() as DataSetNode<number, T>[]}>{
                 node => <Node node={node} depth={0} />
             }</For>
         </tbody>
diff --git a/src/features/file/grid.tsx b/src/features/file/grid.tsx
index fc32a3e..4d8ec7e 100644
--- a/src/features/file/grid.tsx
+++ b/src/features/file/grid.tsx
@@ -71,7 +71,7 @@ export function Grid(props: { class?: string, rows: Entry[], locales: string[],
         });
     });
 
-    return <GridComp rows={rows()} columns={columns()} api={setApi} />;
+    return <GridComp data={rows()} columns={columns()} api={setApi} />;
 };
 
 const TextArea: Component<{ row: number, key: string, lang: string, value: string, oninput?: (event: InputEvent) => any }> = (props) => {
diff --git a/src/routes/(editor)/experimental/grid.tsx b/src/routes/(editor)/experimental/grid.tsx
index d92addd..1b425bd 100644
--- a/src/routes/(editor)/experimental/grid.tsx
+++ b/src/routes/(editor)/experimental/grid.tsx
@@ -90,7 +90,7 @@ export default function GridExperiment() {
         </Sidebar>
 
         <div class={css.content}>
-            <Grid class={css.table} api={setApi} rows={rows} columns={columns} groupBy="country" />
+            <Grid class={css.table} api={setApi} data={rows} columns={columns} groupBy="country" />
 
             <fieldset class={css.mutaions}>
                 <legend>Mutations ({mutations().length})</legend>