@dxos/react-ui-editor 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/src/components/CommandMenu/CommandMenu.tsx

@@ -1,348 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type EditorView } from '@codemirror/view';
-import { useControllableState } from '@radix-ui/react-use-controllable-state';
-import React, { Fragment, type PropsWithChildren, useCallback, useEffect, useRef, useState } from 'react';
-
-import { addEventListener } from '@dxos/async';
-import {
-  type DxAnchorActivate,
-  Icon,
-  type Label,
-  Popover,
-  toLocalizedString,
-  useThemeContext,
-  useTranslation,
-} from '@dxos/react-ui';
-import { type MaybePromise } from '@dxos/util';
-
-import { commandRangeEffect } from '../../extensions';
-
-// TODO(burdon): Rename ComboBox (and factor out to separate package).
-
-export type CommandMenuGroup = {
-  id: string;
-  label?: Label;
-  items: CommandMenuItem[];
-};
-
-export type CommandMenuItem = {
-  id: string;
-  label: Label;
-  icon?: string;
-  onSelect?: (view: EditorView, head: number) => MaybePromise<void>;
-};
-
-export type CommandMenuProps = PropsWithChildren<{
-  groups: CommandMenuGroup[];
-  onSelect: (item: CommandMenuItem) => void;
-  onActivate?: (event: DxAnchorActivate) => void;
-  currentItem?: string;
-  open?: boolean;
-  onOpenChange?: (nextOpen: boolean) => void;
-  defaultOpen?: boolean;
-}>;
-
-// NOTE: Not using DropdownMenu because the command menu needs to manage focus explicitly.
-export const CommandMenuProvider = ({
-  groups,
-  onSelect,
-  onActivate,
-  currentItem,
-  children,
-  open: propsOpen,
-  onOpenChange,
-  defaultOpen,
-}: CommandMenuProps) => {
-  const { tx } = useThemeContext();
-  const groupsWithItems = groups.filter((group) => group.items.length > 0);
-  const trigger = useRef<HTMLButtonElement | null>(null);
-
-  const [open, setOpen] = useControllableState({
-    prop: propsOpen,
-    onChange: onOpenChange,
-    defaultProp: defaultOpen,
-  });
-
-  const handleDxAnchorActivate = useCallback(
-    (event: DxAnchorActivate) => {
-      const { trigger: dxTrigger, refId } = event;
-      // If this has a `refId`, then it’s probably a URL or DXN and out of scope for this component.
-      if (!refId) {
-        trigger.current = dxTrigger as HTMLButtonElement;
-        if (onActivate) {
-          onActivate(event);
-        } else {
-          queueMicrotask(() => setOpen(true));
-        }
-      }
-    },
-    [onActivate],
-  );
-
-  const [rootRef, setRootRef] = useState<HTMLDivElement | null>(null);
-
-  useEffect(() => {
-    if (!rootRef || !handleDxAnchorActivate) {
-      return;
-    }
-
-    return addEventListener(rootRef, 'dx-anchor-activate' as any, handleDxAnchorActivate, {
-      capture: true,
-      passive: false,
-    });
-  }, [rootRef, handleDxAnchorActivate]);
-
-  return (
-    <Popover.Root modal={false} open={open} onOpenChange={setOpen}>
-      <Popover.Portal>
-        <Popover.Content
-          align='start'
-          onOpenAutoFocus={(event) => event.preventDefault()}
-          classNames={tx('menu.content', 'menu--exotic-unfocusable', { elevation: 'positioned' }, [
-            'max-bs-80 overflow-y-auto',
-          ])}
-        >
-          <Popover.Viewport classNames={tx('menu.viewport', 'menu__viewport--exotic-unfocusable', {})}>
-            <ul>
-              {groupsWithItems.map((group, index) => (
-                <Fragment key={group.id}>
-                  <CommandGroup group={group} currentItem={currentItem} onSelect={onSelect} />
-                  {index < groupsWithItems.length - 1 && <div className={tx('menu.separator', 'menu__item', {})} />}
-                </Fragment>
-              ))}
-            </ul>
-          </Popover.Viewport>
-          <Popover.Arrow />
-        </Popover.Content>
-      </Popover.Portal>
-      <Popover.VirtualTrigger virtualRef={trigger} />
-      <div role='none' className='contents' ref={setRootRef}>
-        {children}
-      </div>
-    </Popover.Root>
-  );
-};
-
-const CommandGroup = ({
-  group,
-  currentItem,
-  onSelect,
-}: {
-  group: CommandMenuGroup;
-  currentItem?: string;
-  onSelect: (item: CommandMenuItem) => void;
-}) => {
-  const { tx } = useThemeContext();
-  const { t } = useTranslation();
-  return (
-    <>
-      {group.label && (
-        <div className={tx('menu.groupLabel', 'menu__group__label', {})}>
-          <span>{toLocalizedString(group.label, t)}</span>
-        </div>
-      )}
-      {group.items.map((item) => (
-        <CommandItem key={item.id} item={item} current={currentItem === item.id} onSelect={onSelect} />
-      ))}
-    </>
-  );
-};
-
-const CommandItem = ({
-  item,
-  current,
-  onSelect,
-}: {
-  item: CommandMenuItem;
-  current: boolean;
-  onSelect: (item: CommandMenuItem) => void;
-}) => {
-  const ref = useRef<HTMLLIElement>(null);
-  const { tx } = useThemeContext();
-  const { t } = useTranslation();
-  const handleSelect = useCallback(() => onSelect(item), [item, onSelect]);
-
-  useEffect(() => {
-    if (current && ref.current) {
-      ref.current.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
-    }
-  }, [current]);
-
-  return (
-    <li
-      ref={ref}
-      className={tx('menu.item', 'menu__item--exotic-unfocusable', {}, [current && 'bg-hoverSurface'])}
-      onClick={handleSelect}
-    >
-      {item.icon && <Icon icon={item.icon} size={5} />}
-      <span className='grow truncate'>{toLocalizedString(item.label, t)}</span>
-    </li>
-  );
-};
-
-// TODO(wittjosiah): Factor out into a separate file.
-
-//
-// Helpers
-//
-
-export const getItem = (groups: CommandMenuGroup[], id?: string): CommandMenuItem | undefined => {
-  return groups.flatMap((group) => group.items).find((item) => item.id === id);
-};
-
-export const getNextItem = (groups: CommandMenuGroup[], id?: string): CommandMenuItem => {
-  const items = groups.flatMap((group) => group.items);
-  const index = items.findIndex((item) => item.id === id);
-  return items[(index + 1) % items.length];
-};
-
-export const getPreviousItem = (groups: CommandMenuGroup[], id?: string): CommandMenuItem => {
-  const items = groups.flatMap((group) => group.items);
-  const index = items.findIndex((item) => item.id === id);
-  return items[(index - 1 + items.length) % items.length];
-};
-
-export const filterItems = (
-  groups: CommandMenuGroup[],
-  filter: (item: CommandMenuItem) => boolean,
-): CommandMenuGroup[] => {
-  return groups.map((group) => ({
-    ...group,
-    items: group.items.filter(filter),
-  }));
-};
-
-export const insertAtCursor = (view: EditorView, head: number, insert: string) => {
-  view.dispatch({
-    changes: { from: head, to: head, insert },
-    selection: { anchor: head + insert.length, head: head + insert.length },
-  });
-};
-
-/**
- * If the cursor is at the start of a line, insert the text at the cursor.
- * Otherwise, insert the text on a new line.
- */
-export const insertAtLineStart = (view: EditorView, head: number, insert: string) => {
-  const line = view.state.doc.lineAt(head);
-  if (line.from === head) {
-    insertAtCursor(view, head, insert);
-  } else {
-    insert = '\n' + insert;
-    view.dispatch({
-      changes: { from: line.to, to: line.to, insert },
-      selection: { anchor: line.to + insert.length, head: line.to + insert.length },
-    });
-  }
-};
-
-export const coreSlashCommands: CommandMenuGroup = {
-  id: 'markdown',
-  label: 'Markdown',
-  items: [
-    {
-      id: 'heading-1',
-      label: 'Heading 1',
-      icon: 'ph--text-h-one--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '# '),
-    },
-    {
-      id: 'heading-2',
-      label: 'Heading 2',
-      icon: 'ph--text-h-two--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '## '),
-    },
-    {
-      id: 'heading-3',
-      label: 'Heading 3',
-      icon: 'ph--text-h-three--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '### '),
-    },
-    {
-      id: 'heading-4',
-      label: 'Heading 4',
-      icon: 'ph--text-h-four--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '#### '),
-    },
-    {
-      id: 'heading-5',
-      label: 'Heading 5',
-      icon: 'ph--text-h-five--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '##### '),
-    },
-    {
-      id: 'heading-6',
-      label: 'Heading 6',
-      icon: 'ph--text-h-six--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '###### '),
-    },
-    {
-      id: 'bullet-list',
-      label: 'Bullet List',
-      icon: 'ph--list-bullets--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '- '),
-    },
-    {
-      id: 'numbered-list',
-      label: 'Numbered List',
-      icon: 'ph--list-numbers--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '1. '),
-    },
-    {
-      id: 'task-list',
-      label: 'Task List',
-      icon: 'ph--list-checks--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '- [ ] '),
-    },
-    {
-      id: 'quote',
-      label: 'Quote',
-      icon: 'ph--quotes--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '> '),
-    },
-    {
-      id: 'code-block',
-      label: 'Code Block',
-      icon: 'ph--code-block--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '```\n\n```'),
-    },
-    {
-      id: 'table',
-      label: 'Table',
-      icon: 'ph--table--regular',
-      onSelect: (view, head) => insertAtLineStart(view, head, '| | | |\n|---|---|---|\n| | | |'),
-    },
-  ],
-};
-
-export const linkSlashCommands: CommandMenuGroup = {
-  id: 'link',
-  label: 'Link',
-  items: [
-    {
-      id: 'inline-link',
-      label: 'Inline link',
-      icon: 'ph--link--regular',
-      onSelect: (view, head) =>
-        view.dispatch({
-          changes: { from: head, insert: '@' },
-          selection: { anchor: head + 1, head: head + 1 },
-          effects: commandRangeEffect.of({ trigger: '@', range: { from: head, to: head + 1 } }),
-        }),
-    },
-    {
-      id: 'block-embed',
-      label: 'Block embed',
-      icon: 'ph--lego--regular',
-      onSelect: (view, head) =>
-        view.dispatch({
-          changes: { from: head, insert: '@@' },
-          selection: { anchor: head + 2, head: head + 2 },
-          effects: commandRangeEffect.of({ trigger: '@', range: { from: head, to: head + 2 } }),
-        }),
-    },
-  ],
-};

package/src/components/CommandMenu/index.ts

@@ -1,5 +0,0 @@
-//
-// Copyright 2022 DXOS.org
-//
-
-export * from './CommandMenu';

package/src/components/EditorToolbar/util.ts

@@ -1,76 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type EditorView } from '@codemirror/view';
-import { type Rx } from '@effect-rx/rx-react';
-import { useMemo } from 'react';
-
-import { type Action } from '@dxos/app-graph';
-import { type Live, live } from '@dxos/live-object';
-import { type ThemedClassName } from '@dxos/react-ui';
-import {
-  type ActionGraphProps,
-  type MenuActionProperties,
-  type MenuItemGroup,
-  type MenuSeparator,
-  type ToolbarMenuActionGroupProperties,
-  createMenuAction,
-  createMenuItemGroup,
-} from '@dxos/react-ui-menu';
-
-import type { EditorAction, Formatting } from '../../extensions';
-import { translationKey } from '../../translations';
-import { type EditorViewMode } from '../../types';
-
-export type EditorToolbarState = Formatting & Partial<{ viewMode: EditorViewMode }>;
-
-export const useEditorToolbarState = (initialState: Partial<EditorToolbarState> = {}) => {
-  return useMemo(() => live<EditorToolbarState>(initialState), []);
-};
-
-export type EditorToolbarFeatureFlags = Partial<{
-  headings: boolean;
-  formatting: boolean;
-  lists: boolean;
-  blocks: boolean;
-  search: boolean;
-  // TODO(wittjosiah): Factor out. Depend on plugin-level capabilities.
-  image: () => void;
-  viewMode: (mode: EditorViewMode) => void;
-}>;
-
-export type EditorToolbarActionGraphProps = {
-  state: Live<EditorToolbarState>;
-  getView: () => EditorView;
-  // TODO(wittjosiah): Control positioning.
-  customActions?: Rx.Rx<ActionGraphProps>;
-};
-
-export type EditorToolbarProps = ThemedClassName<
-  EditorToolbarActionGraphProps & EditorToolbarFeatureFlags & { attendableId?: string; role?: string }
->;
-
-export type EditorToolbarItem = EditorAction | MenuItemGroup | MenuSeparator;
-
-export const createEditorAction = (id: string, props: Partial<MenuActionProperties>, invoke: () => void) => {
-  const { label = [`${id} label`, { ns: translationKey }], ...rest } = props;
-  return createMenuAction(id, invoke, {
-    label,
-    ...rest,
-  }) as Action<MenuActionProperties>;
-};
-
-export const createEditorActionGroup = (
-  id: string,
-  props: Omit<ToolbarMenuActionGroupProperties, 'icon'>,
-  icon?: string,
-) => {
-  const { label = [`${id} label`, { ns: translationKey }], ...rest } = props;
-  return createMenuItemGroup(id, {
-    label,
-    icon,
-    iconOnly: true,
-    ...rest,
-  });
-};

package/src/defaults.ts

@@ -1,52 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { EditorView } from '@codemirror/view';
-
-import { mx } from '@dxos/react-ui-theme';
-
-import { type ThemeExtensionsOptions } from './extensions';
-import { fontMono } from './styles';
-
-/**
- * CodeMirror content width.
- * 40rem = 640px. Corresponds to initial plank width (Google docs, Stashpad, etc.)
- * 50rem = 800px. Maximum content width for solo mode.
- * NOTE: Max width - 4rem = 2rem left/right margin (or 2rem gutter plus 1rem left/right margin).
- */
-export const editorWidth = '!mli-auto is-full max-is-[min(50rem,100%-4rem)]';
-
-export const editorSlots: ThemeExtensionsOptions['slots'] = {
-  scroll: {
-    className: 'pbs-2',
-  },
-  content: {
-    className: editorWidth,
-  },
-};
-
-export const editorGutter = EditorView.theme({
-  '.cm-gutters': {
-    // NOTE: Color required to cover content if scrolling horizontally.
-    // TODO(burdon): Non-transparent background clips the focus ring.
-    background: 'var(--dx-baseSurface) !important',
-    paddingRight: '1rem',
-  },
-});
-
-export const editorMonospace = EditorView.theme({
-  '.cm-content': {
-    fontFamily: fontMono,
-  },
-});
-
-export const editorWithToolbarLayout =
-  'grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden';
-
-// NOTE: Padding is added to the editor to account for the focus ring (since otherwise the CM gutter will clip it)
-export const stackItemContentEditorClassNames = (role?: string) =>
-  mx(
-    'p-0.5 dx-focus-ring-inset attention-surface data-[toolbar=disabled]:pbs-2',
-    role === 'section' ? '[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-bs-24' : 'min-bs-0',
-  );

package/src/extensions/annotations.ts

@@ -1,55 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type Extension, RangeSetBuilder } from '@codemirror/state';
-import { Decoration, type DecorationSet, EditorView, ViewPlugin, type ViewUpdate } from '@codemirror/view';
-
-const annotationMark = Decoration.mark({ class: 'cm-annotation' });
-
-export type AnnotationOptions = {
-  match?: RegExp; // TODO(burdon): Update via hook (e.g., for search).
-};
-
-/**
- *
- */
-export const annotations = ({ match }: AnnotationOptions = {}): Extension => {
-  return [
-    ViewPlugin.fromClass(
-      class {
-        decorations: DecorationSet = Decoration.none;
-        update(update: ViewUpdate) {
-          const builder = new RangeSetBuilder<Decoration>();
-          if (match) {
-            // Only process visible lines.
-            const { from, to } = update.view.viewport;
-            const text = update.state.doc.sliceString(from, to);
-            const matches = text.matchAll(match);
-            for (const m of matches) {
-              if (m.index !== undefined) {
-                // Adjust match position relative to viewport.
-                const start = from + m.index;
-                const end = start + m[0].length;
-                builder.add(start, end, annotationMark);
-              }
-            }
-          }
-
-          this.decorations = builder.finish();
-        }
-      },
-      {
-        decorations: (v) => v.decorations,
-      },
-    ),
-
-    EditorView.theme({
-      '.cm-annotation': {
-        textDecoration: 'underline',
-        textDecorationStyle: 'wavy',
-        textDecorationColor: 'var(--dx-errorText)',
-      },
-    }),
-  ];
-};