@dxos/plugin-sheet 0.6.12-main.89e9959 → 0.6.12-main.c1d977f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.6.12-main.89e9959",
+  "version": "0.6.12-main.c1d977f",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -65,7 +65,7 @@
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^7.0.1",
     "@dnd-kit/utilities": "^3.2.0",
-    "@effect/schema": "^0.67.16",
+    "@effect/schema": "^0.75.1",
     "@lezer/common": "^1.2.2",
     "@lezer/highlight": "^1.2.1",
     "@lezer/lezer": "^1.1.2",
@@ -79,29 +79,29 @@
     "re-resizable": "^6.9.17",
     "react-markdown": "^8.0.5",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.6.12-main.89e9959",
-    "@dxos/async": "0.6.12-main.89e9959",
-    "@dxos/context": "0.6.12-main.89e9959",
-    "@dxos/client": "0.6.12-main.89e9959",
-    "@dxos/crypto": "0.6.12-main.89e9959",
-    "@dxos/keys": "0.6.12-main.89e9959",
-    "@dxos/debug": "0.6.12-main.89e9959",
-    "@dxos/echo-schema": "0.6.12-main.89e9959",
-    "@dxos/invariant": "0.6.12-main.89e9959",
-    "@dxos/log": "0.6.12-main.89e9959",
-    "@dxos/plugin-attention": "0.6.12-main.89e9959",
-    "@dxos/plugin-graph": "0.6.12-main.89e9959",
-    "@dxos/plugin-markdown": "0.6.12-main.89e9959",
-    "@dxos/plugin-script": "0.6.12-main.89e9959",
-    "@dxos/plugin-client": "0.6.12-main.89e9959",
-    "@dxos/plugin-space": "0.6.12-main.89e9959",
-    "@dxos/plugin-stack": "0.6.12-main.89e9959",
-    "@dxos/react-client": "0.6.12-main.89e9959",
-    "@dxos/react-hooks": "0.6.12-main.89e9959",
-    "@dxos/react-ui-attention": "0.6.12-main.89e9959",
-    "@dxos/react-ui-grid": "0.6.12-main.89e9959",
-    "@dxos/util": "0.6.12-main.89e9959",
-    "@dxos/react-ui-editor": "0.6.12-main.89e9959"
+    "@dxos/app-framework": "0.6.12-main.c1d977f",
+    "@dxos/client": "0.6.12-main.c1d977f",
+    "@dxos/async": "0.6.12-main.c1d977f",
+    "@dxos/crypto": "0.6.12-main.c1d977f",
+    "@dxos/context": "0.6.12-main.c1d977f",
+    "@dxos/echo-schema": "0.6.12-main.c1d977f",
+    "@dxos/debug": "0.6.12-main.c1d977f",
+    "@dxos/invariant": "0.6.12-main.c1d977f",
+    "@dxos/keys": "0.6.12-main.c1d977f",
+    "@dxos/log": "0.6.12-main.c1d977f",
+    "@dxos/plugin-attention": "0.6.12-main.c1d977f",
+    "@dxos/plugin-graph": "0.6.12-main.c1d977f",
+    "@dxos/plugin-client": "0.6.12-main.c1d977f",
+    "@dxos/plugin-script": "0.6.12-main.c1d977f",
+    "@dxos/plugin-markdown": "0.6.12-main.c1d977f",
+    "@dxos/plugin-space": "0.6.12-main.c1d977f",
+    "@dxos/plugin-stack": "0.6.12-main.c1d977f",
+    "@dxos/react-hooks": "0.6.12-main.c1d977f",
+    "@dxos/react-client": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-attention": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-grid": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-editor": "0.6.12-main.c1d977f",
+    "@dxos/util": "0.6.12-main.c1d977f"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
@@ -114,20 +114,20 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-generator": "0.6.12-main.89e9959",
-    "@dxos/random": "0.6.12-main.89e9959",
-    "@dxos/react-ui-syntax-highlighter": "0.6.12-main.89e9959",
-    "@dxos/react-ui": "0.6.12-main.89e9959",
-    "@dxos/react-ui-types": "0.6.12-main.89e9959",
-    "@dxos/react-ui-theme": "0.6.12-main.89e9959",
-    "@dxos/storybook-utils": "0.6.12-main.89e9959"
+    "@dxos/echo-generator": "0.6.12-main.c1d977f",
+    "@dxos/react-ui": "0.6.12-main.c1d977f",
+    "@dxos/random": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-syntax-highlighter": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-theme": "0.6.12-main.c1d977f",
+    "@dxos/storybook-utils": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-types": "0.6.12-main.c1d977f"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.6.12-main.89e9959",
-    "@dxos/react-ui-theme": "0.6.12-main.89e9959"
+    "@dxos/react-ui": "0.6.12-main.c1d977f",
+    "@dxos/react-ui-theme": "0.6.12-main.c1d977f"
   },
   "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.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/sheet-model.test.ts

@@ -8,12 +8,10 @@ import { Trigger } from '@dxos/async';
 import { FunctionType } from '@dxos/plugin-script/types';
 
 import { SheetModel } from './sheet-model';
-import { createSheet, addressFromA1Notation } from '../defs';
+import { addressFromA1Notation, createSheet } from '../defs';
 import { TestBuilder, testFunctionPlugins } from '../graph/testing';
 import { type CellScalarValue } from '../types';
 
-// TODO(burdon): GPT("prompt", inputs); e.g., with large text cells.
-
 describe('SheetModel', () => {
   let testBuilder: TestBuilder;
   beforeEach(async () => {

package/src/types.ts

@@ -105,7 +105,7 @@ export class SheetType extends TypedObject({ typename: 'dxos.org/type/SheetType'
   name: S.optional(S.String),
 
   // Sparse map of cells referenced by index.
-  cells: S.mutable(S.Record(S.String, S.mutable(CellValue))),
+  cells: S.mutable(S.Record({ key: S.String, value: S.mutable(CellValue) })),
 
   // Ordered row indices.
   rows: S.mutable(S.Array(S.String)),
@@ -114,13 +114,13 @@ export class SheetType extends TypedObject({ typename: 'dxos.org/type/SheetType'
   columns: S.mutable(S.Array(S.String)),
 
   // Row metadata referenced by index.
-  rowMeta: S.mutable(S.Record(S.String, S.mutable(RowColumnMeta))),
+  rowMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),
 
   // Column metadata referenced by index.
-  columnMeta: S.mutable(S.Record(S.String, S.mutable(RowColumnMeta))),
+  columnMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),
 
   // Cell formatting referenced by indexed range.
-  formatting: S.mutable(S.Record(S.String, S.mutable(Formatting))),
+  formatting: S.mutable(S.Record({ key: S.String, value: S.mutable(Formatting) })),
 
   // Threads associated with the sheet
   threads: S.optional(S.mutable(S.Array(ref(ThreadType)))),