@dxos/plugin-sheet 0.6.12-main.7907542 → 0.6.12-main.ac23639

package/dist/types/src/types.d.ts

@@ -4,6 +4,7 @@ import { type SchemaProvides } from '@dxos/plugin-client';
 import { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';
 import { type SpaceInitProvides } from '@dxos/plugin-space';
 import { type StackProvides } from '@dxos/plugin-stack';
+import { FieldValueType } from '@dxos/schema';
 export declare enum SheetAction {
     CREATE = "dxos.org/plugin/sheet/action/create"
 }
@@ -19,25 +20,8 @@ export declare const CellValue: S.Struct<{
     value: typeof S.Any;
 }>;
 export type CellValue = S.Schema.Type<typeof CellValue>;
-/**
- * https://www.tutorialsteacher.com/typescript/typescript-number
- */
-export declare enum ValueTypeEnum {
-    Null = 0,
-    Number = 1,
-    Boolean = 2,
-    String = 3,
-    Percent = 10,
-    Currency = 11,
-    DateTime = 20,
-    Date = 21,
-    Time = 22,
-    URL = 30,
-    DID = 31
-}
-export declare const ValueType: S.Enums<typeof ValueTypeEnum>;
 export declare const Formatting: S.Struct<{
-    type: S.optional<S.Enums<typeof ValueTypeEnum>>;
+    type: S.optional<S.Enums<typeof FieldValueType>>;
     format: S.optional<typeof S.String>;
     precision: S.optional<typeof S.Number>;
     classNames: S.optional<S.Array$<typeof S.String>>;
@@ -67,7 +51,7 @@ declare const SheetType_base: import("@dxos/echo-schema").AbstractTypedObject<{
     };
     formatting: {
         [x: string]: {
-            type?: ValueTypeEnum | undefined;
+            type?: FieldValueType | undefined;
             format?: string | undefined;
             precision?: number | undefined;
             classNames?: readonly string[] | undefined;
@@ -122,7 +106,7 @@ declare const SheetType_base: import("@dxos/echo-schema").AbstractTypedObject<{
         size: S.optional<typeof S.Number>;
     }>>>>;
     formatting: S.mutable<S.Record$<typeof S.String, S.mutable<S.Struct<{
-        type: S.optional<S.Enums<typeof ValueTypeEnum>>;
+        type: S.optional<S.Enums<typeof FieldValueType>>;
         format: S.optional<typeof S.String>;
         precision: S.optional<typeof S.Number>;
         classNames: S.optional<S.Array$<typeof S.String>>;

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMxD,oBAAY,WAAW;IACrB,MAAM,wCAA2B;CAClC;AAKD,KAAK,cAAc,CAAC,CAAC,IAAI;IACvB,MAAM,EAAE;QACN,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;QAClC,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC;KAC9F,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,eAAe,GAC/C,sBAAsB,GACtB,oBAAoB,GACpB,yBAAyB,GACzB,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,iBAAiB,GACjB,aAAa,GACb,cAAc,CAAC,SAAS,CAAC,CAAC;AAE5B,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AAE/D,eAAO,MAAM,SAAS;;EAMpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,SAAS,CAAC,CAAC;AAExD;;GAEG;AAEH,oBAAY,aAAa;IACvB,IAAI,IAAI;IACR,MAAM,IAAI;IACV,OAAO,IAAI;IACX,MAAM,IAAI;IAGV,OAAO,KAAK;IACZ,QAAQ,KAAK;IAGb,QAAQ,KAAK;IACb,IAAI,KAAK;IACT,IAAI,KAAK;IAIT,GAAG,KAAK;IACR,GAAG,KAAK;CACT;AAED,eAAO,MAAM,SAAS,+BAAyB,CAAC;AAEhD,eAAO,MAAM,UAAU;;;;;EAKrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAG1D,eAAO,MAAM,aAAa;;EAExB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqB0E,CAAC;;oBAG5E,CAAC;uBAAyC,CAAC;wBAE7B,CAAC;;;;;;;;2BAYb,CAAA;qBACe,CAAC;;iBAA8C,CAAC;sBAA4E,CAAC;;;mBAAwE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAlB5I,CAAC;;oBAG5E,CAAC;uBAAyC,CAAC;wBAE7B,CAAC;;;;;;;;2BAYb,CAAA;qBACe,CAAC;;iBAA8C,CAAC;sBAA4E,CAAC;;;mBAAwE,CAAC;;;;;;;;AAlCzN,qBAAa,SAAU,SAAQ,cAuB7B;CAAG;AAEL,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACnC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAM9C,oBAAY,WAAW;IACrB,MAAM,wCAA2B;CAClC;AAKD,KAAK,cAAc,CAAC,CAAC,IAAI;IACvB,MAAM,EAAE;QACN,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;QAClC,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC;KAC9F,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,eAAe,GAC/C,sBAAsB,GACtB,oBAAoB,GACpB,yBAAyB,GACzB,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,iBAAiB,GACjB,aAAa,GACb,cAAc,CAAC,SAAS,CAAC,CAAC;AAE5B,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AAE/D,eAAO,MAAM,SAAS;;EAKpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,SAAS,CAAC,CAAC;AAGxD,eAAO,MAAM,UAAU;;;;;EAKrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAG1D,eAAO,MAAM,aAAa;;EAExB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsCoB,CAAC;;oBAA8D,CAAC;uBAAyC,CAAC;wBAAwD,CAAC;;;;;;;;2BAAsP,CAAC;qBAAuC,CAAC;;iBAA8C,CAAC;sBAA4E,CAAC;;;mBAAwE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAvoB,CAAC;;oBAA8D,CAAC;uBAAyC,CAAC;wBAAwD,CAAC;;;;;;;;2BAAsP,CAAC;qBAAuC,CAAC;;iBAA8C,CAAC;sBAA4E,CAAC;;;mBAAwE,CAAC;;;;;;;;AAnC9pB,qBAAa,SAAU,SAAQ,cAwB7B;CAAG;AAEL,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACnC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.6.12-main.7907542",
+  "version": "0.6.12-main.ac23639",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -74,34 +74,36 @@
     "@radix-ui/react-context": "^1.0.0",
     "@tanstack/react-virtual": "^3.9.0",
     "codemirror-lang-spreadsheet": "^1.3.0",
+    "date-fns": "^3.3.1",
     "hyperformula": "^2.7.1",
     "lodash.defaultsdeep": "^4.6.1",
     "re-resizable": "^6.9.17",
     "react-markdown": "^8.0.5",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.6.12-main.7907542",
-    "@dxos/async": "0.6.12-main.7907542",
-    "@dxos/crypto": "0.6.12-main.7907542",
-    "@dxos/client": "0.6.12-main.7907542",
-    "@dxos/debug": "0.6.12-main.7907542",
-    "@dxos/context": "0.6.12-main.7907542",
-    "@dxos/echo-schema": "0.6.12-main.7907542",
-    "@dxos/invariant": "0.6.12-main.7907542",
-    "@dxos/log": "0.6.12-main.7907542",
-    "@dxos/plugin-attention": "0.6.12-main.7907542",
-    "@dxos/keys": "0.6.12-main.7907542",
-    "@dxos/plugin-client": "0.6.12-main.7907542",
-    "@dxos/plugin-markdown": "0.6.12-main.7907542",
-    "@dxos/plugin-graph": "0.6.12-main.7907542",
-    "@dxos/plugin-script": "0.6.12-main.7907542",
-    "@dxos/plugin-space": "0.6.12-main.7907542",
-    "@dxos/react-client": "0.6.12-main.7907542",
-    "@dxos/react-hooks": "0.6.12-main.7907542",
-    "@dxos/react-ui-editor": "0.6.12-main.7907542",
-    "@dxos/plugin-stack": "0.6.12-main.7907542",
-    "@dxos/react-ui-attention": "0.6.12-main.7907542",
-    "@dxos/react-ui-grid": "0.6.12-main.7907542",
-    "@dxos/util": "0.6.12-main.7907542"
+    "@dxos/async": "0.6.12-main.ac23639",
+    "@dxos/app-framework": "0.6.12-main.ac23639",
+    "@dxos/context": "0.6.12-main.ac23639",
+    "@dxos/client": "0.6.12-main.ac23639",
+    "@dxos/crypto": "0.6.12-main.ac23639",
+    "@dxos/debug": "0.6.12-main.ac23639",
+    "@dxos/invariant": "0.6.12-main.ac23639",
+    "@dxos/keys": "0.6.12-main.ac23639",
+    "@dxos/log": "0.6.12-main.ac23639",
+    "@dxos/echo-schema": "0.6.12-main.ac23639",
+    "@dxos/plugin-attention": "0.6.12-main.ac23639",
+    "@dxos/plugin-graph": "0.6.12-main.ac23639",
+    "@dxos/plugin-client": "0.6.12-main.ac23639",
+    "@dxos/plugin-markdown": "0.6.12-main.ac23639",
+    "@dxos/plugin-space": "0.6.12-main.ac23639",
+    "@dxos/plugin-stack": "0.6.12-main.ac23639",
+    "@dxos/react-hooks": "0.6.12-main.ac23639",
+    "@dxos/react-client": "0.6.12-main.ac23639",
+    "@dxos/plugin-script": "0.6.12-main.ac23639",
+    "@dxos/react-ui-attention": "0.6.12-main.ac23639",
+    "@dxos/schema": "0.6.12-main.ac23639",
+    "@dxos/react-ui-grid": "0.6.12-main.ac23639",
+    "@dxos/react-ui-editor": "0.6.12-main.ac23639",
+    "@dxos/util": "0.6.12-main.ac23639"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
@@ -114,20 +116,20 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-generator": "0.6.12-main.7907542",
-    "@dxos/react-ui-syntax-highlighter": "0.6.12-main.7907542",
-    "@dxos/react-ui": "0.6.12-main.7907542",
-    "@dxos/random": "0.6.12-main.7907542",
-    "@dxos/react-ui-types": "0.6.12-main.7907542",
-    "@dxos/react-ui-theme": "0.6.12-main.7907542",
-    "@dxos/storybook-utils": "0.6.12-main.7907542"
+    "@dxos/random": "0.6.12-main.ac23639",
+    "@dxos/echo-generator": "0.6.12-main.ac23639",
+    "@dxos/react-ui": "0.6.12-main.ac23639",
+    "@dxos/react-ui-syntax-highlighter": "0.6.12-main.ac23639",
+    "@dxos/react-ui-theme": "0.6.12-main.ac23639",
+    "@dxos/storybook-utils": "0.6.12-main.ac23639",
+    "@dxos/react-ui-types": "0.6.12-main.ac23639"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.6.12-main.7907542",
-    "@dxos/react-ui-theme": "0.6.12-main.7907542"
+    "@dxos/react-ui": "0.6.12-main.ac23639",
+    "@dxos/react-ui-theme": "0.6.12-main.ac23639"
   },
   "publishConfig": {
     "access": "public"

package/src/components/GridSheet/GridSheet.tsx

@@ -10,44 +10,18 @@ import {
   type GridContentProps,
   type GridScopedProps,
   useGridContext,
+  editorKeys,
+  type EditorKeysProps,
+  GridCellEditor,
 } from '@dxos/react-ui-grid';
 
 import { colLabelCell, dxGridCellIndexToSheetCellAddress, rowLabelCell, useSheetModelDxGridProps } from './util';
 import { rangeToA1Notation, type CellRange } from '../../defs';
+import { rangeExtension, sheetExtension, type CellRangeNotifier } from '../../extensions';
 import { type ComputeGraph } from '../../graph';
 import { useFormattingModel, useSheetModel, type UseSheetModelOptions } from '../../hooks';
 import { type SheetModel, type FormattingModel } from '../../model';
 import { type SheetType } from '../../types';
-import {
-  CellEditor,
-  type CellEditorProps,
-  type CellRangeNotifier,
-  editorKeys,
-  type EditorKeysProps,
-  rangeExtension,
-  sheetExtension,
-} from '../CellEditor';
-
-const GridSheetCellEditor = ({
-  model,
-  extension,
-  __gridScope,
-}: GridScopedProps<Pick<CellEditorProps, 'extension'> & { model: SheetModel }>) => {
-  const { id, editing, setEditing, editBox } = useGridContext('GridSheetCellEditor', __gridScope);
-  const cell = dxGridCellIndexToSheetCellAddress(editing);
-
-  return editing ? (
-    <CellEditor
-      variant='grid'
-      value={editing.initialContent ?? (cell ? model.getCellText(cell) : undefined)}
-      autoFocus
-      box={editBox}
-      onBlur={() => setEditing(null)}
-      extension={extension}
-      gridId={id}
-    />
-  ) : null;
-};
 
 const initialCells = {
   grid: {},
@@ -82,7 +56,7 @@ const GridSheetImpl = ({
   const handleClose = useCallback<NonNullable<EditorKeysProps['onClose']> | NonNullable<EditorKeysProps['onNav']>>(
     (value, { key, shift }) => {
       if (value !== undefined) {
-        model.setValue(dxGridCellIndexToSheetCellAddress(editing)!, value);
+        model.setValue(dxGridCellIndexToSheetCellAddress(editing!.index), value);
       }
       setEditing(null);
       const axis = ['Enter', 'ArrowUp', 'ArrowDown'].includes(key)
@@ -136,9 +110,17 @@ const GridSheetImpl = ({
     [model, handleClose, editing],
   );
 
+  const getCellContent = useCallback(
+    (index: string) => {
+      const cell = dxGridCellIndexToSheetCellAddress(index);
+      return model.getCellText(cell);
+    },
+    [model],
+  );
+
   return (
     <>
-      <GridSheetCellEditor model={model} extension={extension} />
+      <GridCellEditor getCellContent={getCellContent} extension={extension} />
       <Grid.Content
         initialCells={initialCells}
         columns={columns}

package/src/components/{CellEditor/CellEditor.stories.tsx → GridSheet/SheetCellEditor.stories.tsx}

@@ -9,12 +9,12 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { Client } from '@dxos/client';
 import { createDocAccessor, type EchoReactiveObject } from '@dxos/client/echo';
 import { automerge } from '@dxos/react-ui-editor';
+import { CellEditor, type CellEditorProps } from '@dxos/react-ui-grid';
 import { withTheme } from '@dxos/storybook-utils';
 
 import { HyperFormula } from '#hyperformula';
-import { CellEditor, type CellEditorProps } from './CellEditor';
-import { sheetExtension } from './extension';
 import { createSheet } from '../../defs';
+import { sheetExtension } from '../../extensions';
 import { defaultFunctions } from '../../graph';
 import { SheetType } from '../../types';
 

package/src/components/GridSheet/util.ts

@@ -6,7 +6,6 @@ import { type MutableRefObject, useEffect, useLayoutEffect, useState } from 'rea
 
 import { createDocAccessor } from '@dxos/react-client/echo';
 import {
-  type GridEditing,
   type GridContentProps,
   type DxGridElement,
   type DxGridAxisMeta,
@@ -21,11 +20,8 @@ import { mx } from '@dxos/react-ui-theme';
 import { type CellAddress } from '../../defs';
 import { type SheetModel, type FormattingModel } from '../../model';
 
-export const dxGridCellIndexToSheetCellAddress = (gridEditing: GridEditing): CellAddress | null => {
-  if (!gridEditing) {
-    return null;
-  }
-  const [colStr, rowStr] = gridEditing.index.split(',');
+export const dxGridCellIndexToSheetCellAddress = (index: string): CellAddress => {
+  const [colStr, rowStr] = index.split(',');
   return {
     col: parseInt(colStr),
     row: parseInt(rowStr),

package/src/components/Sheet/Sheet.stories.tsx

@@ -11,6 +11,7 @@ import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Button } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
+import { FieldValueType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { Sheet } from './Sheet';
@@ -21,7 +22,7 @@ import { type ComputeGraph } from '../../graph';
 import { testFunctionPlugins } from '../../graph/testing';
 import { useComputeGraph } from '../../hooks';
 import { createTestCells, useTestSheet, withComputeGraphDecorator } from '../../testing';
-import { SheetType, ValueTypeEnum } from '../../types';
+import { SheetType } from '../../types';
 import { Toolbar, type ToolbarActionHandler } from '../Toolbar';
 
 // TODO(burdon): Allow toolbar to access sheet context; provide state for current cursor/range.
@@ -69,12 +70,12 @@ const SheetWithToolbar = ({ graph, debug }: { graph: ComputeGraph; debug?: boole
       }
 
       case 'date': {
-        format.type = ValueTypeEnum.Date;
+        format.type = FieldValueType.Date;
         format.format = 'YYYY-MM-DD';
         break;
       }
       case 'currency': {
-        format.type = ValueTypeEnum.Currency;
+        format.type = FieldValueType.Currency;
         format.precision = 2;
         break;
       }

package/src/components/Sheet/Sheet.tsx

@@ -42,6 +42,7 @@ import { fullyQualifiedId, createDocAccessor } from '@dxos/client/echo';
 import { log } from '@dxos/log';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { ATTENABLE_ATTRIBUTE, useAttendableAttributes, useAttention, useAttentionPath } from '@dxos/react-ui-attention';
+import { CellEditor, type EditorKeysProps, editorKeys } from '@dxos/react-ui-grid';
 import { mx } from '@dxos/react-ui-theme';
 
 import {
@@ -73,14 +74,7 @@ import {
   addressToIndex,
   addressFromIndex,
 } from '../../defs';
-import {
-  CellEditor,
-  type CellRangeNotifier,
-  type EditorKeysProps,
-  editorKeys,
-  rangeExtension,
-  sheetExtension,
-} from '../CellEditor';
+import { rangeExtension, sheetExtension, type CellRangeNotifier } from '../../extensions';
 
 // TODO(burdon): Virtualization bug.
 // TODO(burdon): Toolbar styles and formatting.

package/src/{components/CellEditor → extensions/editor}/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './CellEditor';
 export * from './extension';

package/src/extensions/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './compute';
+export * from './editor';

package/src/{meta.tsx → meta.ts}

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import { pluginMeta } from '@dxos/app-framework';
+import { type PluginMeta } from '@dxos/app-framework';
 
 export const SHEET_PLUGIN = 'dxos.org/plugin/sheet';
 
-export default pluginMeta({
+export default {
   id: SHEET_PLUGIN,
   name: 'Sheet',
   description: 'A simple spreadsheet plugin.',
   icon: 'ph--grid-nine--regular',
-});
+} satisfies PluginMeta;

package/src/model/formatting-model.ts

@@ -3,17 +3,20 @@
 //
 
 import { type ClassNameValue } from '@dxos/react-ui-types';
+import { FieldValueType } from '@dxos/schema';
 
 import { type SheetModel } from './sheet-model';
 import { type CellAddress, inRange } from '../defs';
 import { addressToIndex, rangeFromIndex } from '../defs';
-import { ValueTypeEnum } from '../types';
 
 export type CellFormat = {
   value?: string;
   classNames?: ClassNameValue;
 };
 
+/**
+ * @deprecated See react-ui-data.
+ */
 export class FormattingModel {
   constructor(private readonly _model: SheetModel) {}
 
@@ -55,7 +58,7 @@ export class FormattingModel {
 
     const type = formatting?.type ?? this._model.getValueType(cell);
     switch (type) {
-      case ValueTypeEnum.Boolean: {
+      case FieldValueType.Boolean: {
         return {
           value: (value as boolean).toLocaleString().toUpperCase(),
           classNames: [...classNames, value ? '!text-greenText' : '!text-orangeText'],
@@ -66,15 +69,15 @@ export class FormattingModel {
       // Numbers.
       //
 
-      case ValueTypeEnum.Number: {
+      case FieldValueType.Number: {
         return { value: value.toLocaleString(locales), classNames: [...classNames, defaultNumber] };
       }
 
-      case ValueTypeEnum.Percent: {
+      case FieldValueType.Percent: {
         return { value: (value as number) * 100 + '%', classNames: [...classNames, defaultNumber] };
       }
 
-      case ValueTypeEnum.Currency: {
+      case FieldValueType.Currency: {
         return {
           value: (value as number).toLocaleString(locales, {
             style: 'currency',
@@ -90,17 +93,17 @@ export class FormattingModel {
       // Dates.
       //
 
-      case ValueTypeEnum.DateTime: {
+      case FieldValueType.DateTime: {
         const date = this._model.toLocalDate(value as number);
         return { value: date.toLocaleString(locales), classNames };
       }
 
-      case ValueTypeEnum.Date: {
+      case FieldValueType.Date: {
         const date = this._model.toLocalDate(value as number);
         return { value: date.toLocaleDateString(locales), classNames };
       }
 
-      case ValueTypeEnum.Time: {
+      case FieldValueType.Time: {
         const date = this._model.toLocalDate(value as number);
         return { value: date.toLocaleTimeString(locales), classNames };
       }

package/src/model/sheet-model.ts

@@ -12,6 +12,7 @@ import { getTypename } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { FieldValueType } from '@dxos/schema';
 
 import { DetailedCellError, ExportedCellChange } from '#hyperformula';
 import {
@@ -24,16 +25,17 @@ import {
 } from '../defs';
 import { addressFromIndex, addressToIndex, initialize, insertIndices, ReadonlyException } from '../defs';
 import { type ComputeNode, type ComputeGraph, createSheetName, type ComputeNodeEvent } from '../graph';
-import { type CellScalarValue, type CellValue, type SheetType, ValueTypeEnum } from '../types';
-
-const typeMap: Record<string, ValueTypeEnum> = {
-  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,
+import { type CellScalarValue, type CellValue, type SheetType } from '../types';
+
+// Map sheet types to system types.
+const typeMap: Record<string, FieldValueType> = {
+  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,
 };
 
 const getTopLeft = (range: CellRange): CellAddress => {
@@ -269,7 +271,7 @@ export class SheetModel extends Resource {
   /**
    * Get value type.
    */
-  getValueType(cell: CellAddress): ValueTypeEnum {
+  getValueType(cell: CellAddress): FieldValueType {
     invariant(this._node);
     const addr = toSimpleCellAddress(this._node.sheetId, cell);
     const type = this._node.graph.hf.getCellValueDetailedType(addr);

package/src/types.ts

@@ -15,6 +15,7 @@ import { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';
 import { type SpaceInitProvides } from '@dxos/plugin-space';
 import { ThreadType } from '@dxos/plugin-space/types';
 import { type StackProvides } from '@dxos/plugin-stack';
+import { FieldValueType } from '@dxos/schema';
 
 import { SHEET_PLUGIN } from './meta';
 
@@ -51,41 +52,14 @@ export const CellValue = S.Struct({
   // TODO(burdon): How to store dates (datetime, date, time), percentages, etc.
   //  Consider import/export; natural access for other plugins. Special handling for currency (precision).
   // TODO(burdon): Automerge (long string) or short string or number.
-  // TODO(burdon): Arrays?
   value: S.Any,
 });
 
 export type CellValue = S.Schema.Type<typeof CellValue>;
 
-/**
- * https://www.tutorialsteacher.com/typescript/typescript-number
- */
-// TODO(burdon): Format vs. value.
-export enum ValueTypeEnum {
-  Null = 0,
-  Number = 1,
-  Boolean = 2,
-  String = 3,
-
-  // Special numbers.
-  Percent = 10,
-  Currency = 11,
-
-  // Dates.
-  DateTime = 20,
-  Date = 21,
-  Time = 22,
-
-  // Validated string types.
-  // TODO(burdon): Define effect types.
-  URL = 30,
-  DID = 31,
-}
-
-export const ValueType = S.Enums(ValueTypeEnum);
-
+// TODO(burdon): IMPORTANT: Reconcile with Field definition.
 export const Formatting = S.Struct({
-  type: S.optional(ValueType),
+  type: S.optional(S.Enums(FieldValueType)),
   format: S.optional(S.String),
   precision: S.optional(S.Number),
   classNames: S.optional(S.Array(S.String)),
@@ -99,8 +73,6 @@ export const RowColumnMeta = S.Struct({
 });
 
 // TODO(burdon): Index to all updates when rows/columns are inserted/deleted.
-// TODO(wittjosiah): Migrate typename to remove `Type` suffix.
-// TODO(wittjosiah): Rename title to name to align with other schemas.
 export class SheetType extends TypedObject({ typename: 'dxos.org/type/SheetType', version: '0.1.0' })({
   name: S.optional(S.String),
 
@@ -119,6 +91,7 @@ export class SheetType extends TypedObject({ typename: 'dxos.org/type/SheetType'
   // Column metadata referenced by index.
   columnMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),
 
+  // TODO(burdon): Change to array.
   // Cell formatting referenced by indexed range.
   formatting: S.mutable(S.Record({ key: S.String, value: S.mutable(Formatting) })),
 

package/dist/lib/browser/chunk-5ZMVZYGB.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport type {\n  GraphBuilderProvides,\n  IntentResolverProvides,\n  MetadataRecordsProvides,\n  SurfaceProvides,\n  TranslationsProvides,\n} from '@dxos/app-framework';\nimport { ref, S, TypedObject } from '@dxos/echo-schema';\nimport { type SchemaProvides } from '@dxos/plugin-client';\nimport { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';\nimport { type SpaceInitProvides } from '@dxos/plugin-space';\nimport { ThreadType } from '@dxos/plugin-space/types';\nimport { type StackProvides } from '@dxos/plugin-stack';\n\nimport { SHEET_PLUGIN } from './meta';\n\nconst SHEET_ACTION = `${SHEET_PLUGIN}/action`;\n\nexport enum SheetAction {\n  CREATE = `${SHEET_ACTION}/create`,\n}\n\n// TODO(Zan): Move this to the plugin-space plugin or another common location\n// when we implement comments in sheets.\n// This is currently duplicated in a few places.\ntype ThreadProvides<T> = {\n  thread: {\n    predicate: (obj: any) => obj is T;\n    createSort: (obj: T) => (anchorA: string | undefined, anchorB: string | undefined) => number;\n  };\n};\n\nexport type SheetPluginProvides = SurfaceProvides &\n  IntentResolverProvides &\n  GraphBuilderProvides &\n  MarkdownExtensionProvides &\n  MetadataRecordsProvides &\n  TranslationsProvides &\n  SchemaProvides &\n  SpaceInitProvides &\n  StackProvides &\n  ThreadProvides<SheetType>;\n\nexport type CellScalarValue = number | string | boolean | null;\n\nexport const CellValue = S.Struct({\n  // TODO(burdon): How to store dates (datetime, date, time), percentages, etc.\n  //  Consider import/export; natural access for other plugins. Special handling for currency (precision).\n  // TODO(burdon): Automerge (long string) or short string or number.\n  // TODO(burdon): Arrays?\n  value: S.Any,\n});\n\nexport type CellValue = S.Schema.Type<typeof CellValue>;\n\n/**\n * https://www.tutorialsteacher.com/typescript/typescript-number\n */\n// TODO(burdon): Format vs. value.\nexport enum ValueTypeEnum {\n  Null = 0,\n  Number = 1,\n  Boolean = 2,\n  String = 3,\n\n  // Special numbers.\n  Percent = 10,\n  Currency = 11,\n\n  // Dates.\n  DateTime = 20,\n  Date = 21,\n  Time = 22,\n\n  // Validated string types.\n  // TODO(burdon): Define effect types.\n  URL = 30,\n  DID = 31,\n}\n\nexport const ValueType = S.Enums(ValueTypeEnum);\n\nexport const Formatting = S.Struct({\n  type: S.optional(ValueType),\n  format: S.optional(S.String),\n  precision: S.optional(S.Number),\n  classNames: S.optional(S.Array(S.String)),\n});\n\nexport type Formatting = S.Schema.Type<typeof Formatting>;\n\n// TODO(burdon): Visibility, locked, frozen, etc.\nexport const RowColumnMeta = S.Struct({\n  size: S.optional(S.Number),\n});\n\n// TODO(burdon): Index to all updates when rows/columns are inserted/deleted.\n// TODO(wittjosiah): Migrate typename to remove `Type` suffix.\n// TODO(wittjosiah): Rename title to name to align with other schemas.\nexport class SheetType extends TypedObject({ typename: 'dxos.org/type/SheetType', version: '0.1.0' })({\n  name: S.optional(S.String),\n\n  // Sparse map of cells referenced by index.\n  cells: S.mutable(S.Record({ key: S.String, value: S.mutable(CellValue) })),\n\n  // Ordered row indices.\n  rows: S.mutable(S.Array(S.String)),\n\n  // Ordered column indices.\n  columns: S.mutable(S.Array(S.String)),\n\n  // Row metadata referenced by index.\n  rowMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),\n\n  // Column metadata referenced by index.\n  columnMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),\n\n  // Cell formatting referenced by indexed range.\n  formatting: S.mutable(S.Record({ key: S.String, value: S.mutable(Formatting) })),\n\n  // Threads associated with the sheet\n  threads: S.optional(S.mutable(S.Array(ref(ThreadType)))),\n}) {}\n\nexport type SheetSize = {\n  rows: number;\n  columns: number;\n};\n\nexport type CreateSheetOptions = {\n  name?: string;\n  cells?: Record<string, CellValue>;\n} & Partial<SheetSize>;\n"],
-  "mappings": ";;;;;AAWA,SAASA,KAAKC,GAAGC,mBAAmB;AAIpC,SAASC,kBAAkB;AAK3B,IAAMC,eAAe,GAAGC,YAAAA;;UAEZC,cAAAA;wCACD,GAAGF,YAAAA,SAAqB,IAAA;GADvBE,gBAAAA,cAAAA,CAAAA,EAAAA;AA2BL,IAAMC,YAAYC,EAAEC,OAAO;;;;;EAKhCC,OAAOF,EAAEG;AACX,CAAA;;UAQYC,gBAAAA;;;;;;;;;;;;GAAAA,kBAAAA,gBAAAA,CAAAA,EAAAA;AAqBL,IAAMC,YAAYL,EAAEM,MAAMF,aAAAA;AAE1B,IAAMG,aAAaP,EAAEC,OAAO;EACjCO,MAAMR,EAAES,SAASJ,SAAAA;EACjBK,QAAQV,EAAES,SAAST,EAAEW,MAAM;EAC3BC,WAAWZ,EAAES,SAAST,EAAEa,MAAM;EAC9BC,YAAYd,EAAES,SAAST,EAAEe,MAAMf,EAAEW,MAAM,CAAA;AACzC,CAAA;AAKO,IAAMK,gBAAgBhB,EAAEC,OAAO;EACpCgB,MAAMjB,EAAES,SAAST,EAAEa,MAAM;AAC3B,CAAA;AAKO,IAAMK,YAAN,cAAwBC,YAAY;EAAEC,UAAU;EAA2BC,SAAS;AAAQ,CAAA,EAAG;EACpGC,MAAMtB,EAAES,SAAST,EAAEW,MAAM;;EAGzBY,OAAOvB,EAAEwB,QAAQxB,EAAEyB,OAAO;IAAEC,KAAK1B,EAAEW;IAAQT,OAAOF,EAAEwB,QAAQzB,SAAAA;EAAW,CAAA,CAAA;;EAGvE4B,MAAM3B,EAAEwB,QAAQxB,EAAEe,MAAMf,EAAEW,MAAM,CAAA;;EAGhCiB,SAAS5B,EAAEwB,QAAQxB,EAAEe,MAAMf,EAAEW,MAAM,CAAA;;EAGnCkB,SAAS7B,EAAEwB,QAAQxB,EAAEyB,OAAO;IAAEC,KAAK1B,EAAEW;IAAQT,OAAOF,EAAEwB,QAAQR,aAAAA;EAAe,CAAA,CAAA;;EAG7Ec,YAAY9B,EAAEwB,QAAQxB,EAAEyB,OAAO;IAAEC,KAAK1B,EAAEW;IAAQT,OAAOF,EAAEwB,QAAQR,aAAAA;EAAe,CAAA,CAAA;;EAGhFe,YAAY/B,EAAEwB,QAAQxB,EAAEyB,OAAO;IAAEC,KAAK1B,EAAEW;IAAQT,OAAOF,EAAEwB,QAAQjB,UAAAA;EAAY,CAAA,CAAA;;EAG7EyB,SAAShC,EAAES,SAAST,EAAEwB,QAAQxB,EAAEe,MAAMkB,IAAIC,UAAAA,CAAAA,CAAAA,CAAAA;AAC5C,CAAA,EAAA;AAAI;",
-  "names": ["ref", "S", "TypedObject", "ThreadType", "SHEET_ACTION", "SHEET_PLUGIN", "SheetAction", "CellValue", "S", "Struct", "value", "Any", "ValueTypeEnum", "ValueType", "Enums", "Formatting", "type", "optional", "format", "String", "precision", "Number", "classNames", "Array", "RowColumnMeta", "size", "SheetType", "TypedObject", "typename", "version", "name", "cells", "mutable", "Record", "key", "rows", "columns", "rowMeta", "columnMeta", "formatting", "threads", "ref", "ThreadType"]
-}

package/dist/lib/browser/chunk-QILRZNE5.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.tsx"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { pluginMeta } from '@dxos/app-framework';\n\nexport const SHEET_PLUGIN = 'dxos.org/plugin/sheet';\n\nexport default pluginMeta({\n  id: SHEET_PLUGIN,\n  name: 'Sheet',\n  description: 'A simple spreadsheet plugin.',\n  icon: 'ph--grid-nine--regular',\n});\n"],
-  "mappings": ";AAIA,SAASA,kBAAkB;AAEpB,IAAMC,eAAe;AAE5B,IAAA,eAAeC,WAAW;EACxBC,IAAIF;EACJG,MAAM;EACNC,aAAa;EACbC,MAAM;AACR,CAAA;",
-  "names": ["pluginMeta", "SHEET_PLUGIN", "pluginMeta", "id", "name", "description", "icon"]
-}