@dxos/plugin-sheet 0.6.14-main.7bd9c89 → 0.6.14-staging.3e2eaca

package/dist/lib/node-esm/{chunk-T3PRH7QS.mjs → chunk-BW36PM2Y.mjs}

@@ -1,16 +1,36 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
-  SheetType
-} from "./chunk-WFDTY3IC.mjs";
+  DEFAULT_COLUMNS,
+  DEFAULT_ROWS,
+  MAX_COLUMNS,
+  MAX_ROWS,
+  RANGE_NOTATION,
+  ReadonlyException,
+  addressFromA1Notation,
+  addressFromIndex,
+  addressToA1Notation,
+  addressToIndex,
+  cellClassNameForRange,
+  createSheetName,
+  inRange,
+  initialize,
+  insertIndices,
+  isFormula,
+  rangeFromIndex,
+  rangeToA1Notation
+} from "./chunk-CR4K75EL.mjs";
 import {
-  SHEET_PLUGIN
-} from "./chunk-VCYJWE3O.mjs";
+  Range,
+  SheetAction
+} from "./chunk-UIBWRHW7.mjs";
 import {
-  createSheetName
-} from "./chunk-5WPZCXNS.mjs";
+  SHEET_PLUGIN
+} from "./chunk-BM2Q3FFC.mjs";
 
 // packages/plugins/plugin-sheet/src/components/ComputeGraph/ComputeGraphContextProvider.tsx
-import React, { createContext } from "react";
+import React, { createContext, useContext } from "react";
+import { raise } from "@dxos/debug";
+import { useAsyncState } from "@dxos/react-hooks";
 var ComputeGraphContext = /* @__PURE__ */ createContext(void 0);
 var ComputeGraphContextProvider = ({ registry, children }) => {
   return /* @__PURE__ */ React.createElement(ComputeGraphContext.Provider, {
@@ -19,192 +39,19 @@ var ComputeGraphContextProvider = ({ registry, children }) => {
     }
   }, children);
 };
-
-// packages/plugins/plugin-sheet/src/defs/util.ts
-import { randomBytes } from "@dxos/crypto";
-import { create } from "@dxos/echo-schema";
-
-// packages/plugins/plugin-sheet/src/defs/types.ts
-import { invariant } from "@dxos/invariant";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/defs/types.ts";
-var DEFAULT_ROWS = 50;
-var DEFAULT_COLUMNS = 26;
-var MAX_ROWS = 500;
-var MAX_COLUMNS = 26 * 2;
-var posEquals = (a, b) => {
-  return a?.col === b?.col && a?.row === b?.row;
-};
-var columnLetter = (col) => {
-  invariant(col < MAX_COLUMNS, `Invalid column: ${col}`, {
-    F: __dxlog_file,
-    L: 26,
-    S: void 0,
-    A: [
-      "col < MAX_COLUMNS",
-      "`Invalid column: ${col}`"
-    ]
-  });
-  return (col >= 26 ? String.fromCharCode("A".charCodeAt(0) + Math.floor(col / 26) - 1) : "") + String.fromCharCode("A".charCodeAt(0) + col % 26);
-};
-var addressToA1Notation = ({ col, row }) => {
-  return `${columnLetter(col)}${row + 1}`;
-};
-var addressFromA1Notation = (ref) => {
-  const match = ref.match(/([A-Z]+)(\d+)/);
-  invariant(match, `Invalid notation: ${ref}`, {
-    F: __dxlog_file,
-    L: 40,
-    S: void 0,
-    A: [
-      "match",
-      "`Invalid notation: ${ref}`"
-    ]
-  });
-  return {
-    row: parseInt(match[2], 10) - 1,
-    col: match[1].split("").reduce((acc, c) => acc * 26 + c.charCodeAt(0) - "A".charCodeAt(0) + 1, 0) - 1
-  };
-};
-var rangeToA1Notation = (range) => {
-  return [
-    range?.from && addressToA1Notation(range?.from),
-    range?.to && addressToA1Notation(range?.to)
-  ].filter(Boolean).join(":");
-};
-var inRange = (range, cell) => {
-  if (!range) {
-    return false;
-  }
-  const { from, to } = range;
-  if (from && posEquals(from, cell) || to && posEquals(to, cell)) {
-    return true;
-  }
-  if (!from || !to) {
-    return false;
-  }
-  const { col: c1, row: r1 } = from;
-  const { col: c2, row: r2 } = to;
-  const cMin = Math.min(c1, c2);
-  const cMax = Math.max(c1, c2);
-  const rMin = Math.min(r1, r2);
-  const rMax = Math.max(r1, r2);
-  const { col, row } = cell;
-  return col >= cMin && col <= cMax && row >= rMin && row <= rMax;
-};
-
-// packages/plugins/plugin-sheet/src/defs/util.ts
-var ApiError = class extends Error {
-};
-var ReadonlyException = class extends ApiError {
-};
-var RangeException = class extends ApiError {
-  constructor(n) {
-    super();
-  }
-};
-var createIndex = (length = 8) => {
-  const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  const charactersLength = characters.length;
-  const randomBuffer = randomBytes(length);
-  return Array.from(randomBuffer, (byte) => characters[byte % charactersLength]).join("");
-};
-var createIndices = (length) => Array.from({
-  length
-}).map(() => createIndex());
-var insertIndices = (indices, i, n, max) => {
-  if (i + n > max) {
-    throw new RangeException(i + n);
-  }
-  const idx = createIndices(n);
-  indices.splice(i, 0, ...idx);
-};
-var initialize = (sheet, { rows = DEFAULT_ROWS, columns = DEFAULT_COLUMNS } = {}) => {
-  if (!sheet.rows.length) {
-    insertIndices(sheet.rows, 0, rows, MAX_ROWS);
-  }
-  if (!sheet.columns.length) {
-    insertIndices(sheet.columns, 0, columns, MAX_COLUMNS);
-  }
-};
-var createSheet = ({ name, cells, ...size } = {}) => {
-  const sheet = create(SheetType, {
-    name,
-    cells: {},
-    rows: [],
-    columns: [],
-    rowMeta: {},
-    columnMeta: {},
-    ranges: []
-  });
-  initialize(sheet, size);
-  if (cells) {
-    Object.entries(cells).forEach(([key, { value }]) => {
-      const idx = addressToIndex(sheet, addressFromA1Notation(key));
-      sheet.cells[idx] = {
-        value
-      };
-    });
-  }
-  return sheet;
-};
-var addressToIndex = (sheet, cell) => {
-  return `${sheet.columns[cell.col]}@${sheet.rows[cell.row]}`;
-};
-var addressFromIndex = (sheet, idx) => {
-  const [column, row] = idx.split("@");
-  return {
-    col: sheet.columns.indexOf(column),
-    row: sheet.rows.indexOf(row)
-  };
-};
-var closest = (cursor, cells) => {
-  let closestCell2;
-  let closestDistance = Number.MAX_SAFE_INTEGER;
-  for (const cell of cells) {
-    const distance = Math.abs(cell.row - cursor.row) + Math.abs(cell.col - cursor.col);
-    if (distance < closestDistance) {
-      closestCell2 = cell;
-      closestDistance = distance;
+var useComputeGraph = (space) => {
+  const { registry } = useContext(ComputeGraphContext) ?? raise(new Error("Missing ComputeGraphContext"));
+  const [graph] = useAsyncState(async () => {
+    if (space) {
+      const graph2 = registry.getOrCreateGraph(space);
+      await graph2.open();
+      return graph2;
     }
-  }
-  return closestCell2;
-};
-var compareIndexPositions = (sheet, indexA, indexB) => {
-  const { row: rowA, col: columnA } = addressFromIndex(sheet, indexA);
-  const { row: rowB, col: columnB } = addressFromIndex(sheet, indexB);
-  if (rowA !== rowB) {
-    return rowA - rowB;
-  } else {
-    return columnA - columnB;
-  }
-};
-
-// packages/plugins/plugin-sheet/src/defs/sheet-range-types.ts
-var cellClassNameForRange = ({ key, value }) => {
-  switch (key) {
-    case "align":
-      switch (value) {
-        case "start":
-          return "text-start";
-        case "center":
-          return "text-center";
-        case "end":
-          return "text-end";
-        default:
-          return void 0;
-      }
-    case "comment":
-      return "bg-gridComment";
-    case "style":
-      switch (value) {
-        case "highlight":
-          return "bg-gridHighlight";
-        default:
-          return void 0;
-      }
-    default:
-      return void 0;
-  }
+  }, [
+    space,
+    registry
+  ]);
+  return graph;
 };
 
 // packages/plugins/plugin-sheet/src/extensions/compute.ts
@@ -212,8 +59,8 @@ import { syntaxTree } from "@codemirror/language";
 import { RangeSetBuilder, StateEffect, StateField } from "@codemirror/state";
 import { Decoration, EditorView, ViewPlugin, WidgetType } from "@codemirror/view";
 import { debounce } from "@dxos/async";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { documentId, singleValueFacet } from "@dxos/react-ui-editor/state";
+import { invariant } from "@dxos/invariant";
+import { documentId, singleValueFacet } from "@dxos/react-ui-editor";
 var updateAllDecorations = StateEffect.define();
 var computeGraphFacet = singleValueFacet();
 
@@ -223,7 +70,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
 import { ViewPlugin as ViewPlugin2, keymap } from "@codemirror/view";
 import { tags } from "@lezer/highlight";
 import { spreadsheet } from "codemirror-lang-spreadsheet";
-import { singleValueFacet as singleValueFacet2 } from "@dxos/react-ui-editor/state";
+import { singleValueFacet as singleValueFacet2 } from "@dxos/react-ui-editor";
 import { mx } from "@dxos/react-ui-theme";
 var highlightStyles = HighlightStyle.define([
   // Function.
@@ -347,27 +194,29 @@ var sheetExtension = ({ functions = [] }) => {
     ])
   ];
 };
-var rangeExtension = (onInit) => {
+var rangeExtension = ({ onInit, onStateChange }) => {
   let view;
   let activeRange;
-  const provider = (range) => {
-    if (activeRange) {
-      view.dispatch(view.state.update({
-        changes: {
-          ...activeRange,
-          insert: range.toString()
-        },
-        selection: {
-          anchor: activeRange.from + range.length
-        }
-      }));
+  const notifier = {
+    setRange: (range) => {
+      if (activeRange) {
+        view.dispatch(view.state.update({
+          changes: {
+            ...activeRange,
+            insert: range.toString()
+          },
+          selection: {
+            anchor: activeRange.from + range.length
+          }
+        }));
+      }
+      view.focus();
     }
-    view.focus();
   };
   return ViewPlugin2.fromClass(class {
     constructor(_view) {
       view = _view;
-      onInit(provider);
+      onInit?.(notifier);
     }
     update(view2) {
       const { anchor } = view2.state.selection.ranges[0];
@@ -377,20 +226,18 @@ var rangeExtension = (onInit) => {
       visitTree(topNode, ({ type, from, to }) => {
         if (from <= anchor && to >= anchor) {
           switch (type.name) {
-            case "Function": {
+            case "Function":
               activeRange = {
                 from: to,
                 to
               };
               break;
-            }
-            case "CloseParen": {
+            case "CloseParen":
               activeRange = {
                 from,
                 to: from
               };
               break;
-            }
             case "RangeToken":
             case "CellToken":
               activeRange = {
@@ -403,11 +250,17 @@ var rangeExtension = (onInit) => {
         return false;
       });
       if (!activeRange && view2.state.doc.toString()[0] === "=") {
-        activeRange = {
-          from: 1,
-          to: view2.state.doc.toString().length
-        };
+        const str = view2.state.doc.sliceString(1);
+        if (RANGE_NOTATION.test(str)) {
+          activeRange = {
+            from: 1,
+            to: str.length + 1
+          };
+        }
       }
+      onStateChange?.({
+        activeRange: activeRange ? view2.state.doc.sliceString(activeRange.from, activeRange.to) : void 0
+      });
     }
   });
 };
@@ -423,334 +276,156 @@ var visitTree = (node, callback) => {
   return false;
 };
 
-// packages/plugins/plugin-sheet/src/hooks/useComputeGraph.ts
-import { useContext as useContext2 } from "react";
-import { raise } from "@dxos/debug";
-import { useAsyncState } from "@dxos/react-hooks";
-
-// packages/plugins/plugin-sheet/src/components/index.ts
-import { lazy } from "react";
-
-// packages/plugins/plugin-sheet/src/components/GridSheet/GridSheet.tsx
-import React3, { useCallback as useCallback2, useMemo as useMemo3, useRef } from "react";
-import { useAttention } from "@dxos/react-ui-attention";
-import { Grid as Grid2, editorKeys, GridCellEditor, closestCell } from "@dxos/react-ui-grid";
+// packages/plugins/plugin-sheet/src/components/SheetContext/SheetContext.tsx
+import React2, { createContext as createContext2, useCallback, useContext as useContext2, useState as useState2 } from "react";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { fullyQualifiedId } from "@dxos/react-client/echo";
+import { Grid, useGridContext } from "@dxos/react-ui-grid";
 
-// packages/plugins/plugin-sheet/src/components/GridSheet/util.ts
-import { useEffect, useLayoutEffect, useState } from "react";
-import { createDocAccessor } from "@dxos/react-client/echo";
-import { parseValue, cellClassesForFieldType } from "@dxos/react-ui-data";
-import { colToA1Notation, rowToA1Notation } from "@dxos/react-ui-grid";
-import { mx as mx2 } from "@dxos/react-ui-theme";
-var dxGridCellIndexToSheetCellAddress = (index) => {
-  const [colStr, rowStr] = index.split(",");
+// packages/plugins/plugin-sheet/src/model/sheet-model.ts
+import { Event } from "@dxos/async";
+import { Resource } from "@dxos/context";
+import { getTypename, FormatEnum, TypeEnum } from "@dxos/echo-schema";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { PublicKey } from "@dxos/keys";
+import { log } from "@dxos/log";
+import { DetailedCellError, ExportedCellChange } from "#hyperformula";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/model/sheet-model.ts";
+var typeMap = {
+  BOOLEAN: {
+    type: TypeEnum.Boolean
+  },
+  NUMBER_RAW: {
+    type: TypeEnum.Number
+  },
+  NUMBER_PERCENT: {
+    type: TypeEnum.Number,
+    format: FormatEnum.Percent
+  },
+  NUMBER_CURRENCY: {
+    type: TypeEnum.Number,
+    format: FormatEnum.Currency
+  },
+  NUMBER_DATETIME: {
+    type: TypeEnum.String,
+    format: FormatEnum.DateTime
+  },
+  NUMBER_DATE: {
+    type: TypeEnum.String,
+    format: FormatEnum.Date
+  },
+  NUMBER_TIME: {
+    type: TypeEnum.String,
+    format: FormatEnum.Time
+  }
+};
+var getTopLeft = (range) => {
+  const to = range.to ?? range.from;
   return {
-    col: parseInt(colStr),
-    row: parseInt(rowStr)
+    row: Math.min(range.from.row, to.row),
+    col: Math.min(range.from.col, to.col)
   };
 };
-var createDxGridColumns = (model) => {
-  return model.sheet.columns.reduce((acc, columnId, numericIndex) => {
-    if (model.sheet.columnMeta[columnId] && model.sheet.columnMeta[columnId].size) {
-      acc.grid[numericIndex] = {
-        size: model.sheet.columnMeta[columnId].size,
-        resizeable: true
-      };
-    }
-    return acc;
-  }, {
-    grid: {}
-  });
-};
-var createDxGridRows = (model) => {
-  return model.sheet.rows.reduce((acc, rowId, numericIndex) => {
-    if (model.sheet.rowMeta[rowId] && model.sheet.rowMeta[rowId].size) {
-      acc.grid[numericIndex] = {
-        size: model.sheet.rowMeta[rowId].size,
-        resizeable: true
-      };
-    }
-    return acc;
-  }, {
-    grid: {}
-  });
-};
-var projectCellProps = (model, col, row) => {
-  const address = {
-    col,
-    row
-  };
-  const rawValue = model.getValue(address);
-  if (rawValue === void 0 || rawValue === null) {
+var toSimpleCellAddress = (sheet, cell) => ({
+  sheet,
+  row: cell.row,
+  col: cell.col
+});
+var toModelRange = (sheet, range) => ({
+  start: toSimpleCellAddress(sheet, range.from),
+  end: toSimpleCellAddress(sheet, range.to ?? range.from)
+});
+var SheetModel = class extends Resource {
+  constructor(_graph, _sheet, _options = {}) {
+    super();
+    this._graph = _graph;
+    this._sheet = _sheet;
+    this._options = _options;
+    this.id = `model-${PublicKey.random().truncate()}`;
+    this.update = new Event();
+  }
+  get graph() {
+    return this._graph;
+  }
+  get sheet() {
+    return this._sheet;
+  }
+  get readonly() {
+    return this._options.readonly;
+  }
+  get bounds() {
     return {
-      value: ""
+      rows: this._sheet.rows.length,
+      columns: this._sheet.columns.length
     };
   }
-  const ranges = model.sheet.ranges?.filter(({ range }) => inRange(range, address));
-  const type = model.getValueType(address);
-  const classNames = ranges?.map(cellClassNameForRange).reverse();
-  return {
-    value: parseValue(type, rawValue),
-    className: mx2(cellClassesForFieldType(type), classNames)
-  };
-};
-var gridCellGetter = (model) => {
-  const cachedGridCells = {};
-  return (nextBounds) => {
-    [
-      ...Array(nextBounds.end.col - nextBounds.start.col)
-    ].forEach((_, c0) => {
-      return [
-        ...Array(nextBounds.end.row - nextBounds.start.row)
-      ].forEach((_2, r0) => {
-        const col = nextBounds.start.col + c0;
-        const row = nextBounds.start.row + r0;
-        cachedGridCells[`${col},${row}`] = projectCellProps(model, col, row);
+  /**
+  * Initialize sheet and engine.
+  */
+  async _open() {
+    log("initialize", {
+      id: this.id
+    }, {
+      F: __dxlog_file,
+      L: 113,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    initialize(this._sheet);
+    this._graph.update.on((event) => {
+      if (event.type === "functionsUpdated") {
+        this.reset();
+      }
+    });
+    this._node = this._graph.getOrCreateNode(createSheetName({
+      type: getTypename(this._sheet),
+      id: this._sheet.id
+    }));
+    await this._node.open();
+    const unsubscribe = this._node.update.on((event) => this.update.emit(event));
+    this._ctx.onDispose(unsubscribe);
+    this.reset();
+  }
+  /**
+  * Update engine.
+  * NOTE: This resets the undo history.
+  * @deprecated
+  */
+  reset() {
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 139,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    this._node.graph.hf.clearSheet(this._node.sheetId);
+    Object.entries(this._sheet.cells).forEach(([key, { value }]) => {
+      invariant2(this._node, void 0, {
+        F: __dxlog_file,
+        L: 142,
+        S: this,
+        A: [
+          "this._node",
+          ""
+        ]
       });
-    });
-    return cachedGridCells;
-  };
-};
-var rowLabelCell = (row) => ({
-  value: rowToA1Notation(row),
-  className: "text-end !pie-1",
-  resizeHandle: "row"
-});
-var colLabelCell = (col) => ({
-  value: colToA1Notation(col),
-  resizeHandle: "col"
-});
-var cellGetter = (model) => {
-  const getGridCells = gridCellGetter(model);
-  return (nextBounds, plane) => {
-    switch (plane) {
-      case "grid":
-        return getGridCells(nextBounds);
-      case "frozenColsStart":
-        return [
-          ...Array(nextBounds.end.row - nextBounds.start.row)
-        ].reduce((acc, _, r0) => {
-          const r = nextBounds.start.row + r0;
-          acc[`0,${r}`] = rowLabelCell(r);
-          return acc;
-        }, {});
-      case "frozenRowsStart":
-        return [
-          ...Array(nextBounds.end.col - nextBounds.start.col)
-        ].reduce((acc, _, c0) => {
-          const c = nextBounds.start.col + c0;
-          acc[`${c},0`] = colLabelCell(c);
-          return acc;
-        }, {});
-      default:
-        return {};
-    }
-  };
-};
-var useSheetModelDxGridProps = (dxGridRef, model) => {
-  const [columns, setColumns] = useState(createDxGridColumns(model));
-  const [rows, setRows] = useState(createDxGridColumns(model));
-  useLayoutEffect(() => {
-    const cellsAccessor = createDocAccessor(model.sheet, [
-      "cells"
-    ]);
-    if (dxGridRef.current) {
-      dxGridRef.current.getCells = cellGetter(model);
-    }
-    const handleCellsUpdate = () => {
-      dxGridRef.current?.requestUpdate("initialCells");
-    };
-    cellsAccessor.handle.addListener("change", handleCellsUpdate);
-    return () => cellsAccessor.handle.removeListener("change", handleCellsUpdate);
-  }, [
-    model
-  ]);
-  useEffect(() => {
-    const columnMetaAccessor = createDocAccessor(model.sheet, [
-      "columnMeta"
-    ]);
-    const rowMetaAccessor = createDocAccessor(model.sheet, [
-      "rowMeta"
-    ]);
-    const handleColumnMetaUpdate = () => {
-      setColumns(createDxGridColumns(model));
-    };
-    const handleRowMetaUpdate = () => {
-      setRows(createDxGridRows(model));
-    };
-    columnMetaAccessor.handle.addListener("change", handleColumnMetaUpdate);
-    rowMetaAccessor.handle.addListener("change", handleRowMetaUpdate);
-    return () => {
-      columnMetaAccessor.handle.removeListener("change", handleColumnMetaUpdate);
-      rowMetaAccessor.handle.removeListener("change", handleRowMetaUpdate);
-    };
-  }, [
-    model
-  ]);
-  return {
-    columns,
-    rows
-  };
-};
-
-// packages/plugins/plugin-sheet/src/hooks/useSheetModel.ts
-import { useEffect as useEffect2, useState as useState2 } from "react";
-
-// packages/plugins/plugin-sheet/src/model/decorations.ts
-import { create as create2 } from "@dxos/echo-schema";
-var createDecorations = () => {
-  const { decorations } = create2({
-    decorations: {}
-  });
-  const addDecoration = (cellIndex, decorator) => {
-    decorations[cellIndex] = [
-      ...decorations[cellIndex] || [],
-      decorator
-    ];
-  };
-  const removeDecoration = (cellIndex, type) => {
-    if (type) {
-      decorations[cellIndex] = (decorations[cellIndex] || []).filter((d) => d.type !== type);
-    } else {
-      delete decorations[cellIndex];
-    }
-  };
-  const getDecorationsForCell = (cellIndex) => {
-    return decorations[cellIndex];
-  };
-  const getAllDecorations = () => {
-    const result = [];
-    for (const decoratorArray of Object.values(decorations)) {
-      for (const decorator of decoratorArray) {
-        result.push(decorator);
-      }
-    }
-    return result;
-  };
-  return {
-    addDecoration,
-    removeDecoration,
-    getDecorationsForCell,
-    getAllDecorations
-  };
-};
-
-// packages/plugins/plugin-sheet/src/model/sheet-model.ts
-import { Event } from "@dxos/async";
-import { Resource } from "@dxos/context";
-import { getTypename } from "@dxos/echo-schema";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { PublicKey } from "@dxos/keys";
-import { log } from "@dxos/log";
-import { FieldValueType } from "@dxos/schema";
-import { DetailedCellError, ExportedCellChange } from "#hyperformula";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/model/sheet-model.ts";
-var typeMap = {
-  BOOLEAN: FieldValueType.Boolean,
-  NUMBER_RAW: FieldValueType.Number,
-  NUMBER_PERCENT: FieldValueType.Percent,
-  NUMBER_CURRENCY: FieldValueType.Currency,
-  NUMBER_DATETIME: FieldValueType.DateTime,
-  NUMBER_DATE: FieldValueType.Date,
-  NUMBER_TIME: FieldValueType.Time
-};
-var getTopLeft = (range) => {
-  const to = range.to ?? range.from;
-  return {
-    row: Math.min(range.from.row, to.row),
-    col: Math.min(range.from.col, to.col)
-  };
-};
-var toSimpleCellAddress = (sheet, cell) => ({
-  sheet,
-  row: cell.row,
-  col: cell.col
-});
-var toModelRange = (sheet, range) => ({
-  start: toSimpleCellAddress(sheet, range.from),
-  end: toSimpleCellAddress(sheet, range.to ?? range.from)
-});
-var SheetModel = class extends Resource {
-  constructor(_graph, _sheet, _options = {}) {
-    super();
-    this._graph = _graph;
-    this._sheet = _sheet;
-    this._options = _options;
-    this.id = `model-${PublicKey.random().truncate()}`;
-    this.update = new Event();
-  }
-  get graph() {
-    return this._graph;
-  }
-  get sheet() {
-    return this._sheet;
-  }
-  get readonly() {
-    return this._options.readonly;
-  }
-  get bounds() {
-    return {
-      rows: this._sheet.rows.length,
-      columns: this._sheet.columns.length
-    };
-  }
-  /**
-  * Initialize sheet and engine.
-  */
-  async _open() {
-    log("initialize", {
-      id: this.id
-    }, {
-      F: __dxlog_file2,
-      L: 106,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    initialize(this._sheet);
-    this._node = this._graph.getOrCreateNode(createSheetName({
-      type: getTypename(this._sheet),
-      id: this._sheet.id
-    }));
-    await this._node.open();
-    const unsubscribe = this._node.update.on((event) => this.update.emit(event));
-    this._ctx.onDispose(unsubscribe);
-    this.reset();
-  }
-  /**
-  * Update engine.
-  * NOTE: This resets the undo history.
-  * @deprecated
-  */
-  reset() {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 126,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    this._node.graph.hf.clearSheet(this._node.sheetId);
-    Object.entries(this._sheet.cells).forEach(([key, { value }]) => {
-      invariant3(this._node, void 0, {
-        F: __dxlog_file2,
-        L: 129,
-        S: this,
-        A: [
-          "this._node",
-          ""
-        ]
-      });
-      const { col, row } = addressFromIndex(this._sheet, key);
-      if (typeof value === "string" && value.charAt(0) === "=") {
-        value = this._graph.mapFormulaToNative(this._graph.mapFunctionBindingFromId(this.mapFormulaIndicesToRefs(value)));
-      }
-      this._node.graph.hf.setCellContents({
-        sheet: this._node.sheetId,
-        row,
-        col
-      }, value);
+      const { col, row } = addressFromIndex(this._sheet, key);
+      if (isFormula(value)) {
+        const binding = this._graph.mapFunctionBindingFromId(this.mapFormulaIndicesToRefs(value));
+        if (binding) {
+          value = this._graph.mapFormulaToNative(binding);
+        } else {
+          value = "";
+        }
+      }
+      this._node.graph.hf.setCellContents({
+        sheet: this._node.sheetId,
+        row,
+        col
+      }, value);
     });
   }
   /**
@@ -764,11 +439,79 @@ var SheetModel = class extends Resource {
     this._node?.graph.hf.rebuildAndRecalculate();
   }
   insertRows(i, n = 1) {
-    insertIndices(this._sheet.rows, i, n, MAX_ROWS);
+    const idx = insertIndices(this._sheet.rows, i, n, MAX_ROWS);
     this.reset();
+    return idx;
   }
   insertColumns(i, n = 1) {
-    insertIndices(this._sheet.columns, i, n, MAX_COLUMNS);
+    const idx = insertIndices(this._sheet.columns, i, n, MAX_COLUMNS);
+    this.reset();
+    return idx;
+  }
+  dropRow(rowIndex) {
+    const range = {
+      from: addressFromIndex(this._sheet, `${this._sheet.columns[0]}@${rowIndex}`),
+      to: addressFromIndex(this._sheet, `${this._sheet.columns[this._sheet.columns.length - 1]}@${rowIndex}`)
+    };
+    const values = this.getCellValues(range).flat();
+    const index = this._sheet.rows.indexOf(rowIndex);
+    this.clear(range);
+    this._sheet.rows.splice(index, 1);
+    delete this._sheet.rowMeta[rowIndex];
+    this.reset();
+    return {
+      axis: "row",
+      index,
+      axisIndex: rowIndex,
+      axisMeta: this._sheet.rowMeta[rowIndex],
+      values
+    };
+  }
+  dropColumn(colIndex) {
+    const range = {
+      from: addressFromIndex(this._sheet, `${colIndex}@${this._sheet.rows[0]}`),
+      to: addressFromIndex(this._sheet, `${colIndex}@${this._sheet.rows[this._sheet.rows.length - 1]}`)
+    };
+    const values = this.getCellValues(range).flat();
+    const index = this._sheet.columns.indexOf(colIndex);
+    this.clear(range);
+    this._sheet.columns.splice(index, 1);
+    delete this._sheet.columnMeta[colIndex];
+    this.reset();
+    return {
+      axis: "col",
+      index,
+      axisIndex: colIndex,
+      axisMeta: this._sheet.rowMeta[colIndex],
+      values
+    };
+  }
+  restoreRow({ index, axisIndex, axisMeta, values }) {
+    this._sheet.rows.splice(index, 0, axisIndex);
+    values.forEach((value, col) => {
+      if (value) {
+        this._sheet.cells[`${this._sheet.columns[col]}@${axisIndex}`] = {
+          value
+        };
+      }
+    });
+    if (axisMeta) {
+      this._sheet.rowMeta[axisIndex] = axisMeta;
+    }
+    this.reset();
+  }
+  restoreColumn({ index, axisIndex, axisMeta, values }) {
+    this._sheet.columns.splice(index, 0, axisIndex);
+    values.forEach((value, row) => {
+      if (value) {
+        this._sheet.cells[`${axisIndex}@${this._sheet.rows[row]}`] = {
+          value
+        };
+      }
+    });
+    if (axisMeta) {
+      this._sheet.columnMeta[axisIndex] = axisMeta;
+    }
     this.reset();
   }
   //
@@ -779,9 +522,9 @@ var SheetModel = class extends Resource {
   * Clear range of values.
   */
   clear(range) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 171,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 245,
       S: this,
       A: [
         "this._node",
@@ -797,9 +540,9 @@ var SheetModel = class extends Resource {
     });
   }
   cut(range) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 182,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 256,
       S: this,
       A: [
         "this._node",
@@ -813,9 +556,9 @@ var SheetModel = class extends Resource {
     });
   }
   copy(range) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 191,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 265,
       S: this,
       A: [
         "this._node",
@@ -825,9 +568,9 @@ var SheetModel = class extends Resource {
     this._node.graph.hf.copy(toModelRange(this._node.sheetId, range));
   }
   paste(cell) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 196,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 270,
       S: this,
       A: [
         "this._node",
@@ -852,9 +595,9 @@ var SheetModel = class extends Resource {
   }
   // TODO(burdon): Display undo/redo state.
   undo() {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 211,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 285,
       S: this,
       A: [
         "this._node",
@@ -866,9 +609,9 @@ var SheetModel = class extends Resource {
     }
   }
   redo() {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 219,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 293,
       S: this,
       A: [
         "this._node",
@@ -894,7 +637,7 @@ var SheetModel = class extends Resource {
     if (value == null) {
       return void 0;
     }
-    if (typeof value === "string" && value.charAt(0) === "=") {
+    if (isFormula(value)) {
       return this._graph.mapFunctionBindingFromId(this.mapFormulaIndicesToRefs(value));
     } else {
       return String(value);
@@ -910,17 +653,27 @@ var SheetModel = class extends Resource {
   * Gets the regular or computed value from the engine.
   */
   getValue(cell) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 262,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 336,
       S: this,
       A: [
         "this._node",
         ""
       ]
     });
-    const value = this._node.graph.hf.getCellValue(toSimpleCellAddress(this._node.sheetId, cell));
+    const address = toSimpleCellAddress(this._node.sheetId, cell);
+    const value = this._node.graph.hf.getCellValue(address);
     if (value instanceof DetailedCellError) {
+      log.info("cell error", {
+        cell,
+        error: value
+      }, {
+        F: __dxlog_file,
+        L: 341,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return value.toString();
     }
     return value;
@@ -928,10 +681,10 @@ var SheetModel = class extends Resource {
   /**
   * Get value type.
   */
-  getValueType(cell) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 275,
+  getValueDescription(cell) {
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 352,
       S: this,
       A: [
         "this._node",
@@ -946,9 +699,9 @@ var SheetModel = class extends Resource {
   * Sets the value, updating the sheet and engine.
   */
   setValue(cell, value) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 285,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 362,
       S: this,
       A: [
         "this._node",
@@ -976,14 +729,14 @@ var SheetModel = class extends Resource {
       col: cell.col
     }, [
       [
-        typeof value === "string" && value.charAt(0) === "=" ? this._graph.mapFormulaToNative(value) : value
+        isFormula(value) ? this._graph.mapFormulaToNative(value) : value
       ]
     ]);
     const idx = addressToIndex(this._sheet, cell);
     if (value === void 0 || value === null) {
       delete this._sheet.cells[idx];
     } else {
-      if (typeof value === "string" && value.charAt(0) === "=") {
+      if (isFormula(value)) {
         value = this._graph.mapFunctionBindingToId(this.mapFormulaRefsToIndices(value));
       }
       this._sheet.cells[idx] = {
@@ -1043,12 +796,12 @@ var SheetModel = class extends Resource {
   * Map from A1 notation to indices.
   */
   mapFormulaRefsToIndices(formula) {
-    invariant3(formula.charAt(0) === "=", void 0, {
-      F: __dxlog_file2,
-      L: 374,
+    invariant2(isFormula(formula), void 0, {
+      F: __dxlog_file,
+      L: 451,
       S: this,
       A: [
-        "formula.charAt(0) === '='",
+        "isFormula(formula)",
         ""
       ]
     });
@@ -1060,12 +813,12 @@ var SheetModel = class extends Resource {
   * Map from indices to A1 notation.
   */
   mapFormulaIndicesToRefs(formula) {
-    invariant3(formula.charAt(0) === "=", void 0, {
-      F: __dxlog_file2,
-      L: 384,
+    invariant2(isFormula(formula), void 0, {
+      F: __dxlog_file,
+      L: 461,
       S: this,
       A: [
-        "formula.charAt(0) === '='",
+        "isFormula(formula)",
         ""
       ]
     });
@@ -1086,9 +839,9 @@ var SheetModel = class extends Resource {
     return new Date(year, month - 1, day, hours, minutes, seconds);
   }
   toDateTime(num) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 405,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 482,
       S: this,
       A: [
         "this._node",
@@ -1098,9 +851,9 @@ var SheetModel = class extends Resource {
     return this._node.graph.hf.numberToDateTime(num);
   }
   toDate(num) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 410,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 487,
       S: this,
       A: [
         "this._node",
@@ -1110,9 +863,9 @@ var SheetModel = class extends Resource {
     return this._node.graph.hf.numberToDate(num);
   }
   toTime(num) {
-    invariant3(this._node, void 0, {
-      F: __dxlog_file2,
-      L: 415,
+    invariant2(this._node, void 0, {
+      F: __dxlog_file,
+      L: 492,
       S: this,
       A: [
         "this._node",
@@ -1123,10 +876,11 @@ var SheetModel = class extends Resource {
   }
 };
 
-// packages/plugins/plugin-sheet/src/hooks/useSheetModel.ts
+// packages/plugins/plugin-sheet/src/model/useSheetModel.ts
+import { useEffect, useState } from "react";
 var useSheetModel = (graph, sheet, { readonly } = {}) => {
-  const [model, setModel] = useState2();
-  useEffect2(() => {
+  const [model, setModel] = useState();
+  useEffect(() => {
     if (!graph || !sheet) {
       return;
     }
@@ -1150,153 +904,46 @@ var useSheetModel = (graph, sheet, { readonly } = {}) => {
   return model;
 };
 
-// packages/plugins/plugin-sheet/src/hooks/threads.ts
-import { effect } from "@preact/signals-core";
-import { useCallback, useEffect as useEffect3, useMemo } from "react";
-import { LayoutAction, useIntentDispatcher, useIntentResolver } from "@dxos/app-framework";
-import { debounce as debounce2 } from "@dxos/async";
-import { fullyQualifiedId } from "@dxos/react-client/echo";
-var useUpdateFocusedCellOnThreadSelection = (model, grid) => {
-  const handleScrollIntoView = useCallback(({ action, data }) => {
-    switch (action) {
-      case LayoutAction.SCROLL_INTO_VIEW: {
-        if (!data?.id || data?.cursor === void 0 || data?.id !== fullyQualifiedId(model.sheet)) {
-          return;
-        }
-        const cellAddress = addressFromIndex(model.sheet, data.cursor);
-        grid.current?.setFocus({
-          ...cellAddress,
-          plane: "grid"
-        }, true);
-      }
-    }
-  }, [
-    model.sheet
-  ]);
-  useIntentResolver(SHEET_PLUGIN, handleScrollIntoView);
+// packages/plugins/plugin-sheet/src/components/SheetContext/SheetContext.tsx
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/components/SheetContext/SheetContext.tsx";
+var SheetContext = /* @__PURE__ */ createContext2(void 0);
+var useSheetContext = () => {
+  const context = useContext2(SheetContext);
+  invariant3(context, void 0, {
+    F: __dxlog_file2,
+    L: 52,
+    S: void 0,
+    A: [
+      "context",
+      ""
+    ]
+  });
+  return context;
 };
-var useSelectThreadOnCellFocus = (model, cursor) => {
-  const dispatch = useIntentDispatcher();
-  const activeThreads = useMemo(() => model.sheet.threads?.filter((thread) => !!thread && thread.status === "active") ?? [], [
-    // TODO(thure): Surely we can find a better dependency for this…
-    JSON.stringify(model.sheet.threads)
-  ]);
-  const activeThreadAddresses = useMemo(() => activeThreads.map((thread) => thread.anchor).filter((anchor) => anchor !== void 0).map((anchor) => addressFromIndex(model.sheet, anchor)), [
-    activeThreads,
-    model.sheet
-  ]);
-  const selectClosestThread = useCallback((cellAddress) => {
-    if (!cellAddress || !activeThreads) {
-      return;
-    }
-    const closestThreadAnchor = closest(cellAddress, activeThreadAddresses);
-    if (closestThreadAnchor) {
-      const closestThread = activeThreads.find((thread) => thread && thread.anchor === addressToIndex(model.sheet, closestThreadAnchor));
-      if (closestThread) {
-        void dispatch([
-          {
-            action: "dxos.org/plugin/thread/action/select",
-            data: {
-              current: fullyQualifiedId(closestThread)
-            }
-          }
-        ]);
-      }
-    }
+var SheetProviderImpl = ({ model, onInfo, children, __gridScope }) => {
+  const { id, editing, setEditing } = useGridContext("SheetProvider", __gridScope);
+  const [cursor, setCursorInternal] = useState2();
+  const [range, setRangeInternal] = useState2();
+  const [cursorFallbackRange, setCursorFallbackRange] = useState2();
+  const [activeRefs, setActiveRefs] = useState2("");
+  const setCursor = useCallback((nextCursor) => {
+    setCursorInternal(nextCursor);
+    setCursorFallbackRange(range?.to ? range : nextCursor ? {
+      from: nextCursor,
+      to: nextCursor
+    } : void 0);
   }, [
-    dispatch,
-    activeThreads,
-    activeThreadAddresses,
-    model.sheet
+    range
   ]);
-  const debounced = useMemo(() => {
-    return debounce2((cellCoords) => requestAnimationFrame(() => selectClosestThread(cellCoords)), 50);
-  }, [
-    selectClosestThread
-  ]);
-  useEffect3(() => {
-    if (!cursor) {
-      return;
-    }
-    debounced(cursor);
+  const setRange = useCallback((nextRange) => {
+    setRangeInternal(nextRange);
+    setCursorFallbackRange(nextRange?.to ? nextRange : cursor ? {
+      from: cursor,
+      to: cursor
+    } : void 0);
   }, [
-    cursor,
-    selectClosestThread
-  ]);
-};
-var createThreadDecoration = (cellIndex, threadId, sheetId) => {
-  return {
-    type: "comment",
-    classNames: [
-      "bg-greenFill"
-    ],
-    cellIndex
-  };
-};
-var useThreadDecorations = (model, decorations) => {
-  const sheet = useMemo(() => model.sheet, [
-    model.sheet
-  ]);
-  const sheetId = useMemo(() => fullyQualifiedId(sheet), [
-    sheet
+    cursor
   ]);
-  useEffect3(() => {
-    const unsubscribe = effect(() => {
-      const activeThreadAnchors = /* @__PURE__ */ new Set();
-      if (!sheet.threads) {
-        return;
-      }
-      for (const thread of sheet.threads) {
-        if (!thread || thread.anchor === void 0 || thread.status === "resolved") {
-          continue;
-        }
-        activeThreadAnchors.add(thread.anchor);
-        const index = thread.anchor;
-        const existingDecorations = decorations.getDecorationsForCell(index);
-        if (!existingDecorations || !existingDecorations.some((d) => d.type === "comment")) {
-          decorations.addDecoration(index, createThreadDecoration(index, thread.id, sheetId));
-        }
-      }
-      for (const decoration of decorations.getAllDecorations()) {
-        if (decoration.type !== "comment") {
-          continue;
-        }
-        if (!activeThreadAnchors.has(decoration.cellIndex)) {
-          decorations.removeDecoration(decoration.cellIndex, "comment");
-        }
-      }
-    });
-    return () => unsubscribe();
-  });
-};
-
-// packages/plugins/plugin-sheet/src/components/SheetContext/SheetContext.tsx
-import React2, { createContext as createContext2, useContext, useMemo as useMemo2, useState as useState3 } from "react";
-import { invariant as invariant4 } from "@dxos/invariant";
-import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
-import { Grid, useGridContext } from "@dxos/react-ui-grid";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/components/SheetContext/SheetContext.tsx";
-var SheetContext = /* @__PURE__ */ createContext2(void 0);
-var useSheetContext = () => {
-  const context = useContext(SheetContext);
-  invariant4(context, void 0, {
-    F: __dxlog_file3,
-    L: 45,
-    S: void 0,
-    A: [
-      "context",
-      ""
-    ]
-  });
-  return context;
-};
-var SheetProviderImpl = ({ model, onInfo, children, __gridScope }) => {
-  const { id, editing, setEditing } = useGridContext("SheetProvider", __gridScope);
-  const decorations = useMemo2(() => createDecorations(), []);
-  const [cursor, setCursor] = useState3();
-  const [range, setRange] = useState3();
-  useSelectThreadOnCellFocus(model, cursor);
-  useThreadDecorations(model, decorations);
   return /* @__PURE__ */ React2.createElement(SheetContext.Provider, {
     value: {
       id,
@@ -1307,9 +954,11 @@ var SheetProviderImpl = ({ model, onInfo, children, __gridScope }) => {
       setCursor,
       range,
       setRange,
+      cursorFallbackRange,
+      activeRefs,
+      setActiveRefs,
       // TODO(burdon): Change to event.
-      onInfo,
-      decorations
+      onInfo
     }
   }, children);
 };
@@ -1318,7 +967,7 @@ var SheetProvider = ({ children, graph, sheet, readonly, onInfo }) => {
     readonly
   });
   return !model ? null : /* @__PURE__ */ React2.createElement(Grid.Root, {
-    id: fullyQualifiedId2(sheet)
+    id: fullyQualifiedId(sheet)
   }, /* @__PURE__ */ React2.createElement(SheetProviderImpl, {
     model,
     onInfo
@@ -1326,6 +975,337 @@ var SheetProvider = ({ children, graph, sheet, readonly, onInfo }) => {
 };
 
 // packages/plugins/plugin-sheet/src/components/GridSheet/GridSheet.tsx
+import React4, { useCallback as useCallback4, useMemo as useMemo2, useRef, useState as useState4 } from "react";
+import { useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { DropdownMenu, Icon, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { useAttention } from "@dxos/react-ui-attention";
+import { closestCell, defaultSizeRow, editorKeys, Grid as Grid2, GridCellEditor } from "@dxos/react-ui-grid";
+
+// packages/plugins/plugin-sheet/src/components/GridSheet/util.ts
+import { useEffect as useEffect3, useState as useState3 } from "react";
+import { createDocAccessor, fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
+import { parseValue, cellClassesForFieldType } from "@dxos/react-ui-data";
+import { colToA1Notation, rowToA1Notation, commentedClassName } from "@dxos/react-ui-grid";
+import { mx as mx2 } from "@dxos/react-ui-theme";
+
+// packages/plugins/plugin-sheet/src/integrations/thread-ranges.ts
+import { useCallback as useCallback3, useEffect as useEffect2, useMemo } from "react";
+import { LayoutAction, useIntentDispatcher, useIntentResolver } from "@dxos/app-framework";
+import { debounce as debounce2 } from "@dxos/async";
+import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
+
+// packages/plugins/plugin-sheet/src/components/index.ts
+import { lazy } from "react";
+
+// packages/plugins/plugin-sheet/src/components/RangeList/RangeList.tsx
+import React3, { useCallback as useCallback2 } from "react";
+import { S } from "@dxos/echo-schema";
+import { useTranslation } from "@dxos/react-ui";
+import { List } from "@dxos/react-ui-list";
+import { ghostHover } from "@dxos/react-ui-theme";
+var RangeList = ({ sheet }) => {
+  const { t } = useTranslation(SHEET_PLUGIN);
+  const handleSelectRange = (range) => {
+  };
+  const handleDeleteRange = useCallback2((range) => {
+    const index = sheet.ranges.findIndex((sheetRange) => sheetRange === range);
+    sheet.ranges.splice(index, 1);
+  }, [
+    sheet
+  ]);
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement("h2", {
+    className: "p-2 text-sm font-semibold"
+  }, t("range list heading")), /* @__PURE__ */ React3.createElement(List.Root, {
+    items: sheet.ranges,
+    isItem: S.is(Range)
+  }, ({ items: ranges }) => ranges.map((range, i) => /* @__PURE__ */ React3.createElement(List.Item, {
+    key: i,
+    item: range,
+    classNames: [
+      "p-2",
+      ghostHover
+    ]
+  }, /* @__PURE__ */ React3.createElement(List.ItemDragHandle, null), /* @__PURE__ */ React3.createElement(List.ItemTitle, {
+    onClick: () => handleSelectRange(range)
+  }, t("range title", {
+    position: rangeToA1Notation(rangeFromIndex(sheet, range.range)),
+    key: t(`range key ${range.key} label`),
+    value: t(`range value ${range.value} label`)
+  })), /* @__PURE__ */ React3.createElement(List.ItemDeleteButton, {
+    onClick: () => handleDeleteRange(range)
+  })))));
+};
+
+// packages/plugins/plugin-sheet/src/components/index.ts
+var SheetContainer = lazy(() => import("./SheetContainer-22IOAW3B.mjs"));
+
+// packages/plugins/plugin-sheet/src/integrations/thread-ranges.ts
+var completeCellRangeToThreadCursor = (range) => {
+  return `${range.from.col},${range.from.row},${range.to.col},${range.to.row}`;
+};
+var parseThreadAnchorAsCellRange = (cursor) => {
+  const coords = cursor.split(",");
+  if (coords.length !== 4) {
+    return null;
+  } else {
+    const [fromCol, fromRow, toCol, toRow] = coords;
+    return {
+      from: {
+        col: parseInt(fromCol),
+        row: parseInt(fromRow)
+      },
+      to: {
+        col: parseInt(toCol),
+        row: parseInt(toRow)
+      }
+    };
+  }
+};
+var useUpdateFocusedCellOnThreadSelection = (grid) => {
+  const { model, setActiveRefs } = useSheetContext();
+  const handleScrollIntoView = useCallback3(({ action, data }) => {
+    switch (action) {
+      case LayoutAction.SCROLL_INTO_VIEW: {
+        if (!data?.id || data?.cursor === void 0 || data?.id !== fullyQualifiedId2(model.sheet)) {
+          return;
+        }
+        setActiveRefs(data.thread);
+        const range = parseThreadAnchorAsCellRange(data.cursor);
+        range && grid?.setFocus({
+          ...range.to,
+          plane: "grid"
+        }, true);
+      }
+    }
+  }, [
+    model.sheet,
+    setActiveRefs
+  ]);
+  useIntentResolver(SHEET_PLUGIN, handleScrollIntoView);
+};
+var useSelectThreadOnCellFocus = () => {
+  const { model, cursor } = useSheetContext();
+  const dispatch = useIntentDispatcher();
+  const threads = useMemo(() => model.sheet.threads?.filter((thread) => !!thread) ?? [], [
+    // TODO(thure): Surely we can find a better dependency for this…
+    JSON.stringify(model.sheet.threads)
+  ]);
+  const selectClosestThread = useCallback3((cellAddress) => {
+    if (!cellAddress || !threads) {
+      return;
+    }
+    const closestThread = threads?.find(({ anchor }) => {
+      if (anchor) {
+        const range = parseThreadAnchorAsCellRange(anchor);
+        return range ? inRange(range, cellAddress) : false;
+      } else {
+        return false;
+      }
+    });
+    if (closestThread) {
+      void dispatch([
+        {
+          action: "dxos.org/plugin/thread/action/select",
+          data: {
+            current: fullyQualifiedId2(closestThread)
+          }
+        }
+      ]);
+    }
+  }, [
+    dispatch,
+    threads
+  ]);
+  const debounced = useMemo(() => {
+    return debounce2((cellCoords) => requestAnimationFrame(() => selectClosestThread(cellCoords)), 50);
+  }, [
+    selectClosestThread
+  ]);
+  useEffect2(() => {
+    if (!cursor) {
+      return;
+    }
+    debounced(cursor);
+  }, [
+    cursor,
+    debounced
+  ]);
+};
+
+// packages/plugins/plugin-sheet/src/components/GridSheet/util.ts
+var dxGridCellIndexToSheetCellAddress = (index) => {
+  const [colStr, rowStr] = index.split(",");
+  return {
+    col: parseInt(colStr),
+    row: parseInt(rowStr)
+  };
+};
+var createDxGridColumns = (model) => {
+  return model.sheet.columns.reduce((acc, columnId, numericIndex) => {
+    if (model.sheet.columnMeta[columnId] && model.sheet.columnMeta[columnId].size) {
+      acc.grid[numericIndex] = {
+        size: model.sheet.columnMeta[columnId].size,
+        resizeable: true
+      };
+    }
+    return acc;
+  }, {
+    grid: {}
+  });
+};
+var createDxGridRows = (model) => {
+  return model.sheet.rows.reduce((acc, rowId, numericIndex) => {
+    if (model.sheet.rowMeta[rowId] && model.sheet.rowMeta[rowId].size) {
+      acc.grid[numericIndex] = {
+        size: model.sheet.rowMeta[rowId].size,
+        resizeable: true
+      };
+    }
+    return acc;
+  }, {
+    grid: {}
+  });
+};
+var projectCellProps = (model, col, row) => {
+  const address = {
+    col,
+    row
+  };
+  const rawValue = model.getValue(address);
+  const ranges = model.sheet.ranges?.filter(({ range }) => inRange(rangeFromIndex(model.sheet, range), address));
+  const threadRefs = model.sheet.threads?.filter((thread) => {
+    const range = thread?.anchor && parseThreadAnchorAsCellRange(thread.anchor);
+    return thread && range ? inRange(range, address) : false;
+  }).map((thread) => fullyQualifiedId3(thread)).join(" ");
+  const description = model.getValueDescription(address);
+  const type = description?.type;
+  const format = description?.format;
+  const classNames = ranges?.map(cellClassNameForRange).reverse();
+  return {
+    value: parseValue({
+      type,
+      format,
+      value: rawValue
+    }),
+    className: mx2(cellClassesForFieldType({
+      type,
+      format
+    }), threadRefs && commentedClassName, classNames),
+    dataRefs: threadRefs
+  };
+};
+var gridCellGetter = (model) => {
+  const cachedGridCells = {};
+  return (nextBounds) => {
+    [
+      ...Array(nextBounds.end.col - nextBounds.start.col)
+    ].forEach((_, c0) => {
+      return [
+        ...Array(nextBounds.end.row - nextBounds.start.row)
+      ].forEach((_2, r0) => {
+        const col = nextBounds.start.col + c0;
+        const row = nextBounds.start.row + r0;
+        cachedGridCells[`${col},${row}`] = projectCellProps(model, col, row);
+      });
+    });
+    return cachedGridCells;
+  };
+};
+var rowLabelCell = (row) => ({
+  value: rowToA1Notation(row),
+  className: "text-end !pie-1 text-subdued",
+  resizeHandle: "row"
+});
+var colLabelCell = (col) => ({
+  value: colToA1Notation(col),
+  className: "text-subdued",
+  resizeHandle: "col"
+});
+var cellGetter = (model) => {
+  const getGridCells = gridCellGetter(model);
+  return (nextBounds, plane) => {
+    switch (plane) {
+      case "grid":
+        return getGridCells(nextBounds);
+      case "frozenColsStart":
+        return [
+          ...Array(nextBounds.end.row - nextBounds.start.row)
+        ].reduce((acc, _, r0) => {
+          const r = nextBounds.start.row + r0;
+          acc[`0,${r}`] = rowLabelCell(r);
+          return acc;
+        }, {});
+      case "frozenRowsStart":
+        return [
+          ...Array(nextBounds.end.col - nextBounds.start.col)
+        ].reduce((acc, _, c0) => {
+          const c = nextBounds.start.col + c0;
+          acc[`${c},0`] = colLabelCell(c);
+          return acc;
+        }, {});
+      default:
+        return {};
+    }
+  };
+};
+var useSheetModelDxGridProps = (dxGrid, model) => {
+  const [columns, setColumns] = useState3(createDxGridColumns(model));
+  const [rows, setRows] = useState3(createDxGridRows(model));
+  useEffect3(() => {
+    const cellsAccessor = createDocAccessor(model.sheet, [
+      "cells"
+    ]);
+    if (dxGrid) {
+      dxGrid.getCells = cellGetter(model);
+    }
+    const handleCellsUpdate = () => {
+      dxGrid?.requestUpdate("initialCells");
+    };
+    cellsAccessor.handle.addListener("change", handleCellsUpdate);
+    const unsubscribe = model.graph.update.on(handleCellsUpdate);
+    return () => {
+      cellsAccessor.handle.removeListener("change", handleCellsUpdate);
+      unsubscribe();
+    };
+  }, [
+    model,
+    dxGrid
+  ]);
+  useEffect3(() => {
+    const columnMetaAccessor = createDocAccessor(model.sheet, [
+      "columnMeta"
+    ]);
+    const rowMetaAccessor = createDocAccessor(model.sheet, [
+      "rowMeta"
+    ]);
+    const handleColumnMetaUpdate = () => {
+      setColumns(createDxGridColumns(model));
+    };
+    const handleRowMetaUpdate = () => {
+      setRows(createDxGridRows(model));
+    };
+    columnMetaAccessor.handle.addListener("change", handleColumnMetaUpdate);
+    rowMetaAccessor.handle.addListener("change", handleRowMetaUpdate);
+    return () => {
+      columnMetaAccessor.handle.removeListener("change", handleColumnMetaUpdate);
+      rowMetaAccessor.handle.removeListener("change", handleRowMetaUpdate);
+    };
+  }, [
+    model,
+    dxGrid
+  ]);
+  return {
+    columns,
+    rows
+  };
+};
+
+// packages/plugins/plugin-sheet/src/components/GridSheet/GridSheet.tsx
+var inertPosition = {
+  plane: "grid",
+  col: 0,
+  row: 0
+};
 var initialCells = {
   grid: {},
   frozenColsStart: [
@@ -1347,11 +1327,11 @@ var frozen = {
 };
 var sheetRowDefault = {
   frozenRowsStart: {
-    size: 32,
+    size: defaultSizeRow,
     readonly: true
   },
   grid: {
-    size: 32,
+    size: defaultSizeRow,
     resizeable: true
   }
 };
@@ -1366,48 +1346,65 @@ var sheetColDefault = {
   }
 };
 var GridSheet = () => {
-  const { id, model, editing, setEditing, setCursor, setRange, range, cursor } = useSheetContext();
-  const dxGrid = useRef(null);
-  const rangeNotifier = useRef();
+  const { t } = useTranslation2(SHEET_PLUGIN);
+  const { id, model, editing, setCursor, setRange, cursor, cursorFallbackRange, activeRefs } = useSheetContext();
+  const [dxGrid, setDxGrid] = useState4(null);
+  const [extraplanarFocus, setExtraplanarFocus] = useState4(null);
+  const dispatch = useIntentDispatcher2();
+  const rangeController = useRef();
   const { hasAttention } = useAttention(id);
-  const handleFocus = useCallback2((event) => {
+  const handleFocus = useCallback4((event) => {
     if (!editing) {
       const cell = closestCell(event.target);
-      if (cell && cell.plane === "grid") {
-        setCursor({
-          col: cell.col,
-          row: cell.row
-        });
+      if (cell) {
+        if (cell.plane === "grid") {
+          setCursor({
+            col: cell.col,
+            row: cell.row
+          });
+          setExtraplanarFocus(null);
+        } else {
+          setExtraplanarFocus(cell);
+        }
+      } else {
+        setExtraplanarFocus(null);
       }
     }
   }, [
     editing
   ]);
-  const handleClose = useCallback2((value, { key, shift }) => {
+  const handleClose = useCallback4((_value, event) => {
+    if (event) {
+      const { key, shift } = event;
+      const axis = [
+        "Enter",
+        "ArrowUp",
+        "ArrowDown"
+      ].includes(key) ? "row" : [
+        "Tab",
+        "ArrowLeft",
+        "ArrowRight"
+      ].includes(key) ? "col" : void 0;
+      const delta = key.startsWith("Arrow") ? [
+        "ArrowUp",
+        "ArrowLeft"
+      ].includes(key) ? -1 : 1 : shift ? -1 : 1;
+      dxGrid?.refocus(axis, delta);
+    }
+  }, [
+    model,
+    editing,
+    dxGrid
+  ]);
+  const handleBlur = useCallback4((value) => {
     if (value !== void 0) {
       model.setValue(dxGridCellIndexToSheetCellAddress(editing.index), value);
     }
-    setEditing(null);
-    const axis = [
-      "Enter",
-      "ArrowUp",
-      "ArrowDown"
-    ].includes(key) ? "row" : [
-      "Tab",
-      "ArrowLeft",
-      "ArrowRight"
-    ].includes(key) ? "col" : void 0;
-    const delta = key.startsWith("Arrow") ? [
-      "ArrowUp",
-      "ArrowLeft"
-    ].includes(key) ? -1 : 1 : shift ? -1 : 1;
-    dxGrid.current?.refocus(axis, delta);
   }, [
     model,
-    editing,
-    setEditing
+    editing
   ]);
-  const handleAxisResize = useCallback2(({ axis, size, index: numericIndex }) => {
+  const handleAxisResize = useCallback4(({ axis, size, index: numericIndex }) => {
     if (axis === "row") {
       const rowId = model.sheet.rows[parseInt(numericIndex)];
       model.sheet.rowMeta[rowId] ??= {};
@@ -1420,44 +1417,91 @@ var GridSheet = () => {
   }, [
     model
   ]);
-  const handleSelect = useCallback2(({ minCol, maxCol, minRow, maxRow }) => {
-    const range2 = {
+  const handleSelect = useCallback4(({ minCol, maxCol, minRow, maxRow }) => {
+    const range = {
       from: {
         col: minCol,
         row: minRow
       }
     };
     if (minCol !== maxCol || minRow !== maxRow) {
-      range2.to = {
+      range.to = {
         col: maxCol,
         row: maxRow
       };
     }
     if (editing) {
-      rangeNotifier.current?.(rangeToA1Notation(range2));
+      rangeController.current?.setRange(rangeToA1Notation(range));
     } else {
-      setRange(range2.to ? range2 : void 0);
+      setRange(range.to ? range : void 0);
     }
   }, [
     editing
   ]);
-  const handleWheel = useCallback2((event) => {
+  const handleWheel = useCallback4((event) => {
     if (!hasAttention) {
       event.stopPropagation();
     }
   }, [
     hasAttention
   ]);
-  const handleKeyDown = useCallback2((event) => {
-    const cursorFallbackRange = range ?? cursor ? {
-      from: cursor,
-      to: cursor
-    } : null;
+  const selectEntireAxis = useCallback4((pos) => {
+    switch (pos.plane) {
+      case "frozenRowsStart":
+        return dxGrid?.setSelection({
+          start: {
+            col: pos.col,
+            row: 0,
+            plane: "grid"
+          },
+          end: {
+            col: pos.col,
+            row: model.sheet.rows.length - 1,
+            plane: "grid"
+          }
+        });
+      case "frozenColsStart":
+        return dxGrid?.setSelection({
+          start: {
+            row: pos.row,
+            col: 0,
+            plane: "grid"
+          },
+          end: {
+            row: pos.row,
+            col: model.sheet.columns.length - 1,
+            plane: "grid"
+          }
+        });
+    }
+  }, [
+    dxGrid,
+    model.sheet
+  ]);
+  const handleClick = useCallback4((event) => {
+    const cell = closestCell(event.target);
+    if (cell) {
+      selectEntireAxis(cell);
+    }
+  }, [
+    selectEntireAxis
+  ]);
+  const handleKeyDown = useCallback4((event) => {
     switch (event.key) {
       case "Backspace":
       case "Delete":
         event.preventDefault();
         return cursorFallbackRange && model.clear(cursorFallbackRange);
+      case "Enter":
+      case "Space":
+        if (dxGrid && extraplanarFocus) {
+          switch (extraplanarFocus.plane) {
+            case "frozenRowsStart":
+            case "frozenColsStart":
+              event.preventDefault();
+              return selectEntireAxis(extraplanarFocus);
+          }
+        }
     }
     if (event.metaKey || event.ctrlKey) {
       switch (event.key) {
@@ -1483,12 +1527,54 @@ var GridSheet = () => {
       }
     }
   }, [
-    range,
+    cursorFallbackRange,
     model,
-    cursor
+    cursor,
+    extraplanarFocus,
+    selectEntireAxis
+  ]);
+  const contextMenuAnchorRef = useRef(null);
+  const [contextMenuOpen, setContextMenuOpen] = useState4(null);
+  const contextMenuAxis = contextMenuOpen?.plane.startsWith("frozenRows") ? "col" : "row";
+  const handleContextMenu = useCallback4((event) => {
+    const cell = closestCell(event.target);
+    if (cell && cell.plane.startsWith("frozen")) {
+      event.preventDefault();
+      contextMenuAnchorRef.current = event.target;
+      setContextMenuOpen(cell);
+    }
+  }, []);
+  const handleAxisMenuAction = useCallback4((operation) => {
+    switch (operation) {
+      case "insert-before":
+      case "insert-after":
+        return dispatch({
+          action: SheetAction.INSERT_AXIS,
+          data: {
+            model,
+            axis: contextMenuAxis,
+            index: contextMenuOpen[contextMenuAxis] + (operation === "insert-before" ? 0 : 1)
+          }
+        });
+        break;
+      case "drop":
+        return dispatch({
+          action: SheetAction.DROP_AXIS,
+          data: {
+            model,
+            axis: contextMenuAxis,
+            axisIndex: model.sheet[contextMenuAxis === "row" ? "rows" : "columns"][contextMenuOpen[contextMenuAxis]]
+          }
+        });
+    }
+  }, [
+    contextMenuAxis,
+    contextMenuOpen,
+    model,
+    dispatch
   ]);
   const { columns, rows } = useSheetModelDxGridProps(dxGrid, model);
-  const extension = useMemo3(() => [
+  const extension = useMemo2(() => [
     editorKeys({
       onClose: handleClose,
       ...editing?.initialContent && {
@@ -1498,23 +1584,32 @@ var GridSheet = () => {
     sheetExtension({
       functions: model.graph.getFunctions()
     }),
-    rangeExtension((fn) => rangeNotifier.current = fn)
+    rangeExtension({
+      onInit: (fn) => rangeController.current = fn,
+      onStateChange: (state) => {
+        if (dxGrid) {
+          dxGrid.mode = typeof state.activeRange === "undefined" ? "edit" : "edit-select";
+        }
+      }
+    })
   ], [
     model,
     handleClose,
     editing
   ]);
-  const getCellContent = useCallback2((index) => {
+  const getCellContent = useCallback4((index) => {
     const cell = dxGridCellIndexToSheetCellAddress(index);
     return model.getCellText(cell);
   }, [
     model
   ]);
-  useUpdateFocusedCellOnThreadSelection(model, dxGrid);
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(GridCellEditor, {
+  useUpdateFocusedCellOnThreadSelection(dxGrid);
+  useSelectThreadOnCellFocus();
+  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(GridCellEditor, {
     getCellContent,
-    extension
-  }), /* @__PURE__ */ React3.createElement(Grid2.Content, {
+    extension,
+    onBlur: handleBlur
+  }), /* @__PURE__ */ React4.createElement(Grid2.Content, {
     initialCells,
     limitColumns: DEFAULT_COLUMNS,
     limitRows: DEFAULT_ROWS,
@@ -1528,44 +1623,49 @@ var GridSheet = () => {
     onFocus: handleFocus,
     onWheelCapture: handleWheel,
     onKeyDown: handleKeyDown,
-    overscroll: "inline",
-    className: "[--dx-grid-base:var(--surface-bg)]",
-    ref: dxGrid
-  }));
-};
-
-// packages/plugins/plugin-sheet/src/components/index.ts
-var SheetContainer = lazy(() => import("./SheetContainer-46PBMF2E.mjs"));
-
-// packages/plugins/plugin-sheet/src/hooks/useComputeGraph.ts
-var useComputeGraph = (space) => {
-  const { registry } = useContext2(ComputeGraphContext) ?? raise(new Error("Missing ComputeGraphContext"));
-  const [graph] = useAsyncState(async () => {
-    if (space) {
-      const graph2 = registry.getOrCreateGraph(space);
-      await graph2.open();
-      return graph2;
-    }
-  }, [
-    space,
-    registry
-  ]);
-  return graph;
+    onContextMenu: handleContextMenu,
+    onClick: handleClick,
+    overscroll: "trap",
+    className: "[--dx-grid-base:var(--surface-bg)] [&_.dx-grid]:border-bs [&_.dx-grid]:border-separator",
+    activeRefs,
+    ref: setDxGrid
+  }), /* @__PURE__ */ React4.createElement(DropdownMenu.Root, {
+    modal: false,
+    open: !!contextMenuOpen,
+    onOpenChange: (nextOpen) => setContextMenuOpen(nextOpen ? inertPosition : null)
+  }, /* @__PURE__ */ React4.createElement(DropdownMenu.VirtualTrigger, {
+    virtualRef: contextMenuAnchorRef
+  }), /* @__PURE__ */ React4.createElement(DropdownMenu.Content, {
+    side: contextMenuAxis === "col" ? "bottom" : "right",
+    sideOffset: 4,
+    collisionPadding: 8
+  }, /* @__PURE__ */ React4.createElement(DropdownMenu.Viewport, null, /* @__PURE__ */ React4.createElement(DropdownMenu.Item, {
+    onClick: () => handleAxisMenuAction("insert-before")
+  }, /* @__PURE__ */ React4.createElement(Icon, {
+    size: 5,
+    icon: contextMenuAxis === "col" ? "ph--columns-plus-left--regular" : "ph--rows-plus-top--regular"
+  }), /* @__PURE__ */ React4.createElement("span", null, t(`add ${contextMenuAxis} before label`))), /* @__PURE__ */ React4.createElement(DropdownMenu.Item, {
+    onClick: () => handleAxisMenuAction("insert-after")
+  }, /* @__PURE__ */ React4.createElement(Icon, {
+    size: 5,
+    icon: contextMenuAxis === "col" ? "ph--columns-plus-right--regular" : "ph--rows-plus-bottom--regular"
+  }), /* @__PURE__ */ React4.createElement("span", null, t(`add ${contextMenuAxis} after label`))), /* @__PURE__ */ React4.createElement(DropdownMenu.Item, {
+    onClick: () => handleAxisMenuAction("drop")
+  }, /* @__PURE__ */ React4.createElement(Icon, {
+    size: 5,
+    icon: "ph--backspace--regular"
+  }), /* @__PURE__ */ React4.createElement("span", null, t(`delete ${contextMenuAxis} label`)))), /* @__PURE__ */ React4.createElement(DropdownMenu.Arrow, null))));
 };
 
 export {
   ComputeGraphContextProvider,
-  addressToA1Notation,
-  rangeToA1Notation,
-  inRange,
-  createSheet,
-  addressToIndex,
-  compareIndexPositions,
-  computeGraphFacet,
   useComputeGraph,
+  completeCellRangeToThreadCursor,
+  computeGraphFacet,
   useSheetContext,
   SheetProvider,
   GridSheet,
+  RangeList,
   SheetContainer
 };
-//# sourceMappingURL=chunk-T3PRH7QS.mjs.map
+//# sourceMappingURL=chunk-BW36PM2Y.mjs.map