@seafile/sdoc-editor 2.0.68 → 2.0.70

package/dist/basic-sdk/node-id/helpers.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.replacePastedDataId = exports.replaceNodeId = exports.decorateOperation = void 0;
+exports.replacePastedDataId = exports.replaceNodeId = exports.removeCommentMarks = exports.decorateOperation = void 0;
 var _slate = require("@seafile/slate");
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
 var _slugid = _interopRequireDefault(require("slugid"));
@@ -133,4 +133,28 @@ const replacePastedDataId = pastedData => {
     return item;
   });
 };
-exports.replacePastedDataId = replacePastedDataId;
+exports.replacePastedDataId = replacePastedDataId;
+const removeCommentMarks = fragment => {
+  const cleanNode = node => {
+    if (_slate.Text.isText(node)) {
+      const newNode = {
+        ...node
+      };
+      for (const key of Object.keys(newNode)) {
+        if (key.startsWith('sdoc_comment') || key.startsWith('removed_')) {
+          delete newNode[key];
+        }
+      }
+      return newNode;
+    }
+    if (node.children) {
+      return {
+        ...node,
+        children: node.children.map(cleanNode)
+      };
+    }
+    return node;
+  };
+  return fragment.map(cleanNode);
+};
+exports.removeCommentMarks = removeCommentMarks;

package/dist/basic-sdk/node-id/index.js

@@ -4,18 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _slate = require("@seafile/slate");
 var _constants = require("../extension/constants");
 var _documentUtils = require("../utils/document-utils");
 var _helpers = require("./helpers");
 const withNodeId = editor => {
   const {
-    apply
+    apply,
+    insertText
   } = editor;
   const newEditor = editor;
   newEditor.apply = op => {
     const newOp = (0, _helpers.decorateOperation)(newEditor, op);
     apply(newOp);
   };
+  newEditor.insertText = text => {
+    const {
+      selection
+    } = editor;
+    // Remove context comment marks when inserting position has comment before selection and no comment after selection
+    if (selection && _slate.Range.isCollapsed(selection)) {
+      const beforePoint = _slate.Editor.before(editor, selection.focus, {
+        unit: 'character'
+      });
+      const afterPoint = _slate.Editor.after(editor, selection.focus, {
+        unit: 'character'
+      });
+      const beforeText = beforePoint && _slate.Editor.node(editor, beforePoint);
+      const afterText = afterPoint && _slate.Editor.node(editor, afterPoint);
+      const hasCommentBefore = beforeText && _slate.Text.isText(beforeText[0]) && Object.keys(beforeText[0]).some(k => k.includes('sdoc_comment'));
+      const hasCommentAfter = afterText && _slate.Text.isText(afterText[0]) && Object.keys(afterText[0]).some(k => k.includes('sdoc_comment'));
+      const hasTrueCommentAfter = afterText && _slate.Text.isText(afterText[0]) && Object.keys(afterText[0]).filter(k => k.includes('sdoc_comment')).some(k => afterText[0][k]);
+      if (hasCommentBefore && (!hasCommentAfter || !hasTrueCommentAfter)) {
+        const marks = _slate.Editor.marks(editor);
+        if (marks) {
+          for (const key of Object.keys(marks)) {
+            if (key.includes('sdoc_comment')) {
+              _slate.Editor.removeMark(editor, key);
+            }
+          }
+        }
+      }
+    }
+    insertText(text);
+  };
 
   // rewrite insert fragment data
   newEditor.insertFragmentData = data => {
@@ -23,7 +55,10 @@ const withNodeId = editor => {
     if (fragment) {
       const decoded = decodeURIComponent(window.atob(fragment));
       const parsed = JSON.parse(decoded);
-      const newData = (0, _helpers.replacePastedDataId)(parsed);
+
+      // Clean context comment style when pasting commented context
+      const cleaned = (0, _helpers.removeCommentMarks)(parsed);
+      const newData = (0, _helpers.replacePastedDataId)(cleaned);
       const normalizeNewData = (0, _documentUtils.normalizeCopyNodes)(newEditor, newData);
       newEditor.insertFragment(normalizeNewData);
       return newEditor;

package/dist/components/doc-operations/revision-operations/index.js

@@ -39,7 +39,7 @@ const RevisionOperations = _ref => {
   const [isLoading, setLoading] = (0, _react.useState)(false);
   const {
     loadDocument
-  } = (0, _hooks.useDocument)();
+  } = (0, _hooks.useDocument)(false);
   (0, _react.useEffect)(() => {
     if (!isSdocRevision) return;
     if (isShowChanges) return;

package/dist/hooks/use-document.js

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useDocument = void 0;
 var _react = require("react");
 var _context = _interopRequireDefault(require("../context"));
-const useDocument = () => {
+const useDocument = function () {
+  let isInitData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
   const isSdocRevision = _context.default.getSetting('isSdocRevision');
   const isPublished = _context.default.getSetting('isPublished');
   const [isFirstLoading, setIsFirstLoading] = (0, _react.useState)(true);
@@ -53,6 +54,7 @@ const useDocument = () => {
   }, [loadDocument]);
   (0, _react.useEffect)(() => {
     if (isSdocRevision && isPublished) return;
+    if (!isInitData) return;
     loadDocument().then(document => {
       setDocument(document);
       setIsFirstLoading(false);

package/package.json

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

package/public/locales/en/sdoc-editor.json

@@ -633,5 +633,6 @@
   "Presentation": "Presentation",
   "More_operation": "More operation",
   "Property": "Property",
-  "Comment_list": "Comment list"
+  "Comment_list": "Comment list",
+  "Add_Comment": "Add Comment"
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -634,5 +634,6 @@
   "Presentation": "演示",
   "More_operation": "更多操作",
   "Property": "属性",
-  "Comment_list": "评论列表"
+  "Comment_list": "评论列表",
+  "Add_Comment": "添加评论"
 }