@dxos/lit-grid 0.7.1 → 0.7.2-staging.6d26b2a

package/src/types.ts

@@ -3,9 +3,12 @@
 //
 
 import { type DxGrid } from './dx-grid';
-import { toCellIndex } from './util';
+import { toPlaneCellIndex } from './util';
 
-export type DxGridCellIndex = `${string},${string}`;
+export const separator = ',' as const;
+
+export type DxGridPlaneCellIndex = `${string}${typeof separator}${string}`;
+export type DxGridCellIndex = `${DxGridPlane}${typeof separator}${string}${typeof separator}${string}`;
 
 export type DxGridAxis = 'row' | 'col';
 
@@ -28,7 +31,7 @@ export type DxGridAnnotatedPanEvent = (WheelEvent | PointerEvent) & { deltaX: nu
     gridId: string;
   }>;
 
-export type DxGridPlaneCells = Record<DxGridCellIndex, DxGridCellValue>;
+export type DxGridPlaneCells = Record<DxGridPlaneCellIndex, DxGridCellValue>;
 export type DxGridCells = { grid: DxGridPlaneCells } & Partial<
   Record<DxGridFixedPlane | DxGridFrozenPlane, DxGridPlaneCells>
 >;
@@ -151,7 +154,7 @@ export class DxAxisResizeInternal extends Event {
 export type DxEditRequestProps = Pick<DxEditRequest, 'cellIndex' | 'cellBox' | 'initialContent'>;
 
 export class DxEditRequest extends Event {
-  public readonly cellIndex: DxGridCellIndex;
+  public readonly cellIndex: DxGridPlaneCellIndex;
   public readonly cellBox: Record<'insetInlineStart' | 'insetBlockStart' | 'inlineSize' | 'blockSize', number>;
   public readonly initialContent?: string;
   constructor(props: DxEditRequestProps) {
@@ -174,8 +177,8 @@ export class DxGridCellsSelect extends Event {
   public readonly maxRow: number;
   constructor({ start, end }: DxGridRange) {
     super('dx-grid-cells-select');
-    this.start = toCellIndex(start);
-    this.end = toCellIndex(end);
+    this.start = toPlaneCellIndex(start);
+    this.end = toPlaneCellIndex(end);
     this.minCol = Math.min(start.col, end.col);
     this.maxCol = Math.max(start.col, end.col);
     this.minRow = Math.min(start.row, end.row);

package/src/util.ts

@@ -4,6 +4,7 @@
 
 import { defaultSizeRow } from './defs';
 import {
+  type DxGridPlaneCellIndex,
   type DxGridCellIndex,
   type DxGridPosition,
   type DxGridPointer,
@@ -14,15 +15,15 @@ import {
   type DxGridFrozenColsPlane,
   type DxGridFrozenPlane,
   type DxGridAxis,
+  type DxGridPlanePosition,
+  separator,
 } from './types';
 
-/**
- * Separator for serializing cell position vectors
- */
-export const separator = ',';
+export const toPlaneCellIndex = (cellCoords: Partial<DxGridPosition> & DxGridPlanePosition): DxGridPlaneCellIndex =>
+  `${cellCoords.col}${separator}${cellCoords.row}`;
 
 export const toCellIndex = (cellCoords: DxGridPosition): DxGridCellIndex =>
-  `${cellCoords.col}${separator}${cellCoords.row}`;
+  `${cellCoords.plane}${separator}${cellCoords.col}${separator}${cellCoords.row}`;
 
 //
 // A1 notation is the fallback for numbering columns and rows.