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

package/src/components/EditorToolbar/lists.ts

@@ -1,59 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type EditorView } from '@codemirror/view';
-
-import { type NodeArg } from '@dxos/app-graph';
-import { type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
-
-import { createEditorAction, createEditorActionGroup, type EditorToolbarState } from './util';
-import { addList, List, removeList } from '../../extensions';
-
-const listStyles = {
-  bullet: 'ph--list-bullets--regular',
-  ordered: 'ph--list-numbers--regular',
-  task: 'ph--list-checks--regular',
-};
-
-const createListGroupAction = (value: string) =>
-  createEditorActionGroup('list', {
-    variant: 'toggleGroup',
-    selectCardinality: 'single',
-    value,
-  } as ToolbarMenuActionGroupProperties);
-
-const createListActions = (value: string, getView: () => EditorView) =>
-  Object.entries(listStyles).map(([listStyle, icon]) => {
-    const checked = value === listStyle;
-    return createEditorAction(
-      `list-${listStyle}`,
-      () => {
-        const view = getView();
-        if (!view) {
-          return;
-        }
-
-        const listType = listStyle === 'ordered' ? List.Ordered : listStyle === 'bullet' ? List.Bullet : List.Task;
-        if (checked) {
-          removeList(listType)(view);
-        } else {
-          addList(listType)(view);
-        }
-      },
-      { checked, icon },
-    );
-  });
-
-export const createLists = (state: EditorToolbarState, getView: () => EditorView) => {
-  const value = state.listStyle ?? '';
-  const listGroupAction = createListGroupAction(value);
-  const listActionsMap = createListActions(value, getView);
-  return {
-    nodes: [listGroupAction as NodeArg<any>, ...listActionsMap],
-    edges: [
-      { source: 'root', target: 'list' },
-      ...listActionsMap.map(({ id }) => ({ source: listGroupAction.id, target: id })),
-    ],
-  };
-};

package/src/components/EditorToolbar/util.ts

@@ -1,65 +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 { live, type 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, invoke: () => void, properties: Partial<MenuActionProperties>) => {
-  const { label = [`${id} label`, { ns: translationKey }], ...rest } = properties;
-  return createMenuAction(id, invoke, { label, ...rest }) as Action<MenuActionProperties>;
-};
-
-export const createEditorActionGroup = (
-  id: string,
-  props: Omit<ToolbarMenuActionGroupProperties, 'icon'>,
-  icon?: string,
-) => createMenuItemGroup(id, { icon, iconOnly: true, ...props });

package/src/components/Popover/CommandMenu.tsx

@@ -1,279 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type EditorView } from '@codemirror/view';
-import React, { useCallback, useEffect, useRef } from 'react';
-
-import { Icon, type Label, Popover, toLocalizedString, useThemeContext, useTranslation } from '@dxos/react-ui';
-import { type MaybePromise } from '@dxos/util';
-
-import { commandRangeEffect } from '../../extensions';
-
-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 = {
-  groups: CommandMenuGroup[];
-  currentItem?: string;
-  onSelect: (item: CommandMenuItem) => void;
-};
-
-// NOTE: Not using DropdownMenu because the command menu needs to manage focus explicitly.
-export const CommandMenu = ({ groups, currentItem, onSelect }: CommandMenuProps) => {
-  const { tx } = useThemeContext();
-  const groupsWithItems = groups.filter((group) => group.items.length > 0);
-  return (
-    <Popover.Portal>
-      <Popover.Content
-        align='start'
-        onOpenAutoFocus={(event) => event.preventDefault()}
-        classNames={tx('menu.content', 'menu--exotic-unfocusable', { elevation: 'positioned' }, [
-          'max-h-[300px] overflow-y-auto',
-        ])}
-      >
-        <Popover.Viewport classNames={tx('menu.viewport', 'menu__viewport--exotic-unfocusable', {})}>
-          <ul>
-            {groupsWithItems.map((group, index) => (
-              <React.Fragment key={group.id}>
-                <CommandGroup group={group} currentItem={currentItem} onSelect={onSelect} />
-                {index < groupsWithItems.length - 1 && <div className={tx('menu.separator', 'menu__item', {})} />}
-              </React.Fragment>
-            ))}
-          </ul>
-        </Popover.Viewport>
-      </Popover.Content>
-    </Popover.Portal>
-  );
-};
-
-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/Popover/RefDropdownMenu.tsx

@@ -1,85 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { createContext } from '@radix-ui/react-context';
-import React, { type PropsWithChildren, useRef, useState, useEffect, useCallback, type RefObject } from 'react';
-
-import { addEventListener } from '@dxos/async';
-import { type DxRefTag, type DxRefTagActivate } from '@dxos/lit-ui';
-import { DropdownMenu } from '@dxos/react-ui';
-
-import { type PreviewLinkRef, type PreviewLinkTarget, type PreviewLookup } from '../../extensions';
-
-// TODO(burdon): Reconcile this file with RefPopover?
-
-const customEventOptions = { capture: true, passive: false };
-
-// Create a context for the dxn value.
-type RefDropdownMenuValue = Partial<{
-  link: PreviewLinkRef;
-  target: PreviewLinkTarget;
-  pending: boolean;
-}>;
-
-const REF_DROPDOWN_MENU = 'RefDropdownMenu';
-const [RefDropdownMenuContextProvider, useRefDropdownMenu] = createContext<RefDropdownMenuValue>(REF_DROPDOWN_MENU, {});
-
-type RefDropdownMenuProviderProps = PropsWithChildren<{
-  onLookup?: PreviewLookup;
-}>;
-
-const RefDropdownMenuProvider = ({ children, onLookup }: RefDropdownMenuProviderProps) => {
-  const trigger = useRef<DxRefTag | null>(null);
-  const [value, setValue] = useState<RefDropdownMenuValue>({});
-  const [rootRef, setRootRef] = useState<HTMLDivElement | null>(null);
-  const [open, setOpen] = useState(false);
-
-  const handleDxRefTagActivate = useCallback(
-    (event: DxRefTagActivate) => {
-      const { refId, label, trigger: dxTrigger } = event;
-      setValue((value) => ({
-        ...value,
-        link: { label, ref: refId },
-        pending: true,
-      }));
-      trigger.current = dxTrigger;
-      queueMicrotask(() => setOpen(true));
-      void onLookup?.({ label, ref: refId }).then((target) =>
-        setValue((value) => ({
-          ...value,
-          target: target ?? undefined,
-          pending: false,
-        })),
-      );
-    },
-    [onLookup],
-  );
-
-  useEffect(() => {
-    if (!rootRef) {
-      return;
-    }
-
-    return addEventListener(rootRef, 'dx-ref-tag-activate' as any, handleDxRefTagActivate, customEventOptions);
-  }, [rootRef]);
-
-  return (
-    <RefDropdownMenuContextProvider pending={value.pending} link={value.link} target={value.target}>
-      <DropdownMenu.Root open={open} onOpenChange={setOpen}>
-        <DropdownMenu.VirtualTrigger virtualRef={trigger as unknown as RefObject<HTMLButtonElement>} />
-        <div role='none' className='contents' ref={setRootRef}>
-          {children}
-        </div>
-      </DropdownMenu.Root>
-    </RefDropdownMenuContextProvider>
-  );
-};
-
-export const RefDropdownMenu = {
-  Provider: RefDropdownMenuProvider,
-};
-
-export { useRefDropdownMenu };
-
-export type { RefDropdownMenuProviderProps, RefDropdownMenuValue };

package/src/components/Popover/RefPopover.tsx

@@ -1,99 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { createContext } from '@radix-ui/react-context';
-import React, {
-  type PropsWithChildren,
-  useRef,
-  useState,
-  useEffect,
-  useCallback,
-  type RefObject,
-  forwardRef,
-} from 'react';
-
-import { addEventListener } from '@dxos/async';
-import { type DxRefTag, type DxRefTagActivate } from '@dxos/lit-ui';
-import { Popover } from '@dxos/react-ui';
-
-import { type PreviewLinkRef, type PreviewLinkTarget, type PreviewLookup } from '../../extensions';
-
-const customEventOptions = { capture: true, passive: false };
-
-export type RefPopoverProps = PropsWithChildren<{
-  modal?: boolean;
-  open?: boolean;
-  onOpenChange?: (open: boolean) => void;
-  onActivate?: (event: DxRefTagActivate) => void;
-}>;
-
-export const RefPopover = forwardRef<DxRefTag | null, RefPopoverProps>(
-  ({ children, open, onOpenChange, modal, onActivate }, ref) => {
-    const [rootRef, setRootRef] = useState<HTMLDivElement | null>(null);
-
-    useEffect(() => {
-      if (!rootRef || !onActivate) {
-        return;
-      }
-
-      return addEventListener(rootRef, 'dx-ref-tag-activate' as any, onActivate, customEventOptions);
-    }, [rootRef, onActivate]);
-
-    return (
-      <Popover.Root open={open} onOpenChange={onOpenChange} modal={modal}>
-        <Popover.VirtualTrigger virtualRef={ref as unknown as RefObject<HTMLButtonElement>} />
-        <div role='none' className='contents' ref={setRootRef}>
-          {children}
-        </div>
-      </Popover.Root>
-    );
-  },
-);
-
-// Create a context for the dxn value.
-type RefPopoverValue = Partial<{ link: PreviewLinkRef; target: PreviewLinkTarget; pending: boolean }>;
-
-const REF_POPOVER = 'RefPopover';
-const [RefPopoverContextProvider, useRefPopover] = createContext<RefPopoverValue>(REF_POPOVER, {});
-
-type PreviewProviderProps = PropsWithChildren<{ onLookup?: PreviewLookup }>;
-
-const PreviewProvider = ({ children, onLookup }: PreviewProviderProps) => {
-  const trigger = useRef<DxRefTag | null>(null);
-  const [value, setValue] = useState<RefPopoverValue>({});
-  const [open, setOpen] = useState(false);
-
-  const handleDxRefTagActivate = useCallback(
-    (event: DxRefTagActivate) => {
-      const { refId, label, trigger: dxTrigger } = event;
-      setValue((value) => ({
-        ...value,
-        link: { label, ref: refId },
-        pending: true,
-      }));
-      trigger.current = dxTrigger;
-      queueMicrotask(() => setOpen(true));
-      void onLookup?.({ label, ref: refId }).then((target) =>
-        setValue((value) => ({
-          ...value,
-          target: target ?? undefined,
-          pending: false,
-        })),
-      );
-    },
-    [onLookup],
-  );
-
-  return (
-    <RefPopoverContextProvider pending={value.pending} link={value.link} target={value.target}>
-      <RefPopover ref={trigger} open={open} onOpenChange={setOpen} onActivate={handleDxRefTagActivate}>
-        {children}
-      </RefPopover>
-    </RefPopoverContextProvider>
-  );
-};
-
-export { PreviewProvider, useRefPopover };
-
-export type { PreviewProviderProps, RefPopoverValue };

package/src/components/Popover/index.ts

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

package/src/extensions/autocomplete.ts

@@ -1,69 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import {
-  autocompletion,
-  completionKeymap,
-  type CompletionSource,
-  type Completion,
-  type CompletionContext,
-  type CompletionResult,
-} from '@codemirror/autocomplete';
-import { markdownLanguage } from '@codemirror/lang-markdown';
-import { type Extension } from '@codemirror/state';
-import { keymap } from '@codemirror/view';
-
-export type AutocompleteResult = Completion;
-
-export type AutocompleteOptions = {
-  activateOnTyping?: boolean;
-  override?: CompletionSource[];
-  onSearch?: (text: string) => Completion[];
-};
-
-// https://codemirror.net/examples/autocompletion
-// https://codemirror.net/docs/ref/#autocomplete.autocompletion
-// https://codemirror.net/docs/ref/#autocomplete.Completion
-
-/**
- * Autocomplete extension.
- */
-export const autocomplete = ({ activateOnTyping, override, onSearch }: AutocompleteOptions = {}): Extension => {
-  const extensions: Extension[] = [
-    // https://codemirror.net/docs/ref/#view.keymap
-    // https://discuss.codemirror.net/t/how-can-i-replace-the-default-autocompletion-keymap-v6/3322
-    // TODO(burdon): Set custom keymap.
-    keymap.of(completionKeymap),
-
-    // https://codemirror.net/examples/autocompletion
-    // https://codemirror.net/docs/ref/#autocomplete.autocompletion
-    autocompletion({
-      override,
-      activateOnTyping,
-      // closeOnBlur: false,
-      // tooltipClass: () => 'rounded-be pbe-1 border-separator',
-    }),
-  ];
-
-  if (onSearch) {
-    extensions.push(
-      // TODO(burdon): Optional decoration via addToOptions.
-      markdownLanguage.data.of({
-        autocomplete: (context: CompletionContext): CompletionResult | null => {
-          const match = context.matchBefore(/\w*/);
-          if (!match || (match.from === match.to && !context.explicit)) {
-            return null;
-          }
-
-          return {
-            from: match.from,
-            options: onSearch(match.text.toLowerCase()),
-          };
-        },
-      }),
-    );
-  }
-
-  return extensions;
-};