@dxos/plugin-sheet 0.6.12-main.ed7cda7 → 0.6.12-staging.e11e696

package/dist/lib/node-esm/{chunk-7HVSOTGA.mjs → chunk-KK3XL37M.mjs}

@@ -2,13 +2,13 @@ import { createRequire } from 'node:module';const require = createRequire(import
 import {
   SheetType,
   ValueTypeEnum
-} from "./chunk-BMNA27EX.mjs";
+} from "./chunk-RR2AO4SM.mjs";
 import {
   SHEET_PLUGIN
 } from "./chunk-IU2L277A.mjs";
 import {
   createSheetName
-} from "./chunk-D6KU5MI7.mjs";
+} from "./chunk-5WPZCXNS.mjs";
 
 // packages/plugins/plugin-sheet/src/components/Sheet/Sheet.tsx
 import { DndContext, DragOverlay, KeyboardSensor, MouseSensor, TouchSensor, useDraggable, useDroppable, useSensor, useSensors } from "@dnd-kit/core";
@@ -22,7 +22,7 @@ import { useResizeDetector } from "react-resize-detector";
 import { debounce as debounce2 } from "@dxos/async";
 import { fullyQualifiedId as fullyQualifiedId2, createDocAccessor } from "@dxos/client/echo";
 import { log as log2 } from "@dxos/log";
-import { createAttendableAttributes, useHasAttention } from "@dxos/react-ui-attention";
+import { ATTENABLE_ATTRIBUTE, useAttendableAttributes, useAttention, useAttentionPath } from "@dxos/react-ui-attention";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-sheet/src/components/Sheet/grid.ts
@@ -57,7 +57,7 @@ var addressFromA1Notation = (ref) => {
   const match = ref.match(/([A-Z]+)(\d+)/);
   invariant(match, `Invalid notation: ${ref}`, {
     F: __dxlog_file,
-    L: 39,
+    L: 40,
     S: void 0,
     A: [
       "match",
@@ -132,9 +132,9 @@ var initialize = (sheet, { rows = DEFAULT_ROWS, columns = DEFAULT_COLUMNS } = {}
     insertIndices(sheet.columns, 0, columns, MAX_COLUMNS);
   }
 };
-var createSheet = ({ title, ...size } = {}) => {
+var createSheet = ({ name, cells, ...size } = {}) => {
   const sheet = create(SheetType, {
-    title,
+    name,
     cells: {},
     rows: [],
     columns: [],
@@ -143,6 +143,14 @@ var createSheet = ({ title, ...size } = {}) => {
     formatting: {}
   });
   initialize(sheet, size);
+  if (cells) {
+    Object.entries(cells).forEach(([key, { value }]) => {
+      const idx = addressToIndex(sheet, addressFromA1Notation(key));
+      sheet.cells[idx] = {
+        value
+      };
+    });
+  }
   return sheet;
 };
 var addressToIndex = (sheet, cell) => {
@@ -537,15 +545,22 @@ var ComputeGraphContextProvider = ({ registry, children }) => {
 };
 
 // packages/plugins/plugin-sheet/src/components/index.ts
-var SheetContainer = React2.lazy(() => import("./SheetContainer-PXSJX6XK.mjs"));
+var SheetContainer = React2.lazy(() => import("./SheetContainer-4XS2G25Z.mjs"));
 
 // 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), [
+  const [graph] = useAsyncState(async () => {
+    if (space) {
+      const graph2 = registry.getOrCreateGraph(space);
+      await graph2.open();
+      return graph2;
+    }
+  }, [
     space,
     registry
   ]);
+  return graph;
 };
 
 // packages/plugins/plugin-sheet/src/hooks/useFormattingModel.ts
@@ -665,6 +680,7 @@ var FormattingModel = class {
 // packages/plugins/plugin-sheet/src/model/sheet-model.ts
 import { Event } from "@dxos/async";
 import { Resource } from "@dxos/context";
+import { getTypename } from "@dxos/echo-schema";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
@@ -703,8 +719,6 @@ var SheetModel = class extends Resource {
     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;
@@ -729,14 +743,19 @@ var SheetModel = class extends Resource {
       id: this.id
     }, {
       F: __dxlog_file2,
-      L: 105,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
     initialize(this._sheet);
-    this.reset();
-    const unsubscribe = this._graph.update.on(() => this.update.emit());
+    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.
@@ -744,13 +763,31 @@ var SheetModel = class extends Resource {
   * @deprecated
   */
   reset() {
-    this._node.hf.clearSheet(this._node.sheetId);
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 124,
+      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_file2,
+        L: 127,
+        S: this,
+        A: [
+          "this._node",
+          ""
+        ]
+      });
       const { col, row } = addressFromIndex(this._sheet, key);
       if (typeof value === "string" && value.charAt(0) === "=") {
         value = this._graph.mapFormulaToNative(this._graph.mapFunctionBindingFromId(this.mapFormulaIndicesToRefs(value)));
       }
-      this._node.hf.setCellContents({
+      this._node.graph.hf.setCellContents({
         sheet: this._node.sheetId,
         row,
         col
@@ -765,7 +802,7 @@ var SheetModel = class extends Resource {
   */
   // TODO(burdon): Remove.
   recalculate() {
-    this._node.hf.rebuildAndRecalculate();
+    this._node?.graph.hf.rebuildAndRecalculate();
   }
   insertRows(i, n = 1) {
     insertIndices(this._sheet.rows, i, n, MAX_ROWS);
@@ -783,27 +820,63 @@ var SheetModel = class extends Resource {
   * Clear range of values.
   */
   clear(range) {
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 169,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
     const topLeft = getTopLeft(range);
     const values = this._iterRange(range, () => null);
-    this._node.hf.setCellContents(toSimpleCellAddress(this._node.sheetId, topLeft), values);
+    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) {
-    this._node.hf.cut(toModelRange(this._node.sheetId, range));
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 180,
+      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) {
-    this._node.hf.copy(toModelRange(this._node.sheetId, range));
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 189,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    this._node.graph.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));
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 194,
+      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;
@@ -820,15 +893,31 @@ var SheetModel = class extends Resource {
   }
   // TODO(burdon): Display undo/redo state.
   undo() {
-    if (this._node.hf.isThereSomethingToUndo()) {
-      this._node.hf.undo();
-      this.update.emit();
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 209,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    if (this._node.graph.hf.isThereSomethingToUndo()) {
+      this._node.graph.hf.undo();
     }
   }
   redo() {
-    if (this._node.hf.isThereSomethingToRedo()) {
-      this._node.hf.redo();
-      this.update.emit();
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 217,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    if (this._node.graph.hf.isThereSomethingToRedo()) {
+      this._node.graph.hf.redo();
     }
   }
   /**
@@ -862,7 +951,16 @@ var SheetModel = class extends Resource {
   * Gets the regular or computed value from the engine.
   */
   getValue(cell) {
-    const value = this._node.hf.getCellValue(toSimpleCellAddress(this._node.sheetId, cell));
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 260,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    const value = this._node.graph.hf.getCellValue(toSimpleCellAddress(this._node.sheetId, cell));
     if (value instanceof DetailedCellError) {
       return value.toString();
     }
@@ -872,14 +970,32 @@ var SheetModel = class extends Resource {
   * Get value type.
   */
   getValueType(cell) {
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 273,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
     const addr = toSimpleCellAddress(this._node.sheetId, cell);
-    const type = this._node.hf.getCellValueDetailedType(addr);
+    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_file2,
+      L: 283,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
     if (this._options.readonly) {
       throw new ReadonlyException();
     }
@@ -895,7 +1011,7 @@ var SheetModel = class extends Resource {
     if (refresh) {
       this.reset();
     }
-    this._node.hf.setCellContents({
+    this._node.graph.hf.setCellContents({
       sheet: this._node.sheetId,
       row: cell.row,
       col: cell.col
@@ -970,7 +1086,7 @@ var SheetModel = class extends Resource {
   mapFormulaRefsToIndices(formula) {
     invariant2(formula.charAt(0) === "=", void 0, {
       F: __dxlog_file2,
-      L: 358,
+      L: 372,
       S: this,
       A: [
         "formula.charAt(0) === '='",
@@ -987,7 +1103,7 @@ var SheetModel = class extends Resource {
   mapFormulaIndicesToRefs(formula) {
     invariant2(formula.charAt(0) === "=", void 0, {
       F: __dxlog_file2,
-      L: 368,
+      L: 382,
       S: this,
       A: [
         "formula.charAt(0) === '='",
@@ -1011,13 +1127,40 @@ var SheetModel = class extends Resource {
     return new Date(year, month - 1, day, hours, minutes, seconds);
   }
   toDateTime(num) {
-    return this._node.hf.numberToDateTime(num);
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 403,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    return this._node.graph.hf.numberToDateTime(num);
   }
   toDate(num) {
-    return this._node.hf.numberToDate(num);
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 408,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    return this._node.graph.hf.numberToDate(num);
   }
   toTime(num) {
-    return this._node.hf.numberToTime(num);
+    invariant2(this._node, void 0, {
+      F: __dxlog_file2,
+      L: 413,
+      S: this,
+      A: [
+        "this._node",
+        ""
+      ]
+    });
+    return this._node.graph.hf.numberToTime(num);
   }
 };
 
@@ -1030,11 +1173,10 @@ var useFormattingModel = (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);
+var useSheetModel = (graph, sheet, { readonly } = {}) => {
   const [model, setModel] = useState3();
   useEffect2(() => {
-    if (!space || !graph || !sheet) {
+    if (!graph || !sheet) {
       return;
     }
     let model2;
@@ -1050,9 +1192,8 @@ var useSheetModel = (space, sheet, { readonly } = {}) => {
       void model2?.close();
     };
   }, [
-    space,
-    sheet,
     graph,
+    sheet,
     readonly
   ]);
   return model;
@@ -1074,8 +1215,8 @@ var useSheetContext = () => {
   });
   return context;
 };
-var SheetContextProvider = ({ children, sheet, space, readonly, onInfo }) => {
-  const model = useSheetModel(space, sheet, {
+var SheetContextProvider = ({ children, graph, sheet, readonly, onInfo }) => {
+  const model = useSheetModel(graph, sheet, {
     readonly
   });
   const formatting = useFormattingModel(model);
@@ -1457,10 +1598,10 @@ var CellEditor = ({ value, extension, autoFocus, onBlur, variant = "legacy", box
 // packages/plugins/plugin-sheet/src/components/CellEditor/extension.ts
 import { acceptCompletion, autocompletion, completionStatus, startCompletion } from "@codemirror/autocomplete";
 import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
-import { Facet } from "@codemirror/state";
 import { ViewPlugin, keymap as keymap2 } from "@codemirror/view";
 import { tags } from "@lezer/highlight";
 import { spreadsheet } from "codemirror-lang-spreadsheet";
+import { singleValueFacet } from "@dxos/react-ui-editor/state";
 import { mx } from "@dxos/react-ui-theme";
 var highlightStyles = HighlightStyle.define([
   // Function.
@@ -1492,7 +1633,7 @@ var highlightStyles = HighlightStyle.define([
     class: "text-unAccent"
   }
 ]);
-var languageFacet = Facet.define();
+var languageFacet = singleValueFacet();
 var sheetExtension = ({ functions = [] }) => {
   const { extension, language } = spreadsheet({
     idiom: "en-US",
@@ -1609,7 +1750,7 @@ var rangeExtension = (onInit) => {
     update(view2) {
       const { anchor } = view2.state.selection.ranges[0];
       activeRange = void 0;
-      const [language] = view2.state.facet(languageFacet);
+      const language = view2.state.facet(languageFacet);
       const { topNode } = language.parser.parse(view2.state.doc.toString());
       visitTree(topNode, ({ type, from, to }) => {
         if (from <= anchor && to >= anchor) {
@@ -2173,7 +2314,7 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
         id: model.id
       }, {
         F: __dxlog_file4,
-        L: 737,
+        L: 738,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2291,8 +2432,7 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
     columnSizes
   });
   const id = fullyQualifiedId2(model.sheet);
-  const attendableAttrs = createAttendableAttributes(id);
-  const hasAttention = useHasAttention(id);
+  const { hasAttention } = useAttention(id);
   return /* @__PURE__ */ React6.createElement("div", {
     ref: containerRef,
     role: "grid",
@@ -2379,13 +2519,25 @@ var SheetGrid = /* @__PURE__ */ forwardRef(({ size, rows, columns, rowSizes, col
         }
       });
     });
-  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React6.createElement("input", {
+  }))), /* @__PURE__ */ createPortal(/* @__PURE__ */ React6.createElement(SheetInput, {
     ref: inputRef,
-    autoFocus: true,
+    id,
+    onKeyDown: handleKeyDown
+  }), document.body));
+});
+var SheetInput = /* @__PURE__ */ forwardRef(({ id, onKeyDown }, forwardedRef) => {
+  const path = useAttentionPath();
+  const attendableAttrs = useAttendableAttributes(id);
+  return path.toReversed().reduce((acc, part) => {
+    return /* @__PURE__ */ React6.createElement("div", {
+      [ATTENABLE_ATTRIBUTE]: part
+    }, acc);
+  }, /* @__PURE__ */ React6.createElement("input", {
+    ref: forwardedRef,
     className: "absolute w-[1px] h-[1px] bg-transparent outline-none border-none caret-transparent",
-    onKeyDown: handleKeyDown,
+    onKeyDown,
     ...attendableAttrs
-  }), document.body));
+  }));
 });
 var SelectionOverlay = ({ root }) => {
   const { range } = useSheetContext();
@@ -2546,8 +2698,9 @@ export {
   createSheet,
   addressToIndex,
   compareIndexPositions,
+  useComputeGraph,
   useSheetContext,
   Sheet,
   SheetContainer
 };
-//# sourceMappingURL=chunk-7HVSOTGA.mjs.map
+//# sourceMappingURL=chunk-KK3XL37M.mjs.map