@seafile/sdoc-editor 0.4.37 → 0.5.0

package/dist/basic-sdk/extension/plugins/code-block/helpers.js

@@ -29,15 +29,50 @@ export const getSelectCodeElem = editor => {
   if (codeNode == null) return null;
   return codeNode;
 };
+export const getCodeBlockNode = language => {
+  const node = {
+    id: slugid.nice(),
+    type: CODE_BLOCK,
+    language,
+    style: {
+      white_space: 'nowrap'
+    },
+    // default nowrap
+    children: [{
+      id: slugid.nice(),
+      type: CODE_LINE,
+      children: [{
+        text: '',
+        id: slugid.nice()
+      }]
+    }]
+  };
+  return node;
+};
 export const changeToCodeBlock = function (editor) {
   let language = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   let position = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : INSERT_POSITION.CURRENT;
-  // Summarizes the strings for the selected highest-level node
-  let strArr = [];
-  let path = Editor.path(editor, editor.selection);
+  if (!editor.selection) return;
+  let strArr = []; // Summarizes the strings for the selected highest-level node
+  const path = Editor.path(editor, editor.selection, {
+    edge: 'start'
+  });
+  const newCodeBlockNode = getCodeBlockNode(language); // New code-block node
+
+  // Insert after
   if (position === INSERT_POSITION.AFTER) {
     strArr = [''];
-  } else {
+    newCodeBlockNode.children[0].children[0].text = strArr.join('\n');
+    Transforms.insertNodes(editor, newCodeBlockNode, {
+      mode: 'highest',
+      at: [path[0] + 1]
+    });
+    Transforms.select(editor, [path[0] + 1, 0, 0]);
+    return;
+  }
+
+  // Insert current
+  if (position === INSERT_POSITION.CURRENT) {
     // Select the plain text of the node
     const nodeEntries = Editor.nodes(editor, {
       match: n => editor.children.includes(n),
@@ -48,55 +83,33 @@ export const changeToCodeBlock = function (editor) {
       const [n] = nodeEntry;
       if (n) strArr.push(Node.string(n));
     }
-
     // Deletes the selected node at the highest level
     Transforms.removeNodes(editor, {
       mode: 'highest'
     });
-  }
-
-  // Insert the codeBlockNode node
-  const newCodeBlockNode = {
-    id: slugid.nice(),
-    type: CODE_BLOCK,
-    language,
-    style: {
-      white_space: 'nowrap' // default nowrap
-    },
 
-    children: [{
-      id: slugid.nice(),
-      type: CODE_LINE,
-      children: [{
-        text: strArr.join('\n'),
-        id: slugid.nice()
-      }]
-    }]
-  };
-  if (position === INSERT_POSITION.AFTER) {
+    // Modify location
+    const atPath = [path[0]];
+    const atPoint = {
+      anchor: {
+        offset: 0,
+        path: [path[0], 0, 0]
+      },
+      focus: {
+        offset: 0,
+        path: [path[0], 0, 0]
+      }
+    };
+    // Insert new node
+    newCodeBlockNode.children[0].children[0].text = strArr.join('\n');
     Transforms.insertNodes(editor, newCodeBlockNode, {
       mode: 'highest',
-      at: [path[0] + 1]
+      at: atPath
+    });
+    queueMicrotask(() => {
+      Transforms.select(editor, atPoint);
     });
-    Transforms.select(editor, [path[0] + 1, 0, 0]);
-    return;
   }
-  const atPath = path ? [path[0]] : editor.selection;
-  const atPoint = path ? {
-    anchor: {
-      offset: 0,
-      path: [path[0], 0, 0]
-    },
-    focus: {
-      offset: 0,
-      path: [path[0], 0, 0]
-    }
-  } : editor.selection;
-  Transforms.insertNodes(editor, newCodeBlockNode, {
-    mode: 'highest',
-    at: atPath
-  });
-  Transforms.select(editor, atPoint);
 };
 export const changeToPlainText = editor => {
   const elem = getSelectCodeElem(editor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.4.37",
+  "version": "0.5.0",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",