@dxos/react-ui-chat 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-chat",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fffef41",
   "description": "Chat components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -9,6 +9,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -23,50 +24,51 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/search": "^6.5.11",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "@fluentui/react-tabster": "^9.24.2",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "@radix-ui/react-accordion": "1.2.3",
     "@radix-ui/react-context": "1.1.1",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-components": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-editor": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-dnd": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-sfx": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-types": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/live-object": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/debug": "0.8.4-main.fffef41",
+    "@dxos/react-ui-components": "0.8.4-main.fffef41",
+    "@dxos/react-ui-dnd": "0.8.4-main.fffef41",
+    "@dxos/react-ui-editor": "0.8.4-main.fffef41",
+    "@dxos/react-ui-sfx": "0.8.4-main.fffef41",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.fffef41",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.fffef41",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41",
+    "@dxos/react-ui-types": "0.8.4-main.fffef41"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/random": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/react-client": "0.8.4-main.fffef41",
+    "@dxos/storybook-utils": "0.8.4-main.fffef41",
+    "@dxos/random": "0.8.4-main.fffef41"
   },
   "peerDependencies": {
-    "effect": "3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "effect": "^3.13.3",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"

package/src/components/ChatDialog/ChatDialog.stories.tsx

@@ -2,20 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Input, Toolbar } from '@dxos/react-ui';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { ChatDialog } from './ChatDialog';
 import { translations } from '../../translations';
 
+import { ChatDialog } from './ChatDialog';
+
 const items = Array.from({ length: 100 }, (_, i) => `Item ${i}`);
 
-const meta: Meta<typeof ChatDialog.Root> = {
+const meta = {
   title: 'ui/react-ui-chat/ChatDialog',
   component: ChatDialog.Root,
   render: (args) => {
@@ -43,7 +42,7 @@ const meta: Meta<typeof ChatDialog.Root> = {
               </div>
             ))}
           </ChatDialog.Content>
-          <ChatDialog.Footer classNames='px-2 items-center'>
+          <ChatDialog.Footer classNames='pli-2 items-center'>
             <Input.Root>
               <Input.TextInput classNames='border-none' placeholder='Test' />
             </Input.Root>
@@ -52,14 +51,14 @@ const meta: Meta<typeof ChatDialog.Root> = {
       </>
     );
   },
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'flex flex-col' })],
+  decorators: [withTheme, withLayout({ container: 'column' })],
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof ChatDialog.Root>;
 
 export default meta;
 
-type Story = StoryObj<typeof ChatDialog.Root>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};

package/src/components/ChatDialog/ChatDialog.tsx

@@ -5,8 +5,8 @@
 import { createContext } from '@radix-ui/react-context';
 import React, { type Dispatch, type PropsWithChildren, type SetStateAction, useEffect, useState } from 'react';
 
-import { Dialog, Icon, IconButton, useControlledState, type ThemedClassName } from '@dxos/react-ui';
-import { resizeAttributes, ResizeHandle, type Size, sizeStyle } from '@dxos/react-ui-dnd';
+import { Dialog, Icon, IconButton, type ThemedClassName, useControlledState } from '@dxos/react-ui';
+import { ResizeHandle, type Size, resizeAttributes, sizeStyle } from '@dxos/react-ui-dnd';
 import { mx } from '@dxos/react-ui-theme';
 
 const preventDefault = (event: Event) => event.preventDefault();
@@ -14,7 +14,7 @@ const preventDefault = (event: Event) => event.preventDefault();
 // TODO(burdon): Factor out.
 const Endcap = ({ children }: PropsWithChildren) => {
   return (
-    <div className='grid w-[var(--rail-action)] h-[var(--rail-action)] items-center justify-center'>{children}</div>
+    <div className='grid is-[var(--rail-action)] bs-[var(--rail-action)] items-center justify-center'>{children}</div>
   );
 };
 
@@ -47,15 +47,15 @@ type ChatDialogRootProps = PropsWithChildren<{
 
 const ChatDialogRoot = ({
   children,
-  open: _open = false,
-  expanded: _expanded = false,
+  open: openParam = false,
+  expanded: expandedParam = false,
   onOpenChange,
   onExpandedChange,
   onEscape,
 }: ChatDialogRootProps) => {
   const [size, setSize] = useState<Size>('min-content');
-  const [open, setOpen] = useControlledState<boolean>(_open, onOpenChange);
-  const [expanded, setExpanded] = useControlledState<boolean>(_expanded, onExpandedChange);
+  const [open, setOpen] = useControlledState<boolean>(openParam, onOpenChange);
+  const [expanded, setExpanded] = useControlledState<boolean>(expandedParam, onExpandedChange);
 
   // NOTE: We set the min size to 5rem (80px), and the header and prompt bar to 40px (i.e., the rail-size) each.
   // The dialog has no vertical padding and has box-content so that when closed it collapses to the size of the header and prompt bar.
@@ -108,7 +108,7 @@ const ChatDialogHeader = ({ classNames, title }: ChatDialogHeaderProps) => {
         </Dialog.Close>
       </Endcap>
       <Dialog.Title
-        classNames='flex w-full justify-center text-sm text-subdued select-none cursor-pointer'
+        classNames='flex is-full justify-center text-sm text-subdued select-none cursor-pointer'
         onClick={() => setExpanded((expanded) => !expanded)}
       >
         {title}
@@ -144,7 +144,7 @@ const ChatDialogContent = ({ children, classNames }: ChatDialogContentProps) =>
   return (
     <div
       className={mx(
-        'flex flex-col overflow-y-auto border-t border-b border-subduedSeparator',
+        'flex flex-col overflow-y-auto border-t border-be border-subduedSeparator',
         'transition-[block-size] ease-in-out duration-0 [&:not([data-dx-resizing="true"])]:duration-200',
         classNames,
       )}

package/src/components/ChatEditor/ChatEditor.stories.tsx

@@ -2,18 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { log } from '@dxos/log';
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
 
 import { ChatEditor } from './ChatEditor';
 import { type ReferenceData } from './references';
-import { translations } from '../../translations';
 
-const meta: Meta<typeof ChatEditor> = {
+const meta = {
   title: 'ui/react-ui-chat/ChatEditor',
   component: ChatEditor,
   decorators: [withTheme],
@@ -21,13 +20,13 @@ const meta: Meta<typeof ChatEditor> = {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof ChatEditor>;
 
 export default meta;
 
-const classNames = 'w-[20rem] p-2 border border-separator';
+const classNames = 'is-[20rem] p-2 border border-separator';
 
-type Story = StoryObj<typeof ChatEditor>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
@@ -35,31 +34,33 @@ export const Default: Story = {
   },
 };
 
+// TODO(burdon): Restore and reconcile with suggest/typeahead.
 export const WithSuggestions: Story = {
   args: {
     classNames,
     onSubmit: (text) => {
       log('onSubmit', { text });
     },
-    onSuggest: (text) => {
-      const trimmed = text.trim().toLowerCase();
-      if (trimmed.length < 2) {
-        return [];
-      }
+    // onSuggest: (text) => {
+    //   const trimmed = text.trim().toLowerCase();
+    //   if (trimmed.length < 2) {
+    //     return [];
+    //   }
 
-      const suggestions = [
-        'Create a kanban board',
-        'Create a new project',
-        'Find flights to Tokyo',
-        "Let's play chess",
-        'Show me Paris on a map',
-      ];
+    //   const suggestions = [
+    //     'Create a kanban board',
+    //     'Create a new project',
+    //     'Find flights to Tokyo',
+    //     "Let's play chess",
+    //     'Show me Paris on a map',
+    //   ];
 
-      return suggestions.filter((s) => s.toLowerCase().startsWith(text));
-    },
+    //   return suggestions.filter((s) => s.toLowerCase().startsWith(text));
+    // },
   },
 };
 
+// TODO(burdon): Replace.
 const references: ReferenceData[] = [
   {
     uri: 'dxn:echo:@:AAAAAAAA',

package/src/components/ChatEditor/ChatEditor.tsx

@@ -3,89 +3,57 @@
 //
 
 import { type Extension } from '@codemirror/state';
-import React, { forwardRef, useImperativeHandle } from 'react';
+import React, { forwardRef, useMemo } from 'react';
 
 import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
 import {
   type BasicExtensionsOptions,
+  Editor,
+  type EditorController,
+  type SubmitOptions,
   type UseTextEditorProps,
   createBasicExtensions,
   createThemeExtensions,
-  useTextEditor,
+  submit,
 } from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
-import { isNonNullable } from '@dxos/util';
+import { isTruthy } from '@dxos/util';
 
-import { autocomplete, type AutocompleteOptions } from './autocomplete';
-import { references as referencesExtension, type ReferencesOptions } from './references';
+import { type ReferencesOptions } from './references';
 
-// TODO(burdon): Handle object references.
-
-export interface ChatEditorController {
-  focus(): void;
-  setText(text: string): void;
-}
+export interface ChatEditorController extends EditorController {}
 
 export type ChatEditorProps = ThemedClassName<
   {
     extensions?: Extension;
     references?: ReferencesOptions;
-  } & AutocompleteOptions &
-    Pick<UseTextEditorProps, 'autoFocus'> &
-    Pick<BasicExtensionsOptions, 'lineWrapping' | 'placeholder'>
+  } & (SubmitOptions &
+    Pick<UseTextEditorProps, 'id' | 'autoFocus'> &
+    Pick<BasicExtensionsOptions, 'lineWrapping' | 'placeholder'>)
 >;
 
-export const ChatEditor = forwardRef<ChatEditorController, ChatEditorProps>(
-  (
-    { classNames, extensions, references, autoFocus, lineWrapping = false, placeholder, onSubmit, onSuggest, onCancel },
-    forwardRef,
-  ) => {
-    const { themeMode } = useThemeContext();
-    const { parentRef, view } = useTextEditor(
-      {
-        debug: true,
-        autoFocus,
-        extensions: [
-          createThemeExtensions({ themeMode }),
-          autocomplete({ onSubmit, onSuggest, onCancel }),
-          references ? referencesExtension({ provider: references.provider }) : [],
-          createBasicExtensions({
-            bracketMatching: false,
-            lineWrapping,
-            placeholder,
-          }),
-          extensions,
-        ].filter(isNonNullable),
-      },
-      [themeMode, extensions, onSubmit, onSuggest],
-    );
+export const useChatExtensions = ({ extensions, lineWrapping = false, placeholder, onSubmit }: ChatEditorProps) => {
+  const { themeMode } = useThemeContext();
+  return useMemo<Extension[]>(
+    () =>
+      [
+        createThemeExtensions({ themeMode }),
+        createBasicExtensions({ bracketMatching: false, lineWrapping, placeholder }),
+        submit({ onSubmit }),
+        extensions,
+      ].filter(isTruthy),
+    [themeMode, extensions, onSubmit],
+  );
+};
 
-    // Expose editor view.
-    useImperativeHandle(
-      forwardRef,
-      () => {
-        return {
-          focus: () => {
-            view?.focus();
-          },
-          setText: (text: string) => {
-            view?.dispatch({
-              changes: {
-                from: 0,
-                to: view.state.doc.length,
-                insert: text,
-              },
-              selection: {
-                anchor: text.length,
-                head: text.length,
-              },
-            });
-          },
-        };
-      },
-      [view, onSubmit],
+export const ChatEditor = forwardRef<ChatEditorController, ChatEditorProps>(
+  ({ classNames, autoFocus, extensions: extensionsParam, lineWrapping = false, placeholder, onSubmit }, forwardRef) => {
+    const extensions = useChatExtensions({ extensions: extensionsParam, lineWrapping, placeholder, onSubmit });
+
+    // TODO(burdon): Popover.
+    return (
+      <Editor.Root ref={forwardRef}>
+        <Editor.Content classNames={classNames} autoFocus={autoFocus} extensions={extensions} />
+      </Editor.Root>
     );
-
-    return <div ref={parentRef} className={mx('is-full', classNames)} />;
   },
 );

package/src/components/ChatEditor/references.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { autocompletion, completionKeymap, type CompletionResult } from '@codemirror/autocomplete';
+import { type CompletionResult, autocompletion, completionKeymap } from '@codemirror/autocomplete';
 import { type Extension, RangeSet } from '@codemirror/state';
 import {
   Decoration,
@@ -19,10 +19,14 @@ import { invariant } from '@dxos/invariant';
 
 // TODO(dmaretskyi): Consider adding details renderer for when you hover over the reference.
 export type ReferenceData = {
-  uri: string;
+  uri: string; // TODO(burdon): Rename dxn.
   label: string;
 };
 
+/**
+ * @deprecated
+ */
+// TODO(burdon): Remove.
 export interface ReferencesProvider {
   getReferences({ query }: { query: string }): Promise<ReferenceData[]>;
   resolveReference({ uri }: { uri: string }): Promise<ReferenceData | null>;
@@ -45,7 +49,9 @@ export type ReferencesOptions = {
 
 /**
  * Lookup object references.
+ * @deprecated
  */
+// TODO(burdon): Remove.
 export const references = ({ provider, triggerCharacter = '@', debug = false }: ReferencesOptions): Extension => {
   invariant(triggerCharacter.length === 1);
 
@@ -103,7 +109,7 @@ export const references = ({ provider, triggerCharacter = '@', debug = false }:
     },
     {
       decorations: (v) => v.decorations,
-      provide: (plugin) => [
+      provide: () => [
         EditorView.atomicRanges.of(
           (view): DecorationSet => view.plugin(decorationField)?.decorations ?? RangeSet.empty,
         ),
@@ -158,18 +164,18 @@ class ReferenceWidget extends WidgetType {
     super();
   }
 
-  override toDOM(): HTMLSpanElement {
-    const span = document.createElement('span');
-    span.textContent = `@ ${this.data.label}`;
-    span.className = 'cm-reference-pill';
-    return span;
+  override ignoreEvent() {
+    return true;
   }
 
-  override eq(other: ReferenceWidget): boolean {
-    return other.data.uri === this.data.uri;
+  override eq(other: this) {
+    return this.data.uri === other.data.uri;
   }
 
-  override ignoreEvent(): boolean {
-    return true;
+  override toDOM() {
+    const span = document.createElement('span');
+    span.textContent = `@${this.data.label}`;
+    span.className = 'cm-reference-pill';
+    return span;
   }
 }

package/src/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './components';
+export * from './translations';

package/src/translations.ts

@@ -9,46 +9,7 @@ export const translationKey = 'react-ui-chat';
 export const translations = [
   {
     'en-US': {
-      [translationKey]: {
-        'templates label': 'Templates',
-        'open ambient chat label': 'Open Assistant',
-        'assistant chat label': 'Assistant',
-        'plugin name': 'Assistant',
-        'object placeholder': 'New prompt',
-        'create object label': 'Create prompt',
-        'create trigger label': 'Create trigger',
-        'create stack section label': 'Create prompt',
-        'command placeholder': 'Enter slash command...',
-        'template placeholder': 'Enter template...',
-        'value placeholder': 'Enter value...',
-        'prompt rules label': 'Prompt Rules',
-        'typename placeholder': 'Enter typename of objects which this template is for',
-        'description placeholder': 'Enter description of when this template should be used',
-        'select preset template placeholder': 'Select preset',
-        'service registry label': 'Service Registry',
-
-        'sequence logs label': 'Logs',
-
-        'assistant dialog title': 'Assistant',
-        'open assistant label': 'Open assistant',
-
-        'search input placeholder': 'Search...',
-        'chat input placeholder': 'Ask a question...',
-        'chat stop': 'Cancel request.',
-
-        'button save': 'Save',
-        'button run': 'Run',
-
-        'prompt placeholder': 'Ask a question...',
-        'microphone button': 'Click to speak',
-        'cancel processing button': 'Stop processing',
-
-        'settings default label': 'Default',
-        'settings custom prompts label': 'Use custom prompts',
-        'settings llm provider label': 'LLM provider',
-        'settings edge llm model label': 'Remote language model',
-        'settings ollama llm model label': 'Ollama language model',
-      },
+      [translationKey]: {},
     },
   },
 ] as const satisfies Resource[];

package/dist/types/src/components/ChatEditor/autocomplete.d.ts

@@ -1,25 +0,0 @@
-import { type Extension } from '@codemirror/state';
-export type AutocompleteOptions = {
-    /**
-     * Callback triggered when Enter is pressed.
-     * @param text The current text in the editor
-     * @returns true if the editor should reset the document.
-     */
-    onSubmit?: (text: string) => boolean | void;
-    /**
-     * Function that returns a list of suggestions based on the current text.
-     * @param text The current text before the cursor
-     * @returns Array of suggestion strings
-     */
-    onSuggest?: (text: string) => string[];
-    /**
-     * ESC pressed.
-     */
-    onCancel?: () => void;
-};
-/**
- * Creates an autocomplete extension that shows inline suggestions.
- * Pressing Tab will complete the suggestion.
- */
-export declare const autocomplete: ({ onSubmit, onSuggest, onCancel }: AutocompleteOptions) => Extension;
-//# sourceMappingURL=autocomplete.d.ts.map

package/dist/types/src/components/ChatEditor/autocomplete.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"autocomplete.d.ts","sourceRoot":"","sources":["../../../../../src/components/ChatEditor/autocomplete.ts"],"names":[],"mappings":"AAIA,OAAO,EAAQ,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAWzD,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI,CAAC;IAE5C;;;;OAIG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF;;;GAGG;AAEH,eAAO,MAAM,YAAY,GAAI,mCAAmC,mBAAmB,KAAG,SA+JrF,CAAC"}