@dxos/react-ui-editor 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/src/hooks/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './useActionHandler';
 export * from './useTextEditor';

package/src/stories/TextEditorBasic.stories.tsx

@@ -38,6 +38,7 @@ import {
   table,
   autocomplete,
   mention,
+  outliner,
 } from '../extensions';
 
 const meta: Meta<typeof DefaultStory> = {
@@ -188,20 +189,63 @@ export const Lists = {
   ),
 };
 
+//
+// Bullet List
+//
+
 export const BulletList = {
   render: () => <DefaultStory text={str(content.bullets, content.footer)} extensions={[decorateMarkdown()]} />,
 };
 
+//
+// Ordered List
+//
+
 export const OrderedList = {
   render: () => <DefaultStory text={str(content.numbered, content.footer)} extensions={[decorateMarkdown()]} />,
 };
 
+//
+// Task List
+//
+
 export const TaskList = {
   render: () => (
     <DefaultStory text={str(content.tasks, content.footer)} extensions={[decorateMarkdown()]} debug='raw+tree' />
   ),
 };
 
+//
+// Outliner
+//
+
+export const Outliner = {
+  render: () => (
+    <DefaultStory
+      // text={str(...content.tasks.split('\n').filter((line) => line.trim().startsWith('-')))}
+      text={str(
+        //
+        '- [ ] A',
+        '- [ ] B',
+        // Continuation lines.
+        '  ## Example',
+        '  Continuation line belonging to B.',
+        '  ```ts',
+        '  const x = 100',
+        '  ```',
+        '  - [ ] C',
+        '    - D Items can have links [like this](https://example.com).',
+      )}
+      extensions={[decorateMarkdown({ listPaddingLeft: 8 }), outliner()]}
+      debug='raw+tree'
+    />
+  ),
+};
+
+//
+// Table
+//
+
 export const Table = {
   render: () => <DefaultStory text={str(content.table, content.footer)} extensions={[decorateMarkdown(), table()]} />,
 };

package/src/stories/story-utils.tsx

@@ -17,21 +17,19 @@ import { mx } from '@dxos/react-ui-theme';
 
 import { editorContent, editorGutter } from '../defaults';
 import {
-  type EditorSelectionState,
   type DebugNode,
-  decorateMarkdown,
-  formattingKeymap,
-  linkTooltip,
-  image,
-  table,
-  folding,
-} from '../extensions';
-import {
+  type EditorSelectionState,
   createDataExtensions,
   createBasicExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
+  decorateMarkdown,
   debugTree,
+  folding,
+  formattingKeymap,
+  image,
+  linkTooltip,
+  table,
 } from '../extensions';
 import { useTextEditor, type UseTextEditorProps } from '../hooks';
 import { createRenderer } from '../util';

package/src/styles/theme.ts

@@ -119,6 +119,9 @@ export const defaultTheme: ThemeStyles = {
   '.cm-selectionBackground': {
     background: 'var(--dx-cmSelection)',
   },
+  '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground': {
+    background: 'var(--dx-cmFocusedSelection)',
+  },
 
   /**
    * Search.

package/dist/types/src/hooks/useActionHandler.d.ts

@@ -1,4 +0,0 @@
-import { type EditorView } from '@codemirror/view';
-import { type EditorAction } from '../extensions';
-export declare const useActionHandler: (view?: EditorView | null) => (action: EditorAction) => void | null | undefined;
-//# sourceMappingURL=useActionHandler.d.ts.map

package/dist/types/src/hooks/useActionHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActionHandler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useActionHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,eAAe,CAAC;AAExE,eAAO,MAAM,gBAAgB,UAAW,UAAU,GAAG,IAAI,cAC3B,YAAY,4BACzC,CAAC"}

package/dist/types/src/stories/InputMode.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"InputMode.stories.d.ts","sourceRoot":"","sources":["../../../../src/stories/InputMode.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAmB,MAAM,OAAO,CAAC;AAiBxC,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAGpF,KAAK,UAAU,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,kBAAkB,CAAC;AAqEpF,eAAO,MAAM,OAAO;;CAanB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;CAMpB,CAAC;;;iEAxFwE,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0FpF,wBAKE"}

package/src/hooks/useActionHandler.ts

@@ -1,12 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type EditorView } from '@codemirror/view';
-import { useCallback } from 'react';
-
-import { type EditorAction, processEditorPayload } from '../extensions';
-
-export const useActionHandler = (view?: EditorView | null) => {
-  return useCallback((action: EditorAction) => view && processEditorPayload(view, action.properties), [view]);
-};

package/src/stories/InputMode.stories.tsx

@@ -1,124 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import '@dxos-theme';
-
-import React, { useState } from 'react';
-
-import { Toolbar as NaturalToolbar, Select, useThemeContext } from '@dxos/react-ui';
-import { attentionSurface, mx } from '@dxos/react-ui-theme';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
-
-import { EditorToolbar, useEditorToolbarState } from '../components';
-import {
-  type EditorInputMode,
-  decorateMarkdown,
-  createMarkdownExtensions,
-  formattingKeymap,
-  useFormattingState,
-  createBasicExtensions,
-  createThemeExtensions,
-  InputModeExtensions,
-} from '../extensions';
-import { useActionHandler, useTextEditor, type UseTextEditorProps } from '../hooks';
-import translations from '../translations';
-
-type StoryProps = { placeholder?: string; readOnly?: boolean } & UseTextEditorProps;
-
-const DefaultStory = ({ autoFocus, initialValue, placeholder, readOnly }: StoryProps) => {
-  const { themeMode } = useThemeContext();
-  const toolbarState = useEditorToolbarState({ viewMode: 'source' });
-  const trackFormatting = useFormattingState(toolbarState);
-  const [editorInputMode, _setEditorInputMode] = useState<EditorInputMode>('default');
-  const { parentRef, view } = useTextEditor(
-    () => ({
-      autoFocus,
-      initialValue,
-      moveToEndOfLine: true,
-      extensions: [
-        editorInputMode ? InputModeExtensions[editorInputMode] : [],
-        createBasicExtensions({ placeholder, lineWrapping: true, readOnly }),
-        createMarkdownExtensions({ themeMode }),
-        createThemeExtensions({ themeMode, syntaxHighlighting: true }),
-        decorateMarkdown(),
-        formattingKeymap(),
-        trackFormatting,
-      ],
-    }),
-    [editorInputMode, themeMode, placeholder, readOnly],
-  );
-
-  const handleAction = useActionHandler(view);
-
-  // TODO(marijn): This doesn't update the state on view changes.
-  //  Also not sure if view is even guaranteed to exist at this point.
-  return (
-    <div role='none' className={mx('fixed inset-0 flex flex-col')}>
-      {toolbarState && <EditorToolbar onAction={handleAction} state={toolbarState} />}
-      <div role='none' className='grow overflow-hidden'>
-        <div className={attentionSurface} ref={parentRef} />
-      </div>
-    </div>
-  );
-};
-
-const _EditorInputModeToolbar = ({
-  editorInputMode,
-  setEditorInputMode,
-}: {
-  editorInputMode: EditorInputMode;
-  setEditorInputMode: (mode: EditorInputMode) => void;
-}) => {
-  return (
-    <Select.Root value={editorInputMode} onValueChange={(value) => setEditorInputMode(value as EditorInputMode)}>
-      <NaturalToolbar.Button asChild>
-        <Select.TriggerButton variant='ghost'>{editorInputMode}</Select.TriggerButton>
-      </NaturalToolbar.Button>
-      <Select.Portal>
-        <Select.Content>
-          <Select.ScrollUpButton />
-          <Select.Viewport>
-            {['default', 'vim'].map((mode) => (
-              <Select.Option key={mode} value={mode}>
-                {mode}
-              </Select.Option>
-            ))}
-          </Select.Viewport>
-          <Select.ScrollDownButton />
-          <Select.Arrow />
-        </Select.Content>
-      </Select.Portal>
-    </Select.Root>
-  );
-};
-
-export const Default = {
-  render: () => {
-    const { themeMode } = useThemeContext();
-    const { parentRef } = useTextEditor({
-      extensions: [
-        //
-        createBasicExtensions({ placeholder: 'Enter text...' }),
-        createThemeExtensions({ themeMode }),
-      ],
-    });
-
-    return <div ref={parentRef} className={attentionSurface} />;
-  },
-};
-
-export const Markdown = {
-  args: {
-    autoFocus: true,
-    placeholder: 'Text...',
-    initialValue: '# Demo\n\nThis is a document.\n\n',
-  },
-};
-
-export default {
-  title: 'ui/react-ui-editor/InputMode',
-  render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true, tooltips: true })],
-  parameters: { translations, layout: 'fullscreen' },
-};