@seafile/sdoc-editor 2.0.84 → 2.0.86-test-0.0.1

package/dist/comment/components/comment-context-menu/index.js

@@ -14,6 +14,11 @@ require("./index.css");
 var CommentContextMenu = function CommentContextMenu(_ref) {
   var isRichEditor = _ref.isRichEditor;
   var onCommentClick = (0, _react.useCallback)(function (event) {
+    // Make context toolbar disappear
+    var contextToolBarDom = document.querySelector('.sdoc-context-toolbar');
+    if (contextToolBarDom) {
+      contextToolBarDom.removeAttribute('style');
+    }
     var eventBus = _eventBus["default"].getInstance();
     eventBus.dispatch(_constants.INTERNAL_EVENT.ADD_CONTEXT_COMMENT);
   }, []);

package/dist/comment/components/comment-item-content.js

@@ -130,9 +130,9 @@ var CommentItemContent = function CommentItemContent(_ref) {
     className: "comment-success-resolved sdocfont sdoc-mark-as-resolved"
   })))), isUnseen && !isActive && /*#__PURE__*/_react["default"].createElement("span", {
     className: "sdoc-unread-message-tip"
-  }), isActive && comment.user_email === user.username && /*#__PURE__*/_react["default"].createElement("div", {
+  }), isActive && [comment === null || comment === void 0 ? void 0 : comment.user_email, comment === null || comment === void 0 ? void 0 : comment.author].includes(user.username) && /*#__PURE__*/_react["default"].createElement("div", {
     className: "d-flex comment-item-operation-wrapper"
-  }, !comment.resolved && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  }, (!comment.resolved || (comment === null || comment === void 0 ? void 0 : comment.isContextComment)) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     id: "tooltip_".concat(menuId),
     className: "comment-operation mr-2",
     onClick: markAsResolved

package/dist/cursor/use-cursors.js

@@ -14,6 +14,7 @@ var useCursors = exports.useCursors = function useCursors(editor) {
     setCursors = _useState2[1];
   (0, _react.useEffect)(function () {
     var cursors = Object.values(editor.cursors) || [];
+    console.log(1, cursors);
     setCursors(cursors);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

package/dist/extension/plugins/image/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateImage = exports.selectImageWhenSelectPartial = exports.resetCursor = exports.removeImageBlockNode = exports.queryCopyMoveProgressView = exports.isInsertImageMenuDisabled = exports.isImageUrlIsFromUpload = exports.isImageUrlIsFromCopy = exports.insertImageFiles = exports.insertImage = exports.hasSdocImages = exports.handleBase64Image = exports.getSingleImageFromFragment = exports.getImageURL = exports.getImageData = exports.getDigitalSignImgUrl = exports.getColumnByKey = exports.generateImageNode = exports.generateImageInfos = void 0;
+exports.updateImage = exports.selectImageWhenSelectPartial = exports.resetCursor = exports.removeImageBlockNode = exports.queryCopyMoveProgressView = exports.isInsertImageMenuDisabled = exports.isImageUrlIsFromUpload = exports.isImageUrlIsFromCopy = exports.isCommentEditor = exports.insertImageFiles = exports.insertImage = exports.hasSdocImages = exports.handleBase64Image = exports.getSingleImageFromFragment = exports.getImageURL = exports.getImageData = exports.getDigitalSignImgUrl = exports.getColumnByKey = exports.generateImageNode = exports.generateImageInfos = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
@@ -84,10 +84,7 @@ var insertImage = exports.insertImage = function insertImage(editor, imgInfos, s
   var imageNodes = imgInfos.map(function (_ref) {
     var src = _ref.src,
       file_uuid = _ref.file_uuid;
-    var isCommentEditor = editor.editorType === _constants.COMMENT_EDITOR;
-    var imgSrc = isCommentEditor ? getImageURL({
-      src: src
-    }) : src;
+    var imgSrc = src;
     return generateImageNode(imgSrc, file_uuid);
   });
   var validSelection = selection || editor.selection;
@@ -320,6 +317,9 @@ var isImageUrlIsFromUpload = exports.isImageUrlIsFromUpload = function isImageUr
   if (url && url.startsWith('blob:http')) return true;
   return false;
 };
+var isCommentEditor = exports.isCommentEditor = function isCommentEditor(editor) {
+  return editor.editorType === _constants.COMMENT_EDITOR;
+};
 var generateImageInfos = exports.generateImageInfos = function generateImageInfos(files) {
   var newFiles = Array.from(files);
   var imgInfos = newFiles.filter(function (item) {

package/dist/extension/plugins/image/render-elem.js

@@ -230,10 +230,10 @@ var Image = function Image(_ref) {
     }
   }, [data, editor]);
   var onImageLoaded = (0, _react.useCallback)(function () {
-    if ((0, _helpers.isImageUrlIsFromCopy)(data.src)) {
+    if ((0, _helpers.isImageUrlIsFromCopy)(data.src) && !(0, _helpers.isCommentEditor)(editor)) {
       setCopyImageLoading(true);
     }
-  }, [data.src, setCopyImageLoading]);
+  }, [data.src, editor, setCopyImageLoading]);
   var onImageLoadError = (0, _react.useCallback)(function () {
     // Check is due to the image is pasted from the clipboard in base64
     if (data.src.startsWith('data:image/jpeg;base64')) {

package/dist/extension/plugins/image/use-copy-image.js

@@ -49,7 +49,8 @@ var useCopyImage = function useCopyImage(_ref2) {
     element = _ref2.element;
   var data = element.data;
   var _data$is_copy_error = data.is_copy_error,
-    is_copy_error = _data$is_copy_error === void 0 ? false : _data$is_copy_error;
+    is_copy_error = _data$is_copy_error === void 0 ? false : _data$is_copy_error,
+    isComment = data.is_comment;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isLoading = _useState2[0],
@@ -61,6 +62,7 @@ var useCopyImage = function useCopyImage(_ref2) {
   (0, _react.useEffect)(function () {
     var url = data.src;
     if (isCopyError) return;
+    if (isComment) return;
     if (!(0, _helpers.isImageUrlIsFromCopy)(url)) return;
     var downloadAndUploadImages = /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(url) {

package/dist/extension/plugins/image/use-upload-image.js

@@ -16,20 +16,24 @@ var _helpers = require("./helpers");
 var _imageCache = _interopRequireDefault(require("./image-cache"));
 var updateImageNode = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee(editor, element, newUrl) {
-    var nodePath, newData;
+    var url, nodePath, newData;
     return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          url = (0, _helpers.isCommentEditor)(editor) ? (0, _helpers.getImageURL)({
+            src: newUrl
+          }, editor) : newUrl;
           nodePath = _slateReact.ReactEditor.findPath(editor, element);
           newData = {
-            src: newUrl
+            src: url,
+            is_comment: true
           };
           _slate.Transforms.setNodes(editor, {
             data: newData
           }, {
             at: nodePath
           });
-        case 3:
+        case 4:
         case "end":
           return _context.stop();
       }

package/dist/socket/socket-manager.js

@@ -305,6 +305,7 @@ var SocketManager = /*#__PURE__*/(0, _createClass2["default"])(function SocketMa
     });
   });
   (0, _defineProperty2["default"])(this, "sendCursorLocation", function (location) {
+    console.log(1, location);
     _this.socketClient.sendCursorLocation(location);
   });
   (0, _defineProperty2["default"])(this, "receiveCursorLocation", function (params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.84",
+  "version": "2.0.86-test-0.0.1",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -69,6 +69,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "faddcd9b08201ed369f2d7c324b885aad558744f"
+  }
 }