@dxos/plugin-sheet 0.7.4 → 0.7.5-main.9cb18ac

package/dist/lib/browser/{chunk-E5WQ7U7G.mjs → chunk-A374JPWV.mjs}

@@ -1,29 +1,12 @@
 import {
-  DEFAULT_COLUMNS,
+  DEFAULT_COLS,
   DEFAULT_ROWS,
-  MAX_COLUMNS,
-  MAX_ROWS,
-  RANGE_NOTATION,
-  ReadonlyException,
-  addressFromA1Notation,
-  addressFromIndex,
-  addressToA1Notation,
-  addressToIndex,
+  Range,
+  SheetAction,
   cellClassNameForRange,
-  createSheetName,
-  inRange,
-  initialize,
-  insertIndices,
-  isFormula,
-  mapFormulaIndicesToRefs,
-  mapFormulaRefsToIndices,
   rangeFromIndex,
-  rangeToA1Notation
-} from "./chunk-F3HE6D3J.mjs";
-import {
-  Range,
-  SheetAction
-} from "./chunk-JXFPOYNA.mjs";
+  useSheetModel
+} from "./chunk-Q4XS4YWF.mjs";
 import {
   SHEET_PLUGIN
 } from "./chunk-RABELMEQ.mjs";
@@ -60,6 +43,7 @@ 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 { createSheetName } from "@dxos/compute";
 import { invariant } from "@dxos/invariant";
 import { documentId, singleValueFacet } from "@dxos/react-ui-editor";
 var updateAllDecorations = StateEffect.define();
@@ -71,6 +55,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 { RANGE_NOTATION } from "@dxos/compute";
 import { singleValueFacet as singleValueFacet2 } from "@dxos/react-ui-editor";
 import { mx } from "@dxos/react-ui-theme";
 var highlightStyles = HighlightStyle.define([
@@ -277,621 +262,17 @@ var visitTree = (node, callback) => {
 };
 
 // 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 React2, { createContext as createContext2, useCallback, useContext as useContext2, useState } from "react";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { fullyQualifiedId } from "@dxos/react-client/echo";
 import { Grid, useGridContext } from "@dxos/react-ui-grid";
-
-// 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 {
-    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_file,
-      L: 115,
-      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: 141,
-      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: 144,
-        S: this,
-        A: [
-          "this._node",
-          ""
-        ]
-      });
-      const { col, row } = addressFromIndex(this._sheet, key);
-      if (isFormula(value)) {
-        const binding = this._graph.mapFunctionBindingFromId(mapFormulaIndicesToRefs(this._sheet, value));
-        if (binding) {
-          value = this._graph.mapFormulaToNative(binding);
-        } else {
-          value = "";
-        }
-      }
-      this._node.graph.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?.graph.hf.rebuildAndRecalculate();
-  }
-  insertRows(i, n = 1) {
-    const idx = insertIndices(this._sheet.rows, i, n, MAX_ROWS);
-    this.reset();
-    return idx;
-  }
-  insertColumns(i, n = 1) {
-    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();
-  }
-  //
-  // Undoable actions.
-  // TODO(burdon): Group undoable methods; consistently update hf/sheet.
-  //
-  /**
-  * Clear range of values.
-  */
-  clear(range) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 247,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    const topLeft = getTopLeft(range);
-    const values = this._iterRange(range, () => null);
-    this._node.graph.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) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 258,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    this._node.graph.hf.cut(toModelRange(this._node.sheetId, range));
-    this._iterRange(range, (cell) => {
-      const idx = addressToIndex(this._sheet, cell);
-      delete this._sheet.cells[idx];
-    });
-  }
-  copy(range) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 267,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    this._node.graph.hf.copy(toModelRange(this._node.sheetId, range));
-  }
-  paste(cell) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 272,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    if (!this._node.graph.hf.isClipboardEmpty()) {
-      const changes = this._node.graph.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() {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 287,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    if (this._node.graph.hf.isThereSomethingToUndo()) {
-      this._node.graph.hf.undo();
-    }
-  }
-  redo() {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 295,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    if (this._node.graph.hf.isThereSomethingToRedo()) {
-      this._node.graph.hf.redo();
-    }
-  }
-  /**
-  * 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 (isFormula(value)) {
-      return this._graph.mapFunctionBindingFromId(mapFormulaIndicesToRefs(this._sheet, value));
-    } else {
-      return String(value);
-    }
-  }
-  /**
-  * 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) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 338,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    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: 343,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return value.toString();
-    }
-    return value;
-  }
-  /**
-  * Get value type.
-  */
-  getValueDescription(cell) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 354,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    const addr = toSimpleCellAddress(this._node.sheetId, cell);
-    const type = this._node.graph.hf.getCellValueDetailedType(addr);
-    return typeMap[type];
-  }
-  /**
-  * Sets the value, updating the sheet and engine.
-  */
-  setValue(cell, value) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 364,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    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;
-    }
-    if (refresh) {
-      this.reset();
-    }
-    this._node.graph.hf.setCellContents({
-      sheet: this._node.sheetId,
-      row: cell.row,
-      col: cell.col
-    }, [
-      [
-        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 (isFormula(value)) {
-        value = this._graph.mapFunctionBindingToId(mapFormulaRefsToIndices(this._sheet, 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");
-  }
-  /**
-  * Map from indices to A1 notation.
-  */
-  mapFormulaIndicesToRefs(formula) {
-    invariant2(isFormula(formula), void 0, {
-      F: __dxlog_file,
-      L: 449,
-      S: this,
-      A: [
-        "isFormula(formula)",
-        ""
-      ]
-    });
-    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) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 470,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    return this._node.graph.hf.numberToDateTime(num);
-  }
-  toDate(num) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 475,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    return this._node.graph.hf.numberToDate(num);
-  }
-  toTime(num) {
-    invariant2(this._node, void 0, {
-      F: __dxlog_file,
-      L: 480,
-      S: this,
-      A: [
-        "this._node",
-        ""
-      ]
-    });
-    return this._node.graph.hf.numberToTime(num);
-  }
-};
-
-// packages/plugins/plugin-sheet/src/model/useSheetModel.ts
-import { useEffect, useState } from "react";
-var useSheetModel = (graph, sheet, { readonly } = {}) => {
-  const [model, setModel] = useState();
-  useEffect(() => {
-    if (!graph || !sheet) {
-      return;
-    }
-    let model2;
-    const t = setTimeout(async () => {
-      model2 = new SheetModel(graph, sheet, {
-        readonly
-      });
-      await model2.open();
-      setModel(model2);
-    });
-    return () => {
-      clearTimeout(t);
-      void model2?.close();
-    };
-  }, [
-    graph,
-    sheet,
-    readonly
-  ]);
-  return model;
-};
-
-// 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 __dxlog_file = "/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: 55,
+  invariant2(context, void 0, {
+    F: __dxlog_file,
+    L: 54,
     S: void 0,
     A: [
       "context",
@@ -902,10 +283,10 @@ var useSheetContext = () => {
 };
 var SheetProviderImpl = ({ model, onInfo, ignoreAttention, 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 [cursor, setCursorInternal] = useState();
+  const [range, setRangeInternal] = useState();
+  const [cursorFallbackRange, setCursorFallbackRange] = useState();
+  const [activeRefs, setActiveRefs] = useState("");
   const setCursor = useCallback((nextCursor) => {
     setCursorInternal(nextCursor);
     setCursorFallbackRange(range?.to ? range : nextCursor ? {
@@ -957,23 +338,27 @@ var SheetProvider = ({ children, graph, sheet, readonly, ignoreAttention, onInfo
 };
 
 // packages/plugins/plugin-sheet/src/components/GridSheet/GridSheet.tsx
-import React5, { useCallback as useCallback4, useMemo as useMemo2, useRef, useState as useState4 } from "react";
-import { useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import React5, { useCallback as useCallback4, useMemo as useMemo2, useRef, useState as useState3 } from "react";
+import { createIntent as createIntent2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { rangeToA1Notation as rangeToA1Notation2 } from "@dxos/compute";
 import { DropdownMenu, Icon, useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { useAttention } from "@dxos/react-ui-attention";
 import { closestCell, defaultSizeRow, editorKeys, Grid as Grid2, GridCellEditor, parseCellIndex } from "@dxos/react-ui-grid";
 
 // packages/plugins/plugin-sheet/src/components/GridSheet/util.ts
-import { useEffect as useEffect3, useState as useState3 } from "react";
+import { useEffect as useEffect2, useState as useState2 } from "react";
+import { inRange as inRange2 } from "@dxos/compute";
 import { createDocAccessor, fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
 import { parseValue, cellClassesForFieldType } from "@dxos/react-ui-form";
 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 { useCallback as useCallback3, useEffect, useMemo } from "react";
+import { createIntent, createResolver, LayoutAction, useIntentDispatcher, useIntentResolver } from "@dxos/app-framework";
 import { debounce as debounce2 } from "@dxos/async";
+import { inRange } from "@dxos/compute";
+import { ThreadAction } from "@dxos/plugin-thread/types";
 import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
 
 // packages/plugins/plugin-sheet/src/components/index.ts
@@ -981,6 +366,7 @@ import { lazy } from "react";
 
 // packages/plugins/plugin-sheet/src/components/RangeList/RangeList.tsx
 import React3, { useCallback as useCallback2 } from "react";
+import { rangeToA1Notation } from "@dxos/compute";
 import { S } from "@dxos/echo-schema";
 import { useTranslation } from "@dxos/react-ui";
 import { List } from "@dxos/react-ui-list";
@@ -1039,7 +425,7 @@ var SheetObjectSettings = ({ sheet }) => {
 };
 
 // packages/plugins/plugin-sheet/src/components/index.ts
-var SheetContainer = lazy(() => import("./SheetContainer-KCLT6PEO.mjs"));
+var SheetContainer = lazy(() => import("./SheetContainer-S4NCLUYL.mjs"));
 
 // packages/plugins/plugin-sheet/src/integrations/thread-ranges.ts
 var completeCellRangeToThreadCursor = (range) => {
@@ -1065,32 +451,25 @@ var parseThreadAnchorAsCellRange = (cursor) => {
 };
 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);
-        return {
-          data: true
-        };
-      }
-    }
-  }, [
+  const scrollIntoViewResolver = useMemo(() => createResolver(LayoutAction.ScrollIntoView, ({ cursor, ref }) => {
+    setActiveRefs(ref);
+    const range = parseThreadAnchorAsCellRange(cursor);
+    range && grid?.setFocus({
+      ...range.to,
+      plane: "grid"
+    }, true);
+  }, {
+    disposition: "hoist",
+    filter: (data) => data.id === fullyQualifiedId2(model.sheet) && !!data.cursor
+  }), [
     model.sheet,
     setActiveRefs
   ]);
-  useIntentResolver(SHEET_PLUGIN, handleScrollIntoView);
+  useIntentResolver(SHEET_PLUGIN, scrollIntoViewResolver);
 };
 var useSelectThreadOnCellFocus = () => {
   const { model, cursor } = useSheetContext();
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: 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)
@@ -1099,23 +478,18 @@ var useSelectThreadOnCellFocus = () => {
     if (!cellAddress || !threads) {
       return;
     }
-    const closestThread = threads?.find(({ anchor }) => {
-      if (anchor) {
-        const range = parseThreadAnchorAsCellRange(anchor);
+    const closestThread = threads?.find((ref) => {
+      if (ref.target?.anchor) {
+        const range = parseThreadAnchorAsCellRange(ref.target.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)
-          }
-        }
-      ]);
+      void dispatch(createIntent(ThreadAction.Select, {
+        current: fullyQualifiedId2(closestThread)
+      }));
     }
   }, [
     dispatch,
@@ -1126,7 +500,7 @@ var useSelectThreadOnCellFocus = () => {
   }, [
     selectClosestThread
   ]);
-  useEffect2(() => {
+  useEffect(() => {
     if (!cursor) {
       return;
     }
@@ -1170,10 +544,10 @@ var projectCellProps = (model, col, row) => {
     row
   };
   const rawValue = model.getValue(address);
-  const ranges = model.sheet.ranges?.filter(({ range }) => inRange(rangeFromIndex(model.sheet, range), address));
+  const ranges = model.sheet.ranges?.filter(({ range }) => inRange2(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;
+    const range = thread.target?.anchor && parseThreadAnchorAsCellRange(thread.target.anchor);
+    return thread && range ? inRange2(range, address) : false;
   }).map((thread) => fullyQualifiedId3(thread)).join(" ");
   const description = model.getValueDescription(address);
   const type = description?.type;
@@ -1247,9 +621,9 @@ var cellGetter = (model) => {
   };
 };
 var useSheetModelDxGridProps = (dxGrid, model) => {
-  const [columns, setColumns] = useState3(createDxGridColumns(model));
-  const [rows, setRows] = useState3(createDxGridRows(model));
-  useEffect3(() => {
+  const [columns, setColumns] = useState2(createDxGridColumns(model));
+  const [rows, setRows] = useState2(createDxGridRows(model));
+  useEffect2(() => {
     const cellsAccessor = createDocAccessor(model.sheet, [
       "cells"
     ]);
@@ -1269,7 +643,7 @@ var useSheetModelDxGridProps = (dxGrid, model) => {
     model,
     dxGrid
   ]);
-  useEffect3(() => {
+  useEffect2(() => {
     const columnMetaAccessor = createDocAccessor(model.sheet, [
       "columnMeta"
     ]);
@@ -1346,9 +720,9 @@ var sheetColDefault = {
 var GridSheet = () => {
   const { t } = useTranslation3(SHEET_PLUGIN);
   const { id, model, editing, setCursor, setRange, cursor, cursorFallbackRange, activeRefs, ignoreAttention } = useSheetContext();
-  const [dxGrid, setDxGrid] = useState4(null);
-  const [extraplanarFocus, setExtraplanarFocus] = useState4(null);
-  const dispatch = useIntentDispatcher2();
+  const [dxGrid, setDxGrid] = useState3(null);
+  const [extraplanarFocus, setExtraplanarFocus] = useState3(null);
+  const { dispatchPromise: dispatch } = useIntentDispatcher2();
   const rangeController = useRef();
   const { hasAttention } = useAttention(id);
   const handleFocus = useCallback4((event) => {
@@ -1429,7 +803,7 @@ var GridSheet = () => {
       };
     }
     if (editing) {
-      rangeController.current?.setRange(rangeToA1Notation(range));
+      rangeController.current?.setRange(rangeToA1Notation2(range));
     } else {
       setRange(range.to ? range : void 0);
     }
@@ -1533,7 +907,7 @@ var GridSheet = () => {
     selectEntireAxis
   ]);
   const contextMenuAnchorRef = useRef(null);
-  const [contextMenuOpen, setContextMenuOpen] = useState4(null);
+  const [contextMenuOpen, setContextMenuOpen] = useState3(null);
   const contextMenuAxis = contextMenuOpen?.plane.startsWith("frozenRows") ? "col" : "row";
   const handleContextMenu = useCallback4((event) => {
     const cell = closestCell(event.target);
@@ -1547,24 +921,17 @@ var GridSheet = () => {
     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;
+        return dispatch(createIntent2(SheetAction.InsertAxis, {
+          model,
+          axis: contextMenuAxis,
+          index: contextMenuOpen[contextMenuAxis] + (operation === "insert-before" ? 0 : 1)
+        }));
       case "drop":
-        return dispatch({
-          action: SheetAction.DROP_AXIS,
-          data: {
-            model,
-            axis: contextMenuAxis,
-            axisIndex: model.sheet[contextMenuAxis === "row" ? "rows" : "columns"][contextMenuOpen[contextMenuAxis]]
-          }
-        });
+        return dispatch(createIntent2(SheetAction.DropAxis, {
+          model,
+          axis: contextMenuAxis,
+          axisIndex: model.sheet[contextMenuAxis === "row" ? "rows" : "columns"][contextMenuOpen[contextMenuAxis]]
+        }));
     }
   }, [
     contextMenuAxis,
@@ -1612,7 +979,7 @@ var GridSheet = () => {
     onBlur: handleBlur
   }), /* @__PURE__ */ React5.createElement(Grid2.Content, {
     initialCells,
-    limitColumns: DEFAULT_COLUMNS,
+    limitColumns: DEFAULT_COLS,
     limitRows: DEFAULT_ROWS,
     columns,
     rows,
@@ -1672,4 +1039,4 @@ export {
   SheetObjectSettings,
   SheetContainer
 };
-//# sourceMappingURL=chunk-E5WQ7U7G.mjs.map
+//# sourceMappingURL=chunk-A374JPWV.mjs.map