@dxos/react-ui-editor 0.3.11-main.5cbcf4e → 0.3.11-main.5e05862

package/src/hooks/useActionHandler.ts

@@ -7,13 +7,22 @@ import type { EditorView } from '@codemirror/view';
 import type { ToolbarProps } from '../components';
 import {
   createComment,
-  insertCodeblock,
   insertTable,
   setHeading,
-  toggleBold,
-  toggleItalic,
+  setStyle,
+  toggleStyle,
+  addLink,
+  removeLink,
+  Inline,
+  List,
+  addList,
+  removeList,
   toggleList,
-  toggleStrikethrough,
+  addBlockquote,
+  removeBlockquote,
+  addCodeblock,
+  removeCodeblock,
+  toggleBlockquote,
 } from '../extensions';
 
 export const useActionHandler = (view?: EditorView | null): ToolbarProps['onAction'] => {
@@ -22,28 +31,51 @@ export const useActionHandler = (view?: EditorView | null): ToolbarProps['onActi
       return;
     }
 
+    let inlineType, listType;
     switch (action.type) {
       case 'heading':
         setHeading(parseInt(action.data))(view);
         break;
 
-      case 'bold':
-        toggleBold(view);
+      case 'strong':
+      case 'emphasis':
+      case 'strikethrough':
+      case 'code':
+        inlineType =
+          action.type === 'strong'
+            ? Inline.Strong
+            : action.type === 'emphasis'
+              ? Inline.Emphasis
+              : action.type === 'strikethrough'
+                ? Inline.Strikethrough
+                : Inline.Code;
+        (typeof action.data === 'boolean' ? setStyle(inlineType, action.data) : toggleStyle(inlineType))(view);
         break;
-      case 'italic':
-        toggleItalic(view);
+
+      case 'link':
+        (action.data === false ? removeLink : addLink)(view);
         break;
-      case 'strikethrough':
-        toggleStrikethrough(view);
+
+      case 'list-ordered':
+      case 'list-bullet':
+      case 'list-tasks':
+        listType =
+          action.type === 'list-ordered' ? List.Ordered : action.type === 'list-bullet' ? List.Bullet : List.Task;
+        (action.data === false
+          ? removeList(listType)
+          : action.data === true
+            ? addList(listType)
+            : toggleList(listType))(view);
         break;
 
-      case 'list':
-        toggleList(view);
+      case 'blockquote':
+        (action.data === false ? removeBlockquote : action.data === true ? addBlockquote : toggleBlockquote)(view);
         break;
 
       case 'codeblock':
-        insertCodeblock(view);
+        (action.data === false ? removeCodeblock : addCodeblock)(view);
         break;
+
       case 'table':
         insertTable(view);
         break;
@@ -55,8 +87,9 @@ export const useActionHandler = (view?: EditorView | null): ToolbarProps['onActi
 
     // TODO(burdon): Hack otherwise remains on heading selector.
     setTimeout(() => {
-      view.focus();
-      view.dispatch({ selection: view.state.selection });
+      if (!view.hasFocus) {
+        view.focus();
+      }
     });
   };
 };