@dxos/react-ui-grid 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-grid",
-  "version": "0.8.4-main.8360d9e660",
+  "version": "0.8.4-main.8baae0fced",
   "description": "React component which manages a `dx-grid` Lit web component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
@@ -16,13 +16,11 @@
     ".": {
       "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"
@@ -30,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",
     "@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.8360d9e660",
-    "@dxos/react-ui-editor": "0.8.4-main.8360d9e660",
-    "@dxos/ui-editor": "0.8.4-main.8360d9e660",
-    "@dxos/util": "0.8.4-main.8360d9e660"
+    "@dxos/lit-grid": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-editor": "0.8.4-main.8baae0fced",
+    "@dxos/ui-editor": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-searchlist": "0.8.4-main.8360d9e660",
-    "@dxos/storybook-utils": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660",
-    "@dxos/random": "0.8.4-main.8360d9e660"
+    "vite": "^8.0.13",
+    "@dxos/random": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-list": "0.8.4-main.8baae0fced",
+    "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-search": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "peerDependencies": {
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660"
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "publishConfig": {
     "access": "public"

package/src/CellEditor/CellEditor.tsx

@@ -132,11 +132,22 @@ export const CellEditor = ({ value, extensions, box, gridId, autoFocus, slots, o
       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({
@@ -148,10 +159,10 @@ export const CellEditor = ({ value, extensions, box, gridId, autoFocus, slots, o
                 slots?.editor?.className,
               ),
             },
-            scroll: {
+            scroller: {
               className: mx(
                 '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?.scroll?.className,
+                slots?.scroller?.className,
               ),
             },
             content: {

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

@@ -7,15 +7,16 @@ import React, { type MouseEvent, type MutableRefObject, useCallback, useRef, use
 
 import { defaultRowSize } from '@dxos/lit-grid';
 import { type DxGridPlaneCells } from '@dxos/lit-grid';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { DropdownMenu } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { toPlaneCellIndex } from '@dxos/react-ui-grid';
-import { Combobox, type ComboboxRootProps, useSearchListResults } from '@dxos/react-ui-searchlist';
+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'>;
 
@@ -64,7 +65,7 @@ const GridStory = ({ initialCells, ...props }: GridStoryProps) => {
   }, []);
 
   return (
-    <div role='none' className='contents'>
+    <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} />
@@ -94,13 +95,13 @@ const GridStory = ({ initialCells, ...props }: GridStoryProps) => {
 };
 
 const ComboboxContentWithFiltering = () => {
-  const { results, handleSearch } = useSearchListResults({
+  const { results, query, handleSearch } = useSearchListResults({
     items: storybookItems,
   });
 
   return (
-    <Combobox.Content onSearch={handleSearch}>
-      <Combobox.Input placeholder='Search...' />
+    <Combobox.Content>
+      <Combobox.Input placeholder='Search...' value={query} onValueChange={handleSearch} />
       <Combobox.List>
         {results.map((value) => (
           <Combobox.Item key={value} value={value} label={value} />
@@ -126,6 +127,29 @@ 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',

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;