@dxos/plugin-sheet 0.6.11 → 0.6.12-main.15a606f

package/dist/lib/browser/{SheetContainer-U4H5D34A.mjs → chunk-U2JHW3L6.mjs}

@@ -1,24 +1,13 @@
 import {
-  useComputeGraph
-} from "./chunk-APHOLYUB.mjs";
+  SheetType,
+  ValueTypeEnum
+} from "./chunk-T3NJFTD4.mjs";
 import {
-  SheetModel,
-  addressFromA1Notation,
-  addressToA1Notation,
-  columnLetter,
-  defaultFunctions,
-  inRange,
-  posEquals,
-  rangeToA1Notation
-} from "./chunk-D5AGLXJP.mjs";
+  SHEET_PLUGIN
+} from "./chunk-QILRZNE5.mjs";
 import {
-  ValueTypeEnum
-} from "./chunk-FUAGSXA4.mjs";
-import "./chunk-JRL5LGCE.mjs";
-
-// packages/plugins/plugin-sheet/src/components/SheetContainer.tsx
-import React4 from "react";
-import { mx as mx3 } from "@dxos/react-ui-theme";
+  createSheetName
+} from "./chunk-6ZMQVB4Z.mjs";
 
 // packages/plugins/plugin-sheet/src/components/Sheet/Sheet.tsx
 import { DndContext, DragOverlay, KeyboardSensor, MouseSensor, TouchSensor, useDraggable, useDroppable, useSensor, useSensors } from "@dnd-kit/core";
@@ -26,17 +15,175 @@ import { restrictToHorizontalAxis, restrictToVerticalAxis } from "@dnd-kit/modif
 import { getEventCoordinates, useCombinedRefs } from "@dnd-kit/utilities";
 import { Function as FunctionIcon } from "@phosphor-icons/react";
 import { Resizable } from "re-resizable";
-import React3, { forwardRef, useEffect as useEffect3, useImperativeHandle, useMemo, useRef, useState as useState4 } from "react";
+import React6, { forwardRef, useEffect as useEffect4, useImperativeHandle, useMemo as useMemo4, useRef, useState as useState5 } from "react";
 import { createPortal } from "react-dom";
 import { useResizeDetector } from "react-resize-detector";
-import { debounce } from "@dxos/async";
+import { debounce as debounce2 } from "@dxos/async";
 import { fullyQualifiedId as fullyQualifiedId2, createDocAccessor } from "@dxos/client/echo";
-import { log } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { createAttendableAttributes, useHasAttention } from "@dxos/react-ui-attention";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-sheet/src/components/Sheet/grid.ts
 import { useEffect, useState } from "react";
+
+// 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: 39,
+    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
+import { randomBytes } from "@dxos/crypto";
+import { create } from "@dxos/echo-schema";
+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 = ({ title, ...size } = {}) => {
+  const sheet = create(SheetType, {
+    title,
+    cells: {},
+    rows: [],
+    columns: [],
+    rowMeta: {},
+    columnMeta: {},
+    formatting: {}
+  });
+  initialize(sheet, size);
+  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 rangeFromIndex = (sheet, idx) => {
+  const [from, to] = idx.split(":").map((index) => addressFromIndex(sheet, index));
+  return {
+    from,
+    to
+  };
+};
+var closest = (cursor, cells) => {
+  let closestCell;
+  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) {
+      closestCell = cell;
+      closestDistance = distance;
+    }
+  }
+  return closestCell;
+};
+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/components/Sheet/grid.ts
 var axisWidth = "calc(var(--rail-size)-2px)";
 var axisHeight = 34;
 var minWidth = 40;
@@ -78,7 +225,7 @@ var useGridLayout = ({ scroller, size, rows, columns, rowSizes, columnSizes }) =
       const left = x;
       x += width2 - 1;
       return {
-        column: i,
+        col: i,
         left,
         width: width2
       };
@@ -183,14 +330,14 @@ var handleNav = (ev, cursor, range, size) => {
         break;
       }
       case "ArrowLeft": {
-        if (opposite.column > 0) {
-          opposite.column -= 1;
+        if (opposite.col > 0) {
+          opposite.col -= 1;
         }
         break;
       }
       case "ArrowRight": {
-        if (opposite.column < size.numColumns - 1) {
-          opposite.column += 1;
+        if (opposite.col < size.numCols - 1) {
+          opposite.col += 1;
         }
         break;
       }
@@ -208,18 +355,18 @@ var handleNav = (ev, cursor, range, size) => {
     cursor: next
   };
 };
-var handleArrowNav = (ev, cursor, { numRows, numColumns }) => {
+var handleArrowNav = (ev, cursor, { numRows, numCols }) => {
   switch (ev.key) {
     case "ArrowUp":
       if (cursor === void 0) {
         return {
           row: 0,
-          column: 0
+          col: 0
         };
       } else if (cursor.row > 0) {
         return {
           row: ev.metaKey ? 0 : cursor.row - 1,
-          column: cursor.column
+          col: cursor.col
         };
       }
       break;
@@ -227,12 +374,12 @@ var handleArrowNav = (ev, cursor, { numRows, numColumns }) => {
       if (cursor === void 0) {
         return {
           row: 0,
-          column: 0
+          col: 0
         };
       } else if (cursor.row < numRows - 1) {
         return {
           row: ev.metaKey ? numRows - 1 : cursor.row + 1,
-          column: cursor.column
+          col: cursor.col
         };
       }
       break;
@@ -240,12 +387,12 @@ var handleArrowNav = (ev, cursor, { numRows, numColumns }) => {
       if (cursor === void 0) {
         return {
           row: 0,
-          column: 0
+          col: 0
         };
-      } else if (cursor.column > 0) {
+      } else if (cursor.col > 0) {
         return {
           row: cursor.row,
-          column: ev.metaKey ? 0 : cursor.column - 1
+          col: ev.metaKey ? 0 : cursor.col - 1
         };
       }
       break;
@@ -253,24 +400,24 @@ var handleArrowNav = (ev, cursor, { numRows, numColumns }) => {
       if (cursor === void 0) {
         return {
           row: 0,
-          column: 0
+          col: 0
         };
-      } else if (cursor.column < numColumns - 1) {
+      } else if (cursor.col < numCols - 1) {
         return {
           row: cursor.row,
-          column: ev.metaKey ? numColumns - 1 : cursor.column + 1
+          col: ev.metaKey ? numCols - 1 : cursor.col + 1
         };
       }
       break;
     case "Home":
       return {
         row: 0,
-        column: 0
+        col: 0
       };
     case "End":
       return {
         row: numRows - 1,
-        column: numColumns - 1
+        col: numCols - 1
       };
   }
 };
@@ -327,31 +474,103 @@ var useRangeSelect = (cb) => {
 };
 
 // packages/plugins/plugin-sheet/src/components/Sheet/sheet-context.tsx
-import React, { createContext, useContext, useState as useState3, useEffect as useEffect2 } from "react";
-import { invariant } from "@dxos/invariant";
-import { fullyQualifiedId } from "@dxos/react-client/echo";
+import React3, { createContext as createContext2, useContext as useContext2, useMemo as useMemo2, useState as useState4 } from "react";
+import { invariant as invariant3 } from "@dxos/invariant";
+
+// packages/plugins/plugin-sheet/src/components/Sheet/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/hooks/useComputeGraph.ts
+import { useContext } from "react";
+import { raise } from "@dxos/debug";
+import { useAsyncState } from "@dxos/react-hooks";
+
+// packages/plugins/plugin-sheet/src/components/index.ts
+import React2 from "react";
+
+// packages/plugins/plugin-sheet/src/components/ComputeGraph/ComputeGraphContextProvider.tsx
+import React, { createContext } from "react";
+var ComputeGraphContext = /* @__PURE__ */ createContext(void 0);
+var ComputeGraphContextProvider = ({ registry, children }) => {
+  return /* @__PURE__ */ React.createElement(ComputeGraphContext.Provider, {
+    value: {
+      registry
+    }
+  }, children);
+};
+
+// packages/plugins/plugin-sheet/src/components/index.ts
+var SheetContainer = React2.lazy(() => import("./SheetContainer-V4GCCZTX.mjs"));
 
-// packages/plugins/plugin-sheet/src/components/Sheet/formatting.ts
+// packages/plugins/plugin-sheet/src/hooks/useComputeGraph.ts
+var useComputeGraph = (space) => {
+  const { registry } = useContext(ComputeGraphContext) ?? raise(new Error("Missing ComputeGraphContext"));
+  return useAsyncState(async () => space && registry.getOrCreateGraph(space), [
+    space,
+    registry
+  ]);
+};
+
+// packages/plugins/plugin-sheet/src/hooks/useFormattingModel.ts
+import { useMemo } from "react";
+
+// packages/plugins/plugin-sheet/src/model/formatting-model.ts
 var FormattingModel = class {
-  constructor(model) {
-    this.model = model;
+  constructor(_model) {
+    this._model = _model;
   }
   /**
   * Get formatted string value and className for cell.
   */
   getFormatting(cell) {
-    const value = this.model.getValue(cell);
+    const value = this._model.getValue(cell);
     if (value === void 0 || value === null) {
       return {};
     }
     const locales = void 0;
-    const idx = this.model.addressToIndex(cell);
-    let formatting = this.model.sheet.formatting?.[idx] ?? {};
+    const idx = addressToIndex(this._model.sheet, cell);
+    let formatting = this._model.sheet.formatting?.[idx] ?? {};
     const classNames = [
       ...formatting?.classNames ?? []
     ];
-    for (const [idx2, _formatting] of Object.entries(this.model.sheet.formatting)) {
-      const range = this.model.rangeFromIndex(idx2);
+    for (const [idx2, _formatting] of Object.entries(this._model.sheet.formatting)) {
+      const range = rangeFromIndex(this._model.sheet, idx2);
       if (inRange(range, cell)) {
         if (_formatting.classNames) {
           classNames.push(..._formatting.classNames);
@@ -362,7 +581,7 @@ var FormattingModel = class {
       }
     }
     const defaultNumber = "justify-end font-mono";
-    const type = formatting?.type ?? this.model.getValueType(cell);
+    const type = formatting?.type ?? this._model.getValueType(cell);
     switch (type) {
       case ValueTypeEnum.Boolean: {
         return {
@@ -412,21 +631,21 @@ var FormattingModel = class {
       // Dates.
       //
       case ValueTypeEnum.DateTime: {
-        const date = this.model.toLocalDate(value);
+        const date = this._model.toLocalDate(value);
         return {
           value: date.toLocaleString(locales),
           classNames
         };
       }
       case ValueTypeEnum.Date: {
-        const date = this.model.toLocalDate(value);
+        const date = this._model.toLocalDate(value);
         return {
           value: date.toLocaleDateString(locales),
           classNames
         };
       }
       case ValueTypeEnum.Time: {
-        const date = this.model.toLocalDate(value);
+        const date = this._model.toLocalDate(value);
         return {
           value: date.toLocaleTimeString(locales),
           classNames
@@ -442,84 +661,428 @@ var FormattingModel = class {
   }
 };
 
-// packages/plugins/plugin-sheet/src/components/Sheet/sheet-context.tsx
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/components/Sheet/sheet-context.tsx";
-var OBJECT_ID_LENGTH = 60;
-var SheetContext = /* @__PURE__ */ createContext(null);
-var useSheetContext = () => {
-  const context = useContext(SheetContext);
-  invariant(context, void 0, {
-    F: __dxlog_file,
-    L: 45,
-    S: void 0,
-    A: [
-      "context",
-      ""
-    ]
-  });
-  return context;
+// packages/plugins/plugin-sheet/src/model/sheet-model.ts
+import { Event } from "@dxos/async";
+import { Resource } from "@dxos/context";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { PublicKey } from "@dxos/keys";
+import { log } from "@dxos/log";
+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: ValueTypeEnum.Boolean,
+  NUMBER_RAW: ValueTypeEnum.Number,
+  NUMBER_PERCENT: ValueTypeEnum.Percent,
+  NUMBER_CURRENCY: ValueTypeEnum.Currency,
+  NUMBER_DATETIME: ValueTypeEnum.DateTime,
+  NUMBER_DATE: ValueTypeEnum.Date,
+  NUMBER_TIME: ValueTypeEnum.Time
 };
-var mapFormulaBindingToId = (functions) => (formula) => {
-  return formula.replace(/([a-zA-Z0-9]+)\((.*)\)/g, (match, binding, args) => {
-    if (defaultFunctions.find((fn2) => fn2.name === binding) || binding === "EDGE") {
-      return match;
+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();
+    this._node = this._graph.getOrCreateNode(createSheetName(this._sheet.id));
+    this.reset();
+  }
+  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: 105,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    initialize(this._sheet);
+    this.reset();
+    const unsubscribe = this._graph.update.on(() => this.update.emit());
+    this._ctx.onDispose(unsubscribe);
+  }
+  /**
+  * Update engine.
+  * NOTE: This resets the undo history.
+  * @deprecated
+  */
+  reset() {
+    this._node.hf.clearSheet(this._node.sheetId);
+    Object.entries(this._sheet.cells).forEach(([key, { value }]) => {
+      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.hf.setCellContents({
+        sheet: this._node.sheetId,
+        row,
+        col
+      }, value);
+    });
+  }
+  /**
+  * Recalculate formulas.
+  * NOTE: This resets the undo history.
+  * https://hyperformula.handsontable.com/guide/volatile-functions.html#volatile-actions
+  * @deprecated
+  */
+  // TODO(burdon): Remove.
+  recalculate() {
+    this._node.hf.rebuildAndRecalculate();
+  }
+  insertRows(i, n = 1) {
+    insertIndices(this._sheet.rows, i, n, MAX_ROWS);
+    this.reset();
+  }
+  insertColumns(i, n = 1) {
+    insertIndices(this._sheet.columns, i, n, MAX_COLUMNS);
+    this.reset();
+  }
+  //
+  // Undoable actions.
+  // TODO(burdon): Group undoable methods; consistently update hf/sheet.
+  //
+  /**
+  * Clear range of values.
+  */
+  clear(range) {
+    const topLeft = getTopLeft(range);
+    const values = this._iterRange(range, () => null);
+    this._node.hf.setCellContents(toSimpleCellAddress(this._node.sheetId, topLeft), values);
+    this._iterRange(range, (cell) => {
+      const idx = addressToIndex(this._sheet, cell);
+      delete this._sheet.cells[idx];
+    });
+  }
+  cut(range) {
+    this._node.hf.cut(toModelRange(this._node.sheetId, range));
+    this._iterRange(range, (cell) => {
+      const idx = addressToIndex(this._sheet, cell);
+      delete this._sheet.cells[idx];
+    });
+  }
+  copy(range) {
+    this._node.hf.copy(toModelRange(this._node.sheetId, range));
+  }
+  paste(cell) {
+    if (!this._node.hf.isClipboardEmpty()) {
+      const changes = this._node.hf.paste(toSimpleCellAddress(this._node.sheetId, cell));
+      for (const change of changes) {
+        if (change instanceof ExportedCellChange) {
+          const { address, newValue } = change;
+          const idx = addressToIndex(this._sheet, {
+            row: address.row,
+            col: address.col
+          });
+          this._sheet.cells[idx] = {
+            value: newValue
+          };
+        }
+      }
+    }
+  }
+  // TODO(burdon): Display undo/redo state.
+  undo() {
+    if (this._node.hf.isThereSomethingToUndo()) {
+      this._node.hf.undo();
+      this.update.emit();
+    }
+  }
+  redo() {
+    if (this._node.hf.isThereSomethingToRedo()) {
+      this._node.hf.redo();
+      this.update.emit();
     }
-    const fn = functions.find((fn2) => fn2.binding === binding);
-    if (fn) {
-      return `${fullyQualifiedId(fn)}(${args})`;
+  }
+  /**
+  * Get value from sheet.
+  */
+  getCellValue(cell) {
+    const idx = addressToIndex(this._sheet, cell);
+    return this._sheet.cells[idx]?.value ?? null;
+  }
+  /**
+  * Get value as a string for editing.
+  */
+  getCellText(cell) {
+    const value = this.getCellValue(cell);
+    if (value == null) {
+      return void 0;
+    }
+    if (typeof value === "string" && value.charAt(0) === "=") {
+      return this._graph.mapFunctionBindingFromId(this.mapFormulaIndicesToRefs(value));
     } else {
-      return match;
+      return String(value);
     }
-  });
-};
-var mapFormulaBindingFromId = (functions) => (formula) => {
-  return formula.replace(/([a-zA-Z0-9]+):([a-zA-Z0-9]+)\((.*)\)/g, (match, spaceId, objectId, args) => {
-    const id = `${spaceId}:${objectId}`;
-    if (id.length !== OBJECT_ID_LENGTH) {
-      return match;
+  }
+  /**
+  * Get array of raw values from sheet.
+  */
+  getCellValues(range) {
+    return this._iterRange(range, (cell) => this.getCellValue(cell));
+  }
+  /**
+  * Gets the regular or computed value from the engine.
+  */
+  getValue(cell) {
+    const value = this._node.hf.getCellValue(toSimpleCellAddress(this._node.sheetId, cell));
+    if (value instanceof DetailedCellError) {
+      return value.toString();
+    }
+    return value;
+  }
+  /**
+  * Get value type.
+  */
+  getValueType(cell) {
+    const addr = toSimpleCellAddress(this._node.sheetId, cell);
+    const type = this._node.hf.getCellValueDetailedType(addr);
+    return typeMap[type];
+  }
+  /**
+  * Sets the value, updating the sheet and engine.
+  */
+  setValue(cell, value) {
+    if (this._options.readonly) {
+      throw new ReadonlyException();
+    }
+    let refresh = false;
+    if (cell.row >= this._sheet.rows.length) {
+      insertIndices(this._sheet.rows, cell.row, 1, MAX_ROWS);
+      refresh = true;
+    }
+    if (cell.col >= this._sheet.columns.length) {
+      insertIndices(this._sheet.columns, cell.col, 1, MAX_COLUMNS);
+      refresh = true;
     }
-    const fn = functions.find((fn2) => fullyQualifiedId(fn2) === id);
-    if (fn?.binding) {
-      return `${fn.binding}(${args})`;
+    if (refresh) {
+      this.reset();
+    }
+    this._node.hf.setCellContents({
+      sheet: this._node.sheetId,
+      row: cell.row,
+      col: cell.col
+    }, [
+      [
+        typeof value === "string" && value.charAt(0) === "=" ? this._graph.mapFormulaToNative(value) : value
+      ]
+    ]);
+    const idx = addressToIndex(this._sheet, cell);
+    if (value === void 0 || value === null) {
+      delete this._sheet.cells[idx];
     } else {
-      return match;
+      if (typeof value === "string" && value.charAt(0) === "=") {
+        value = this._graph.mapFunctionBindingToId(this.mapFormulaRefsToIndices(value));
+      }
+      this._sheet.cells[idx] = {
+        value
+      };
     }
-  });
+  }
+  /**
+  * Sets values from a simple map.
+  */
+  setValues(values) {
+    Object.entries(values).forEach(([key, { value }]) => {
+      this.setValue(addressFromA1Notation(key), value);
+    });
+  }
+  /**
+  * Iterate range.
+  */
+  _iterRange(range, cb) {
+    const to = range.to ?? range.from;
+    const rowRange = [
+      Math.min(range.from.row, to.row),
+      Math.max(range.from.row, to.row)
+    ];
+    const columnRange = [
+      Math.min(range.from.col, to.col),
+      Math.max(range.from.col, to.col)
+    ];
+    const rows = [];
+    for (let row = rowRange[0]; row <= rowRange[1]; row++) {
+      const rowCells = [];
+      for (let column = columnRange[0]; column <= columnRange[1]; column++) {
+        const value = cb({
+          row,
+          col: column
+        });
+        if (value !== void 0) {
+          rowCells.push(value);
+        }
+      }
+      rows.push(rowCells);
+    }
+    return rows;
+  }
+  // TODO(burdon): Delete index.
+  _deleteIndices(indices, i, n) {
+    throw new Error("Not implemented");
+  }
+  // TODO(burdon): Move. Cannot use fractional without changing. Switch back to using unique IDs?
+  _moveIndices(indices, i, j, n) {
+    throw new Error("Not implemented");
+  }
+  //
+  // Indices.
+  //
+  /**
+  * Map from A1 notation to indices.
+  */
+  mapFormulaRefsToIndices(formula) {
+    invariant2(formula.charAt(0) === "=", void 0, {
+      F: __dxlog_file2,
+      L: 358,
+      S: this,
+      A: [
+        "formula.charAt(0) === '='",
+        ""
+      ]
+    });
+    return formula.replace(/([a-zA-Z]+)([0-9]+)/g, (match) => {
+      return addressToIndex(this._sheet, addressFromA1Notation(match));
+    });
+  }
+  /**
+  * Map from indices to A1 notation.
+  */
+  mapFormulaIndicesToRefs(formula) {
+    invariant2(formula.charAt(0) === "=", void 0, {
+      F: __dxlog_file2,
+      L: 368,
+      S: this,
+      A: [
+        "formula.charAt(0) === '='",
+        ""
+      ]
+    });
+    return formula.replace(/([a-zA-Z0-9]+)@([a-zA-Z0-9]+)/g, (idx) => {
+      return addressToA1Notation(addressFromIndex(this._sheet, idx));
+    });
+  }
+  //
+  // Values
+  //
+  /**
+  * https://hyperformula.handsontable.com/guide/date-and-time-handling.html#example
+  * https://hyperformula.handsontable.com/api/interfaces/configparams.html#nulldate
+  * NOTE: TODAY() is number of FULL days since nullDate. It will typically be -1 days from NOW().
+  */
+  toLocalDate(num) {
+    const { year, month, day, hours, minutes, seconds } = this.toDateTime(num);
+    return new Date(year, month - 1, day, hours, minutes, seconds);
+  }
+  toDateTime(num) {
+    return this._node.hf.numberToDateTime(num);
+  }
+  toDate(num) {
+    return this._node.hf.numberToDate(num);
+  }
+  toTime(num) {
+    return this._node.hf.numberToTime(num);
+  }
 };
-var SheetContextProvider = ({ children, sheet, space, readonly, onInfo, ...options }) => {
-  const graph = useComputeGraph(space, options);
-  const [cursor, setCursor] = useState3();
-  const [range, setRange] = useState3();
-  const [editing, setEditing] = useState3(false);
-  const [[model, formatting] = [], setModels] = useState3(void 0);
+
+// packages/plugins/plugin-sheet/src/hooks/useFormattingModel.ts
+var useFormattingModel = (model) => {
+  return useMemo(() => model && new FormattingModel(model), [
+    model
+  ]);
+};
+
+// packages/plugins/plugin-sheet/src/hooks/useSheetModel.ts
+import { useEffect as useEffect2, useState as useState3 } from "react";
+var useSheetModel = (space, sheet, { readonly } = {}) => {
+  const graph = useComputeGraph(space);
+  const [model, setModel] = useState3();
   useEffect2(() => {
+    if (!space || !graph || !sheet) {
+      return;
+    }
     let model2;
-    let formatting2;
     const t = setTimeout(async () => {
-      model2 = new SheetModel(graph, sheet, space, {
-        readonly,
-        mapFormulaBindingToId,
-        mapFormulaBindingFromId
+      model2 = new SheetModel(graph, sheet, {
+        readonly
       });
-      await model2.initialize();
-      formatting2 = new FormattingModel(model2);
-      setModels([
-        model2,
-        formatting2
-      ]);
+      await model2.open();
+      setModel(model2);
     });
     return () => {
       clearTimeout(t);
-      void model2?.destroy();
+      void model2?.close();
     };
   }, [
+    space,
+    sheet,
     graph,
     readonly
   ]);
-  if (!model || !formatting) {
-    return null;
-  }
-  return /* @__PURE__ */ React.createElement(SheetContext.Provider, {
+  return model;
+};
+
+// packages/plugins/plugin-sheet/src/components/Sheet/sheet-context.tsx
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/components/Sheet/sheet-context.tsx";
+var SheetContext = /* @__PURE__ */ createContext2(null);
+var useSheetContext = () => {
+  const context = useContext2(SheetContext);
+  invariant3(context, void 0, {
+    F: __dxlog_file3,
+    L: 43,
+    S: void 0,
+    A: [
+      "context",
+      ""
+    ]
+  });
+  return context;
+};
+var SheetContextProvider = ({ children, sheet, space, readonly, onInfo }) => {
+  const model = useSheetModel(space, sheet, {
+    readonly
+  });
+  const formatting = useFormattingModel(model);
+  const [cursor, setCursor] = useState4();
+  const [range, setRange] = useState4();
+  const [editing, setEditing] = useState4(false);
+  const decorations = useMemo2(() => createDecorations(), []);
+  return !model || !formatting ? null : /* @__PURE__ */ React3.createElement(SheetContext.Provider, {
     value: {
       model,
       formatting,
@@ -530,11 +1093,177 @@ var SheetContextProvider = ({ children, sheet, space, readonly, onInfo, ...optio
       editing,
       setEditing,
       // TODO(burdon): Change to event.
-      onInfo
+      onInfo,
+      decorations
     }
   }, children);
 };
 
+// packages/plugins/plugin-sheet/src/components/Sheet/threads.tsx
+import { effect } from "@preact/signals-core";
+import React4, { useCallback, useEffect as useEffect3, useMemo as useMemo3 } from "react";
+import { LayoutAction, useIntentDispatcher, useIntentResolver } from "@dxos/app-framework";
+import { debounce } from "@dxos/async";
+import { fullyQualifiedId } from "@dxos/react-client/echo";
+import { Icon, useTranslation } from "@dxos/react-ui";
+var CommentIndicator = () => {
+  return /* @__PURE__ */ React4.createElement("div", {
+    role: "none",
+    className: "absolute top-0 right-0 w-0 h-0 border-t-8 border-l-8 border-t-cmCommentSurface border-l-transparent"
+  });
+};
+var ThreadedCellWrapper = ({ children }) => {
+  const dispatch = useIntentDispatcher();
+  const [isHovered, setIsHovered] = React4.useState(false);
+  const { t } = useTranslation(SHEET_PLUGIN);
+  const handleClick = React4.useCallback((_event) => {
+    void dispatch({
+      action: LayoutAction.SET_LAYOUT,
+      data: {
+        element: "complementary",
+        state: true
+      }
+    });
+  }, [
+    dispatch
+  ]);
+  return /* @__PURE__ */ React4.createElement("div", {
+    role: "none",
+    className: "relative h-full is-full",
+    onMouseEnter: () => {
+      setIsHovered(true);
+    },
+    onMouseLeave: () => {
+      setIsHovered(false);
+    }
+  }, /* @__PURE__ */ React4.createElement(CommentIndicator, null), isHovered && /* @__PURE__ */ React4.createElement("div", {
+    className: "absolute inset-0 flex items-center justify-end pr-1"
+  }, /* @__PURE__ */ React4.createElement("button", {
+    className: "ch-button text-xs min-bs-0 p-1",
+    onClick: handleClick,
+    "aria-label": t("open comment for sheet cell")
+  }, /* @__PURE__ */ React4.createElement(Icon, {
+    icon: "ph--chat--regular",
+    "aria-hidden": true
+  }))), children);
+};
+var createThreadDecoration = (cellIndex, threadId, sheetId) => {
+  return {
+    type: "comment",
+    cellIndex,
+    decorate: (props) => /* @__PURE__ */ React4.createElement(ThreadedCellWrapper, props)
+  };
+};
+var useUpdateCursorOnThreadSelection = () => {
+  const { setCursor, model } = useSheetContext();
+  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);
+        setCursor(cellAddress);
+      }
+    }
+  }, [
+    model.sheet,
+    setCursor
+  ]);
+  useIntentResolver(SHEET_PLUGIN, handleScrollIntoView);
+};
+var useSelectThreadOnCursorChange = () => {
+  const { cursor, model } = useSheetContext();
+  const dispatch = useIntentDispatcher();
+  const activeThreads = useMemo3(() => model.sheet.threads?.filter((thread) => !!thread && thread.status === "active") ?? [], [
+    JSON.stringify(model.sheet.threads)
+  ]);
+  const activeThreadAddresses = useMemo3(() => 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)
+            }
+          }
+        ]);
+      }
+    }
+  }, [
+    dispatch,
+    activeThreads,
+    activeThreadAddresses,
+    model.sheet
+  ]);
+  const debounced = useMemo3(() => {
+    return debounce((cursor2) => requestAnimationFrame(() => selectClosestThread(cursor2)), 50);
+  }, [
+    selectClosestThread
+  ]);
+  useEffect3(() => {
+    if (!cursor) {
+      return;
+    }
+    debounced(cursor);
+  }, [
+    cursor,
+    selectClosestThread
+  ]);
+};
+var useThreadDecorations = () => {
+  const { decorations, model } = useSheetContext();
+  const sheet = useMemo3(() => model.sheet, [
+    model.sheet
+  ]);
+  const sheetId = useMemo3(() => fullyQualifiedId(sheet), [
+    sheet
+  ]);
+  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();
+  });
+};
+var useThreads = () => {
+  useUpdateCursorOnThreadSelection();
+  useSelectThreadOnCursorChange();
+  useThreadDecorations();
+};
+
 // packages/plugins/plugin-sheet/src/components/Sheet/util.ts
 var getRelativeClientRect = (root, element) => {
   const rootRect = root.getBoundingClientRect();
@@ -570,7 +1299,7 @@ var scrollIntoView = (scrollContainer, el) => {
 
 // packages/plugins/plugin-sheet/src/components/CellEditor/CellEditor.tsx
 import { EditorView, keymap } from "@codemirror/view";
-import React2 from "react";
+import React5 from "react";
 import { useThemeContext } from "@dxos/react-ui";
 import { createBasicExtensions, createThemeExtensions, preventNewline, useTextEditor } from "@dxos/react-ui-editor";
 var editorKeys = ({ onNav, onClose }) => {
@@ -618,20 +1347,60 @@ var editorKeys = ({ onNav, onClose }) => {
     {
       key: "Enter",
       run: (editor) => {
-        onClose(editor.state.doc.toString());
+        onClose(editor.state.doc.toString(), {
+          key: "Enter"
+        });
+        return true;
+      },
+      shift: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Enter",
+          shift: true
+        });
+        return true;
+      }
+    },
+    {
+      key: "Tab",
+      run: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Tab"
+        });
+        return true;
+      },
+      shift: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Tab",
+          shift: true
+        });
         return true;
       }
     },
     {
       key: "Escape",
       run: () => {
-        onClose(void 0);
+        onClose(void 0, {
+          key: "Escape"
+        });
         return true;
       }
     }
   ]);
 };
-var CellEditor = ({ value, extension, autoFocus, onBlur }) => {
+var editorVariants = {
+  // TODO(thure): remove when legacy is no longer used.
+  legacy: {
+    root: "flex w-full",
+    editor: "flex w-full [&>.cm-scroller]:scrollbar-none",
+    content: "!px-2 !py-1"
+  },
+  grid: {
+    root: "absolute z-[1]",
+    editor: "[&>.cm-scroller]:scrollbar-none tabular-nums",
+    content: "!border !border-transparent !p-0.5"
+  }
+};
+var CellEditor = ({ value, extension, autoFocus, onBlur, variant = "legacy", box, gridId }) => {
   const { themeMode } = useThemeContext();
   const { parentRef } = useTextEditor(() => {
     return {
@@ -658,21 +1427,29 @@ var CellEditor = ({ value, extension, autoFocus, onBlur }) => {
           themeMode,
           slots: {
             editor: {
-              className: "flex w-full [&>.cm-scroller]:scrollbar-none"
+              className: editorVariants[variant].editor
             },
             content: {
-              className: "!px-2 !py-1"
+              className: editorVariants[variant].content
             }
           }
         })
       ]
     };
   }, [
-    extension
+    extension,
+    autoFocus,
+    value,
+    variant,
+    onBlur
   ]);
-  return /* @__PURE__ */ React2.createElement("div", {
+  return /* @__PURE__ */ React5.createElement("div", {
     ref: parentRef,
-    className: "flex w-full"
+    className: editorVariants[variant].root,
+    style: box,
+    ...gridId && {
+      "data-grid": gridId
+    }
   });
 };
 
@@ -794,13 +1571,7 @@ var sheetExtension = ({ functions = [] }) => {
       // NOTE: Useful for debugging.
       closeOnBlur: false,
       icons: false,
-      tooltipClass: () => mx(
-        // TODO(burdon): Factor out fragments.
-        // TODO(burdon): Size to make width same as column.
-        "!-left-[1px] !top-[33px] !-m-0 border !border-t-0 [&>ul]:!min-w-[198px]",
-        "[&>ul>li[aria-selected]]:!bg-accentSurface",
-        "border-separator"
-      )
+      tooltipClass: () => mx("!-left-[1px] !top-[33px] !-m-0 border !border-t-0 [&>ul]:!min-w-[198px]", "[&>ul>li[aria-selected]]:!bg-accentSurface", "border-separator")
     }),
     keymap2.of([
       {
@@ -889,7 +1660,7 @@ var visitTree = (node, callback) => {
 };
 
 // packages/plugins/plugin-sheet/src/components/Sheet/Sheet.tsx
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/components/Sheet/Sheet.tsx";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/components/Sheet/Sheet.tsx";
 var fragments = {
   axis: "bg-axisSurface text-axisText text-xs select-none",
   axisSelected: "bg-attention text-baseText",
@@ -897,25 +1668,26 @@ var fragments = {
   cellSelected: "bg-gridCellSelected text-baseText border !border-accentSurface"
 };
 var SheetRoot = ({ children, ...props }) => {
-  return /* @__PURE__ */ React3.createElement(SheetContextProvider, props, children);
+  return /* @__PURE__ */ React6.createElement(SheetContextProvider, props, children);
 };
-var SheetMain = /* @__PURE__ */ forwardRef(({ classNames, numRows, numColumns }, forwardRef2) => {
+var SheetMain = /* @__PURE__ */ forwardRef(({ classNames, numRows, numCols }, forwardRef2) => {
   const { model, cursor, setCursor, setRange, setEditing } = useSheetContext();
   const { rowsRef, columnsRef, contentRef } = useScrollHandlers();
-  const [rows, setRows] = useState4([
+  useThreads();
+  const [rows, setRows] = useState5([
     ...model.sheet.rows
   ]);
-  const [columns, setColumns] = useState4([
+  const [columns, setColumns] = useState5([
     ...model.sheet.columns
   ]);
-  useEffect3(() => {
+  useEffect4(() => {
     const rowsAccessor = createDocAccessor(model.sheet, [
       "rows"
     ]);
     const columnsAccessor = createDocAccessor(model.sheet, [
       "columns"
     ]);
-    const handleUpdate = debounce(() => {
+    const handleUpdate = debounce2(() => {
       setRows([
         ...model.sheet.rows
       ]);
@@ -933,44 +1705,44 @@ var SheetMain = /* @__PURE__ */ forwardRef(({ classNames, numRows, numColumns },
   }, [
     model
   ]);
-  useEffect3(() => {
+  useEffect4(() => {
     model.reset();
   }, [
     rows,
     columns
   ]);
   const handleMoveRows = (from, to, num = 1) => {
-    const cursorIdx = cursor ? model.addressToIndex(cursor) : void 0;
+    const cursorIdx = cursor ? addressToIndex(model.sheet, cursor) : void 0;
     const [rows2] = model.sheet.rows.splice(from, num);
     model.sheet.rows.splice(to, 0, rows2);
     if (cursorIdx) {
-      setCursor(model.addressFromIndex(cursorIdx));
+      setCursor(addressFromIndex(model.sheet, cursorIdx));
     }
     setRows([
       ...model.sheet.rows
     ]);
   };
   const handleMoveColumns = (from, to, num = 1) => {
-    const cursorIdx = cursor ? model.addressToIndex(cursor) : void 0;
+    const cursorIdx = cursor ? addressToIndex(model.sheet, cursor) : void 0;
     const columns2 = model.sheet.columns.splice(from, num);
     model.sheet.columns.splice(to, 0, ...columns2);
     if (cursorIdx) {
-      setCursor(model.addressFromIndex(cursorIdx));
+      setCursor(addressFromIndex(model.sheet, cursorIdx));
     }
     setColumns([
       ...model.sheet.columns
     ]);
   };
-  const [rowSizes, setRowSizes] = useState4();
-  const [columnSizes, setColumnSizes] = useState4();
-  useEffect3(() => {
+  const [rowSizes, setRowSizes] = useState5();
+  const [columnSizes, setColumnSizes] = useState5();
+  useEffect4(() => {
     const rowAccessor = createDocAccessor(model.sheet, [
       "rowMeta"
     ]);
     const columnAccessor = createDocAccessor(model.sheet, [
       "columnMeta"
     ]);
-    const handleUpdate = debounce(() => {
+    const handleUpdate = debounce2(() => {
       const mapSizes = (values) => values.reduce((map, [idx, meta]) => {
         if (meta.size) {
           map[idx] = meta.size;
@@ -1012,54 +1784,54 @@ var SheetMain = /* @__PURE__ */ forwardRef(({ classNames, numRows, numColumns },
       }));
     }
   };
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     role: "none",
     className: mx2("grid grid-cols-[calc(var(--rail-size)-2px)_1fr] grid-rows-[32px_1fr_32px] bs-full is-full overflow-hidden", classNames)
-  }, /* @__PURE__ */ React3.createElement(GridCorner, {
+  }, /* @__PURE__ */ React6.createElement(GridCorner, {
     onClick: () => {
       setCursor(void 0);
       setRange(void 0);
       setEditing(false);
     }
-  }), /* @__PURE__ */ React3.createElement(SheetColumns, {
+  }), /* @__PURE__ */ React6.createElement(SheetColumns, {
     ref: columnsRef,
     columns,
     sizes: columnSizes,
-    selected: cursor?.column,
-    onSelect: (column) => setCursor(cursor?.column === column ? void 0 : {
+    selected: cursor?.col,
+    onSelect: (col) => setCursor(cursor?.col === col ? void 0 : {
       row: -1,
-      column
+      col
     }),
     onResize: handleResizeColumn,
     onMove: handleMoveColumns
-  }), /* @__PURE__ */ React3.createElement(SheetRows, {
+  }), /* @__PURE__ */ React6.createElement(SheetRows, {
     ref: rowsRef,
     rows,
     sizes: rowSizes,
     selected: cursor?.row,
     onSelect: (row) => setCursor(cursor?.row === row ? void 0 : {
       row,
-      column: -1
+      col: -1
     }),
     onResize: handleResizeRow,
     onMove: handleMoveRows
-  }), /* @__PURE__ */ React3.createElement(SheetGrid, {
+  }), /* @__PURE__ */ React6.createElement(SheetGrid, {
     ref: contentRef,
     size: {
       numRows: numRows ?? rows.length,
-      numColumns: numColumns ?? columns.length
+      numCols: numCols ?? columns.length
     },
     rows,
     columns,
     rowSizes,
     columnSizes
-  }), /* @__PURE__ */ React3.createElement(GridCorner, null), /* @__PURE__ */ React3.createElement(SheetStatusBar, null));
+  }), /* @__PURE__ */ React6.createElement(GridCorner, null), /* @__PURE__ */ React6.createElement(SheetStatusBar, null));
 });
 var useScrollHandlers = () => {
   const rowsRef = useRef(null);
   const columnsRef = useRef(null);
   const contentRef = useRef(null);
-  useEffect3(() => {
+  useEffect4(() => {
     const handleRowsScroll = (ev) => {
       const { scrollTop } = ev.target;
       if (!rowsRef.current.dataset.locked) {
@@ -1096,13 +1868,13 @@ var useScrollHandlers = () => {
   };
 };
 var GridCorner = (props) => {
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     className: fragments.axis,
     ...props
   });
 };
 var MovingOverlay = ({ label }) => {
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     className: "flex w-full h-full justify-center items-center text-sm p-1 bg-gridOverlay cursor-pointer"
   }, label);
 };
@@ -1122,7 +1894,7 @@ var SheetRows = /* @__PURE__ */ forwardRef(({ rows, sizes, selected, onSelect, o
   });
   const keyboardSensor = useSensor(KeyboardSensor, {});
   const sensors = useSensors(mouseSensor, touchSensor, keyboardSensor);
-  const [active, setActive] = useState4(null);
+  const [active, setActive] = useState5(null);
   const handleDragStart = ({ active: active2 }) => {
     setActive(active2);
   };
@@ -1146,18 +1918,18 @@ var SheetRows = /* @__PURE__ */ forwardRef(({ rows, sizes, selected, onSelect, o
     }
     return transform;
   };
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     className: "relative flex grow overflow-hidden"
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: mx2("z-20 absolute inset-0 border-y border-gridLine pointer-events-none"),
     style: {
       width: axisWidth
     }
-  }), /* @__PURE__ */ React3.createElement("div", {
+  }), /* @__PURE__ */ React6.createElement("div", {
     ref: forwardRef2,
     role: "rowheader",
     className: "grow overflow-y-auto scrollbar-none"
-  }, /* @__PURE__ */ React3.createElement(DndContext, {
+  }, /* @__PURE__ */ React6.createElement(DndContext, {
     sensors,
     modifiers: [
       restrictToVerticalAxis,
@@ -1165,12 +1937,12 @@ var SheetRows = /* @__PURE__ */ forwardRef(({ rows, sizes, selected, onSelect, o
     ],
     onDragStart: handleDragStart,
     onDragEnd: handleDragEnd
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: "flex flex-col",
     style: {
       width: axisWidth
     }
-  }, rows.map((idx, index) => /* @__PURE__ */ React3.createElement(GridRowCell, {
+  }, rows.map((idx, index) => /* @__PURE__ */ React6.createElement(GridRowCell, {
     key: idx,
     idx,
     index,
@@ -1180,7 +1952,7 @@ var SheetRows = /* @__PURE__ */ forwardRef(({ rows, sizes, selected, onSelect, o
     selected: selected === index,
     onResize,
     onSelect
-  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React3.createElement(DragOverlay, null, active && /* @__PURE__ */ React3.createElement(MovingOverlay, {
+  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React6.createElement(DragOverlay, null, active && /* @__PURE__ */ React6.createElement(MovingOverlay, {
     label: String(active.data.current.index + 1)
   })), document.body))));
 });
@@ -1198,8 +1970,8 @@ var GridRowCell = ({ idx, index, label, size, resize, selected, onSelect, onResi
     }
   });
   const setNodeRef = useCombinedRefs(setDroppableNodeRef, setDraggableNodeRef);
-  const [initialSize, setInitialSize] = useState4(size);
-  const [resizing, setResizing] = useState4(false);
+  const [initialSize, setInitialSize] = useState5(size);
+  const [resizing, setResizing] = useState5(false);
   const scrollHandler = useRef();
   const handleResizeStart = (_ev, _dir, elementRef) => {
     const scrollContainer = elementRef.closest('[role="rowheader"]');
@@ -1221,7 +1993,7 @@ var GridRowCell = ({ idx, index, label, size, resize, selected, onSelect, onResi
     onResize?.(idx, initialSize + height, true);
     setResizing(false);
   };
-  return /* @__PURE__ */ React3.createElement(Resizable, {
+  return /* @__PURE__ */ React6.createElement(Resizable, {
     enable: {
       bottom: resize
     },
@@ -1233,17 +2005,17 @@ var GridRowCell = ({ idx, index, label, size, resize, selected, onSelect, onResi
     onResizeStart: handleResizeStart,
     onResize: handleResize,
     onResizeStop: handleResizeStop
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     ref: setNodeRef,
     ...attributes,
     ...listeners,
     className: mx2("flex h-full items-center justify-center cursor-pointer", "border-t border-gridLine focus-visible:outline-none", fragments.axis, selected && fragments.axisSelected, isDragging && fragments.axisSelected),
     onClick: () => onSelect?.(index)
-  }, /* @__PURE__ */ React3.createElement("span", {
+  }, /* @__PURE__ */ React6.createElement("span", {
     className: "flex w-full justify-center"
-  }, label), over?.id === idx && !isDragging && /* @__PURE__ */ React3.createElement("div", {
+  }, label), over?.id === idx && !isDragging && /* @__PURE__ */ React6.createElement("div", {
     className: "z-20 absolute top-0 w-full min-h-[4px] border-b-4 border-accentSurface"
-  }), resizing && /* @__PURE__ */ React3.createElement("div", {
+  }), resizing && /* @__PURE__ */ React6.createElement("div", {
     className: "z-20 absolute bottom-0 w-full min-h-[4px] border-b-4 border-accentSurface"
   })));
 };
@@ -1256,7 +2028,7 @@ var SheetColumns = /* @__PURE__ */ forwardRef(({ columns, sizes, selected, onSel
   });
   const keyboardSensor = useSensor(KeyboardSensor, {});
   const sensors = useSensors(mouseSensor, touchSensor, keyboardSensor);
-  const [active, setActive] = useState4(null);
+  const [active, setActive] = useState5(null);
   const handleDragStart = ({ active: active2 }) => {
     setActive(active2);
   };
@@ -1280,18 +2052,18 @@ var SheetColumns = /* @__PURE__ */ forwardRef(({ columns, sizes, selected, onSel
     }
     return transform;
   };
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     className: "relative flex grow overflow-hidden"
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: mx2("z-20 absolute inset-0 border-x border-gridLine pointer-events-none"),
     style: {
       height: axisHeight
     }
-  }), /* @__PURE__ */ React3.createElement("div", {
+  }), /* @__PURE__ */ React6.createElement("div", {
     ref: forwardRef2,
     role: "columnheader",
     className: "grow overflow-x-auto scrollbar-none"
-  }, /* @__PURE__ */ React3.createElement(DndContext, {
+  }, /* @__PURE__ */ React6.createElement(DndContext, {
     autoScroll: {
       enabled: true
     },
@@ -1302,12 +2074,12 @@ var SheetColumns = /* @__PURE__ */ forwardRef(({ columns, sizes, selected, onSel
     ],
     onDragStart: handleDragStart,
     onDragEnd: handleDragEnd
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: "flex h-full",
     style: {
       height: axisHeight
     }
-  }, columns.map((idx, index) => /* @__PURE__ */ React3.createElement(GridColumnCell, {
+  }, columns.map((idx, index) => /* @__PURE__ */ React6.createElement(GridColumnCell, {
     key: idx,
     idx,
     index,
@@ -1317,7 +2089,7 @@ var SheetColumns = /* @__PURE__ */ forwardRef(({ columns, sizes, selected, onSel
     selected: selected === index,
     onResize,
     onSelect
-  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React3.createElement(DragOverlay, null, active && /* @__PURE__ */ React3.createElement(MovingOverlay, {
+  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React6.createElement(DragOverlay, null, active && /* @__PURE__ */ React6.createElement(MovingOverlay, {
     label: columnLetter(active.data.current.index)
   })), document.body))));
 });
@@ -1335,8 +2107,8 @@ var GridColumnCell = ({ idx, index, label, size, resize, selected, onSelect, onR
     }
   });
   const setNodeRef = useCombinedRefs(setDroppableNodeRef, setDraggableNodeRef);
-  const [initialSize, setInitialSize] = useState4(size);
-  const [resizing, setResizing] = useState4(false);
+  const [initialSize, setInitialSize] = useState5(size);
+  const [resizing, setResizing] = useState5(false);
   const scrollHandler = useRef();
   const handleResizeStart = (_ev, _dir, elementRef) => {
     const scrollContainer = elementRef.closest('[role="columnheader"]');
@@ -1358,7 +2130,7 @@ var GridColumnCell = ({ idx, index, label, size, resize, selected, onSelect, onR
     onResize?.(idx, initialSize + width, true);
     setResizing(false);
   };
-  return /* @__PURE__ */ React3.createElement(Resizable, {
+  return /* @__PURE__ */ React6.createElement(Resizable, {
     enable: {
       right: resize
     },
@@ -1370,17 +2142,17 @@ var GridColumnCell = ({ idx, index, label, size, resize, selected, onSelect, onR
     onResizeStart: handleResizeStart,
     onResize: handleResize,
     onResizeStop: handleResizeStop
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     ref: setNodeRef,
     ...attributes,
     ...listeners,
     className: mx2("flex h-full items-center justify-center cursor-pointer", "border-l border-gridLine focus-visible:outline-none", fragments.axis, selected && fragments.axisSelected, isDragging && fragments.axisSelected),
     onClick: () => onSelect?.(index)
-  }, /* @__PURE__ */ React3.createElement("span", {
+  }, /* @__PURE__ */ React6.createElement("span", {
     className: "flex w-full justify-center"
-  }, label), over?.id === idx && !isDragging && /* @__PURE__ */ React3.createElement("div", {
+  }, label), over?.id === idx && !isDragging && /* @__PURE__ */ React6.createElement("div", {
     className: "z-20 absolute left-0 h-full min-w-[4px] border-l-4 border-accentSurface"
-  }), resizing && /* @__PURE__ */ React3.createElement("div", {
+  }), resizing && /* @__PURE__ */ React6.createElement("div", {
     className: "z-20 absolute right-0 h-full min-h-[4px] border-l-4 border-accentSurface"
   })));
 };
@@ -1393,14 +2165,14 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
   const { model, cursor, range, editing, setCursor, setRange, setEditing, onInfo } = useSheetContext();
   const initialText = useRef();
   const quickEdit = useRef(false);
-  const [, forceUpdate] = useState4({});
-  useEffect3(() => {
+  const [, forceUpdate] = useState5({});
+  useEffect4(() => {
     const unsubscribe = model.update.on(() => {
-      log("updated", {
+      log2("updated", {
         id: model.id
       }, {
-        F: __dxlog_file2,
-        L: 730,
+        F: __dxlog_file4,
+        L: 737,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1520,16 +2292,16 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
   const id = fullyQualifiedId2(model.sheet);
   const attendableAttrs = createAttendableAttributes(id);
   const hasAttention = useHasAttention(id);
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     ref: containerRef,
     role: "grid",
     className: "relative flex grow overflow-hidden"
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: mx2("z-20 absolute inset-0 border border-gridLine pointer-events-none")
-  }), /* @__PURE__ */ React3.createElement("div", {
+  }), /* @__PURE__ */ React6.createElement("div", {
     ref: scrollerRef,
     className: mx2("grow", hasAttention && "overflow-auto scrollbar-thin")
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: "relative select-none",
     style: {
       width,
@@ -1537,10 +2309,10 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
     },
     onClick: () => inputRef.current?.focus(),
     ...handlers
-  }, scrollerRef.current && /* @__PURE__ */ React3.createElement(SelectionOverlay, {
+  }, scrollerRef.current && /* @__PURE__ */ React6.createElement(SelectionOverlay, {
     root: scrollerRef.current
   }), rowRange.map(({ row, top, height: height2 }) => {
-    return columnRange.map(({ column, left, width: width2 }) => {
+    return columnRange.map(({ col, left, width: width2 }) => {
       const style = {
         position: "absolute",
         top,
@@ -1550,10 +2322,10 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
       };
       const cell = {
         row,
-        column
+        col
       };
       const id2 = addressToA1Notation(cell);
-      const idx = model.addressToIndex(cell);
+      const idx = addressToIndex(model.sheet, cell);
       const active = posEquals(cursor, cell);
       if (active && editing) {
         const value = initialText.current ?? model.getCellText(cell) ?? "";
@@ -1586,7 +2358,7 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
           inputRef.current?.focus();
           setEditing(false);
         };
-        return /* @__PURE__ */ React3.createElement(GridCellEditor, {
+        return /* @__PURE__ */ React6.createElement(GridCellEditor, {
           key: idx,
           value,
           style,
@@ -1594,7 +2366,7 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
           onClose: handleClose
         });
       }
-      return /* @__PURE__ */ React3.createElement(SheetCell, {
+      return /* @__PURE__ */ React6.createElement(SheetCell, {
         key: id2,
         id: id2,
         cell,
@@ -1606,7 +2378,7 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
         }
       });
     });
-  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React3.createElement("input", {
+  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React6.createElement("input", {
     ref: inputRef,
     autoFocus: true,
     className: "absolute w-[1px] h-[1px] bg-transparent outline-none border-none caret-transparent",
@@ -1627,20 +2399,34 @@ var SelectionOverlay = ({ root }) => {
   const b1 = getRelativeClientRect(root, c1);
   const b2 = getRelativeClientRect(root, c2);
   const bounds = getRectUnion(b1, b2);
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     role: "none",
     style: bounds,
     className: "z-10 absolute pointer-events-none bg-gridSelectionOverlay border border-gridOverlay"
   });
 };
 var SheetCell = ({ id, cell, style, active, onSelect }) => {
-  const { formatting, editing, setRange } = useSheetContext();
+  const { formatting, editing, setRange, decorations, model: { sheet } } = useSheetContext();
   const { value, classNames } = formatting.getFormatting(cell);
-  return /* @__PURE__ */ React3.createElement("div", {
+  const decorationsForCell = decorations.getDecorationsForCell(addressToIndex(sheet, cell)) ?? [];
+  const decorationAddedClasses = useMemo4(() => decorationsForCell.flatMap((d) => d.classNames ?? []), [
+    decorationsForCell
+  ]);
+  const decoratedContent = decorationsForCell.reduce((children, { decorate }) => {
+    if (!decorate) {
+      return children;
+    }
+    const DecoratorComponent = decorate;
+    return /* @__PURE__ */ React6.createElement(DecoratorComponent, null, children);
+  }, /* @__PURE__ */ React6.createElement("div", {
+    role: "none",
+    className: mx2("flex flex-grow bs-full is-full px-2 items-center truncate cursor-pointer", ...decorationAddedClasses)
+  }, value));
+  return /* @__PURE__ */ React6.createElement("div", {
     [`data-${CELL_DATA_KEY}`]: id,
     role: "cell",
     style,
-    className: mx2("flex w-full h-full px-2 py-1 truncate items-center border border-gridLine cursor-pointer", fragments.cell, active && [
+    className: mx2("border border-gridLine cursor-pointer", fragments.cell, active && [
       "z-20",
       fragments.cellSelected
     ], classNames),
@@ -1654,36 +2440,36 @@ var SheetCell = ({ id, cell, style, active, onSelect }) => {
       }
     },
     onDoubleClick: () => onSelect?.(cell, true)
-  }, value);
+  }, decoratedContent);
 };
 var GridCellEditor = ({ style, value, onNav, onClose }) => {
   const { model, range } = useSheetContext();
   const notifier = useRef();
-  useEffect3(() => {
+  useEffect4(() => {
     if (range) {
       notifier.current?.(rangeToA1Notation(range));
     }
   }, [
     range
   ]);
-  const extension = useMemo(() => [
+  const extension = useMemo4(() => [
     editorKeys({
       onNav,
       onClose
     }),
     sheetExtension({
-      functions: model.functions
+      functions: model.graph.getFunctions()
     }),
     rangeExtension((fn) => notifier.current = fn)
   ], [
     model
   ]);
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     role: "cell",
     style,
     className: mx2("z-20 flex", fragments.cellSelected),
     onClick: (ev) => ev.stopPropagation()
-  }, /* @__PURE__ */ React3.createElement(CellEditor, {
+  }, /* @__PURE__ */ React6.createElement(CellEditor, {
     autoFocus: true,
     value,
     extension
@@ -1696,30 +2482,30 @@ var SheetStatusBar = () => {
   if (cursor) {
     value = model.getCellValue(cursor);
     if (typeof value === "string" && value.charAt(0) === "=") {
-      value = model.mapFormulaBindingFromId(model.mapFormulaIndicesToRefs(value));
+      value = model.graph.mapFunctionBindingFromId(model.mapFormulaIndicesToRefs(value));
       isFormula = true;
     } else if (value != null) {
       value = String(value);
     }
   }
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     className: mx2("flex shrink-0 justify-between items-center px-4 py-1 text-sm border-x border-gridLine")
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: "flex gap-4 items-center"
-  }, /* @__PURE__ */ React3.createElement("div", {
+  }, /* @__PURE__ */ React6.createElement("div", {
     className: "flex w-16 items-center font-mono"
-  }, range && rangeToA1Notation(range) || cursor && addressToA1Notation(cursor)), /* @__PURE__ */ React3.createElement("div", {
+  }, range && rangeToA1Notation(range) || cursor && addressToA1Notation(cursor)), /* @__PURE__ */ React6.createElement("div", {
     className: "flex gap-2 items-center"
-  }, /* @__PURE__ */ React3.createElement(FunctionIcon, {
+  }, /* @__PURE__ */ React6.createElement(FunctionIcon, {
     className: mx2("text-greenText", isFormula ? "visible" : "invisible")
-  }), /* @__PURE__ */ React3.createElement("span", {
+  }), /* @__PURE__ */ React6.createElement("span", {
     className: "font-mono"
   }, value))));
 };
 var SheetDebug = () => {
   const { model, cursor, range } = useSheetContext();
-  const [, forceUpdate] = useState4({});
-  useEffect3(() => {
+  const [, forceUpdate] = useState5({});
+  useEffect4(() => {
     const accessor = createDocAccessor(model.sheet, []);
     const handleUpdate = () => forceUpdate({});
     accessor.handle.addListener("change", handleUpdate);
@@ -1730,9 +2516,9 @@ var SheetDebug = () => {
   }, [
     model
   ]);
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     className: mx2("z-20 absolute right-0 top-20 bottom-20 w-[30rem] overflow-auto scrollbar-thin", "border border-gridLine text-xs bg-neutral-50 dark:bg-black text-cyan-500 font-mono p-1 opacity-80")
-  }, /* @__PURE__ */ React3.createElement("pre", {
+  }, /* @__PURE__ */ React6.createElement("pre", {
     className: "whitespace-pre-wrap"
   }, JSON.stringify({
     cursor,
@@ -1754,19 +2540,13 @@ var Sheet = {
   Debug: SheetDebug
 };
 
-// packages/plugins/plugin-sheet/src/components/SheetContainer.tsx
-var SheetContainer = ({ sheet, space, role, remoteFunctionUrl }) => {
-  return /* @__PURE__ */ React4.createElement("div", {
-    role: "none",
-    className: mx3("flex", role === "article" && "row-span-2", role === "section" && "aspect-square border-y border-is border-separator")
-  }, /* @__PURE__ */ React4.createElement(Sheet.Root, {
-    sheet,
-    space,
-    remoteFunctionUrl
-  }, /* @__PURE__ */ React4.createElement(Sheet.Main, null)));
-};
-var SheetContainer_default = SheetContainer;
 export {
-  SheetContainer_default as default
+  ComputeGraphContextProvider,
+  createSheet,
+  addressToIndex,
+  compareIndexPositions,
+  useSheetContext,
+  Sheet,
+  SheetContainer
 };
-//# sourceMappingURL=SheetContainer-U4H5D34A.mjs.map
+//# sourceMappingURL=chunk-U2JHW3L6.mjs.map