@dxos/plugin-sheet 0.8.3 → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1da679c",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,11 +10,13 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs"
@@ -24,7 +26,7 @@
   "typesVersions": {
     "*": {
       "types": [
-        "dist/types/src/types.d.ts"
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -33,10 +35,10 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/autocomplete": "^6.18.7",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.2",
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^7.0.1",
@@ -54,73 +56,73 @@
     "re-resizable": "^6.9.17",
     "react-markdown": "^8.0.5",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/compute": "0.8.3",
-    "@dxos/client": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/crypto": "0.8.3",
-    "@dxos/echo": "0.8.3",
-    "@dxos/functions": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/lit-grid": "0.8.3",
-    "@dxos/plugin-attention": "0.8.3",
-    "@dxos/plugin-client": "0.8.3",
-    "@dxos/plugin-deck": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/plugin-graph": "0.8.3",
-    "@dxos/plugin-markdown": "0.8.3",
-    "@dxos/plugin-script": "0.8.3",
-    "@dxos/plugin-space": "0.8.3",
-    "@dxos/plugin-stack": "0.8.3",
-    "@dxos/plugin-thread": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/react-hooks": "0.8.3",
-    "@dxos/react-ui-editor": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-ui-grid": "0.8.3",
-    "@dxos/react-ui-list": "0.8.3",
-    "@dxos/react-ui-menu": "0.8.3",
-    "@dxos/schema": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3"
+    "@dxos/app-framework": "0.8.4-main.1da679c",
+    "@dxos/async": "0.8.4-main.1da679c",
+    "@dxos/client": "0.8.4-main.1da679c",
+    "@dxos/compute": "0.8.4-main.1da679c",
+    "@dxos/context": "0.8.4-main.1da679c",
+    "@dxos/crypto": "0.8.4-main.1da679c",
+    "@dxos/debug": "0.8.4-main.1da679c",
+    "@dxos/echo": "0.8.4-main.1da679c",
+    "@dxos/echo-schema": "0.8.4-main.1da679c",
+    "@dxos/keys": "0.8.4-main.1da679c",
+    "@dxos/invariant": "0.8.4-main.1da679c",
+    "@dxos/live-object": "0.8.4-main.1da679c",
+    "@dxos/lit-grid": "0.8.4-main.1da679c",
+    "@dxos/log": "0.8.4-main.1da679c",
+    "@dxos/plugin-client": "0.8.4-main.1da679c",
+    "@dxos/plugin-attention": "0.8.4-main.1da679c",
+    "@dxos/plugin-graph": "0.8.4-main.1da679c",
+    "@dxos/plugin-deck": "0.8.4-main.1da679c",
+    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
+    "@dxos/plugin-script": "0.8.4-main.1da679c",
+    "@dxos/functions": "0.8.4-main.1da679c",
+    "@dxos/plugin-space": "0.8.4-main.1da679c",
+    "@dxos/plugin-thread": "0.8.4-main.1da679c",
+    "@dxos/plugin-stack": "0.8.4-main.1da679c",
+    "@dxos/react-hooks": "0.8.4-main.1da679c",
+    "@dxos/react-client": "0.8.4-main.1da679c",
+    "@dxos/react-ui-form": "0.8.4-main.1da679c",
+    "@dxos/react-ui-grid": "0.8.4-main.1da679c",
+    "@dxos/react-ui-attention": "0.8.4-main.1da679c",
+    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
+    "@dxos/react-ui-editor": "0.8.4-main.1da679c",
+    "@dxos/react-ui-list": "0.8.4-main.1da679c",
+    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
+    "@dxos/schema": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
+    "@effect-rx/rx-react": "0.38.0",
+    "@effect/platform": "0.90.2",
     "@lezer/generator": "^1.7.1",
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "@types/react-window": "^1.8.8",
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo-generator": "0.8.3",
-    "@dxos/lit-grid": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3",
-    "@dxos/react-ui-types": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3",
-    "@dxos/test-utils": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "vite": "7.1.1",
+    "@dxos/echo-generator": "0.8.4-main.1da679c",
+    "@dxos/random": "0.8.4-main.1da679c",
+    "@dxos/lit-grid": "0.8.4-main.1da679c",
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c",
+    "@dxos/react-ui-types": "0.8.4-main.1da679c",
+    "@dxos/test-utils": "0.8.4-main.1da679c",
+    "@dxos/storybook-utils": "0.8.4-main.1da679c"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.tsx

@@ -2,16 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
 import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { AnchorSort, Markdown, ReactSurface, IntentResolver, ComputeGraphRegistry } from './capabilities';
+import { AnchorSort, ComputeGraphRegistry, IntentResolver, Markdown, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { serializer } from './serializer';
-import translations from './translations';
+import { translations } from './translations';
 import { SheetAction, SheetType } from './types';
 
 export const SheetPlugin = () =>

package/src/capabilities/anchor-sort.ts

@@ -6,7 +6,7 @@ import { Capabilities, contributes } from '@dxos/app-framework';
 import { Type } from '@dxos/echo';
 import { getTarget } from '@dxos/react-client/echo';
 
-import { compareIndexPositions, SheetType } from '../types';
+import { SheetType, compareIndexPositions } from '../types';
 
 export default () =>
   contributes(Capabilities.AnchorSort, {

package/src/capabilities/compute-graph-registry.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext } from '@dxos/app-framework';
+import { type PluginContext, contributes } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { SheetCapabilities } from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, Capabilities, createResolver } from '@dxos/app-framework';
+import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
 
 import { SHEET_PLUGIN } from '../meta';
-import { createSheet, SheetAction } from '../types';
+import { SheetAction, createSheet } from '../types';
 
 export default () =>
   contributes(Capabilities.IntentResolver, [

package/src/capabilities/markdown.ts

@@ -2,13 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext } from '@dxos/app-framework';
+import { type PluginContext, contributes } from '@dxos/app-framework';
 import { getSpace } from '@dxos/client/echo';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 
-import { SheetCapabilities } from './capabilities';
 import { computeGraphFacet } from '../extensions';
 
+import { SheetCapabilities } from './capabilities';
+
 export default (context: PluginContext) =>
   contributes(MarkdownCapabilities.Extensions, [
     ({ document: doc }) => {

package/src/capabilities/react-surface.tsx

@@ -8,11 +8,12 @@ import { Capabilities, contributes, createSurface, useCapability } from '@dxos/a
 import { Obj } from '@dxos/echo';
 import { getSpace } from '@dxos/react-client/echo';
 
-import { SheetCapabilities } from './capabilities';
 import { ComputeGraphContextProvider, RangeList, SheetContainer } from '../components';
 import { SHEET_PLUGIN } from '../meta';
 import { SheetType } from '../types';
 
+import { SheetCapabilities } from './capabilities';
+
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({

package/src/components/ComputeGraph/ComputeGraphContextProvider.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { createContext, type PropsWithChildren, useContext } from 'react';
+import React, { type PropsWithChildren, createContext, useContext } from 'react';
 
 import { type ComputeGraph, type ComputeGraphRegistry } from '@dxos/compute';
 import { raise } from '@dxos/debug';

package/src/components/ComputeGraph/compute-graph.stories.tsx

@@ -4,26 +4,27 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { testFunctionPlugins } from '@dxos/compute/testing';
-import { Obj, Filter } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { FunctionType } from '@dxos/functions';
 import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { Toolbar, Button, Input } from '@dxos/react-ui';
+import { Button, Input, Toolbar } from '@dxos/react-ui';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { withTheme } from '@dxos/storybook-utils';
 
-import { useComputeGraph } from './ComputeGraphContextProvider';
 import { useSheetModel } from '../../model';
 import { withComputeGraphDecorator } from '../../testing';
-import { createSheet, SheetType } from '../../types';
+import { SheetType, createSheet } from '../../types';
+
+import { useComputeGraph } from './ComputeGraphContextProvider';
 
 const FUNCTION_NAME = 'TEST';
 
-const Story = () => {
+const DefaultStory = () => {
   const space = useSpace();
   const graph = useComputeGraph(space);
   const [sheet, setSheet] = useState<SheetType>();
@@ -82,16 +83,18 @@ const Story = () => {
   );
 };
 
-export const Default = {};
+export const Default: Story = {};
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-sheet/functions',
+  render: DefaultStory,
   decorators: [
     withClientProvider({ types: [FunctionType, SheetType], createIdentity: true, createSpace: true }),
     withComputeGraphDecorator({ plugins: testFunctionPlugins }),
     withTheme,
   ],
-  render: (args: any) => <Story {...args} />,
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;

package/src/components/GridSheet/GridSheet.stories.tsx

@@ -4,22 +4,23 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { GridSheet } from './GridSheet';
 import { createTestCells, useTestSheet, withComputeGraphDecorator } from '../../testing';
-import translations from '../../translations';
+import { translations } from '../../translations';
 import { SheetType } from '../../types';
 import { useComputeGraph } from '../ComputeGraph';
 import { SheetProvider } from '../SheetContext';
 
+import { GridSheet } from './GridSheet';
+
 export const Basic = () => {
   const space = useSpace();
   const graph = useComputeGraph(space);
@@ -35,7 +36,7 @@ export const Basic = () => {
   );
 };
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-sheet/GridSheet',
   component: GridSheet,
   decorators: [
@@ -48,6 +49,8 @@ const meta: Meta = {
     }),
   ],
   parameters: { translations },
-};
+} satisfies Meta<typeof GridSheet>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;

package/src/components/GridSheet/GridSheet.tsx

@@ -3,42 +3,43 @@
 //
 
 import React, {
+  type FocusEvent,
+  type KeyboardEvent,
+  type MouseEvent,
+  type WheelEvent,
   useCallback,
   useMemo,
   useRef,
   useState,
-  type FocusEvent,
-  type KeyboardEvent,
-  type WheelEvent,
-  type MouseEvent,
 } from 'react';
 
 import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { rangeToA1Notation, type CellRange } from '@dxos/compute';
+import { type CellRange, rangeToA1Notation } from '@dxos/compute';
 import { defaultColSize, defaultRowSize } from '@dxos/lit-grid';
 import { DropdownMenu, Icon, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import {
-  closestCell,
-  editorKeys,
-  parseCellIndex,
-  Grid,
-  GridCellEditor,
+  type DxGridCellIndex,
   type DxGridElement,
   type DxGridPosition,
-  type DxGridCellIndex,
-  type EditorKeyHandler,
   type EditorBlurHandler,
+  type EditorKeyHandler,
+  Grid,
+  GridCellEditor,
   type GridContentProps,
+  closestCell,
+  editorKeys,
+  parseCellIndex,
 } from '@dxos/react-ui-grid';
 
-import { colLabelCell, rowLabelCell, useSheetModelDxGridProps } from './util';
-import { rangeExtension, sheetExtension, type RangeController } from '../../extensions';
+import { type RangeController, rangeExtension, sheetExtension } from '../../extensions';
 import { useSelectThreadOnCellFocus, useUpdateFocusedCellOnThreadSelection } from '../../integrations';
 import { SHEET_PLUGIN } from '../../meta';
 import { DEFAULT_COLS, DEFAULT_ROWS, SheetAction } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
+import { colLabelCell, rowLabelCell, useSheetModelDxGridProps } from './util';
+
 const inertPosition: DxGridPosition = { plane: 'grid', col: 0, row: 0 };
 
 const initialCells = {
@@ -59,11 +60,11 @@ const frozen = {
 };
 
 const sheetColDefault = {
-  frozenColsStart: { size: 48, readonly: true },
+  frozenColsStart: { size: 48, readonly: true, focusUnfurl: false },
   grid: { size: defaultColSize, resizeable: true },
 };
 const sheetRowDefault = {
-  frozenRowsStart: { size: defaultRowSize, readonly: true },
+  frozenRowsStart: { size: defaultRowSize, readonly: true, focusUnfurl: false },
   grid: { size: defaultRowSize, resizeable: true },
 };
 
@@ -278,7 +279,7 @@ export const GridSheet = () => {
 
   const { columns, rows } = useSheetModelDxGridProps(dxGrid, model);
 
-  const extension = useMemo(
+  const extensions = useMemo(
     () => [
       editorKeys({ onClose: handleClose, ...(editing?.initialContent && { onNav: handleClose }) }),
       sheetExtension({ functions: model.graph.getFunctions() }),
@@ -308,7 +309,7 @@ export const GridSheet = () => {
   return (
     // TODO(thure): Why are Table’s and Sheet’s editor boxes off by 1px?
     <div role='none' className='relative min-bs-0 [&_.cm-editor]:!border-lb [&_.cm-editor]:!border-transparent '>
-      <GridCellEditor getCellContent={getCellContent} extension={extension} onBlur={handleBlur} />
+      <GridCellEditor getCellContent={getCellContent} extensions={extensions} onBlur={handleBlur} />
       <Grid.Content
         initialCells={initialCells}
         limitColumns={DEFAULT_COLS}

package/src/components/GridSheet/SheetCellEditor.stories.tsx

@@ -4,51 +4,48 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
-import React, { useEffect, useMemo, useState } from 'react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useMemo, useState } from 'react';
 
 import { Client } from '@dxos/client';
 import { createDocAccessor } from '@dxos/client/echo';
 import { defaultFunctions } from '@dxos/compute';
 import { getRegisteredFunctionNames } from '@dxos/compute/testing';
+import { useAsyncEffect } from '@dxos/react-hooks';
 import { automerge } from '@dxos/react-ui-editor';
 import { CellEditor, type CellEditorProps } from '@dxos/react-ui-grid';
 import { withTheme } from '@dxos/storybook-utils';
 
 import { sheetExtension } from '../../extensions';
-import { createSheet, SheetType } from '../../types';
+import { SheetType, createSheet } from '../../types';
 
-type StoryProps = CellEditorProps;
-
-const Story = ({ value, ...props }: StoryProps) => {
-  const extension = useMemo(() => {
+const DefaultStory = ({ value, ...props }: CellEditorProps) => {
+  const extensions = useMemo(() => {
     const functionNames = getRegisteredFunctionNames();
     const functions = defaultFunctions.filter(({ name }) => functionNames.includes(name));
     return [sheetExtension({ functions })];
   }, []);
 
-  return <CellEditor {...props} value={value} extension={extension} />;
+  return <CellEditor {...props} value={value} extensions={extensions} />;
 };
 
-const AutomergeStory = ({ value, ...props }: StoryProps) => {
+const AutomergeStory = ({ value, ...props }: CellEditorProps) => {
   const cell = 'A1';
   const [object, setObject] = useState<SheetType>();
-  useEffect(() => {
-    setTimeout(async () => {
-      const client = new Client({ types: [SheetType] });
-      await client.initialize();
-      await client.halo.createIdentity();
-      const space = await client.spaces.create();
-
-      const sheet = createSheet();
-      sheet.name = 'Test';
-      sheet.cells[cell] = { value };
-      space.db.add(sheet);
-      setObject(sheet);
-    });
+  useAsyncEffect(async () => {
+    const client = new Client({ types: [SheetType] });
+    await client.initialize();
+    await client.halo.createIdentity();
+    const space = await client.spaces.create();
+
+    const sheet = createSheet();
+    sheet.name = 'Test';
+    sheet.cells[cell] = { value };
+    space.db.add(sheet);
+    setObject(sheet);
   }, [value]);
 
-  const extension = useMemo(() => {
+  const extensions = useMemo(() => {
     if (!object) {
       return [];
     }
@@ -59,35 +56,37 @@ const AutomergeStory = ({ value, ...props }: StoryProps) => {
     return [automerge(accessor), sheetExtension({ functions })];
   }, [object]);
 
-  return <CellEditor {...props} value={value} extension={extension} />;
+  return <CellEditor {...props} value={value} extensions={extensions} />;
 };
 
-export const Default = {};
+const meta = {
+  title: 'plugins/plugin-sheet/CellEditor',
+  component: CellEditor,
+  render: DefaultStory,
+  decorators: [withTheme],
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
 
-export const AutoComplete = {
+export const AutoComplete: Story = {
   args: {
     value: '=SUM',
   },
 };
 
-export const Formatting = {
+export const Formatting: Story = {
   args: {
     value: '=SUM(A1:A2, 100, TRUE, "100", SUM(A1:A2, B1:B2))',
   },
 };
 
-export const Automerge = {
-  render: (args: StoryProps) => <AutomergeStory {...args} />,
+export const Automerge: Story = {
+  render: AutomergeStory,
   args: {
     value: '=SUM(A1:A2, 100, TRUE, "100", SUM(A1:A2, B1:B2))',
   },
 };
-
-const meta: Meta = {
-  title: 'plugins/plugin-sheet/CellEditor',
-  component: CellEditor,
-  decorators: [withTheme],
-  render: (args: StoryProps) => <Story {...args} />,
-};
-
-export default meta;

package/src/components/GridSheet/util.ts

@@ -6,18 +6,18 @@ import { useEffect, useState } from 'react';
 
 import { inRange } from '@dxos/compute';
 import { createDocAccessor } from '@dxos/react-client/echo';
-import { parseValue, cellClassesForFieldType } from '@dxos/react-ui-form';
+import { cellClassesForFieldType, parseValue } from '@dxos/react-ui-form';
 import {
-  type GridContentProps,
-  type DxGridElement,
   type DxGridAxisMeta,
+  type DxGridCellValue,
+  type DxGridElement,
   type DxGridPlane,
-  type DxGridPlaneRange,
   type DxGridPlaneCells,
-  type DxGridCellValue,
+  type DxGridPlaneRange,
+  type GridContentProps,
   colToA1Notation,
-  rowToA1Notation,
   commentedClassName,
+  rowToA1Notation,
 } from '@dxos/react-ui-grid';
 import { mx } from '@dxos/react-ui-theme';