@dxos/react-ui-grid 0.8.4-main.ae835ea → 0.8.4-main.bc2380dfbc

package/package.json

@@ -1,24 +1,26 @@
 {
   "name": "@dxos/react-ui-grid",
-  "version": "0.8.4-main.ae835ea",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "React component which manages a `dx-grid` Lit web component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "browser": "./dist/lib/browser/index.mjs",
+      "node": "./dist/lib/browser/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
@@ -26,33 +28,34 @@
   "dependencies": {
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@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.ae835ea",
-    "@dxos/react-ui-editor": "0.8.4-main.ae835ea",
-    "@dxos/util": "0.8.4-main.ae835ea"
+    "@dxos/lit-grid": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-editor": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
-    "@dxos/random": "0.8.4-main.ae835ea",
-    "@dxos/storybook-utils": "0.8.4-main.ae835ea",
-    "@dxos/react-ui": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-searchlist": "0.8.4-main.ae835ea"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.13",
+    "@dxos/random": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-list": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-search": "0.8.4-main.bc2380dfbc",
+    "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "peerDependencies": {
-    "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"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "publishConfig": {
     "access": "public"

package/src/CellEditor/CellEditor.stories.tsx

@@ -70,7 +70,7 @@ const meta = {
   title: 'ui/react-ui-grid/CellEditor',
   component: CellEditor,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     layout: 'centered',
   },

package/src/CellEditor/CellEditor.tsx

@@ -8,15 +8,14 @@ import { EditorView, keymap } from '@codemirror/view';
 import React, { type KeyboardEvent } from 'react';
 
 import { useThemeContext } from '@dxos/react-ui';
+import { type UseTextEditorProps, useTextEditor } from '@dxos/react-ui-editor';
 import {
   type ThemeExtensionsOptions,
-  type UseTextEditorProps,
   createBasicExtensions,
   createThemeExtensions,
   filterChars,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
+} from '@dxos/ui-editor';
+import { mx } from '@dxos/ui-theme';
 
 import { type GridEditBox } from '../Grid';
 
@@ -123,7 +122,7 @@ export type CellEditorProps = {
 } & Pick<UseTextEditorProps, 'autoFocus'> &
   Pick<ThemeExtensionsOptions, 'slots'>;
 
-export const CellEditor = ({ value, extensions, box, gridId, onBlur, autoFocus, slots }: CellEditorProps) => {
+export const CellEditor = ({ value, extensions, box, gridId, autoFocus, slots, onBlur }: CellEditorProps) => {
   const { themeMode } = useThemeContext();
   const { parentRef } = useTextEditor(() => {
     return {
@@ -133,11 +132,22 @@ export const CellEditor = ({ value, extensions, box, gridId, onBlur, autoFocus,
       extensions: [
         extensions ?? [],
         filterChars(/[\n\r]+/),
-        EditorView.focusChangeEffect.of((state, focusing) => {
-          if (!focusing) {
-            onBlur?.(state.doc.toString());
-          }
-          return null;
+        // Observe the underlying blur DOM event rather than `EditorView.focusChangeEffect`. The
+        // focus-change facet fires asynchronously (CodeMirror schedules it on a 10ms setTimeout),
+        // which means in React strict mode the destroy → blur of the first EditorView runs the
+        // callback after the second view has mounted — committing stale data and closing the
+        // editor on the user's first keystroke. Deferring via `queueMicrotask` runs the check
+        // *after* `view.destroy()` finishes its synchronous body (which calls `dom.remove()`),
+        // so `view.dom.isConnected === false` reliably distinguishes a programmatic teardown
+        // from a real user blur. Pass `undefined` on teardown so downstream handlers can consume
+        // any pending suppress-next-blur flag without committing stale data.
+        EditorView.domEventObservers({
+          blur: (_event, view) => {
+            const doc = view.state.doc.toString();
+            queueMicrotask(() => {
+              onBlur?.(view.dom.isConnected ? doc : undefined);
+            });
+          },
         }),
         createBasicExtensions({ lineWrapping: true }),
         createThemeExtensions({
@@ -145,18 +155,18 @@ export const CellEditor = ({ value, extensions, box, gridId, onBlur, autoFocus,
           slots: {
             editor: {
               className: mx(
-                '!min-is-full !is-min !max-is-[--dx-grid-cell-editor-max-inline-size] !min-bs-full !max-bs-[--dx-grid-cell-editor-max-block-size]',
+                'min-w-full! w-min! !max-w-(--dx-grid-cell-editor-max-w-size) min-h-full! !max-h-(--dx-grid-cell-editor-max-h-size)',
                 slots?.editor?.className,
               ),
             },
-            scroll: {
+            scroller: {
               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?.scroll?.className,
+                'overflow-x-hidden! !py-[max(0,calc(var(--dx-grid-cell-editor-padding-block)-1px))] pe-0! !pl-(--dx-grid-cell-editor-padding-inline)',
+                slots?.scroller?.className,
               ),
             },
             content: {
-              className: mx('!break-normal', slots?.content?.className),
+              className: mx('break-normal!', slots?.content?.className),
             },
           },
         }),
@@ -174,7 +184,7 @@ export const CellEditor = ({ value, extensions, box, gridId, onBlur, autoFocus,
         insetBlockStart: box?.insetBlockStart ?? '0px',
         minInlineSize: box?.inlineSize ?? '180px',
         minBlockSize: box?.blockSize ?? '30px',
-        ...{ '--dx-gridCellWidth': `${box?.inlineSize ?? 200}px` },
+        ...{ '--dx-grid-cell-width': `${box?.inlineSize ?? 200}px` },
       }}
       {...(gridId && { 'data-grid': gridId })}
     />

package/src/CellEditor/GridCellEditor.tsx

@@ -5,7 +5,6 @@
 import React, { useCallback } from 'react';
 
 import { type DxGridCellIndex, type GridScopedProps, useGridContext } from '../Grid';
-
 import { CellEditor, type CellEditorProps } from './CellEditor';
 
 export type GridCellEditorProps = GridScopedProps<

package/src/Grid/Grid.stories.tsx

@@ -6,14 +6,17 @@ 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 { type DxGridPlaneCells } from '@dxos/lit-grid';
+import { random } from '@dxos/random';
 import { DropdownMenu } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
-import { Combobox, type ComboboxRootProps } from '@dxos/react-ui-searchlist';
+import { toPlaneCellIndex } from '@dxos/react-ui-grid';
+import { Combobox, type ComboboxRootProps } from '@dxos/react-ui-list';
+import { useSearchListResults } from '@dxos/react-ui-search';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { Grid, type GridContentProps, type GridEditing, type GridRootProps } from './Grid';
 
-const storybookItems = faker.helpers.uniqueArray(faker.commerce.productName, 16);
+const storybookItems = random.helpers.uniqueArray(random.commerce.productName, 16);
 
 type GridStoryProps = GridContentProps & Pick<GridRootProps, 'onEditingChange'>;
 
@@ -62,7 +65,7 @@ const GridStory = ({ initialCells, ...props }: GridStoryProps) => {
   }, []);
 
   return (
-    <div role='none' className='fixed inset-0 grid'>
+    <div className='contents'>
       <Grid.Root id='story' editing={editing} onEditingChange={handleEditingChange}>
         {/* TODO(burdon): Why is this property not just "cells" or "values" */}
         <Grid.Content {...props} initialCells={cells} onClick={handleClick} />
@@ -85,24 +88,34 @@ const GridStory = ({ initialCells, ...props }: GridStoryProps) => {
         onValueChange={setMultiselectValue}
       >
         <Combobox.VirtualTrigger virtualRef={triggerRef} />
-        <Combobox.Content filter={(value, search) => (value.includes(search) ? 1 : 0)}>
-          <Combobox.Input placeholder='Search...' />
-          <Combobox.List>
-            {storybookItems.map((value) => (
-              <Combobox.Item key={value}>{value}</Combobox.Item>
-            ))}
-          </Combobox.List>
-          <Combobox.Arrow />
-        </Combobox.Content>
+        <ComboboxContentWithFiltering />
       </Combobox.Root>
     </div>
   );
 };
 
+const ComboboxContentWithFiltering = () => {
+  const { results, query, handleSearch } = useSearchListResults({
+    items: storybookItems,
+  });
+
+  return (
+    <Combobox.Content>
+      <Combobox.Input placeholder='Search...' value={query} onValueChange={handleSearch} />
+      <Combobox.List>
+        {results.map((value) => (
+          <Combobox.Item key={value} value={value} label={value} />
+        ))}
+      </Combobox.List>
+      <Combobox.Arrow />
+    </Combobox.Content>
+  );
+};
+
 const meta = {
   title: 'ui/react-ui-grid/Grid',
   component: GridStory,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
   parameters: {
     layout: 'fullscreen',
   },
@@ -112,6 +125,31 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
+export const Default: Story = {};
+
+/**
+ * Single focusable cell — for verifying focus-ring alignment with grid lines.
+ */
+export const SingleCell: Story = {
+  args: {
+    id: 'story',
+    limitColumns: 1,
+    limitRows: 1,
+    columnDefault: { grid: { size: 200, resizeable: false } },
+    rowDefault: { grid: { size: 32, resizeable: false } },
+    initialCells: {
+      grid: {
+        '0,0': { value: 'Focus me' },
+      },
+    },
+  },
+  render: (args) => (
+    <div className='h-full grid place-items-center'>
+      <GridStory {...args} />
+    </div>
+  ),
+};
+
 export const Basic: Story = {
   args: {
     id: 'story',
@@ -141,7 +179,7 @@ export const Basic: Story = {
         '1,1': {
           value: 'Demo decoration',
           accessoryHtml: `
-            <button class="dx-button is-6 pli-0.5 min-bs-0 absolute inset-block-1 inline-end-1" data-story-action="menu">
+            <button class="dx-button w-6 px-0.5 min-h-0 absolute inset-y-1 right-1" data-story-action="menu">
               <svg><use href="/icons.svg#ph--arrow-right--regular"/></svg>
             </button>
           `,
@@ -158,26 +196,47 @@ export const Basic: Story = {
   },
 };
 
-// TODO(burdon): How to make single-column?
-export const SingleColumn: Story = {
+const cellSize = 40;
+
+// TODO(burdon): Calendar.
+export const Calendar: Story = {
   args: {
     id: 'story',
-    limitColumns: 1,
+    limitColumns: 7,
     columnDefault: {
       grid: {
-        size: 180,
+        size: cellSize,
+        resizeable: false,
       },
     },
     rowDefault: {
       grid: {
-        size: defaultRowSize,
+        size: cellSize,
         resizeable: false,
       },
     },
-    columns: {
-      grid: {
-        0: { size: 200 },
-      },
+    getCells: (range, plane) => {
+      const cells: DxGridPlaneCells = {};
+      if (plane === 'grid') {
+        for (let col = range.start.col; col <= range.end.col; col++) {
+          for (let row = range.start.row; row <= range.end.row; row++) {
+            // TODO(burdon): Formatting changes when cell is selected.
+            cells[toPlaneCellIndex({ col, row })] = {
+              readonly: true,
+              accessoryHtml: '<div class="flex h-full w-full justify-center items-center overflow-hidden">0</div>',
+              className: '',
+            };
+          }
+        }
+      }
+      return cells;
     },
   },
+  render: (args) => (
+    <div className='h-full flex justify-center'>
+      <div className='h-full w-[288px] border-x border-separator'>
+        <GridStory {...args} />
+      </div>
+    </div>
+  ),
 };

package/src/Grid/Grid.tsx

@@ -2,8 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos/lit-grid/dx-grid.pcss';
-
 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';
@@ -16,6 +14,7 @@ import React, {
   useState,
 } from 'react';
 
+import '@dxos/lit-grid/dx-grid.pcss';
 import { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';
 
 type DxGridElement = NaturalDxGrid;
@@ -63,20 +62,23 @@ const [createGridContext, createGridScope] = createContextScope(GRID_NAME, []);
 const [GridProvider, useGridContext] = createGridContext<GridContextValue>(GRID_NAME);
 
 type GridRootProps = PropsWithChildren<
-  { id: string } & Partial<{
+  {
+    id: string;
+  } & Partial<{
     editing: GridEditing;
     defaultEditing: GridEditing;
     onEditingChange: (nextEditing: GridEditing) => void;
   }>
 >;
 
+// TODO(burdon): Make headless.
 const GridRoot = ({
+  __gridScope,
+  children,
   id,
   editing: propsEditing,
   defaultEditing,
   onEditingChange,
-  children,
-  __gridScope,
 }: GridScopedProps<GridRootProps>) => {
   const [editing = null, setEditing] = useControllableState({
     prop: propsEditing,
@@ -150,12 +152,12 @@ GridContent.displayName = GRID_CONTENT_NAME;
 // Fragments
 //
 
-// NOTE(Zan): These fragments add border to inline-end and block-end of the grid using pseudo-elements.
+// NOTE(Zan): These fragments add border to w-end and h-end of the grid using pseudo-elements.
 // These are offset by 1px to avoid double borders in planks.
 const gridSeparatorInlineEnd =
-  '[&>.dx-grid]:relative [&>.dx-grid]:after:absolute [&>.dx-grid]:after:inset-block-0 [&>.dx-grid]:after:-inline-end-px [&>.dx-grid]:after:is-px [&>.dx-grid]:after:bg-subduedSeparator';
+  '[&>.dx-grid]:relative [&>.dx-grid]:after:absolute [&>.dx-grid]:after:inset-y-0 [&>.dx-grid]:after:-right-px [&>.dx-grid]:after:w-px [&>.dx-grid]:after:bg-subdued-separator';
 const gridSeparatorBlockEnd =
-  '[&>.dx-grid]:relative [&>.dx-grid]:before:absolute [&>.dx-grid]:before:inset-inline-0 [&>.dx-grid]:before:-block-end-px [&>.dx-grid]:before:bs-px [&>.dx-grid]:before:bg-subduedSeparator';
+  '[&>.dx-grid]:relative [&>.dx-grid]:before:absolute [&>.dx-grid]:before:inset-x-0 [&>.dx-grid]:before:-bottom-px [&>.dx-grid]:before:h-px [&>.dx-grid]:before:bg-subdued-separator';
 
 //
 // Exports