Fix the right order of parameters in normalizeExternalData.js (#5347)

Co-authored-by: Alin Voinea <[email protected]> Co-authored-by: Claudia Ifrim <[email protected]> Co-authored-by: David Glick <[email protected]> Co-authored-by: Víctor Fernández de Alba <[email protected]>
plone · Dec 1, 2023 · 9cfaa85 · 9cfaa85
1 parent b451fcd
commit 9cfaa85
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/packages/volto-slate/news/5347.bugfix b/packages/volto-slate/news/5347.bugfix
@@ -0,0 +1 @@
+Fix the right order of parameters in normalizeExternalData.js @dobri1408
diff --git a/packages/volto-slate/src/editor/extensions/insertData.js b/packages/volto-slate/src/editor/extensions/insertData.js
@@ -98,7 +98,9 @@ export const insertData = (editor) => {
       if (Editor.string(editor, [])) {
         if (
           Array.isArray(fragment) &&
-          fragment.findIndex((b) => Editor.isInline(b) || Text.isText(b)) > -1
+          fragment.findIndex(
+            (b) => Editor.isInline(editor, b) || Text.isText(b),
+          ) > -1
         ) {
           // console.log('insert fragment', fragment);
           // TODO: we want normalization also when dealing with fragments

diff --git a/packages/volto-slate/src/editor/extensions/normalizeExternalData.js b/packages/volto-slate/src/editor/extensions/normalizeExternalData.js
@@ -2,7 +2,7 @@ import { normalizeExternalData as normalize } from '@plone/volto-slate/utils';
 
 export function normalizeExternalData(editor) {
   editor.normalizeExternalData = (fragment) => {
-    return normalize(fragment);
+    return normalize(editor, fragment);
   };
   return editor;
 }
diff --git a/packages/volto-slate/src/utils/blocks.js b/packages/volto-slate/src/utils/blocks.js
@@ -73,15 +73,19 @@ export const normalizeExternalData = (editor, nodes) => {
   // put all the non-blocks (e.g. images which are inline Elements) inside p-s
   Editor.withoutNormalizing(fakeEditor, () => {
     //for htmlSlateWidget compatibility
-    if (nodes && !Editor.isBlock(fakeEditor, nodes[0]))
+    if (
+      nodes &&
+      (!Editor.isBlock(fakeEditor, nodes[0]) || Text.isText(nodes[0]))
+    )
       Transforms.wrapNodes(
         fakeEditor,
         { type: 'p' },
         {
           at: [],
           match: (node, path) =>
             (!Editor.isEditor(node) && !Editor.isBlock(fakeEditor, node)) ||
-            fakeEditor.isInline(node),
+            fakeEditor.isInline(node) ||
+            Text.isText(node),
           mode: 'highest',
         },
       );

diff --git a/packages/volto/news/5347.bugfix b/packages/volto/news/5347.bugfix
@@ -0,0 +1 @@
+Fix the right order of parameters in normalizeExternalData.js @dobri1408
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix the right order of parameters in normalizeExternalData.js @dobri1408