@dxos/plugin-sheet 0.6.13-main.548ca8d → 0.6.13-main.ed424a1

package/dist/lib/browser/{chunk-AQSGDA4X.mjs → chunk-HOG37RYS.mjs}

@@ -1,6 +1,6 @@
 import {
   SheetType
-} from "./chunk-GKI67SEF.mjs";
+} from "./chunk-BWN5DZWZ.mjs";
 import {
   SHEET_PLUGIN
 } from "./chunk-D3QTX46O.mjs";
@@ -133,7 +133,7 @@ var createSheet = ({ name, cells, ...size } = {}) => {
     columns: [],
     rowMeta: {},
     columnMeta: {},
-    formatting: []
+    ranges: []
   });
   initialize(sheet, size);
   if (cells) {
@@ -156,13 +156,6 @@ var addressFromIndex = (sheet, idx) => {
     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 closestCell2;
   let closestDistance = Number.MAX_SAFE_INTEGER;
@@ -185,6 +178,34 @@ var compareIndexPositions = (sheet, indexA, indexB) => {
   }
 };
 
+// packages/plugins/plugin-sheet/src/defs/sheet-range-types.ts
+var cellClassNameForRange = ({ key, value }) => {
+  switch (key) {
+    case "align":
+      switch (value) {
+        case "start":
+          return "text-start";
+        case "center":
+          return "text-center";
+        case "end":
+          return "text-end";
+        default:
+          return void 0;
+      }
+    case "comment":
+      return "bg-gridComment";
+    case "style":
+      switch (value) {
+        case "highlight":
+          return "bg-gridHighlight";
+        default:
+          return void 0;
+      }
+    default:
+      return void 0;
+  }
+};
+
 // packages/plugins/plugin-sheet/src/extensions/compute.ts
 import { syntaxTree } from "@codemirror/language";
 import { RangeSetBuilder, StateEffect, StateField } from "@codemirror/state";
@@ -410,13 +431,14 @@ import { useAsyncState } from "@dxos/react-hooks";
 import React4 from "react";
 
 // packages/plugins/plugin-sheet/src/components/GridSheet/GridSheet.tsx
-import React3, { useCallback as useCallback2, useMemo as useMemo4, useRef } from "react";
+import React3, { useCallback as useCallback2, useMemo as useMemo3, useRef } from "react";
 import { useAttention } from "@dxos/react-ui-attention";
 import { Grid as Grid2, editorKeys, GridCellEditor, closestCell } from "@dxos/react-ui-grid";
 
 // packages/plugins/plugin-sheet/src/components/GridSheet/util.ts
 import { useEffect, useLayoutEffect, useState } from "react";
 import { createDocAccessor } from "@dxos/react-client/echo";
+import { parseValue, cellClassesForFieldType } from "@dxos/react-ui-data";
 import { colToA1Notation, rowToA1Notation } from "@dxos/react-ui-grid";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 var dxGridCellIndexToSheetCellAddress = (index) => {
@@ -452,7 +474,26 @@ var createDxGridRows = (model) => {
     grid: {}
   });
 };
-var gridCellGetter = (model, formatting) => {
+var projectCellProps = (model, col, row) => {
+  const address = {
+    col,
+    row
+  };
+  const rawValue = model.getValue(address);
+  if (rawValue === void 0 || rawValue === null) {
+    return {
+      value: ""
+    };
+  }
+  const ranges = model.sheet.ranges?.filter(({ range }) => inRange(range, address));
+  const type = model.getValueType(address);
+  const classNames = ranges?.map(cellClassNameForRange).reverse();
+  return {
+    value: parseValue(type, rawValue),
+    className: mx2(cellClassesForFieldType(type), classNames)
+  };
+};
+var gridCellGetter = (model) => {
   const cachedGridCells = {};
   return (nextBounds) => {
     [
@@ -463,16 +504,10 @@ var gridCellGetter = (model, formatting) => {
       ].forEach((_2, r0) => {
         const col = nextBounds.start.col + c0;
         const row = nextBounds.start.row + r0;
-        const cell = formatting.getFormatting({
-          col,
-          row
-        });
+        const cell = projectCellProps(model, col, row);
         if (cell.value) {
           cachedGridCells;
-          cachedGridCells[`${col},${row}`] = {
-            value: cell.value,
-            className: mx2(cell.classNames)
-          };
+          cachedGridCells[`${col},${row}`] = cell;
         }
       });
     });
@@ -488,8 +523,8 @@ var colLabelCell = (col) => ({
   value: colToA1Notation(col),
   resizeHandle: "col"
 });
-var cellGetter = (model, formatting) => {
-  const getGridCells = gridCellGetter(model, formatting);
+var cellGetter = (model) => {
+  const getGridCells = gridCellGetter(model);
   return (nextBounds, plane) => {
     switch (plane) {
       case "grid":
@@ -515,7 +550,7 @@ var cellGetter = (model, formatting) => {
     }
   };
 };
-var useSheetModelDxGridProps = (dxGridRef, model, formatting) => {
+var useSheetModelDxGridProps = (dxGridRef, model) => {
   const [columns, setColumns] = useState(createDxGridColumns(model));
   const [rows, setRows] = useState(createDxGridColumns(model));
   useLayoutEffect(() => {
@@ -523,7 +558,7 @@ var useSheetModelDxGridProps = (dxGridRef, model, formatting) => {
       "cells"
     ]);
     if (dxGridRef.current) {
-      dxGridRef.current.getCells = cellGetter(model, formatting);
+      dxGridRef.current.getCells = cellGetter(model);
     }
     const handleCellsUpdate = () => {
       dxGridRef.current?.requestUpdate("initialCells");
@@ -531,8 +566,7 @@ var useSheetModelDxGridProps = (dxGridRef, model, formatting) => {
     cellsAccessor.handle.addListener("change", handleCellsUpdate);
     return () => cellsAccessor.handle.removeListener("change", handleCellsUpdate);
   }, [
-    model,
-    formatting
+    model
   ]);
   useEffect(() => {
     const columnMetaAccessor = createDocAccessor(model.sheet, [
@@ -562,8 +596,8 @@ var useSheetModelDxGridProps = (dxGridRef, model, formatting) => {
   };
 };
 
-// packages/plugins/plugin-sheet/src/hooks/useFormattingModel.ts
-import { useMemo } from "react";
+// packages/plugins/plugin-sheet/src/hooks/useSheetModel.ts
+import { useEffect as useEffect2, useState as useState2 } from "react";
 
 // packages/plugins/plugin-sheet/src/model/decorations.ts
 import { create as create2 } from "@dxos/echo-schema";
@@ -604,118 +638,6 @@ var createDecorations = () => {
   };
 };
 
-// packages/plugins/plugin-sheet/src/model/formatting-model.ts
-import { FieldValueType } from "@dxos/schema";
-var FormattingModel = class {
-  constructor(_model) {
-    this._model = _model;
-  }
-  /**
-  * Get formatted string value and className for cell.
-  */
-  getFormatting(cell) {
-    const value = this._model.getValue(cell);
-    if (value === void 0 || value === null) {
-      return {};
-    }
-    const locales = void 0;
-    const idx = addressToIndex(this._model.sheet, cell);
-    let formatting = this._model.sheet.formatting.find?.(({ range }) => range === idx);
-    const classNames = [
-      ...formatting?.classNames ?? []
-    ];
-    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);
-        }
-        if (_formatting.type) {
-          formatting = _formatting;
-        }
-      }
-    }
-    const defaultNumber = "justify-end font-mono";
-    const type = formatting?.type ?? this._model.getValueType(cell);
-    switch (type) {
-      case FieldValueType.Boolean: {
-        return {
-          value: value.toLocaleString().toUpperCase(),
-          classNames: [
-            ...classNames,
-            value ? "!text-greenText" : "!text-orangeText"
-          ]
-        };
-      }
-      //
-      // Numbers.
-      //
-      case FieldValueType.Number: {
-        return {
-          value: value.toLocaleString(locales),
-          classNames: [
-            ...classNames,
-            defaultNumber
-          ]
-        };
-      }
-      case FieldValueType.Percent: {
-        return {
-          value: value * 100 + "%",
-          classNames: [
-            ...classNames,
-            defaultNumber
-          ]
-        };
-      }
-      case FieldValueType.Currency: {
-        return {
-          value: value.toLocaleString(locales, {
-            style: "currency",
-            currency: "USD",
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2
-          }),
-          classNames: [
-            ...classNames,
-            defaultNumber
-          ]
-        };
-      }
-      //
-      // Dates.
-      //
-      case FieldValueType.DateTime: {
-        const date = this._model.toLocalDate(value);
-        return {
-          value: date.toLocaleString(locales),
-          classNames
-        };
-      }
-      case FieldValueType.Date: {
-        const date = this._model.toLocalDate(value);
-        return {
-          value: date.toLocaleDateString(locales),
-          classNames
-        };
-      }
-      case FieldValueType.Time: {
-        const date = this._model.toLocalDate(value);
-        return {
-          value: date.toLocaleTimeString(locales),
-          classNames
-        };
-      }
-      default: {
-        return {
-          value: String(value),
-          classNames
-        };
-      }
-    }
-  }
-};
-
 // packages/plugins/plugin-sheet/src/model/sheet-model.ts
 import { Event } from "@dxos/async";
 import { Resource } from "@dxos/context";
@@ -723,17 +645,17 @@ import { getTypename } from "@dxos/echo-schema";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
-import { FieldValueType as FieldValueType2 } from "@dxos/schema";
+import { FieldValueType } from "@dxos/schema";
 import { DetailedCellError, ExportedCellChange } from "#hyperformula";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/model/sheet-model.ts";
 var typeMap = {
-  BOOLEAN: FieldValueType2.Boolean,
-  NUMBER_RAW: FieldValueType2.Number,
-  NUMBER_PERCENT: FieldValueType2.Percent,
-  NUMBER_CURRENCY: FieldValueType2.Currency,
-  NUMBER_DATETIME: FieldValueType2.DateTime,
-  NUMBER_DATE: FieldValueType2.Date,
-  NUMBER_TIME: FieldValueType2.Time
+  BOOLEAN: FieldValueType.Boolean,
+  NUMBER_RAW: FieldValueType.Number,
+  NUMBER_PERCENT: FieldValueType.Percent,
+  NUMBER_CURRENCY: FieldValueType.Currency,
+  NUMBER_DATETIME: FieldValueType.DateTime,
+  NUMBER_DATE: FieldValueType.Date,
+  NUMBER_TIME: FieldValueType.Time
 };
 var getTopLeft = (range) => {
   const to = range.to ?? range.from;
@@ -1204,15 +1126,7 @@ var SheetModel = class extends Resource {
   }
 };
 
-// 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 useState2 } from "react";
 var useSheetModel = (graph, sheet, { readonly } = {}) => {
   const [model, setModel] = useState2();
   useEffect2(() => {
@@ -1241,7 +1155,7 @@ var useSheetModel = (graph, sheet, { readonly } = {}) => {
 
 // packages/plugins/plugin-sheet/src/hooks/threads.ts
 import { effect } from "@preact/signals-core";
-import { useCallback, useEffect as useEffect3, useMemo as useMemo2 } from "react";
+import { useCallback, useEffect as useEffect3, useMemo } from "react";
 import { LayoutAction, useIntentDispatcher, useIntentResolver } from "@dxos/app-framework";
 import { debounce as debounce2 } from "@dxos/async";
 import { fullyQualifiedId } from "@dxos/react-client/echo";
@@ -1266,11 +1180,11 @@ var useUpdateFocusedCellOnThreadSelection = (model, grid) => {
 };
 var useSelectThreadOnCellFocus = (model, cursor) => {
   const dispatch = useIntentDispatcher();
-  const activeThreads = useMemo2(() => model.sheet.threads?.filter((thread) => !!thread && thread.status === "active") ?? [], [
+  const activeThreads = useMemo(() => model.sheet.threads?.filter((thread) => !!thread && thread.status === "active") ?? [], [
     // TODO(thure): Surely we can find a better dependency for this…
     JSON.stringify(model.sheet.threads)
   ]);
-  const activeThreadAddresses = useMemo2(() => activeThreads.map((thread) => thread.anchor).filter((anchor) => anchor !== void 0).map((anchor) => addressFromIndex(model.sheet, anchor)), [
+  const activeThreadAddresses = useMemo(() => activeThreads.map((thread) => thread.anchor).filter((anchor) => anchor !== void 0).map((anchor) => addressFromIndex(model.sheet, anchor)), [
     activeThreads,
     model.sheet
   ]);
@@ -1298,7 +1212,7 @@ var useSelectThreadOnCellFocus = (model, cursor) => {
     activeThreadAddresses,
     model.sheet
   ]);
-  const debounced = useMemo2(() => {
+  const debounced = useMemo(() => {
     return debounce2((cellCoords) => requestAnimationFrame(() => selectClosestThread(cellCoords)), 50);
   }, [
     selectClosestThread
@@ -1323,10 +1237,10 @@ var createThreadDecoration = (cellIndex, threadId, sheetId) => {
   };
 };
 var useThreadDecorations = (model, decorations) => {
-  const sheet = useMemo2(() => model.sheet, [
+  const sheet = useMemo(() => model.sheet, [
     model.sheet
   ]);
-  const sheetId = useMemo2(() => fullyQualifiedId(sheet), [
+  const sheetId = useMemo(() => fullyQualifiedId(sheet), [
     sheet
   ]);
   useEffect3(() => {
@@ -1360,7 +1274,7 @@ var useThreadDecorations = (model, decorations) => {
 };
 
 // packages/plugins/plugin-sheet/src/components/SheetContext/SheetContext.tsx
-import React2, { createContext as createContext2, useContext, useMemo as useMemo3, useState as useState3 } from "react";
+import React2, { createContext as createContext2, useContext, useMemo as useMemo2, useState as useState3 } from "react";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
 import { Grid, useGridContext } from "@dxos/react-ui-grid";
@@ -1370,7 +1284,7 @@ var useSheetContext = () => {
   const context = useContext(SheetContext);
   invariant4(context, void 0, {
     F: __dxlog_file3,
-    L: 46,
+    L: 45,
     S: void 0,
     A: [
       "context",
@@ -1379,9 +1293,9 @@ var useSheetContext = () => {
   });
   return context;
 };
-var SheetProviderImpl = ({ model, formatting, onInfo, children, __gridScope }) => {
+var SheetProviderImpl = ({ model, onInfo, children, __gridScope }) => {
   const { id, editing, setEditing } = useGridContext("SheetProvider", __gridScope);
-  const decorations = useMemo3(() => createDecorations(), []);
+  const decorations = useMemo2(() => createDecorations(), []);
   const [cursor, setCursor] = useState3();
   const [range, setRange] = useState3();
   useSelectThreadOnCellFocus(model, cursor);
@@ -1390,7 +1304,6 @@ var SheetProviderImpl = ({ model, formatting, onInfo, children, __gridScope }) =
     value: {
       id,
       model,
-      formatting,
       editing,
       setEditing,
       cursor,
@@ -1407,12 +1320,10 @@ var SheetProvider = ({ children, graph, sheet, readonly, onInfo }) => {
   const model = useSheetModel(graph, sheet, {
     readonly
   });
-  const formatting = useFormattingModel(model);
-  return !model || !formatting ? null : /* @__PURE__ */ React2.createElement(Grid.Root, {
+  return !model ? null : /* @__PURE__ */ React2.createElement(Grid.Root, {
     id: fullyQualifiedId2(sheet)
   }, /* @__PURE__ */ React2.createElement(SheetProviderImpl, {
     model,
-    formatting,
     onInfo
   }, children));
 };
@@ -1453,17 +1364,19 @@ var sheetColDefault = {
   }
 };
 var GridSheet = () => {
-  const { id, model, formatting, editing, setEditing, setCursor, setRange } = useSheetContext();
+  const { id, model, editing, setEditing, setCursor, setRange } = useSheetContext();
   const dxGrid = useRef(null);
   const rangeNotifier = useRef();
   const { hasAttention } = useAttention(id);
   const handleFocus = useCallback2((event) => {
     if (!editing) {
       const cell = closestCell(event.target);
-      setCursor(cell && cell.plane === "grid" ? {
-        col: cell.col,
-        row: cell.row
-      } : void 0);
+      if (cell && cell.plane === "grid") {
+        setCursor({
+          col: cell.col,
+          row: cell.row
+        });
+      }
     }
   }, [
     editing
@@ -1533,8 +1446,8 @@ var GridSheet = () => {
   }, [
     hasAttention
   ]);
-  const { columns, rows } = useSheetModelDxGridProps(dxGrid, model, formatting);
-  const extension = useMemo4(() => [
+  const { columns, rows } = useSheetModelDxGridProps(dxGrid, model);
+  const extension = useMemo3(() => [
     editorKeys({
       onClose: handleClose,
       ...editing?.initialContent && {
@@ -1579,7 +1492,7 @@ var GridSheet = () => {
 };
 
 // packages/plugins/plugin-sheet/src/components/index.ts
-var SheetContainer = React4.lazy(() => import("./SheetContainer-NDNIS44E.mjs"));
+var SheetContainer = React4.lazy(() => import("./SheetContainer-RVRACGCZ.mjs"));
 
 // packages/plugins/plugin-sheet/src/hooks/useComputeGraph.ts
 var useComputeGraph = (space) => {
@@ -1601,6 +1514,7 @@ export {
   ComputeGraphContextProvider,
   addressToA1Notation,
   rangeToA1Notation,
+  inRange,
   createSheet,
   addressToIndex,
   compareIndexPositions,
@@ -1611,4 +1525,4 @@ export {
   GridSheet,
   SheetContainer
 };
-//# sourceMappingURL=chunk-AQSGDA4X.mjs.map
+//# sourceMappingURL=chunk-HOG37RYS.mjs.map