@seafile/seafile-editor 1.0.18 → 1.0.20

package/dist/slate-convert/md-to-slate/transform.js

@@ -145,6 +145,14 @@ export const transformListItem = node => {
   const {
     children
   } = node;
+  if (children.length === 0) {
+    return {
+      id: slugid.nice(),
+      type: LIST_ITEM,
+      // eslint-disable-next-line array-callback-return
+      children: [transformListContent({})]
+    };
+  }
   return {
     id: slugid.nice(),
     type: LIST_ITEM,

package/dist/slate-convert/slate-to-md/transform.js

@@ -1,3 +1,4 @@
+import isLastCharPunctuation from '../../utils/is-punctuation-mark';
 const generateDefaultText = () => {
   return {
     type: 'text',
@@ -20,18 +21,57 @@ const transformTextNode = textNode => {
 
   // blob = true, add strong parent
   if (textNode['bold']) {
-    mdNode = {
-      type: 'strong',
-      children: [mdNode]
-    };
+    mdNode['value'] = mdNode.value ? mdNode.value.trim() : '';
+    if (isLastCharPunctuation(mdNode.value)) {
+      const value = mdNode.value;
+      const mdNode1 = {
+        ...mdNode,
+        value: value.substring(0, value.length - 1)
+      };
+      const mdNode2 = {
+        type: 'text',
+        value: value.substring(value.length - 1)
+      };
+      mdNode = [{
+        type: 'strong',
+        children: [mdNode1]
+      }, mdNode2];
+    } else {
+      mdNode = {
+        type: 'strong',
+        children: [mdNode]
+      };
+    }
   }
 
   // italic = true, add emphasis parent
-  if (textNode['italic']) {
+  if (textNode['italic'] && mdNode.type === 'strong') {
     mdNode = {
       type: 'emphasis',
       children: [mdNode]
     };
+  } else if (textNode['italic']) {
+    mdNode['value'] = mdNode.value ? mdNode.value.trim() : '';
+    if (isLastCharPunctuation(mdNode.value)) {
+      const value = mdNode.value;
+      const mdNode1 = {
+        ...mdNode,
+        value: value.substring(0, value.length - 1)
+      };
+      const mdNode2 = {
+        type: 'text',
+        value: value.substring(value.length - 1)
+      };
+      mdNode = [{
+        type: 'emphasis',
+        children: [mdNode1]
+      }, mdNode2];
+    } else {
+      mdNode = {
+        type: 'emphasis',
+        children: [mdNode]
+      };
+    }
   }
   return mdNode;
 };

package/dist/utils/is-punctuation-mark.js

@@ -0,0 +1,44 @@
+const isChPunctuation = char => {
+  // \u2014|\u2018|\u2019|\u201c|\u201d|
+  // \u2026|
+  // \u2039｜\u203a
+  // \u3001|\u3002|\u3008|\u3009|\u300a|\u300b|\u300c|\u300d|\u300e|\u300f
+  // \u3010|\u3011|\u3014|\u3015|\u301c|\u301d|\u301e
+  // \ufe43|\ufe44|\ufe4f
+  // \uffe5 (¥)
+  const reg = /[\u2014|\u2018|\u2019|\u201c|\u201d|\u2026|\u2039|\u203a|\u3001|\u3002|\u3008|\u3009|\u300a|\u300b|\u300c|\u300d|\u300e|\u300f|\u3010|\u3011|\u3014|\u3015|\u301c|\u301d|\u301e]/;
+  if (reg.test(char)) {
+    return true;
+  } else {
+    return false;
+  }
+};
+function isEnHalfWidthPunctuation(char) {
+  // Distribution of half-width punctuation points in unicode: 0x0021~0x007e
+  // https://en.wikibooks.org/wiki/Unicode/Character_reference/0000-0FFF
+  const reg = /[\x21-\x2f\x3a-\x40\x5b-\x60\x7B-\x7F]/;
+  if (reg.test(char)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+function isEnFullWidthPunctuation(char) {
+  // 0xff01~0xff5e
+  // https://en.wikibooks.org/wiki/Unicode/Character_reference/F000-FFFF
+  const reg = /[\uff01-\uff0f\uff1a-\uff1f\uff20\uff3b-\uff3f\uff40\uff5b-\uff5f]/;
+  if (reg.test(char)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+const isLastCharPunctuation = value => {
+  if (typeof value !== 'string' || !value) return false;
+  const lastChar = value.slice(-1);
+  if (isChPunctuation(lastChar)) return true;
+  if (isEnHalfWidthPunctuation(lastChar)) return true;
+  if (isEnFullWidthPunctuation(lastChar)) return true;
+  return false;
+};
+export default isLastCharPunctuation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "",
   "main": "dist/index.js",
   "scripts": {