@seafile/comment-editor 0.0.1-alpha.32 → 0.0.1-alpha.34

package/dist/basic-sdk/editor/comment-editor.js

@@ -43,7 +43,7 @@ const CommentEditor = _ref => {
     onContentChange,
     hiddenComment,
     hiddenUserInfo,
-    hiddenToolMenu,
+    toolMenus = ['text_style', _constants2.BLOCKQUOTE, _constants2.UNORDERED_LIST, _constants2.ORDERED_LIST, _constants2.LINK, _constants2.IMAGE],
     closePanel
   } = _ref;
   const commentWrapperRef = (0, _react.useRef)();
@@ -218,62 +218,10 @@ const CommentEditor = _ref => {
     }
     eventProxy.onKeyDown(event);
   }, [eventProxy, editor]);
+  console.log('toolMenus', toolMenus);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('comment-editor-wrapper', className),
     ref: commentWrapperRef
-  }, type === 'comment' && !hiddenUserInfo && /*#__PURE__*/_react.default.createElement("div", {
-    className: "comment-editor-user-info"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "comment-editor-user-img"
-  }, /*#__PURE__*/_react.default.createElement("img", {
-    src: userInfo.avatar_url,
-    alt: "",
-    height: "100%",
-    width: "100%"
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    className: "comment-editor-user-name"
-  }, userInfo.name)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "comment-editor-container"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "comment-editor-content"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    ref: commentEditorContainerRef,
-    className: "article comment-editor",
-    onClick: handleFocusEditor
-  }, /*#__PURE__*/_react.default.createElement(_useScrollContext.ScrollContext.Provider, {
-    value: {
-      scrollRef: commentEditorContainerRef
-    }
-  }, /*#__PURE__*/_react.default.createElement(_slateReact.Slate, {
-    editor: editor,
-    value: slateValue,
-    onChange: setSlateValue
-  }, /*#__PURE__*/_react.default.createElement(_slateReact.Editable, {
-    id: "sdoc-editor",
-    scrollSelectionIntoView: handleScrollIntoView,
-    cursors: cursors,
-    renderElement: props => (0, _renderCommentEditorElement.default)({
-      ...props,
-      commentType: type
-    }),
-    renderLeaf: _extension.renderLeaf,
-    onMouseDown: onMouseDown,
-    decorate: decorate,
-    onCut: eventProxy.onCut,
-    onCopy: eventProxy.onCopy,
-    onCompositionStart: eventProxy.onCompositionStart,
-    onCompositionUpdate: eventProxy.onCompositionUpdate,
-    onCompositionEnd: eventProxy.onCompositionEnd,
-    onKeyDown: onKeyDown,
-    onBeforeInput: eventProxy.onBeforeInput
-  })))), /*#__PURE__*/_react.default.createElement(_commentEditorToolbar.default, {
-    editor: editor,
-    hiddenToolMenu: hiddenToolMenu,
-    onSubmit: onSubmit,
-    submitBtnText: t(submitTip),
-    onCancel: onCancel
-  }))), !hiddenToolMenu && /*#__PURE__*/_react.default.createElement(_insertElementDialog.default, {
-    editor: editor
-  }));
+  }, /*#__PURE__*/_react.default.createElement("div", null, "123"));
 };
 var _default = exports.default = CommentEditor;

package/dist/basic-sdk/extension/toolbar/comment-editor-toolbar/index.js

@@ -23,36 +23,36 @@ const CommentEditorToolbar = _ref => {
     onSubmit,
     submitBtnText,
     onCancel,
-    hiddenToolMenu
+    toolMenus
   } = _ref;
   (0, _useSelectionUpdate.default)();
   const eventBus = _eventBus.default.getInstance();
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-editor-toolbar",
     style: {
-      justifyContent: hiddenToolMenu ? 'end' : ''
+      justifyContent: toolMenus.length === 0 ? 'end' : ''
     }
-  }, !hiddenToolMenu && /*#__PURE__*/_react.default.createElement(_commons.MenuGroup, {
+  }, toolMenus.length !== 0 && /*#__PURE__*/_react.default.createElement(_commons.MenuGroup, {
     className: "menu-group comment-editor-menu-group"
-  }, /*#__PURE__*/_react.default.createElement(_comemntEditorMenu.default, {
+  }, toolMenus.includes('text_style') && /*#__PURE__*/_react.default.createElement(_comemntEditorMenu.default, {
     editor: editor,
     readonly: readonly
-  }), /*#__PURE__*/_react.default.createElement(_menu.default, {
+  }), toolMenus.includes(_constants.BLOCKQUOTE) && /*#__PURE__*/_react.default.createElement(_menu.default, {
     editor: editor,
     readonly: readonly
-  }), /*#__PURE__*/_react.default.createElement(_menu4.default, {
+  }), toolMenus.includes(_constants.UNORDERED_LIST) && /*#__PURE__*/_react.default.createElement(_menu4.default, {
     editor: editor,
     type: _constants.UNORDERED_LIST,
     readonly: readonly
-  }), /*#__PURE__*/_react.default.createElement(_menu4.default, {
+  }), toolMenus.includes(_constants.ORDERED_LIST) && /*#__PURE__*/_react.default.createElement(_menu4.default, {
     editor: editor,
     type: _constants.ORDERED_LIST,
     readonly: readonly
-  }), /*#__PURE__*/_react.default.createElement(_menu3.default, {
+  }), toolMenus.includes(_constants.LINK) && /*#__PURE__*/_react.default.createElement(_menu3.default, {
     editor: editor,
     readonly: readonly,
     eventBus: eventBus
-  }), /*#__PURE__*/_react.default.createElement(_menu2.default, {
+  }), toolMenus.includes(_constants.IMAGE) && /*#__PURE__*/_react.default.createElement(_menu2.default, {
     editor: editor,
     readonly: readonly,
     eventBus: eventBus

package/dist/basic-sdk/hooks/use-comment.js

@@ -21,7 +21,6 @@ const CommentProvider = _ref => {
     children,
     type,
     // comment or replay
-    userInfo,
     className = '',
     pluginName = '',
     // sdoc or wiki or txt ...

package/dist/basic-sdk/socket/helpers.js

@@ -0,0 +1,312 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validateOperation = exports.syncRemoteOperations = exports.syncRemoteCursorLocation = exports.revertOperationList = exports.reExecRevertOperationList = exports.getRevertOperationList = exports.getNodePathById = void 0;
+var _slate = require("@seafile/slate");
+var _deepCopy = _interopRequireDefault(require("deep-copy"));
+var _helper = require("../cursor/helper");
+var _core = require("../extension/core");
+var OPERATION = _interopRequireWildcard(require("../node-id/constants"));
+const getNodePathById = function (rootNode, nodeId) {
+  let path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  if (rootNode.id === nodeId) return path;
+  const {
+    children = []
+  } = rootNode;
+  for (let i = 0; i < children.length; i++) {
+    const child = children[i];
+    path.push(i);
+    const nodePath = getNodePathById(child, nodeId, path);
+    if (nodePath) return nodePath;
+    path.pop();
+  }
+  return null;
+};
+exports.getNodePathById = getNodePathById;
+const validateOperation = (editor, operation) => {
+  let isValid = false;
+  let newOperation = (0, _deepCopy.default)(operation);
+  const {
+    type
+  } = newOperation;
+  switch (type) {
+    case OPERATION.INSERT_TEXT:
+    case OPERATION.REMOVE_TEXT:
+      {
+        const {
+          node_id,
+          path
+        } = newOperation;
+        const node = (0, _core.getNode)(editor, path);
+        // node is exist and node path is not changed
+        if (node && node.id === node_id) {
+          isValid = true;
+          break;
+        }
+
+        // node is exist but node path is changed
+        const nodePath = getNodePathById(editor, node_id);
+        if (nodePath) {
+          isValid = true;
+          newOperation.path = nodePath;
+          break;
+        }
+        // node is not exist
+        isValid = false;
+        break;
+      }
+    case OPERATION.INSERT_NODE:
+      {
+        let {
+          parent_node_id,
+          path
+        } = newOperation;
+        const parentNodePath = getNodePathById(editor, parent_node_id);
+        if (!parentNodePath) {
+          isValid = false;
+          break;
+        }
+        const parentPath = path.slice(0, path.length - 1);
+        if (parentPath.join() === parentNodePath.join()) {
+          isValid = true;
+          break;
+        }
+
+        // reset insert node path
+        const parentNode = (0, _core.getNode)(editor, path);
+        if (parentNode) {
+          const childLength = parentNode.children.length;
+          const index = Math.min(path[path.length - 1], childLength);
+          newOperation.path = parentNodePath.concat([index]);
+          isValid = true;
+        }
+        break;
+      }
+    case OPERATION.REMOVE_NODE:
+      {
+        const {
+          node_id,
+          path
+        } = newOperation;
+        const node = (0, _core.getNode)(editor, path);
+        // node is exist and node path is not changed
+        if (node && node.id === node_id) {
+          isValid = true;
+          break;
+        }
+
+        // node is exist but node path is changed
+        const nodePath = getNodePathById(editor, node_id);
+        if (nodePath) {
+          isValid = true;
+          newOperation.path = nodePath;
+          break;
+        }
+
+        // node is not exist
+        isValid = false;
+        break;
+      }
+    case OPERATION.MERGE_NODE:
+      {
+        // merge next node into prev node
+        const {
+          node_id,
+          path
+        } = newOperation;
+        const node = (0, _core.getNode)(editor, path);
+        // node is exist and node path is not changed
+        if (node && node.id === node_id) {
+          isValid = true;
+          break;
+        }
+
+        // node is exist but node path is changed
+        const nodePath = getNodePathById(editor, node_id);
+        if (nodePath) {
+          isValid = true;
+          newOperation.path = nodePath;
+          break;
+        }
+
+        // node is not exist
+        isValid = false;
+        break;
+      }
+    case OPERATION.SPLIT_NODE:
+      {
+        const {
+          node_id,
+          path
+        } = newOperation;
+        const node = (0, _core.getNode)(editor, path);
+        // node is exist and node path is not changed
+        if (node && node.id === node_id) {
+          isValid = true;
+          break;
+        }
+
+        // node is exist but node path is changed
+        const nodePath = getNodePathById(editor, node_id);
+        if (nodePath) {
+          isValid = true;
+          newOperation.path = nodePath;
+          break;
+        }
+
+        // node is not exist
+        isValid = false;
+        break;
+      }
+    case OPERATION.SET_NODE:
+      {
+        const {
+          node_id,
+          path,
+          properties
+        } = newOperation;
+        const node = (0, _core.getNode)(editor, path);
+        // node is exist and node path is not changed
+        if (node && node.id === node_id) {
+          isValid = true;
+          newOperation.properties = {
+            ...properties,
+            type: node.type
+          };
+          break;
+        }
+
+        // node is exist but node path is changed
+        const nodePath = getNodePathById(editor, node_id);
+        if (nodePath) {
+          isValid = true;
+          const node = (0, _core.getNode)(editor, nodePath);
+          newOperation.properties = {
+            ...properties,
+            type: node.type
+          };
+          newOperation.path = nodePath;
+          break;
+        }
+
+        // node is not exist
+        isValid = false;
+        break;
+      }
+    case OPERATION.MOVE_NODE:
+      {
+        const {
+          node_id,
+          path
+        } = newOperation;
+        const node = (0, _core.getNode)(editor, path);
+        // node is exist and node path is not changed
+        if (node && node.id === node_id) {
+          isValid = true;
+          break;
+        }
+
+        // TODO: newPath can not calculate by nodePath
+        // node is exist but node path is changed
+        // const nodePath = getNodePathById(editor, node_id);
+        // if (nodePath) {}
+
+        // node is not exist
+        isValid = false;
+        break;
+      }
+    default:
+      {
+        // set_selection
+        break;
+      }
+  }
+  if (isValid) return newOperation;
+  return isValid;
+};
+exports.validateOperation = validateOperation;
+const getRevertOperationList = operationList => {
+  if (operationList.length === 0) return [];
+
+  // Generate a duplicate operationList, The original value cannot be modified here
+  let revertOperationList = (0, _deepCopy.default)(operationList);
+  revertOperationList = revertOperationList.reverse();
+  return revertOperationList.map(operations => {
+    const ops = operations.reverse();
+    return ops.map(item => _slate.Operation.inverse(item));
+  });
+};
+exports.getRevertOperationList = getRevertOperationList;
+const revertOperationList = (editor, operationList) => {
+  if (operationList.length === 0) return [];
+  const revertOperationList = getRevertOperationList(operationList);
+
+  // Cancel locale execute operations
+  for (let i = 0; i < revertOperationList.length; i++) {
+    const operations = revertOperationList[i];
+    _slate.Editor.withoutNormalizing(editor, () => {
+      for (let j = 0; j < operations.length; j++) {
+        const op = operations[j];
+        editor.apply(op);
+      }
+    });
+  }
+};
+exports.revertOperationList = revertOperationList;
+const reExecRevertOperationList = (editor, revertOperationList) => {
+  if (revertOperationList.length === 0) return;
+
+  // Re-execute revert operations
+  for (let i = 0; i < revertOperationList.length; i++) {
+    const operations = revertOperationList[i];
+    _slate.Editor.withoutNormalizing(editor, () => {
+      for (let j = 0; j < operations.length; j++) {
+        const op = validateOperation(editor, operations[j]);
+        if (op) {
+          editor.apply(op);
+        }
+      }
+    });
+  }
+};
+exports.reExecRevertOperationList = reExecRevertOperationList;
+const syncRemoteOperations = (editor, remoteOperations) => {
+  if (remoteOperations.length === 0) return;
+  _slate.Editor.withoutNormalizing(editor, () => {
+    for (let i = 0; i < remoteOperations.length; i++) {
+      const op = remoteOperations[i];
+      if (op.type === 'set_selection') {
+        continue;
+      }
+      editor.apply(op);
+    }
+  });
+};
+exports.syncRemoteOperations = syncRemoteOperations;
+const syncRemoteCursorLocation = (editor, user, location, cursorData) => {
+  const currentUser = editor.user;
+  if (user && user.username !== currentUser.username) {
+    // Get front Point as cursor
+    const {
+      anchor,
+      focus
+    } = location;
+    let newLocation = location;
+    if (!_slate.Point.equals(anchor, focus)) {
+      const frontPoint = _slate.Editor.start(editor, location);
+      newLocation = {
+        anchor: frontPoint,
+        focus: frontPoint
+      };
+    }
+    (0, _helper.setCursor)(editor, user, newLocation, cursorData);
+
+    // sync cursor position
+    editor.onCursor && editor.onCursor(editor.cursors);
+  }
+};
+exports.syncRemoteCursorLocation = syncRemoteCursorLocation;

package/dist/pages/seafile-comment-editor.js

@@ -14,7 +14,6 @@ const SeafileCommentEditor = _ref => {
     // Provider
     type,
     // comment or replay
-    userInfo,
     className = '',
     pluginName = '',
     // sdoc or wiki or txt ...
@@ -26,7 +25,7 @@ const SeafileCommentEditor = _ref => {
     onContentChange,
     hiddenUserInfo,
     hiddenComment,
-    hiddenToolMenu,
+    toolMenus,
     closePanel,
     collaborators,
     participants,
@@ -38,7 +37,6 @@ const SeafileCommentEditor = _ref => {
   _basicSdk.context.init(settings, api);
   return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, null, /*#__PURE__*/_react.default.createElement(_basicSdk.CommentProvider, {
     type: type,
-    userInfo: userInfo,
     className: className,
     pluginName: pluginName,
     pluginEventBus: pluginEventBus,
@@ -52,7 +50,7 @@ const SeafileCommentEditor = _ref => {
     onContentChange: onContentChange,
     hiddenUserInfo: hiddenUserInfo,
     hiddenComment: hiddenComment,
-    hiddenToolMenu: hiddenToolMenu,
+    toolMenus: toolMenus,
     closePanel: closePanel,
     addParticipants: addParticipants
   })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/comment-editor",
-  "version": "0.0.1-alpha.32",
+  "version": "0.0.1-alpha.34",
   "private": false,
   "description": "This is a comment editor",
   "main": "dist/index.js",