@dxos/react-ui-grid 0.8.4-main.3a94e84 → 0.8.4-main.406dc2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-grid",
-  "version": "0.8.4-main.3a94e84",
+  "version": "0.8.4-main.406dc2a",
   "description": "React component which manages a `dx-grid` Lit web component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     }
@@ -23,35 +24,35 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
-    "@lit/react": "^1.0.5",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "@lit/react": "^1.0.8",
     "@preact-signals/safe-react": "^0.9.0",
     "@radix-ui/react-context": "1.1.1",
     "@radix-ui/react-popper": "1.2.2",
     "@radix-ui/react-use-controllable-state": "1.1.0",
-    "@dxos/lit-grid": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-editor": "0.8.4-main.3a94e84",
-    "@dxos/util": "0.8.4-main.3a94e84"
+    "@dxos/lit-grid": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
+    "@dxos/util": "0.8.4-main.406dc2a"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-searchlist": "0.8.4-main.3a94e84",
-    "@dxos/react-ui": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84",
-    "@dxos/storybook-utils": "0.8.4-main.3a94e84"
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.406dc2a",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-searchlist": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
+    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
   },
   "publishConfig": {
     "access": "public"

package/src/CellEditor/CellEditor.stories.tsx

@@ -2,17 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { CellEditor, type CellEditorProps, type EditorKeyEvent, editorKeys } from './CellEditor';
 
-const DefaultStory = (args: CellEditorProps) => {
-  const [value, setValue] = useState(args.value || 'Edit me');
+const DefaultStory = (props: CellEditorProps) => {
+  const [value, setValue] = useState(props.value || 'Edit me');
   const [lastAction, setLastAction] = useState<string>('');
 
   const handleBlur = (newValue?: string) => {
@@ -32,7 +30,7 @@ const DefaultStory = (args: CellEditorProps) => {
   };
 
   // Create an extension with editor keys
-  const extension = args.extension || [
+  const extensions = props.extensions || [
     editorKeys({
       onClose: handleKeyEvent,
       onNav: (value, event) => {
@@ -52,8 +50,8 @@ const DefaultStory = (args: CellEditorProps) => {
       <div className='relative border border-separator h-[100px] w-[300px]'>
         <CellEditor
           value={value}
-          extension={extension}
-          autoFocus={args.autoFocus}
+          extensions={extensions}
+          autoFocus={props.autoFocus}
           onBlur={handleBlur}
           box={{
             insetInlineStart: 10,
@@ -68,7 +66,7 @@ const DefaultStory = (args: CellEditorProps) => {
   );
 };
 
-const meta: Meta<CellEditorProps> = {
+const meta = {
   title: 'ui/react-ui-grid/CellEditor',
   component: CellEditor,
   render: DefaultStory,
@@ -76,11 +74,11 @@ const meta: Meta<CellEditorProps> = {
   parameters: {
     layout: 'centered',
   },
-};
+} satisfies Meta<typeof CellEditor>;
 
 export default meta;
 
-type Story = StoryObj<CellEditorProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {

package/src/CellEditor/CellEditor.tsx

@@ -9,12 +9,12 @@ import React, { type KeyboardEvent } from 'react';
 
 import { useThemeContext } from '@dxos/react-ui';
 import {
+  type ThemeExtensionsOptions,
   type UseTextEditorProps,
   createBasicExtensions,
   createThemeExtensions,
-  preventNewline,
+  filterChars,
   useTextEditor,
-  type ThemeExtensionsOptions,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
@@ -116,14 +116,14 @@ export const editorKeys = ({ onNav, onClose }: EditorKeysProps): Extension => {
 
 export type CellEditorProps = {
   value?: string;
-  extension?: Extension;
+  extensions?: Extension;
   box?: GridEditBox;
   gridId?: string;
   onBlur?: EditorBlurHandler;
 } & Pick<UseTextEditorProps, 'autoFocus'> &
   Pick<ThemeExtensionsOptions, 'slots'>;
 
-export const CellEditor = ({ value, extension, autoFocus, onBlur, box, gridId, slots }: CellEditorProps) => {
+export const CellEditor = ({ value, extensions, box, gridId, onBlur, autoFocus, slots }: CellEditorProps) => {
   const { themeMode } = useThemeContext();
   const { parentRef } = useTextEditor(() => {
     return {
@@ -131,8 +131,8 @@ export const CellEditor = ({ value, extension, autoFocus, onBlur, box, gridId, s
       initialValue: value,
       selection: { anchor: value?.length ?? 0 },
       extensions: [
-        extension ?? [],
-        preventNewline,
+        extensions ?? [],
+        filterChars(/[\n\r]+/),
         EditorView.focusChangeEffect.of((state, focusing) => {
           if (!focusing) {
             onBlur?.(state.doc.toString());
@@ -149,18 +149,20 @@ export const CellEditor = ({ value, extension, autoFocus, onBlur, box, gridId, s
                 slots?.editor?.className,
               ),
             },
-            scroller: {
+            scroll: {
               className: mx(
                 '!overflow-x-hidden !plb-[max(0,calc(var(--dx-grid-cell-editor-padding-block)-1px))] !pie-0 !pis-[--dx-grid-cell-editor-padding-inline]',
-                slots?.scroller?.className,
+                slots?.scroll?.className,
               ),
             },
-            content: { className: mx('!break-normal', slots?.content?.className) },
+            content: {
+              className: mx('!break-normal', slots?.content?.className),
+            },
           },
         }),
       ],
     };
-  }, [extension, autoFocus, value, onBlur, themeMode, slots]);
+  }, [extensions, autoFocus, value, onBlur, themeMode, slots]);
 
   return (
     <div

package/src/CellEditor/GridCellEditor.tsx

@@ -4,16 +4,17 @@
 
 import React, { useCallback } from 'react';
 
+import { type DxGridCellIndex, type GridScopedProps, useGridContext } from '../Grid';
+
 import { CellEditor, type CellEditorProps } from './CellEditor';
-import { type GridScopedProps, useGridContext, type DxGridCellIndex } from '../Grid';
 
 export type GridCellEditorProps = GridScopedProps<
-  Pick<CellEditorProps, 'extension' | 'onBlur' | 'slots'> & {
+  Pick<CellEditorProps, 'extensions' | 'onBlur' | 'slots'> & {
     getCellContent: (index: DxGridCellIndex) => string | undefined;
   }
 >;
 
-export const GridCellEditor = ({ extension, getCellContent, onBlur, slots, __gridScope }: GridCellEditorProps) => {
+export const GridCellEditor = ({ extensions, getCellContent, onBlur, slots, __gridScope }: GridCellEditorProps) => {
   const { id, editing, setEditing, editBox } = useGridContext('GridCellEditor', __gridScope);
 
   const handleBlur = useCallback(
@@ -30,7 +31,7 @@ export const GridCellEditor = ({ extension, getCellContent, onBlur, slots, __gri
       autoFocus
       box={editBox}
       onBlur={handleBlur}
-      extension={extension}
+      extensions={extensions}
       gridId={id}
       slots={slots}
     />

package/src/Grid/Grid.stories.tsx

@@ -2,18 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type MouseEvent, type MutableRefObject, useCallback, useRef, useState } from 'react';
 
 import { defaultRowSize } from '@dxos/lit-grid';
 import { faker } from '@dxos/random';
 import { DropdownMenu } from '@dxos/react-ui';
-import { PopoverCombobox, type PopoverComboboxRootProps } from '@dxos/react-ui-searchlist';
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
+import { Combobox, type ComboboxRootProps } from '@dxos/react-ui-searchlist';
 
-import { Grid, type GridEditing, type GridContentProps, type GridRootProps } from './Grid';
+import { Grid, type GridContentProps, type GridEditing, type GridRootProps } from './Grid';
 
 const storybookItems = faker.helpers.uniqueArray(faker.commerce.productName, 16);
 
@@ -33,7 +31,7 @@ const GridStory = ({ initialCells, ...props }: GridStoryProps) => {
   // Multiselect
   const [popoverOpen, setPopoverOpen] = useState(false);
   const [multiSelectValue, setInternalMultiselectValue] = useState('');
-  const setMultiselectValue = useCallback<NonNullable<PopoverComboboxRootProps['onValueChange']>>((nextValue) => {
+  const setMultiselectValue = useCallback<NonNullable<ComboboxRootProps['onValueChange']>>((nextValue) => {
     setInternalMultiselectValue(nextValue);
     setCells((cells) => {
       // TODO(burdon): How can we get the cell address to update?
@@ -80,33 +78,35 @@ const GridStory = ({ initialCells, ...props }: GridStoryProps) => {
       </DropdownMenu.Root>
 
       {/* Multiselect */}
-      <PopoverCombobox.Root
+      <Combobox.Root
         open={popoverOpen}
         onOpenChange={setPopoverOpen}
         value={multiSelectValue}
         onValueChange={setMultiselectValue}
       >
-        <PopoverCombobox.VirtualTrigger virtualRef={triggerRef} />
-        <PopoverCombobox.Content filter={(value, search) => (value.includes(search) ? 1 : 0)}>
-          <PopoverCombobox.Input placeholder='Search...' />
-          <PopoverCombobox.List>
+        <Combobox.VirtualTrigger virtualRef={triggerRef} />
+        <Combobox.Content filter={(value, search) => (value.includes(search) ? 1 : 0)}>
+          <Combobox.Input placeholder='Search...' />
+          <Combobox.List>
             {storybookItems.map((value) => (
-              <PopoverCombobox.Item key={value}>{value}</PopoverCombobox.Item>
+              <Combobox.Item key={value}>{value}</Combobox.Item>
             ))}
-          </PopoverCombobox.List>
-          <PopoverCombobox.Arrow />
-        </PopoverCombobox.Content>
-      </PopoverCombobox.Root>
+          </Combobox.List>
+          <Combobox.Arrow />
+        </Combobox.Content>
+      </Combobox.Root>
     </div>
   );
 };
 
-const meta: Meta<GridStoryProps> = {
+const meta = {
   title: 'ui/react-ui-grid/Grid',
   component: GridStory,
   decorators: [withTheme],
-  parameters: { layout: 'fullscreen' },
-};
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof GridStory>;
 
 export default meta;
 

package/src/Grid/Grid.tsx

@@ -4,8 +4,8 @@
 
 import '@dxos/lit-grid/dx-grid.pcss';
 
-import { createComponent, type EventName } from '@lit/react';
-import { createContextScope, type Scope } from '@radix-ui/react-context';
+import { type EventName, createComponent } from '@lit/react';
+import { type Scope, createContextScope } from '@radix-ui/react-context';
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
 import React, {
   type ComponentProps,
@@ -102,13 +102,13 @@ const GridRoot = ({
 
 GridRoot.displayName = GRID_NAME;
 
+const GRID_CONTENT_NAME = 'GridContent';
+
 type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {
   getCells?: NaturalDxGrid['getCells'];
   activeRefs?: string;
 };
 
-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, setDxGridInternal] = useState<NaturalDxGrid | null>(null);
@@ -166,7 +166,7 @@ export const Grid = {
   Content: GridContent,
 };
 
-export { GridRoot, GridContent, useGridContext, createGridScope, gridSeparatorInlineEnd, gridSeparatorBlockEnd };
+export { GridRoot, GridContent, createGridScope, gridSeparatorInlineEnd, gridSeparatorBlockEnd, useGridContext };
 
 export type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };
 
@@ -178,6 +178,7 @@ export {
   toPlaneCellIndex,
   parseCellIndex,
   cellQuery,
+  DxEditRequest,
 } from '@dxos/lit-grid';
 
 export type {