@dxos/react-ui-grid 0.6.11 → 0.6.12-main.2d19bf1

package/dist/lib/browser/index.mjs

@@ -1,20 +1,262 @@
 // packages/ui/react-ui-grid/src/Grid.tsx
 import "@dxos/lit-grid/dx-grid.pcss";
 import { createComponent } from "@lit/react";
-import React from "react";
+import { createContextScope } from "@radix-ui/react-context";
+import { useControllableState } from "@radix-ui/react-use-controllable-state";
+import React, { forwardRef, useCallback, useLayoutEffect, useState } from "react";
 import { DxGrid as NaturalDxGrid } from "@dxos/lit-grid";
+import { useForwardedRef } from "@dxos/react-ui";
+import { colToA1Notation, rowToA1Notation, closestCell } from "@dxos/lit-grid";
 var DxGrid = createComponent({
   tagName: "dx-grid",
   elementClass: NaturalDxGrid,
   react: React,
   events: {
-    onAxisResize: "dx-axis-resize"
+    onAxisResize: "dx-axis-resize",
+    onEdit: "dx-edit-request",
+    onSelect: "dx-grid-cells-select"
   }
 });
-var Grid = (props) => {
-  return /* @__PURE__ */ React.createElement(DxGrid, props);
+var initialBox = {
+  insetInlineStart: 0,
+  insetBlockStart: 0,
+  inlineSize: 0,
+  blockSize: 0
+};
+var GRID_NAME = "Grid";
+var [createGridContext, createGridScope] = createContextScope(GRID_NAME, []);
+var [GridProvider, useGridContext] = createGridContext(GRID_NAME);
+var GridRoot = ({ id, editing: propsEditing, defaultEditing, onEditingChange, children, __gridScope }) => {
+  const [editing = null, setEditing] = useControllableState({
+    prop: propsEditing,
+    defaultProp: defaultEditing,
+    onChange: onEditingChange
+  });
+  const [editBox, setEditBox] = useState(initialBox);
+  return /* @__PURE__ */ React.createElement(GridProvider, {
+    id,
+    editing,
+    setEditing,
+    editBox,
+    setEditBox,
+    scope: __gridScope
+  }, children);
+};
+GridRoot.displayName = GRID_NAME;
+var GRID_CONTENT_NAME = "GridContent";
+var GridContent = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
+  const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);
+  const dxGrid = useForwardedRef(forwardedRef);
+  useLayoutEffect(() => {
+    if (dxGrid.current && props.getCells) {
+      dxGrid.current.getCells = props.getCells;
+      dxGrid.current.requestUpdate("initialCells");
+    }
+  }, [
+    props.getCells
+  ]);
+  const handleEdit = useCallback((event) => {
+    setEditBox(event.cellBox);
+    setEditing({
+      index: event.cellIndex,
+      initialContent: event.initialContent
+    });
+  }, []);
+  return /* @__PURE__ */ React.createElement(DxGrid, {
+    ...props,
+    gridId: id,
+    mode: editing ? "edit" : "browse",
+    onEdit: handleEdit,
+    ref: dxGrid
+  });
+});
+GridContent.displayName = GRID_CONTENT_NAME;
+var Grid = {
+  Root: GridRoot,
+  Content: GridContent
+};
+
+// packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx
+import { EditorView, keymap } from "@codemirror/view";
+import React2 from "react";
+import { useThemeContext } from "@dxos/react-ui";
+import { createBasicExtensions, createThemeExtensions, preventNewline, useTextEditor } from "@dxos/react-ui-editor";
+var editorKeys = ({ onNav, onClose }) => {
+  return keymap.of([
+    {
+      key: "ArrowUp",
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, {
+          key: "ArrowUp"
+        });
+        return !!onNav;
+      }
+    },
+    {
+      key: "ArrowDown",
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, {
+          key: "ArrowDown"
+        });
+        return !!onNav;
+      }
+    },
+    {
+      key: "ArrowLeft",
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, {
+          key: "ArrowLeft"
+        });
+        return !!onNav;
+      }
+    },
+    {
+      key: "ArrowRight",
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, {
+          key: "ArrowRight"
+        });
+        return !!onNav;
+      }
+    },
+    {
+      key: "Enter",
+      run: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Enter"
+        });
+        return true;
+      },
+      shift: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Enter",
+          shift: true
+        });
+        return true;
+      }
+    },
+    {
+      key: "Tab",
+      run: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Tab"
+        });
+        return true;
+      },
+      shift: (editor) => {
+        onClose(editor.state.doc.toString(), {
+          key: "Tab",
+          shift: true
+        });
+        return true;
+      }
+    },
+    {
+      key: "Escape",
+      run: () => {
+        onClose(void 0, {
+          key: "Escape"
+        });
+        return true;
+      }
+    }
+  ]);
+};
+var editorVariants = {
+  // TODO(thure): remove when legacy is no longer used.
+  legacy: {
+    root: "flex w-full",
+    editor: "flex w-full [&>.cm-scroller]:scrollbar-none",
+    content: "!px-2 !py-1"
+  },
+  grid: {
+    root: "absolute z-[1]",
+    editor: "[&>.cm-scroller]:scrollbar-none tabular-nums",
+    content: "!border !border-transparent !p-0.5"
+  }
+};
+var CellEditor = ({ value, extension, autoFocus, onBlur, variant = "legacy", box, gridId }) => {
+  const { themeMode } = useThemeContext();
+  const { parentRef } = useTextEditor(() => {
+    return {
+      autoFocus,
+      initialValue: value,
+      selection: {
+        anchor: value?.length ?? 0
+      },
+      extensions: [
+        extension ?? [],
+        preventNewline,
+        EditorView.focusChangeEffect.of((_, focusing) => {
+          if (!focusing) {
+            onBlur?.({
+              type: "blur"
+            });
+          }
+          return null;
+        }),
+        createBasicExtensions({
+          lineWrapping: false
+        }),
+        createThemeExtensions({
+          themeMode,
+          slots: {
+            editor: {
+              className: editorVariants[variant].editor
+            },
+            content: {
+              className: editorVariants[variant].content
+            }
+          }
+        })
+      ]
+    };
+  }, [
+    extension,
+    autoFocus,
+    value,
+    variant,
+    onBlur
+  ]);
+  return /* @__PURE__ */ React2.createElement("div", {
+    ref: parentRef,
+    className: editorVariants[variant].root,
+    style: box,
+    ...gridId && {
+      "data-grid": gridId
+    }
+  });
+};
+
+// packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx
+import React3 from "react";
+var GridCellEditor = ({ extension, getCellContent, __gridScope }) => {
+  const { id, editing, setEditing, editBox } = useGridContext("GridSheetCellEditor", __gridScope);
+  return editing ? /* @__PURE__ */ React3.createElement(CellEditor, {
+    variant: "grid",
+    value: editing.initialContent ?? getCellContent(editing.index),
+    autoFocus: true,
+    box: editBox,
+    onBlur: () => setEditing(null),
+    extension,
+    gridId: id
+  }) : null;
 };
 export {
-  Grid
+  CellEditor,
+  Grid,
+  GridCellEditor,
+  GridContent,
+  GridRoot,
+  closestCell,
+  colToA1Notation,
+  createGridScope,
+  editorKeys,
+  rowToA1Notation,
+  useGridContext
 };
 //# sourceMappingURL=index.mjs.map

package/dist/lib/browser/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/Grid.tsx"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\nimport '@dxos/lit-grid/dx-grid.pcss';\n\nimport { createComponent, type EventName } from '@lit/react';\nimport React from 'react';\n\nimport { type DxAxisResize, DxGrid as NaturalDxGrid, type DxGridProps } from '@dxos/lit-grid';\n\nconst DxGrid = createComponent({\n  tagName: 'dx-grid',\n  elementClass: NaturalDxGrid,\n  react: React,\n  events: {\n    onAxisResize: 'dx-axis-resize' as EventName<DxAxisResize>,\n  },\n});\n\nexport type GridProps = DxGridProps & {\n  onAxisResize: (event: DxAxisResize) => void;\n};\n\nexport const Grid = (props: GridProps) => {\n  return <DxGrid {...props} />;\n};\n"],
-  "mappings": ";AAGA,OAAO;AAEP,SAASA,uBAAuC;AAChD,OAAOC,WAAW;AAElB,SAA4BC,UAAUC,qBAAuC;AAE7E,IAAMC,SAASC,gBAAgB;EAC7BC,SAAS;EACTC,cAAcC;EACdC,OAAOC;EACPC,QAAQ;IACNC,cAAc;EAChB;AACF,CAAA;AAMO,IAAMC,OAAO,CAACC,UAAAA;AACnB,SAAO,sBAAA,cAACV,QAAWU,KAAAA;AACrB;",
-  "names": ["createComponent", "React", "DxGrid", "NaturalDxGrid", "DxGrid", "createComponent", "tagName", "elementClass", "NaturalDxGrid", "react", "React", "events", "onAxisResize", "Grid", "props"]
+  "sources": ["../../../src/Grid.tsx", "../../../src/CellEditor/CellEditor.tsx", "../../../src/CellEditor/GridCellEditor.tsx"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport '@dxos/lit-grid/dx-grid.pcss';\n\nimport { createComponent, type EventName } from '@lit/react';\nimport { createContextScope, type Scope } from '@radix-ui/react-context';\nimport { useControllableState } from '@radix-ui/react-use-controllable-state';\nimport React, {\n  type ComponentProps,\n  forwardRef,\n  type PropsWithChildren,\n  useCallback,\n  useLayoutEffect,\n  useState,\n} from 'react';\n\nimport { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';\nimport { useForwardedRef } from '@dxos/react-ui';\n\ntype DxGridElement = NaturalDxGrid;\n\nconst DxGrid = createComponent({\n  tagName: 'dx-grid',\n  elementClass: NaturalDxGrid,\n  react: React,\n  events: {\n    onAxisResize: 'dx-axis-resize' as EventName<DxAxisResize>,\n    onEdit: 'dx-edit-request' as EventName<DxEditRequest>,\n    onSelect: 'dx-grid-cells-select' as EventName<DxGridCellsSelect>,\n  },\n});\n\ntype GridEditBox = DxEditRequest['cellBox'];\n\nconst initialBox = {\n  insetInlineStart: 0,\n  insetBlockStart: 0,\n  inlineSize: 0,\n  blockSize: 0,\n} satisfies GridEditBox;\n\ntype GridEditing = { index: DxEditRequest['cellIndex']; initialContent: DxEditRequest['initialContent'] } | null;\n\ntype GridContextValue = {\n  id: string;\n  editing: GridEditing;\n  setEditing: (nextEditing: GridEditing) => void;\n  editBox: GridEditBox;\n  setEditBox: (nextEditBox: GridEditBox) => void;\n};\n\ntype GridScopedProps<P> = P & { __gridScope?: Scope };\n\nconst GRID_NAME = 'Grid';\n\nconst [createGridContext, createGridScope] = createContextScope(GRID_NAME, []);\n\nconst [GridProvider, useGridContext] = createGridContext<GridContextValue>(GRID_NAME);\n\ntype GridRootProps = PropsWithChildren<\n  { id: string } & Partial<{\n    editing: GridEditing;\n    defaultEditing: GridEditing;\n    onEditingChange: (nextEditing: GridEditing) => void;\n  }>\n>;\n\nconst GridRoot = ({\n  id,\n  editing: propsEditing,\n  defaultEditing,\n  onEditingChange,\n  children,\n  __gridScope,\n}: GridScopedProps<GridRootProps>) => {\n  const [editing = null, setEditing] = useControllableState({\n    prop: propsEditing,\n    defaultProp: defaultEditing,\n    onChange: onEditingChange,\n  });\n  const [editBox, setEditBox] = useState<GridEditBox>(initialBox);\n  return (\n    <GridProvider\n      id={id}\n      editing={editing}\n      setEditing={setEditing}\n      editBox={editBox}\n      setEditBox={setEditBox}\n      scope={__gridScope}\n    >\n      {children}\n    </GridProvider>\n  );\n};\n\nGridRoot.displayName = GRID_NAME;\n\ntype GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {\n  getCells?: NonNullable<NaturalDxGrid['getCells']>;\n};\n\nconst GRID_CONTENT_NAME = 'GridContent';\n\nconst GridContent = forwardRef<NaturalDxGrid, GridScopedProps<GridContentProps>>((props, forwardedRef) => {\n  const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);\n  const dxGrid = useForwardedRef(forwardedRef);\n\n  // Needed instead of `useEffect` to ensure the DxGrid ref is defined.\n  useLayoutEffect(() => {\n    if (dxGrid.current && props.getCells) {\n      dxGrid.current.getCells = props.getCells;\n      dxGrid.current.requestUpdate('initialCells');\n    }\n  }, [props.getCells]);\n\n  const handleEdit = useCallback((event: DxEditRequest) => {\n    setEditBox(event.cellBox);\n    setEditing({ index: event.cellIndex, initialContent: event.initialContent });\n  }, []);\n\n  return <DxGrid {...props} gridId={id} mode={editing ? 'edit' : 'browse'} onEdit={handleEdit} ref={dxGrid} />;\n});\n\nGridContent.displayName = GRID_CONTENT_NAME;\n\nexport const Grid = {\n  Root: GridRoot,\n  Content: GridContent,\n};\n\nexport { GridRoot, GridContent, useGridContext, createGridScope };\n\nexport type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };\n\nexport { colToA1Notation, rowToA1Notation, closestCell } from '@dxos/lit-grid';\n\nexport type {\n  DxGridRange,\n  DxGridAxisMeta,\n  DxAxisResize,\n  DxGridCells,\n  DxGridPlaneRange,\n  DxGridPlaneCells,\n  DxGridPlane,\n  DxGridPosition,\n} from '@dxos/lit-grid';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Extension } from '@codemirror/state';\nimport { EditorView, keymap } from '@codemirror/view';\nimport React, { type DOMAttributes, type KeyboardEvent } from 'react';\n\nimport { useThemeContext } from '@dxos/react-ui';\nimport {\n  type UseTextEditorProps,\n  createBasicExtensions,\n  createThemeExtensions,\n  preventNewline,\n  useTextEditor,\n} from '@dxos/react-ui-editor';\n\nimport { type GridEditBox } from '../Grid';\n\ntype EditorKeyEvent = Pick<KeyboardEvent<HTMLInputElement>, 'key'> & { shift?: boolean };\n\nexport type EditorKeysProps = {\n  onClose: (value: string | undefined, event: EditorKeyEvent) => void;\n  onNav?: (value: string | undefined, event: EditorKeyEvent) => void;\n};\n\n// TODO(Zan): Should each consumer be responsible for defining these?\nexport const editorKeys = ({ onNav, onClose }: EditorKeysProps): Extension => {\n  return keymap.of([\n    {\n      key: 'ArrowUp',\n      run: (editor) => {\n        const value = editor.state.doc.toString();\n        onNav?.(value, { key: 'ArrowUp' });\n        return !!onNav;\n      },\n    },\n    {\n      key: 'ArrowDown',\n      run: (editor) => {\n        const value = editor.state.doc.toString();\n        onNav?.(value, { key: 'ArrowDown' });\n        return !!onNav;\n      },\n    },\n    {\n      key: 'ArrowLeft',\n      run: (editor) => {\n        const value = editor.state.doc.toString();\n        onNav?.(value, { key: 'ArrowLeft' });\n        return !!onNav;\n      },\n    },\n    {\n      key: 'ArrowRight',\n      run: (editor) => {\n        const value = editor.state.doc.toString();\n        onNav?.(value, { key: 'ArrowRight' });\n        return !!onNav;\n      },\n    },\n    {\n      key: 'Enter',\n      run: (editor) => {\n        onClose(editor.state.doc.toString(), { key: 'Enter' });\n        return true;\n      },\n      shift: (editor) => {\n        onClose(editor.state.doc.toString(), { key: 'Enter', shift: true });\n        return true;\n      },\n    },\n    {\n      key: 'Tab',\n      run: (editor) => {\n        onClose(editor.state.doc.toString(), { key: 'Tab' });\n        return true;\n      },\n      shift: (editor) => {\n        onClose(editor.state.doc.toString(), { key: 'Tab', shift: true });\n        return true;\n      },\n    },\n    {\n      key: 'Escape',\n      run: () => {\n        onClose(undefined, { key: 'Escape' });\n        return true;\n      },\n    },\n  ]);\n};\n\nexport type CellEditorProps = {\n  value?: string;\n  extension?: Extension;\n  variant?: keyof typeof editorVariants;\n  box?: GridEditBox;\n  gridId?: string;\n} & Pick<UseTextEditorProps, 'autoFocus'> &\n  Pick<DOMAttributes<HTMLInputElement>, 'onBlur' | 'onKeyDown'>;\n\nconst editorVariants = {\n  // TODO(thure): remove when legacy is no longer used.\n  legacy: {\n    root: 'flex w-full',\n    editor: 'flex w-full [&>.cm-scroller]:scrollbar-none',\n    content: '!px-2 !py-1',\n  },\n  grid: {\n    root: 'absolute z-[1]',\n    editor: '[&>.cm-scroller]:scrollbar-none tabular-nums',\n    content: '!border !border-transparent !p-0.5',\n  },\n};\n\nexport const CellEditor = ({\n  value,\n  extension,\n  autoFocus,\n  onBlur,\n  variant = 'legacy',\n  box,\n  gridId,\n}: CellEditorProps) => {\n  const { themeMode } = useThemeContext();\n  const { parentRef } = useTextEditor(() => {\n    return {\n      autoFocus,\n      initialValue: value,\n      selection: { anchor: value?.length ?? 0 },\n      extensions: [\n        extension ?? [],\n        preventNewline,\n        EditorView.focusChangeEffect.of((_, focusing) => {\n          if (!focusing) {\n            onBlur?.({ type: 'blur' } as any);\n          }\n          return null;\n        }),\n        createBasicExtensions({ lineWrapping: false }),\n        createThemeExtensions({\n          themeMode,\n          slots: {\n            editor: {\n              className: editorVariants[variant].editor,\n            },\n            content: {\n              className: editorVariants[variant].content,\n            },\n          },\n        }),\n      ],\n    };\n  }, [extension, autoFocus, value, variant, onBlur]);\n\n  return (\n    <div\n      ref={parentRef}\n      className={editorVariants[variant].root}\n      style={box}\n      {...(gridId && { 'data-grid': gridId })}\n    />\n  );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport React from 'react';\n\nimport { CellEditor, type CellEditorProps } from './CellEditor';\nimport { type GridScopedProps, useGridContext } from '../Grid';\n\nexport const GridCellEditor = ({\n  extension,\n  getCellContent,\n  __gridScope,\n}: GridScopedProps<Pick<CellEditorProps, 'extension'> & { getCellContent: (index: string) => string | undefined }>) => {\n  const { id, editing, setEditing, editBox } = useGridContext('GridSheetCellEditor', __gridScope);\n\n  return editing ? (\n    <CellEditor\n      variant='grid'\n      value={editing.initialContent ?? getCellContent(editing.index)}\n      autoFocus\n      box={editBox}\n      onBlur={() => setEditing(null)}\n      extension={extension}\n      gridId={id}\n    />\n  ) : null;\n};\n"],
+  "mappings": "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",
+  "names": ["createComponent", "createContextScope", "useControllableState", "React", "forwardRef", "useCallback", "useLayoutEffect", "useState", "DxGrid", "NaturalDxGrid", "useForwardedRef", "colToA1Notation", "rowToA1Notation", "closestCell", "DxGrid", "createComponent", "tagName", "elementClass", "NaturalDxGrid", "react", "React", "events", "onAxisResize", "onEdit", "onSelect", "initialBox", "insetInlineStart", "insetBlockStart", "inlineSize", "blockSize", "GRID_NAME", "createGridContext", "createGridScope", "createContextScope", "GridProvider", "useGridContext", "GridRoot", "id", "editing", "propsEditing", "defaultEditing", "onEditingChange", "children", "__gridScope", "setEditing", "useControllableState", "prop", "defaultProp", "onChange", "editBox", "setEditBox", "useState", "scope", "displayName", "GRID_CONTENT_NAME", "GridContent", "forwardRef", "props", "forwardedRef", "dxGrid", "useForwardedRef", "useLayoutEffect", "current", "getCells", "requestUpdate", "handleEdit", "useCallback", "event", "cellBox", "index", "cellIndex", "initialContent", "gridId", "mode", "ref", "Grid", "Root", "Content", "EditorView", "keymap", "React", "useThemeContext", "createBasicExtensions", "createThemeExtensions", "preventNewline", "useTextEditor", "editorKeys", "onNav", "onClose", "keymap", "of", "key", "run", "editor", "value", "state", "doc", "toString", "shift", "undefined", "editorVariants", "legacy", "root", "content", "grid", "CellEditor", "extension", "autoFocus", "onBlur", "variant", "box", "gridId", "themeMode", "useThemeContext", "parentRef", "useTextEditor", "initialValue", "selection", "anchor", "length", "extensions", "preventNewline", "EditorView", "focusChangeEffect", "_", "focusing", "type", "createBasicExtensions", "lineWrapping", "createThemeExtensions", "slots", "className", "React", "div", "ref", "style", "React", "GridCellEditor", "extension", "getCellContent", "__gridScope", "id", "editing", "setEditing", "editBox", "useGridContext", "React", "CellEditor", "variant", "value", "initialContent", "index", "autoFocus", "box", "onBlur", "gridId"]
 }

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytes":2180,"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-grid/src/index.ts":{"bytes":489,"imports":[{"path":"packages/ui/react-ui-grid/src/Grid.tsx","kind":"import-statement","original":"./Grid"}],"format":"esm"}},"outputs":{"packages/ui/react-ui-grid/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":1186},"packages/ui/react-ui-grid/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true}],"exports":["Grid"],"entryPoint":"packages/ui/react-ui-grid/src/index.ts","inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytesInOutput":412},"packages/ui/react-ui-grid/src/index.ts":{"bytesInOutput":0}},"bytes":508}}}
+{"inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytes":12329,"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx":{"bytes":14862,"imports":[{"path":"@codemirror/view","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-editor","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx":{"bytes":2887,"imports":[{"path":"react","kind":"import-statement","external":true},{"path":"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx","kind":"import-statement","original":"./CellEditor"},{"path":"packages/ui/react-ui-grid/src/Grid.tsx","kind":"import-statement","original":"../Grid"}],"format":"esm"},"packages/ui/react-ui-grid/src/CellEditor/index.ts":{"bytes":620,"imports":[{"path":"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx","kind":"import-statement","original":"./CellEditor"},{"path":"packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx","kind":"import-statement","original":"./GridCellEditor"}],"format":"esm"},"packages/ui/react-ui-grid/src/index.ts":{"bytes":583,"imports":[{"path":"packages/ui/react-ui-grid/src/Grid.tsx","kind":"import-statement","original":"./Grid"},{"path":"packages/ui/react-ui-grid/src/CellEditor/index.ts","kind":"import-statement","original":"./CellEditor"}],"format":"esm"}},"outputs":{"packages/ui/react-ui-grid/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":15661},"packages/ui/react-ui-grid/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true},{"path":"@codemirror/view","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-editor","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"exports":["CellEditor","Grid","GridCellEditor","GridContent","GridRoot","closestCell","colToA1Notation","createGridScope","editorKeys","rowToA1Notation","useGridContext"],"entryPoint":"packages/ui/react-ui-grid/src/index.ts","inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytesInOutput":2440},"packages/ui/react-ui-grid/src/index.ts":{"bytesInOutput":0},"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx":{"bytesInOutput":3537},"packages/ui/react-ui-grid/src/CellEditor/index.ts":{"bytesInOutput":0},"packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx":{"bytesInOutput":478}},"bytes":6838}}}

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

@@ -0,0 +1,34 @@
+import { type Extension } from '@codemirror/state';
+import React, { type DOMAttributes, type KeyboardEvent } from 'react';
+import { type UseTextEditorProps } from '@dxos/react-ui-editor';
+import { type GridEditBox } from '../Grid';
+type EditorKeyEvent = Pick<KeyboardEvent<HTMLInputElement>, 'key'> & {
+    shift?: boolean;
+};
+export type EditorKeysProps = {
+    onClose: (value: string | undefined, event: EditorKeyEvent) => void;
+    onNav?: (value: string | undefined, event: EditorKeyEvent) => void;
+};
+export declare const editorKeys: ({ onNav, onClose }: EditorKeysProps) => Extension;
+export type CellEditorProps = {
+    value?: string;
+    extension?: Extension;
+    variant?: keyof typeof editorVariants;
+    box?: GridEditBox;
+    gridId?: string;
+} & Pick<UseTextEditorProps, 'autoFocus'> & Pick<DOMAttributes<HTMLInputElement>, 'onBlur' | 'onKeyDown'>;
+declare const editorVariants: {
+    legacy: {
+        root: string;
+        editor: string;
+        content: string;
+    };
+    grid: {
+        root: string;
+        editor: string;
+        content: string;
+    };
+};
+export declare const CellEditor: ({ value, extension, autoFocus, onBlur, variant, box, gridId, }: CellEditorProps) => React.JSX.Element;
+export {};
+//# sourceMappingURL=CellEditor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CellEditor.d.ts","sourceRoot":"","sources":["../../../../src/CellEditor/CellEditor.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtE,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,KAAK,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACpE,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CACpE,CAAC;AAGF,eAAO,MAAM,UAAU,uBAAwB,eAAe,KAAG,SAgEhE,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,OAAO,cAAc,CAAC;IACtC,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,GACvC,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;AAEhE,QAAA,MAAM,cAAc;;;;;;;;;;;CAYnB,CAAC;AAEF,eAAO,MAAM,UAAU,mEAQpB,eAAe,sBAwCjB,CAAC"}

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import { type CellEditorProps } from './CellEditor';
+import { type GridScopedProps } from '../Grid';
+export declare const GridCellEditor: ({ extension, getCellContent, __gridScope, }: GridScopedProps<Pick<CellEditorProps, "extension"> & {
+    getCellContent: (index: string) => string | undefined;
+}>) => React.JSX.Element | null;
+//# sourceMappingURL=GridCellEditor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GridCellEditor.d.ts","sourceRoot":"","sources":["../../../../src/CellEditor/GridCellEditor.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,cAAc,gDAIxB,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC,6BAcjH,CAAC"}

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

@@ -0,0 +1,3 @@
+export * from './CellEditor';
+export * from './GridCellEditor';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/CellEditor/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC"}

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

@@ -1,8 +1,55 @@
 import '@dxos/lit-grid/dx-grid.pcss';
-import React from 'react';
-import { type DxAxisResize, type DxGridProps } from '@dxos/lit-grid';
-export type GridProps = DxGridProps & {
-    onAxisResize: (event: DxAxisResize) => void;
+import { type EventName } from '@lit/react';
+import { type Scope } from '@radix-ui/react-context';
+import React, { type ComponentProps, type PropsWithChildren } from 'react';
+import { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';
+type DxGridElement = NaturalDxGrid;
+declare const DxGrid: import("@lit/react").ReactWebComponent<NaturalDxGrid, {
+    onAxisResize: EventName<DxAxisResize>;
+    onEdit: EventName<DxEditRequest>;
+    onSelect: EventName<DxGridCellsSelect>;
+}>;
+type GridEditBox = DxEditRequest['cellBox'];
+type GridEditing = {
+    index: DxEditRequest['cellIndex'];
+    initialContent: DxEditRequest['initialContent'];
+} | null;
+type GridContextValue = {
+    id: string;
+    editing: GridEditing;
+    setEditing: (nextEditing: GridEditing) => void;
+    editBox: GridEditBox;
+    setEditBox: (nextEditBox: GridEditBox) => void;
 };
-export declare const Grid: (props: GridProps) => React.JSX.Element;
+type GridScopedProps<P> = P & {
+    __gridScope?: Scope;
+};
+declare const createGridScope: import("@radix-ui/react-context").CreateScope;
+declare const useGridContext: (consumerName: string, scope: Scope<GridContextValue | undefined>) => GridContextValue;
+type GridRootProps = PropsWithChildren<{
+    id: string;
+} & Partial<{
+    editing: GridEditing;
+    defaultEditing: GridEditing;
+    onEditingChange: (nextEditing: GridEditing) => void;
+}>>;
+declare const GridRoot: {
+    ({ id, editing: propsEditing, defaultEditing, onEditingChange, children, __gridScope, }: GridScopedProps<GridRootProps>): React.JSX.Element;
+    displayName: string;
+};
+type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {
+    getCells?: NonNullable<NaturalDxGrid['getCells']>;
+};
+declare const GridContent: React.ForwardRefExoticComponent<Omit<GridScopedProps<GridContentProps>, "ref"> & React.RefAttributes<NaturalDxGrid>>;
+export declare const Grid: {
+    Root: {
+        ({ id, editing: propsEditing, defaultEditing, onEditingChange, children, __gridScope, }: GridScopedProps<GridRootProps>): React.JSX.Element;
+        displayName: string;
+    };
+    Content: React.ForwardRefExoticComponent<Omit<GridScopedProps<GridContentProps>, "ref"> & React.RefAttributes<NaturalDxGrid>>;
+};
+export { GridRoot, GridContent, useGridContext, createGridScope };
+export type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };
+export { colToA1Notation, rowToA1Notation, closestCell } from '@dxos/lit-grid';
+export type { DxGridRange, DxGridAxisMeta, DxAxisResize, DxGridCells, DxGridPlaneRange, DxGridPlaneCells, DxGridPlane, DxGridPosition, } from '@dxos/lit-grid';
 //# sourceMappingURL=Grid.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Grid.d.ts","sourceRoot":"","sources":["../../../src/Grid.tsx"],"names":[],"mappings":"AAGA,OAAO,6BAA6B,CAAC;AAGrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,KAAK,YAAY,EAA2B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAW9F,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,YAAY,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,sBAEpC,CAAC"}
+{"version":3,"file":"Grid.d.ts","sourceRoot":"","sources":["../../../src/Grid.tsx"],"names":[],"mappings":"AAIA,OAAO,6BAA6B,CAAC;AAErC,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAsB,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,KAAK,EAAE,EACZ,KAAK,cAAc,EAEnB,KAAK,iBAAiB,EAIvB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGxH,KAAK,aAAa,GAAG,aAAa,CAAC;AAEnC,QAAA,MAAM,MAAM;kBAK0B,SAAS,CAAC,YAAY,CAAC;YAC5B,SAAS,CAAC,aAAa,CAAC;cACjB,SAAS,CAAC,iBAAiB,CAAC;EAElE,CAAC;AAEH,KAAK,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;AAS5C,KAAK,WAAW,GAAG;IAAE,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IAAC,cAAc,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC;AAEjH,KAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;IAC/C,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAItD,QAAA,MAA0B,eAAe,+CAAqC,CAAC;AAE/E,QAAA,MAAqB,cAAc,wFAAkD,CAAC;AAEtF,KAAK,aAAa,GAAG,iBAAiB,CACpC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,eAAe,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CACrD,CAAC,CACH,CAAC;AAEF,QAAA,MAAM,QAAQ;6FAOX,eAAe,CAAC,aAAa,CAAC;;CAmBhC,CAAC;AAIF,KAAK,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG;IACtE,QAAQ,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;CACnD,CAAC;AAIF,QAAA,MAAM,WAAW,sHAkBf,CAAC;AAIH,eAAO,MAAM,IAAI;;iGAnDd,eAAe,CAAC,aAAa,CAAC;;;;CAsDhC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAElE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;AAE1G,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE/E,YAAY,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,cAAc,GACf,MAAM,gBAAgB,CAAC"}

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

@@ -1,43 +1,59 @@
-import { type GridProps } from './Grid';
+import '@dxos-theme';
+import React from 'react';
+import { type GridContentProps, type GridRootProps } from './Grid';
+type StoryGridProps = GridContentProps & Pick<GridRootProps, 'onEditingChange'>;
 declare const _default: {
     title: string;
-    component: (props: GridProps) => import("react").JSX.Element;
+    component: ({ onEditingChange, ...props }: StoryGridProps) => React.JSX.Element;
     decorators: import("@storybook/react/*").Decorator[];
+    parameters: {
+        layout: string;
+    };
 };
 export default _default;
 export declare const Basic: {
     args: {
-        cells: {
-            '1,1': {
-                value: string;
+        id: string;
+        initialCells: {
+            grid: {
+                '1,1': {
+                    value: string;
+                };
             };
         };
         columnDefault: {
-            size: number;
-            resizeable: true;
-        };
-        rowDefault: {
-            size: number;
-            resizeable: true;
-        };
-        columns: {
-            0: {
-                size: number;
-            };
-            1: {
+            grid: {
                 size: number;
+                resizeable: true;
             };
-            2: {
-                size: number;
-            };
-            3: {
+        };
+        rowDefault: {
+            grid: {
                 size: number;
+                resizeable: true;
             };
-            4: {
-                size: number;
+        };
+        columns: {
+            grid: {
+                0: {
+                    size: number;
+                };
+                1: {
+                    size: number;
+                };
+                2: {
+                    size: number;
+                };
+                3: {
+                    size: number;
+                };
+                4: {
+                    size: number;
+                };
             };
         };
-        onAxisResize: (event: import("packages/ui/lit-grid/dist/types/src").DxAxisResize) => void;
+        onAxisResize: (event: import("packages/ui/lit-grid/dist/src/types").DxAxisResize) => void;
+        onEditingChange: (event: import("./Grid").GridEditing) => void;
     };
 };
 //# sourceMappingURL=Grid.stories.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Grid.stories.d.ts","sourceRoot":"","sources":["../../../src/Grid.stories.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAQ,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAC;;;;;;AAE9C,wBAIE;AAEF,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BjB,CAAC"}
+{"version":3,"file":"Grid.stories.d.ts","sourceRoot":"","sources":["../../../src/Grid.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAQ,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEzE,KAAK,cAAc,GAAG,gBAAgB,GAAG,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;;;+CAE9B,cAAc;;;;;;AAQhE,wBAKE;AAEF,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCjB,CAAC"}

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

@@ -1,2 +1,3 @@
 export * from './Grid';
+export * from './CellEditor';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-grid",
-  "version": "0.6.11",
+  "version": "0.6.12-main.2d19bf1",
   "description": "React component which manages a `dx-grid` Lit web component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,23 +21,28 @@
     "src"
   ],
   "dependencies": {
+    "@codemirror/state": "^6.4.1",
+    "@codemirror/view": "^6.34.1",
     "@lit/react": "^1.0.5",
-    "@dxos/react-ui": "0.6.11",
-    "@dxos/lit-grid": "0.6.11",
-    "@dxos/react-ui-theme": "0.6.11",
-    "@dxos/util": "0.6.11"
+    "@radix-ui/react-context": "^1.0.0",
+    "@radix-ui/react-use-controllable-state": "^1.0.0",
+    "@dxos/lit-grid": "0.6.12-main.2d19bf1",
+    "@dxos/react-ui-editor": "0.6.12-main.2d19bf1",
+    "@dxos/react-ui": "0.6.12-main.2d19bf1",
+    "@dxos/react-ui-theme": "0.6.12-main.2d19bf1",
+    "@dxos/util": "0.6.12-main.2d19bf1"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "^5.3.4",
-    "@dxos/storybook-utils": "0.6.11"
+    "vite": "5.4.7",
+    "@dxos/storybook-utils": "0.6.12-main.2d19bf1"
   },
   "peerDependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "~18.2.0",
+    "react-dom": "~18.2.0"
   },
   "publishConfig": {
     "access": "public"

package/src/CellEditor/CellEditor.tsx

@@ -0,0 +1,165 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Extension } from '@codemirror/state';
+import { EditorView, keymap } from '@codemirror/view';
+import React, { type DOMAttributes, type KeyboardEvent } from 'react';
+
+import { useThemeContext } from '@dxos/react-ui';
+import {
+  type UseTextEditorProps,
+  createBasicExtensions,
+  createThemeExtensions,
+  preventNewline,
+  useTextEditor,
+} from '@dxos/react-ui-editor';
+
+import { type GridEditBox } from '../Grid';
+
+type EditorKeyEvent = Pick<KeyboardEvent<HTMLInputElement>, 'key'> & { shift?: boolean };
+
+export type EditorKeysProps = {
+  onClose: (value: string | undefined, event: EditorKeyEvent) => void;
+  onNav?: (value: string | undefined, event: EditorKeyEvent) => void;
+};
+
+// TODO(Zan): Should each consumer be responsible for defining these?
+export const editorKeys = ({ onNav, onClose }: EditorKeysProps): Extension => {
+  return keymap.of([
+    {
+      key: 'ArrowUp',
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, { key: 'ArrowUp' });
+        return !!onNav;
+      },
+    },
+    {
+      key: 'ArrowDown',
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, { key: 'ArrowDown' });
+        return !!onNav;
+      },
+    },
+    {
+      key: 'ArrowLeft',
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, { key: 'ArrowLeft' });
+        return !!onNav;
+      },
+    },
+    {
+      key: 'ArrowRight',
+      run: (editor) => {
+        const value = editor.state.doc.toString();
+        onNav?.(value, { key: 'ArrowRight' });
+        return !!onNav;
+      },
+    },
+    {
+      key: 'Enter',
+      run: (editor) => {
+        onClose(editor.state.doc.toString(), { key: 'Enter' });
+        return true;
+      },
+      shift: (editor) => {
+        onClose(editor.state.doc.toString(), { key: 'Enter', shift: true });
+        return true;
+      },
+    },
+    {
+      key: 'Tab',
+      run: (editor) => {
+        onClose(editor.state.doc.toString(), { key: 'Tab' });
+        return true;
+      },
+      shift: (editor) => {
+        onClose(editor.state.doc.toString(), { key: 'Tab', shift: true });
+        return true;
+      },
+    },
+    {
+      key: 'Escape',
+      run: () => {
+        onClose(undefined, { key: 'Escape' });
+        return true;
+      },
+    },
+  ]);
+};
+
+export type CellEditorProps = {
+  value?: string;
+  extension?: Extension;
+  variant?: keyof typeof editorVariants;
+  box?: GridEditBox;
+  gridId?: string;
+} & Pick<UseTextEditorProps, 'autoFocus'> &
+  Pick<DOMAttributes<HTMLInputElement>, 'onBlur' | 'onKeyDown'>;
+
+const editorVariants = {
+  // TODO(thure): remove when legacy is no longer used.
+  legacy: {
+    root: 'flex w-full',
+    editor: 'flex w-full [&>.cm-scroller]:scrollbar-none',
+    content: '!px-2 !py-1',
+  },
+  grid: {
+    root: 'absolute z-[1]',
+    editor: '[&>.cm-scroller]:scrollbar-none tabular-nums',
+    content: '!border !border-transparent !p-0.5',
+  },
+};
+
+export const CellEditor = ({
+  value,
+  extension,
+  autoFocus,
+  onBlur,
+  variant = 'legacy',
+  box,
+  gridId,
+}: CellEditorProps) => {
+  const { themeMode } = useThemeContext();
+  const { parentRef } = useTextEditor(() => {
+    return {
+      autoFocus,
+      initialValue: value,
+      selection: { anchor: value?.length ?? 0 },
+      extensions: [
+        extension ?? [],
+        preventNewline,
+        EditorView.focusChangeEffect.of((_, focusing) => {
+          if (!focusing) {
+            onBlur?.({ type: 'blur' } as any);
+          }
+          return null;
+        }),
+        createBasicExtensions({ lineWrapping: false }),
+        createThemeExtensions({
+          themeMode,
+          slots: {
+            editor: {
+              className: editorVariants[variant].editor,
+            },
+            content: {
+              className: editorVariants[variant].content,
+            },
+          },
+        }),
+      ],
+    };
+  }, [extension, autoFocus, value, variant, onBlur]);
+
+  return (
+    <div
+      ref={parentRef}
+      className={editorVariants[variant].root}
+      style={box}
+      {...(gridId && { 'data-grid': gridId })}
+    />
+  );
+};

package/src/CellEditor/GridCellEditor.tsx

@@ -0,0 +1,28 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React from 'react';
+
+import { CellEditor, type CellEditorProps } from './CellEditor';
+import { type GridScopedProps, useGridContext } from '../Grid';
+
+export const GridCellEditor = ({
+  extension,
+  getCellContent,
+  __gridScope,
+}: GridScopedProps<Pick<CellEditorProps, 'extension'> & { getCellContent: (index: string) => string | undefined }>) => {
+  const { id, editing, setEditing, editBox } = useGridContext('GridSheetCellEditor', __gridScope);
+
+  return editing ? (
+    <CellEditor
+      variant='grid'
+      value={editing.initialContent ?? getCellContent(editing.index)}
+      autoFocus
+      box={editBox}
+      onBlur={() => setEditing(null)}
+      extension={extension}
+      gridId={id}
+    />
+  ) : null;
+};

package/src/CellEditor/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './CellEditor';
+export * from './GridCellEditor';

package/src/Grid.stories.tsx

@@ -2,41 +2,68 @@
 // Copyright 2024 DXOS.org
 //
 
+import '@dxos-theme';
+
+import React from 'react';
+
 import { withTheme } from '@dxos/storybook-utils';
 
-import { Grid, type GridProps } from './Grid';
+import { Grid, type GridContentProps, type GridRootProps } from './Grid';
+
+type StoryGridProps = GridContentProps & Pick<GridRootProps, 'onEditingChange'>;
+
+const StoryGrid = ({ onEditingChange, ...props }: StoryGridProps) => {
+  return (
+    <Grid.Root id='story' onEditingChange={onEditingChange}>
+      <Grid.Content {...props} />
+    </Grid.Root>
+  );
+};
 
 export default {
   title: 'react-ui-grid/Grid',
-  component: Grid,
+  component: StoryGrid,
   decorators: [withTheme],
+  parameters: { layout: 'fullscreen' },
 };
 
 export const Basic = {
   args: {
-    cells: {
-      '1,1': {
-        // end: '8,1',
-        value: 'Weekly sales report',
+    id: 'story',
+    initialCells: {
+      grid: {
+        '1,1': {
+          // end: '8,1',
+          value: 'Weekly sales report',
+        },
       },
     },
     columnDefault: {
-      size: 180,
-      resizeable: true,
+      grid: {
+        size: 180,
+        resizeable: true,
+      },
     },
     rowDefault: {
-      size: 32,
-      resizeable: true,
+      grid: {
+        size: 32,
+        resizeable: true,
+      },
     },
     columns: {
-      0: { size: 200 },
-      1: { size: 210 },
-      2: { size: 230 },
-      3: { size: 250 },
-      4: { size: 270 },
+      grid: {
+        0: { size: 200 },
+        1: { size: 210 },
+        2: { size: 230 },
+        3: { size: 250 },
+        4: { size: 270 },
+      },
     },
     onAxisResize: (event) => {
       console.log('[axis resize]', event);
     },
-  } satisfies GridProps,
+    onEditingChange: (event) => {
+      console.log('[edit]', event);
+    },
+  } satisfies StoryGridProps,
 };

package/src/Grid.tsx

@@ -1,12 +1,25 @@
 //
 // Copyright 2024 DXOS.org
 //
+
 import '@dxos/lit-grid/dx-grid.pcss';
 
 import { createComponent, type EventName } from '@lit/react';
-import React from 'react';
+import { createContextScope, type Scope } from '@radix-ui/react-context';
+import { useControllableState } from '@radix-ui/react-use-controllable-state';
+import React, {
+  type ComponentProps,
+  forwardRef,
+  type PropsWithChildren,
+  useCallback,
+  useLayoutEffect,
+  useState,
+} from 'react';
+
+import { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';
+import { useForwardedRef } from '@dxos/react-ui';
 
-import { type DxAxisResize, DxGrid as NaturalDxGrid, type DxGridProps } from '@dxos/lit-grid';
+type DxGridElement = NaturalDxGrid;
 
 const DxGrid = createComponent({
   tagName: 'dx-grid',
@@ -14,13 +27,122 @@ const DxGrid = createComponent({
   react: React,
   events: {
     onAxisResize: 'dx-axis-resize' as EventName<DxAxisResize>,
+    onEdit: 'dx-edit-request' as EventName<DxEditRequest>,
+    onSelect: 'dx-grid-cells-select' as EventName<DxGridCellsSelect>,
   },
 });
 
-export type GridProps = DxGridProps & {
-  onAxisResize: (event: DxAxisResize) => void;
+type GridEditBox = DxEditRequest['cellBox'];
+
+const initialBox = {
+  insetInlineStart: 0,
+  insetBlockStart: 0,
+  inlineSize: 0,
+  blockSize: 0,
+} satisfies GridEditBox;
+
+type GridEditing = { index: DxEditRequest['cellIndex']; initialContent: DxEditRequest['initialContent'] } | null;
+
+type GridContextValue = {
+  id: string;
+  editing: GridEditing;
+  setEditing: (nextEditing: GridEditing) => void;
+  editBox: GridEditBox;
+  setEditBox: (nextEditBox: GridEditBox) => void;
+};
+
+type GridScopedProps<P> = P & { __gridScope?: Scope };
+
+const GRID_NAME = 'Grid';
+
+const [createGridContext, createGridScope] = createContextScope(GRID_NAME, []);
+
+const [GridProvider, useGridContext] = createGridContext<GridContextValue>(GRID_NAME);
+
+type GridRootProps = PropsWithChildren<
+  { id: string } & Partial<{
+    editing: GridEditing;
+    defaultEditing: GridEditing;
+    onEditingChange: (nextEditing: GridEditing) => void;
+  }>
+>;
+
+const GridRoot = ({
+  id,
+  editing: propsEditing,
+  defaultEditing,
+  onEditingChange,
+  children,
+  __gridScope,
+}: GridScopedProps<GridRootProps>) => {
+  const [editing = null, setEditing] = useControllableState({
+    prop: propsEditing,
+    defaultProp: defaultEditing,
+    onChange: onEditingChange,
+  });
+  const [editBox, setEditBox] = useState<GridEditBox>(initialBox);
+  return (
+    <GridProvider
+      id={id}
+      editing={editing}
+      setEditing={setEditing}
+      editBox={editBox}
+      setEditBox={setEditBox}
+      scope={__gridScope}
+    >
+      {children}
+    </GridProvider>
+  );
+};
+
+GridRoot.displayName = GRID_NAME;
+
+type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {
+  getCells?: NonNullable<NaturalDxGrid['getCells']>;
 };
 
-export const Grid = (props: GridProps) => {
-  return <DxGrid {...props} />;
+const GRID_CONTENT_NAME = 'GridContent';
+
+const GridContent = forwardRef<NaturalDxGrid, GridScopedProps<GridContentProps>>((props, forwardedRef) => {
+  const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);
+  const dxGrid = useForwardedRef(forwardedRef);
+
+  // Needed instead of `useEffect` to ensure the DxGrid ref is defined.
+  useLayoutEffect(() => {
+    if (dxGrid.current && props.getCells) {
+      dxGrid.current.getCells = props.getCells;
+      dxGrid.current.requestUpdate('initialCells');
+    }
+  }, [props.getCells]);
+
+  const handleEdit = useCallback((event: DxEditRequest) => {
+    setEditBox(event.cellBox);
+    setEditing({ index: event.cellIndex, initialContent: event.initialContent });
+  }, []);
+
+  return <DxGrid {...props} gridId={id} mode={editing ? 'edit' : 'browse'} onEdit={handleEdit} ref={dxGrid} />;
+});
+
+GridContent.displayName = GRID_CONTENT_NAME;
+
+export const Grid = {
+  Root: GridRoot,
+  Content: GridContent,
 };
+
+export { GridRoot, GridContent, useGridContext, createGridScope };
+
+export type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };
+
+export { colToA1Notation, rowToA1Notation, closestCell } from '@dxos/lit-grid';
+
+export type {
+  DxGridRange,
+  DxGridAxisMeta,
+  DxAxisResize,
+  DxGridCells,
+  DxGridPlaneRange,
+  DxGridPlaneCells,
+  DxGridPlane,
+  DxGridPosition,
+} from '@dxos/lit-grid';

package/src/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './Grid';
+export * from './CellEditor';