@1771technologies/lytenyte-pro 1.0.2 → 1.0.3

package/dist/state/api/edit-begin.js

@@ -1,4 +1,4 @@
-import { focusCell, isFullWidthMap } from "@1771technologies/lytenyte-shared";
+import { focusCell } from "@1771technologies/lytenyte-shared";
 import { runWithBackoff } from "@1771technologies/lytenyte-js-utils";
 import { editOnChange } from "../helpers/edit-on-change.js";
 export const makeEditBegin = (grid) => {
@@ -38,18 +38,14 @@ export const makeEditBegin = (grid) => {
         grid.api.scrollIntoView({ column, row: params.rowIndex });
         // Let's try begin the cell edit.
         const run = () => {
-            const layout = i.layout.get();
-            const row = layout.get(params.rowIndex);
-            if (!row)
-                return false;
-            if (isFullWidthMap(row))
-                return true;
             const columnIndex = meta.columnsVisible.indexOf(column);
-            const cell = layout.get(columnIndex);
+            const cell = grid.api.cellRoot(params.rowIndex, columnIndex);
             if (!cell)
                 return false;
+            if (cell.kind === "full-width")
+                return true;
             focusCell({
-                layout,
+                getRootCell: grid.api.cellRoot,
                 focusActive: i.focusActive,
                 id: grid.state.gridId.get(),
                 colIndex: columnIndex,

package/dist/state/api/edit-is-cell-active.d.ts

@@ -1,4 +1,4 @@
-import type { InternalAtoms } from "../+types.js";
+import type { InternalAtoms } from "../+types";
 import type { Grid, GridApi } from "../../+types";
 export declare const makeEditIsCellActive: (grid: Grid<any> & {
     internal: InternalAtoms;

package/dist/state/api/edit-is-cell-active.js

@@ -1,4 +1,3 @@
-import { isFullWidthMap } from "@1771technologies/lytenyte-shared";
 export const makeEditIsCellActive = (grid) => {
     return (params) => {
         const active = grid.internal.editActivePos.get();
@@ -14,13 +13,9 @@ export const makeEditIsCellActive = (grid) => {
             column = meta.columnsVisible.find((c) => c.id === params.column.id);
         if (!column)
             return false;
-        const layout = grid.internal.layout.get();
-        const row = layout.get(params.rowIndex);
-        if (!row || isFullWidthMap(row))
-            return false;
         const colIndex = meta.columnsVisible.indexOf(column);
-        const cell = row.get(colIndex);
-        if (!cell)
+        const cell = grid.api.cellRoot(params.rowIndex, colIndex);
+        if (!cell || cell.kind === "full-width")
             return false;
         return active.column.id === column.id && active.rowIndex === params.rowIndex;
     };

package/dist/state/api/focus-cell.js

@@ -32,7 +32,7 @@ export const makeFocusCell = (grid) => {
                 columnCount: grid.state.columnMeta.get().columnsVisible.length,
                 focusActive: grid.internal.focusActive,
                 id: grid.state.gridId.get(),
-                layout: grid.internal.layout.get(),
+                getRootCell: grid.api.cellRoot,
                 rtl: grid.state.rtl.get(),
                 scrollIntoView: grid.api.scrollIntoView,
             });
@@ -108,7 +108,7 @@ export const makeFocusCell = (grid) => {
             rowIndex: position.row,
             focusActive: grid.internal.focusActive,
             id: grid.state.gridId.get(),
-            layout: grid.internal.layout.get(),
+            getRootCell: grid.api.cellRoot,
             scrollIntoView: grid.api.scrollIntoView,
             vp,
         });

package/dist/state/helpers/column-layout.d.ts

@@ -1,3 +1,3 @@
-import type { PathTableItem, SpanLayout } from "@1771technologies/lytenyte-shared";
-import type { Column, ColumnGroupMeta, HeaderLayoutCell, PositionUnion } from "../../+types";
-export declare function makeColumnLayout<T>(combinedView: PathTableItem<Column<T>>[][], groupMeta: ColumnGroupMeta, b: SpanLayout, focus: PositionUnion | null, floatingRowEnabled: boolean): HeaderLayoutCell<T>[][];
+import type { HeaderLayoutCell } from "../../+types";
+import type { MakeColumnViewReturn } from "./column-view";
+export declare function makeColumnLayout<T>(view: MakeColumnViewReturn<T>, floatingRowEnabled: boolean): HeaderLayoutCell<T>[][];

package/dist/state/helpers/column-layout.js

@@ -1,5 +1,7 @@
-import { rangesOverlap } from "@1771technologies/lytenyte-js-utils";
-export function makeColumnLayout(combinedView, groupMeta, b, focus, floatingRowEnabled) {
+export function makeColumnLayout(view, floatingRowEnabled) {
+    const combinedView = view.combinedView;
+    const groupMeta = view.meta;
+    const centerEnd = view.startCount + view.centerCount;
     const layout = [];
     const floatingRow = [];
     for (let r = 0; r < combinedView.length; r++) {
@@ -8,15 +10,7 @@ export function makeColumnLayout(combinedView, groupMeta, b, focus, floatingRowE
         for (let i = 0; i < row.length; i++) {
             const c = row[i];
             const colS = c.colStart;
-            const colE = c.colStart + c.colSpan;
-            if (!rangesOverlap(colS, colE, b.colStartStart, b.colStartEnd) && // not in start area
-                !rangesOverlap(colS, colE, b.colCenterStart, b.colCenterEnd) && // not in center area
-                !rangesOverlap(colS, colE, b.colEndStart, b.colEndEnd) && // not in end area
-                !(focus && rangesOverlap(colS, colE, focus.colIndex, focus.colIndex + 1)) // not if a cell in the column is focused
-            ) {
-                continue;
-            }
-            const colPin = colS < b.colStartEnd ? "start" : colS >= b.colEndStart ? "end" : null;
+            const colPin = colS < view.startCount ? "start" : colS >= centerEnd ? "end" : null;
             if (c.kind === "leaf") {
                 const vals = {
                     id: c.data.id,
@@ -28,8 +22,8 @@ export function makeColumnLayout(combinedView, groupMeta, b, focus, floatingRowE
                     colStart: c.colStart,
                     colEnd: c.colStart + c.colSpan,
                     colSpan: c.colSpan,
-                    colFirstEndPin: c.colStart === b.colCenterLast ? true : undefined,
-                    colLastStartPin: c.colStart + c.colSpan === b.colStartEnd ? true : undefined,
+                    colFirstEndPin: c.colStart === centerEnd ? true : undefined,
+                    colLastStartPin: c.colStart + c.colSpan === view.startCount ? true : undefined,
                 };
                 rowLayout.push({ kind: "cell", ...vals });
                 if (floatingRowEnabled) {
@@ -53,8 +47,8 @@ export function makeColumnLayout(combinedView, groupMeta, b, focus, floatingRowE
                 groupPath: c.data.groupPath,
                 start: c.data.start,
                 end: c.data.end,
-                colFirstEndPin: c.colStart === b.colCenterLast ? true : undefined,
-                colLastStartPin: c.colStart + c.colSpan === b.colStartEnd ? true : undefined,
+                colFirstEndPin: c.colStart === centerEnd ? true : undefined,
+                colLastStartPin: c.colStart + c.colSpan === view.startCount ? true : undefined,
             });
         }
         layout.push(rowLayout);

package/dist/state/helpers/get-full-width-callback.d.ts

@@ -1,2 +1,2 @@
 import type { Grid, RowDataSource, RowFullWidthPredicate } from "../../+types";
-export declare function getFullWidthCallback<T>(rds: RowDataSource<T>, predicate: RowFullWidthPredicate<T>, grid: Grid<T>): (r: number) => boolean;
+export declare function getFullWidthCallback<T>(rds: RowDataSource<T>, predicate: RowFullWidthPredicate<T> | null, grid: Grid<T>): ((r: number) => boolean) | null;

package/dist/state/helpers/get-full-width-callback.js

@@ -1,4 +1,6 @@
 export function getFullWidthCallback(rds, predicate, grid) {
+    if (!predicate)
+        return null;
     return (r) => {
         const rowNode = rds.rowByIndex(r);
         if (!rowNode)

package/dist/state/helpers/get-span-callback.d.ts

@@ -1,2 +1,2 @@
 import type { Column, Grid, RowDataSource } from "../../+types";
-export declare function getSpanFn<T>(rds: RowDataSource<T>, grid: Grid<T>, visibleColumns: Column<T>[], span: "row" | "col"): (r: number, c: number) => number;
+export declare function getSpanFn<T>(rds: RowDataSource<T>, grid: Grid<T>, visibleColumns: Column<T>[], span: "row" | "col"): ((r: number, c: number) => number) | null;

package/dist/state/helpers/get-span-callback.js

@@ -1,4 +1,6 @@
 export function getSpanFn(rds, grid, visibleColumns, span) {
+    if (visibleColumns.every((c) => !(span === "col" ? c.colSpan : c.rowSpan)))
+        return null;
     return (r, c) => {
         const row = rds.rowByIndex(r);
         const column = visibleColumns[c];

package/dist/state/helpers/row-layout/row-layout.d.ts

@@ -1,8 +1,9 @@
-import { type LayoutMap, type SpanLayout } from "@1771technologies/lytenyte-shared";
+import { type LayoutState, type SpanLayout } from "@1771technologies/lytenyte-shared";
 import type { Column, PositionUnion, RowDataStore, RowLayout } from "../../../+types";
 interface MakeRowViewArgs<T> {
-    layout: SpanLayout;
-    layoutMap: LayoutMap;
+    view: SpanLayout;
+    layout: LayoutState;
+    viewCache: Map<number, RowLayout<T>>;
     rds: RowDataStore<T>;
     columns: Column<T>[];
     focus: PositionUnion | null;
@@ -10,7 +11,7 @@ interface MakeRowViewArgs<T> {
 /**
  * This is quite a complex function so read each part carefully.
  */
-export declare function makeRowLayout<T>({ layout: n, layoutMap, rds, columns, focus, }: MakeRowViewArgs<T>): {
+export declare function makeRowLayout<T>({ view: n, viewCache, layout, rds, columns }: MakeRowViewArgs<T>): {
     top: RowLayout<T>[];
     center: RowLayout<T>[];
     bottom: RowLayout<T>[];