@dxos/react-ui-chat 0.8.4-main.406dc2a → 0.8.4-main.52d7546f51

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/react-ui-chat",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.52d7546f51",
   "description": "Chat components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
@@ -29,46 +33,44 @@
     "@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.12.1",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-accordion": "1.2.3",
     "@radix-ui/react-context": "1.1.1",
-    "@dxos/async": "0.8.4-main.406dc2a",
-    "@dxos/debug": "0.8.4-main.406dc2a",
-    "@dxos/invariant": "0.8.4-main.406dc2a",
-    "@dxos/log": "0.8.4-main.406dc2a",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/live-object": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-components": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-dnd": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-sfx": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-types": "0.8.4-main.406dc2a",
-    "@dxos/util": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.406dc2a"
+    "@dxos/async": "0.8.4-main.52d7546f51",
+    "@dxos/echo": "0.8.4-main.52d7546f51",
+    "@dxos/debug": "0.8.4-main.52d7546f51",
+    "@dxos/log": "0.8.4-main.52d7546f51",
+    "@dxos/invariant": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui-dnd": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui-components": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui-sfx": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui-editor": "0.8.4-main.52d7546f51",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.52d7546f51",
+    "@dxos/ui-editor": "0.8.4-main.52d7546f51",
+    "@dxos/ui-theme": "0.8.4-main.52d7546f51",
+    "@dxos/util": "0.8.4-main.52d7546f51",
+    "@dxos/ui-types": "0.8.4-main.52d7546f51"
   },
   "devDependencies": {
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/random": "0.8.4-main.406dc2a",
-    "@dxos/react-client": "0.8.4-main.406dc2a",
-    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
+    "@dxos/echo": "0.8.4-main.52d7546f51",
+    "@dxos/random": "0.8.4-main.52d7546f51",
+    "@dxos/react-client": "0.8.4-main.52d7546f51",
+    "@dxos/storybook-utils": "0.8.4-main.52d7546f51"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "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"
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.52d7546f51",
+    "@dxos/ui-theme": "0.8.4-main.52d7546f51"
   },
   "publishConfig": {
     "access": "public"

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

@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Input, Toolbar } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../../translations';
 
@@ -42,7 +42,7 @@ const meta = {
               </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>
@@ -51,9 +51,8 @@ const meta = {
       </>
     );
   },
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
   parameters: {
-    layout: 'column',
     translations,
   },
 } satisfies Meta<typeof ChatDialog.Root>;

package/src/components/ChatDialog/ChatDialog.tsx

@@ -7,14 +7,14 @@ import React, { type Dispatch, type PropsWithChildren, type SetStateAction, useE
 
 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';
+import { mx } from '@dxos/ui-theme';
 
 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: expandedParam = false,
+  open: openProp = false,
+  expanded: expandedProp = false,
   onOpenChange,
   onExpandedChange,
   onEscape,
 }: ChatDialogRootProps) => {
   const [size, setSize] = useState<Size>('min-content');
-  const [open, setOpen] = useControlledState<boolean>(_open, onOpenChange);
-  const [expanded, setExpanded] = useControlledState<boolean>(expandedParam, onExpandedChange);
+  const [open, setOpen] = useControlledState<boolean>(openProp, onOpenChange);
+  const [expanded, setExpanded] = useControlledState<boolean>(expandedProp, 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.
@@ -93,12 +93,14 @@ ChatDialogRoot.displayName = 'ChatDialog.Root';
 // Header
 //
 
+const CHAT_DIALOG_HEADER_NAME = 'ChatDialog.Header';
+
 type ChatDialogHeaderProps = ThemedClassName<{
   title?: string;
 }>;
 
 const ChatDialogHeader = ({ classNames, title }: ChatDialogHeaderProps) => {
-  const { expanded, setExpanded } = useChatDialogContext(ChatDialogHeader.displayName);
+  const { expanded, setExpanded } = useChatDialogContext(CHAT_DIALOG_HEADER_NAME);
 
   return (
     <div className={mx('grid grid-cols-[var(--rail-action)_1fr_min-content] items-center overflow-hidden', classNames)}>
@@ -108,7 +110,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}
@@ -127,16 +129,18 @@ const ChatDialogHeader = ({ classNames, title }: ChatDialogHeaderProps) => {
   );
 };
 
-ChatDialogHeader.displayName = 'ChatDialog.Header';
+ChatDialogHeader.displayName = CHAT_DIALOG_HEADER_NAME;
 
 //
 // Content
 //
 
+const CHAT_DIALOG_CONTENT_NAME = 'ChatDialog.Content';
+
 type ChatDialogContentProps = ThemedClassName<PropsWithChildren>;
 
 const ChatDialogContent = ({ children, classNames }: ChatDialogContentProps) => {
-  const { expanded, size, setSize } = useChatDialogContext(ChatDialogContent.displayName);
+  const { expanded, size, setSize } = useChatDialogContext(CHAT_DIALOG_CONTENT_NAME);
   useEffect(() => {
     setSize(expanded ? 'min-content' : 0);
   }, [expanded]);
@@ -144,7 +148,7 @@ const ChatDialogContent = ({ children, classNames }: ChatDialogContentProps) =>
   return (
     <div
       className={mx(
-        'flex flex-col overflow-y-auto border-t border-b border-subduedSeparator',
+        'border-bs border-be border-subduedSeparator',
         'transition-[block-size] ease-in-out duration-0 [&:not([data-dx-resizing="true"])]:duration-200',
         classNames,
       )}
@@ -167,19 +171,21 @@ const ChatDialogContent = ({ children, classNames }: ChatDialogContentProps) =>
   );
 };
 
-ChatDialogContent.displayName = 'ChatDialog.Content';
+ChatDialogContent.displayName = CHAT_DIALOG_CONTENT_NAME;
 
 //
 // Footer
 //
 
+const CHAT_DIALOG_FOOTER_NAME = 'ChatDialog.Footer';
+
 type ChatDialogFooterProps = ThemedClassName<PropsWithChildren>;
 
 const ChatDialogFooter = ({ children, classNames }: ChatDialogFooterProps) => {
   return <div className={mx(classNames)}>{children}</div>;
 };
 
-ChatDialogFooter.displayName = 'ChatDialog.Footer';
+ChatDialogFooter.displayName = CHAT_DIALOG_FOOTER_NAME;
 
 //
 // ChatDialog

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

@@ -15,7 +15,7 @@ import { type ReferenceData } from './references';
 const meta = {
   title: 'ui/react-ui-chat/ChatEditor',
   component: ChatEditor,
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     layout: 'centered',
     translations,
@@ -24,7 +24,7 @@ const meta = {
 
 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 meta>;
 
@@ -34,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,104 +3,55 @@
 //
 
 import { type Extension } from '@codemirror/state';
-import { keymap } from '@codemirror/view';
-import { useFocusFinders } from '@fluentui/react-tabster';
-import React, { forwardRef, useImperativeHandle } from 'react';
+import React, { forwardRef, useMemo } from 'react';
 
 import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
+import { Editor, type EditorController, type UseTextEditorProps } from '@dxos/react-ui-editor';
 import {
-  type AutocompleteOptions,
   type BasicExtensionsOptions,
-  type UseTextEditorProps,
-  autocomplete,
+  type SubmitOptions,
   createBasicExtensions,
   createThemeExtensions,
-  useTextEditor,
-} from '@dxos/react-ui-editor';
-import { mx } from '@dxos/react-ui-theme';
+  submit,
+} from '@dxos/ui-editor';
 import { isTruthy } from '@dxos/util';
 
-import { type ReferencesOptions, references as referencesExtension } from './references';
+import { type ReferencesOptions } from './references';
 
-export interface ChatEditorController {
-  focus(): void;
-  getText(): string;
-  setText(text: string): void;
-}
+export interface ChatEditorController extends EditorController {}
 
 export type ChatEditorProps = ThemedClassName<
   {
     extensions?: Extension;
     references?: ReferencesOptions;
-  } & AutocompleteOptions &
+  } & (SubmitOptions &
     Pick<UseTextEditorProps, 'id' | 'autoFocus'> &
-    Pick<BasicExtensionsOptions, 'lineWrapping' | 'placeholder'>
+    Pick<BasicExtensionsOptions, 'lineWrapping' | 'placeholder'>)
 >;
 
+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],
+  );
+};
+
 export const ChatEditor = forwardRef<ChatEditorController, ChatEditorProps>(
-  (
-    { classNames, extensions, references, autoFocus, lineWrapping = false, placeholder, onSubmit, onSuggest, onCancel },
-    forwardRef,
-  ) => {
-    const { themeMode } = useThemeContext();
-    const { findNextFocusable, findPrevFocusable } = useFocusFinders();
-    const { parentRef, view } = useTextEditor(
-      () => ({
-        debug: true,
-        autoFocus,
-        extensions: [
-          createThemeExtensions({ themeMode }),
-          createBasicExtensions({ bracketMatching: false, lineWrapping, placeholder }),
-          autocomplete({ onSubmit, onSuggest, onCancel }),
-          references ? referencesExtension({ provider: references.provider }) : [],
-          // TODO(burdon): Standardize.
-          keymap.of([
-            {
-              key: 'Tab',
-              preventDefault: true,
-              run: (view) => {
-                findNextFocusable(view.dom)?.focus();
-                return true;
-              },
-            },
-            {
-              key: 'Shift-Tab',
-              preventDefault: true,
-              run: (view) => {
-                findPrevFocusable(view.dom)?.focus();
-                return true;
-              },
-            },
-          ]),
-          extensions,
-        ].filter(isTruthy),
-      }),
-      [themeMode, extensions, onSubmit, onSuggest, onCancel],
+  ({ classNames, autoFocus, extensions: extensionsProp, lineWrapping = false, placeholder, onSubmit }, forwardRef) => {
+    const extensions = useChatExtensions({ extensions: extensionsProp, lineWrapping, placeholder, onSubmit });
+
+    // TODO(burdon): Popover.
+    return (
+      <Editor.Root ref={forwardRef}>
+        <Editor.Content classNames={classNames} autoFocus={autoFocus} extensions={extensions} />
+      </Editor.Root>
     );
-
-    // Expose editor view.
-    useImperativeHandle(forwardRef, () => {
-      return {
-        focus: () => {
-          view?.focus();
-        },
-        getText: () => view?.state.doc.toString() ?? '',
-        setText: (text: string) => {
-          view?.dispatch({
-            changes: {
-              from: 0,
-              to: view.state.doc.length,
-              insert: text,
-            },
-            selection: {
-              anchor: text.length,
-              head: text.length,
-            },
-          });
-        },
-      };
-    }, [view, onSubmit]);
-
-    return <div ref={parentRef} className={mx('is-full', classNames)} />;
   },
 );

package/src/components/ChatEditor/references.ts

@@ -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/translations.ts

@@ -4,7 +4,7 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-export const translationKey = 'react-ui-chat';
+export const translationKey = '@dxos/react-ui-chat';
 
 export const translations = [
   {