@dxos/plugin-sheet 0.8.4-main.5ea62a8 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.4-main.5ea62a8",
+  "version": "0.8.4-main.ae835ea",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,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.19.0",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^7.0.1",
@@ -48,81 +48,81 @@
     "@lezer/lezer": "^1.1.2",
     "@lezer/lr": "^1.4.2",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "@radix-ui/react-context": "1.1.1",
     "codemirror-lang-spreadsheet": "^1.3.0",
     "date-fns": "^3.3.1",
     "lodash.defaultsdeep": "^4.6.1",
     "re-resizable": "^6.9.17",
-    "react-markdown": "^8.0.5",
+    "react-markdown": "^10.1.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.4-main.5ea62a8",
-    "@dxos/client": "0.8.4-main.5ea62a8",
-    "@dxos/async": "0.8.4-main.5ea62a8",
-    "@dxos/compute": "0.8.4-main.5ea62a8",
-    "@dxos/crypto": "0.8.4-main.5ea62a8",
-    "@dxos/context": "0.8.4-main.5ea62a8",
-    "@dxos/debug": "0.8.4-main.5ea62a8",
-    "@dxos/echo": "0.8.4-main.5ea62a8",
-    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
-    "@dxos/functions": "0.8.4-main.5ea62a8",
-    "@dxos/invariant": "0.8.4-main.5ea62a8",
-    "@dxos/lit-grid": "0.8.4-main.5ea62a8",
-    "@dxos/live-object": "0.8.4-main.5ea62a8",
-    "@dxos/log": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-attention": "0.8.4-main.5ea62a8",
-    "@dxos/keys": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-deck": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-client": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-graph": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-markdown": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-space": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-script": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-stack": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-thread": "0.8.4-main.5ea62a8",
-    "@dxos/react-client": "0.8.4-main.5ea62a8",
-    "@dxos/react-hooks": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-attention": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-editor": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-grid": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-form": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-list": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-menu": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-stack": "0.8.4-main.5ea62a8",
-    "@dxos/util": "0.8.4-main.5ea62a8",
-    "@dxos/schema": "0.8.4-main.5ea62a8"
+    "@dxos/app-framework": "0.8.4-main.ae835ea",
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/crypto": "0.8.4-main.ae835ea",
+    "@dxos/debug": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/client": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/compute": "0.8.4-main.ae835ea",
+    "@dxos/functions": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/keys": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/lit-grid": "0.8.4-main.ae835ea",
+    "@dxos/plugin-attention": "0.8.4-main.ae835ea",
+    "@dxos/plugin-automation": "0.8.4-main.ae835ea",
+    "@dxos/plugin-deck": "0.8.4-main.ae835ea",
+    "@dxos/plugin-graph": "0.8.4-main.ae835ea",
+    "@dxos/plugin-markdown": "0.8.4-main.ae835ea",
+    "@dxos/plugin-client": "0.8.4-main.ae835ea",
+    "@dxos/plugin-script": "0.8.4-main.ae835ea",
+    "@dxos/plugin-space": "0.8.4-main.ae835ea",
+    "@dxos/plugin-stack": "0.8.4-main.ae835ea",
+    "@dxos/plugin-thread": "0.8.4-main.ae835ea",
+    "@dxos/react-client": "0.8.4-main.ae835ea",
+    "@dxos/react-hooks": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-editor": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-form": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-menu": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-grid": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-list": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-attention": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
+    "@dxos/schema": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
     "@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": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "@types/react-window": "^1.8.8",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/echo-generator": "0.8.4-main.5ea62a8",
-    "@dxos/lit-grid": "0.8.4-main.5ea62a8",
-    "@dxos/random": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-types": "0.8.4-main.5ea62a8",
-    "@dxos/storybook-utils": "0.8.4-main.5ea62a8",
-    "@dxos/test-utils": "0.8.4-main.5ea62a8"
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/echo-generator": "0.8.4-main.ae835ea",
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/lit-grid": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-types": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea",
+    "@dxos/test-utils": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.tsx

@@ -2,7 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import {
+  Capabilities,
+  Events,
+  allOf,
+  contributes,
+  createIntent,
+  defineModule,
+  definePlugin,
+} from '@dxos/app-framework';
+import { AutomationEvents } from '@dxos/plugin-automation';
 import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities } from '@dxos/plugin-space';
@@ -12,65 +21,65 @@ import { AnchorSort, ComputeGraphRegistry, IntentResolver, Markdown, ReactSurfac
 import { meta } from './meta';
 import { serializer } from './serializer';
 import { translations } from './translations';
-import { SheetAction, SheetType } from './types';
+import { Sheet, SheetAction } from './types';
 
-export const SheetPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/compute-graph-registry`,
-      activatesOn: ClientEvents.ClientReady,
-      activate: ComputeGraphRegistry,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: SheetType.typename,
-          metadata: {
-            label: (object: SheetType) => object.name,
-            icon: 'ph--grid-nine--regular',
-            serializer,
-            comments: 'anchored',
-          },
+export const SheetPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/compute-graph-registry`,
+    activatesOn: allOf(ClientEvents.ClientReady, AutomationEvents.ComputeRuntimeReady),
+    activate: ComputeGraphRegistry,
+  }),
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, translations),
+  }),
+  defineModule({
+    id: `${meta.id}/module/metadata`,
+    activatesOn: Events.SetupMetadata,
+    activate: () =>
+      contributes(Capabilities.Metadata, {
+        id: Sheet.Sheet.typename,
+        metadata: {
+          label: (object: Sheet.Sheet) => object.name,
+          icon: 'ph--grid-nine--regular',
+          iconHue: 'indigo',
+          serializer,
+          comments: 'anchored',
+        },
+      }),
+  }),
+  defineModule({
+    id: `${meta.id}/module/object-form`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Sheet.Sheet,
+          getIntent: (props) => createIntent(SheetAction.Create, { ...props }),
         }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: SheetType,
-            getIntent: (props, options) => createIntent(SheetAction.Create, { ...props, space: options.space }),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/markdown`,
-      activatesOn: MarkdownEvents.SetupExtensions,
-      activate: Markdown,
-    }),
-    defineModule({
-      id: `${meta.id}/module/anchor-sort`,
-      // TODO(wittjosiah): More relevant event?
-      activatesOn: Events.AppGraphReady,
-      activate: AnchorSort,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-  ]);
+      ),
+  }),
+  defineModule({
+    id: `${meta.id}/module/markdown`,
+    activatesOn: MarkdownEvents.SetupExtensions,
+    activate: Markdown,
+  }),
+  defineModule({
+    id: `${meta.id}/module/anchor-sort`,
+    // TODO(wittjosiah): More relevant event?
+    activatesOn: Events.AppGraphReady,
+    activate: AnchorSort,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+]);

package/src/capabilities/anchor-sort.ts

@@ -6,13 +6,13 @@ import { Capabilities, contributes } from '@dxos/app-framework';
 import { Type } from '@dxos/echo';
 import { getTarget } from '@dxos/react-client/echo';
 
-import { SheetType, compareIndexPositions } from '../types';
+import { Sheet, compareIndexPositions } from '../types';
 
 export default () =>
   contributes(Capabilities.AnchorSort, {
-    key: Type.getTypename(SheetType)!,
+    key: Type.getTypename(Sheet.Sheet)!,
     sort: (anchorA, anchorB) => {
-      const sheet = getTarget(anchorA) as SheetType;
+      const sheet = getTarget(anchorA) as Sheet.Sheet;
       if (sheet !== getTarget(anchorB)) {
         return 0;
       }

package/src/capabilities/capabilities.ts

@@ -5,10 +5,10 @@
 import { defineCapability } from '@dxos/app-framework';
 import { type ComputeGraphRegistry } from '@dxos/compute';
 
-import { SHEET_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 export namespace SheetCapabilities {
   export const ComputeGraphRegistry = defineCapability<ComputeGraphRegistry>(
-    `${SHEET_PLUGIN}/capability/compute-graph-registry`,
+    `${meta.id}/capability/compute-graph-registry`,
   );
 }

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

@@ -3,26 +3,21 @@
 //
 
 import { type PluginContext, contributes } from '@dxos/app-framework';
-import { ClientCapabilities } from '@dxos/plugin-client';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
 
 import { SheetCapabilities } from './capabilities';
 
-const isSecure = (protocol: string) => {
-  return protocol === 'https:' || protocol === 'wss:';
-};
+// Locally declare the Automation ComputeRuntime capability by ID to avoid direct import dependency.
 
 export default async (context: PluginContext) => {
-  const client = context.getCapability(ClientCapabilities.Client);
-  let remoteFunctionUrl: string | undefined;
-  if (client.config.values.runtime?.services?.edge?.url) {
-    const url = new URL('/functions', client.config.values.runtime?.services?.edge?.url);
-    url.protocol = isSecure(url.protocol) ? 'https' : 'http';
-    remoteFunctionUrl = url.toString();
-  }
-
   // TODO(wittjosiah): This can probably be a module level import now due to lazy capability loading.
   // Async import removes direct dependency on hyperformula.
   const { defaultPlugins, ComputeGraphRegistry } = await import('@dxos/compute');
-  const computeGraphRegistry = new ComputeGraphRegistry({ plugins: defaultPlugins, remoteFunctionUrl });
+  const computeRuntimeResolver = context.getCapability(AutomationCapabilities.ComputeRuntime);
+  const computeGraphRegistry = new ComputeGraphRegistry({
+    plugins: defaultPlugins,
+    computeRuntime: computeRuntimeResolver,
+  });
+
   return contributes(SheetCapabilities.ComputeGraphRegistry, computeGraphRegistry);
 };

package/src/capabilities/intent-resolver.ts

@@ -4,14 +4,14 @@
 
 import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
 
-import { SHEET_PLUGIN } from '../meta';
-import { SheetAction, createSheet } from '../types';
+import { meta } from '../meta';
+import { Sheet, SheetAction } from '../types';
 
 export default () =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
       intent: SheetAction.Create,
-      resolve: ({ name }) => ({ data: { object: createSheet({ name }) } }),
+      resolve: ({ name }) => ({ data: { object: Sheet.make({ name }) } }),
     }),
     createResolver({
       intent: SheetAction.InsertAxis,
@@ -26,7 +26,7 @@ export default () =>
           const undoData = model[axis === 'col' ? 'dropColumn' : 'dropRow'](axisIndex);
           return {
             undoable: {
-              message: [`${axis} dropped label`, { ns: SHEET_PLUGIN }],
+              message: [`${axis} dropped label`, { ns: meta.id }],
               data: { ...undoData, model },
             },
           };

package/src/capabilities/react-surface.tsx

@@ -9,18 +9,18 @@ import { Obj } from '@dxos/echo';
 import { getSpace } from '@dxos/react-client/echo';
 
 import { ComputeGraphContextProvider, RangeList, SheetContainer } from '../components';
-import { SHEET_PLUGIN } from '../meta';
-import { SheetType } from '../types';
+import { meta } from '../meta';
+import { Sheet } from '../types';
 
 import { SheetCapabilities } from './capabilities';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${SHEET_PLUGIN}/sheet`,
+      id: `${meta.id}/sheet`,
       role: ['article', 'section'],
-      filter: (data): data is { subject: SheetType } =>
-        Obj.instanceOf(SheetType, data.subject) && !!getSpace(data.subject),
+      filter: (data): data is { subject: Sheet.Sheet } =>
+        Obj.instanceOf(Sheet.Sheet, data.subject) && !!getSpace(data.subject),
       component: ({ data, role }) => {
         const computeGraphRegistry = useCapability(SheetCapabilities.ComputeGraphRegistry);
 
@@ -32,9 +32,9 @@ export default () =>
       },
     }),
     createSurface({
-      id: `${SHEET_PLUGIN}/object-settings`,
+      id: `${meta.id}/object-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: SheetType } => Obj.instanceOf(SheetType, data.subject),
+      filter: (data): data is { subject: Sheet.Sheet } => Obj.instanceOf(Sheet.Sheet, data.subject),
       component: ({ data }) => <RangeList sheet={data.subject} />,
     }),
   ]);

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

@@ -2,23 +2,21 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { testFunctionPlugins } from '@dxos/compute/testing';
-import { Filter, Obj } from '@dxos/echo';
-import { FunctionType } from '@dxos/functions';
+import { Filter } from '@dxos/echo';
+import { Function } from '@dxos/functions';
 import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Button, Input, Toolbar } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { withTheme } from '@dxos/storybook-utils';
 
 import { useSheetModel } from '../../model';
 import { withComputeGraphDecorator } from '../../testing';
-import { SheetType, createSheet } from '../../types';
+import { Sheet } from '../../types';
 
 import { useComputeGraph } from './ComputeGraphContextProvider';
 
@@ -27,13 +25,13 @@ const FUNCTION_NAME = 'TEST';
 const DefaultStory = () => {
   const space = useSpace();
   const graph = useComputeGraph(space);
-  const [sheet, setSheet] = useState<SheetType>();
+  const [sheet, setSheet] = useState<Sheet.Sheet>();
   const [text, setText] = useState(`${FUNCTION_NAME}(100)`);
   const [result, setResult] = useState<any>();
   const model = useSheetModel(graph, sheet);
   useEffect(() => {
     if (space) {
-      const sheet = space.db.add(createSheet());
+      const sheet = space.db.add(Sheet.make());
       setSheet(sheet);
     }
   }, [space]);
@@ -46,14 +44,14 @@ const DefaultStory = () => {
         setResult({ functions: { standard: f1.length, echo: f2.length } });
       });
 
-      space.db.add(Obj.make(FunctionType, { name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
+      space.db.add(Function.make({ name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
     }
   }, [space, graph]);
 
   const inputRef = useRef<HTMLInputElement | null>(null);
   const handleTest = async () => {
     if (space && graph) {
-      const { objects } = await space.db.query(Filter.type(FunctionType)).run();
+      const { objects } = await space.db.query(Filter.type(Function.Function)).run();
       const mapped = graph.mapFunctionBindingToId(text);
       const unmapped = graph.mapFunctionBindingFromId(mapped);
       const internal = graph.mapFormulaToNative(text);
@@ -89,9 +87,9 @@ const meta = {
   title: 'plugins/plugin-sheet/functions',
   render: DefaultStory,
   decorators: [
-    withClientProvider({ types: [FunctionType, SheetType], createIdentity: true, createSpace: true }),
-    withComputeGraphDecorator({ plugins: testFunctionPlugins }),
     withTheme,
+    withClientProvider({ types: [Function.Function, Sheet.Sheet], createIdentity: true, createSpace: true }),
+    withComputeGraphDecorator({ plugins: testFunctionPlugins }),
   ],
 } satisfies Meta<typeof DefaultStory>;
 

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

@@ -2,20 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 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 { testFunctionPlugins } from '@dxos/compute/testing';
 import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { createTestCells, useTestSheet, withComputeGraphDecorator } from '../../testing';
 import { translations } from '../../translations';
-import { SheetType } from '../../types';
+import { Sheet } from '../../types';
 import { useComputeGraph } from '../ComputeGraph';
 import { SheetProvider } from '../SheetContext';
 
@@ -31,7 +30,9 @@ export const Basic = () => {
 
   return (
     <SheetProvider graph={graph} sheet={sheet} ignoreAttention>
-      <GridSheet />
+      <div role='none' className='grid bs-full is-full'>
+        <GridSheet />
+      </div>
     </SheetProvider>
   );
 };
@@ -40,15 +41,17 @@ const meta = {
   title: 'plugins/plugin-sheet/GridSheet',
   component: GridSheet,
   decorators: [
-    withClientProvider({ types: [SheetType], createSpace: true }),
-    withComputeGraphDecorator(),
     withTheme,
-    withLayout({ fullscreen: true, classNames: 'grid' }),
+    withClientProvider({ types: [Sheet.Sheet], createSpace: true }),
+    withComputeGraphDecorator({ plugins: testFunctionPlugins }),
     withPluginManager({
       plugins: [IntentPlugin()],
     }),
   ],
-  parameters: { translations },
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
 } satisfies Meta<typeof GridSheet>;
 
 export default meta;

package/src/components/GridSheet/GridSheet.tsx

@@ -34,7 +34,7 @@ import {
 
 import { type RangeController, rangeExtension, sheetExtension } from '../../extensions';
 import { useSelectThreadOnCellFocus, useUpdateFocusedCellOnThreadSelection } from '../../integrations';
-import { SHEET_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 import { DEFAULT_COLS, DEFAULT_ROWS, SheetAction } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
@@ -69,7 +69,7 @@ const sheetRowDefault = {
 };
 
 export const GridSheet = () => {
-  const { t } = useTranslation(SHEET_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const { id, model, editing, setCursor, setRange, cursor, cursorFallbackRange, activeRefs, ignoreAttention } =
     useSheetContext();
   // NOTE(thure): using `useState` instead of `useRef` works with refs provided by `@lit/react` and gives us
@@ -77,7 +77,7 @@ export const GridSheet = () => {
   const [dxGrid, setDxGrid] = useState<DxGridElement | null>(null);
   const [extraplanarFocus, setExtraplanarFocus] = useState<DxGridPosition | null>(null);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const rangeController = useRef<RangeController>();
+  const rangeController = useRef<RangeController>(null);
   const { hasAttention } = useAttention(id);
 
   const handleFocus = useCallback(
@@ -279,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,8 +308,8 @@ 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} />
+    <div role='none' className='relative min-bs-0 [&_.cm-editor]:!border-lb [&_.cm-editor]:!border-transparent'>
+      <GridCellEditor getCellContent={getCellContent} extensions={extensions} onBlur={handleBlur} />
       <Grid.Content
         initialCells={initialCells}
         limitColumns={DEFAULT_COLS}