fix: handle list in texteditor widget

RedTurtle · Nov 29, 2023 · db0c167 · db0c167
1 parent d91115d
commit db0c167
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/config/Slate/extensions/breakList.js b/src/config/Slate/extensions/breakList.js
@@ -12,7 +12,6 @@ export const breakList = (editor) => {
   editor.insertBreak = () => {
     // If the selection does not exist or is expanded, handle with the default
     // behavior.
-
     if (!(editor.selection && Range.isCollapsed(editor.selection))) {
       insertBreak();
       return false;

diff --git a/src/config/Slate/handlers.js b/src/config/Slate/handlers.js
@@ -12,6 +12,7 @@ import {
   getNextVoltoBlock,
   getPreviousVoltoBlock,
   createDefaultBlock,
+  getCurrentListItem,
 } from '@plone/volto-slate/utils';
 import config from '@plone/volto/registry';
 
@@ -107,6 +108,13 @@ const focusNext = (props) => {
     onAddBlock,
     index,
   } = props.editor.getBlockProps();
+
+  const [listItem, listItemPath] = getCurrentListItem(props.editor);
+  if (listItem) {
+    //managed by breaklist extension
+    return true;
+  }
+
   props.event.preventDefault();
   props.event.stopPropagation();
   let isAtEnd = false;
@@ -177,13 +185,18 @@ const handleBreak = (props) => {
   } else {
     let ret = softBreak(props);
     if (!ret) {
-      props.event.preventDefault();
-      props.event.stopPropagation();
-      Editor.insertNode(props.editor, {
-        type: 'paragraph',
-        children: [{ text: '' }],
-      });
-      ret = true;
+      const [listItem, listItemPath] = getCurrentListItem(props.editor);
+      if (listItem) {
+        //managed by breaklist extension
+      } else {
+        props.event.preventDefault();
+        props.event.stopPropagation();
+        Editor.insertNode(props.editor, {
+          type: 'paragraph',
+          children: [{ text: '' }],
+        });
+        ret = true;
+      }
     }
     return ret;
   }