@seafile/sdoc-editor 2.0.100 → 2.0.102

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

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

package/dist/comment/components/comment-list.css

@@ -263,6 +263,11 @@
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
   border-radius: 3px;
+  transition: border-color 0.3s ease;
+}
+
+.sdoc-comment-editor-wrapper:focus-within {
+  border-color: #ff8e03;
 }
 
 .comment-editor-wrapper .sdoc-comment-editor-wrapper .article.sdoc-comment-editor {

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

@@ -17,6 +17,7 @@ var _helpers = require("./helpers");
 var updateImageNode = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee(editor, element, newUrl) {
     var isError,
+      url,
       nodePath,
       newData,
       _args = arguments;
@@ -24,9 +25,12 @@ var updateImageNode = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           isError = _args.length > 3 && _args[3] !== undefined ? _args[3] : false;
+          url = (0, _helpers.isCommentEditor)(editor) ? (0, _helpers.getImageURL)({
+            src: newUrl
+          }, editor) : newUrl;
           nodePath = _slateReact.ReactEditor.findPath(editor, element);
           newData = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, element.data), {}, {
-            src: newUrl,
+            src: url,
             is_copy_error: isError
           });
           _slate.Transforms.setNodes(editor, {
@@ -34,7 +38,7 @@ var updateImageNode = /*#__PURE__*/function () {
           }, {
             at: nodePath
           });
-        case 4:
+        case 5:
         case "end":
           return _context.stop();
       }

package/dist/extension/toolbar/context-toolbar/index.js

@@ -22,6 +22,7 @@ var ContextToolbar = function ContextToolbar() {
   var scrollRef = (0, _useScrollContext.useScrollContext)();
   var inFocus = (0, _slateReact.useFocused)();
   var readOnly = (0, _slateReact.useReadOnly)();
+  var clickedCommentRef = (0, _react.useRef)(false);
   var setContextToolbarPosition = (0, _react.useCallback)(function () {
     var el = ref.current;
     var domSelection = window.getSelection();
@@ -52,6 +53,10 @@ var ContextToolbar = function ContextToolbar() {
     if (!el) {
       return;
     }
+    if (clickedCommentRef.current) {
+      clickedCommentRef.current = false;
+      return;
+    }
     if (readOnly || !selection || !inFocus || _slate.Range.isCollapsed(selection) || _slate.Editor.string(editor, selection) === '' || (0, _core.getSelectedNodeByType)(editor, _constants.CODE_BLOCK)) {
       scrollRef.current && scrollRef.current.removeEventListener('scroll', onScroll);
       el.removeAttribute('style');
@@ -60,6 +65,18 @@ var ContextToolbar = function ContextToolbar() {
     scrollRef.current && scrollRef.current.addEventListener('scroll', onScroll);
     setContextToolbarPosition();
   });
+  (0, _react.useEffect)(function () {
+    var handleClickCommentBtn = function handleClickCommentBtn(e) {
+      var target = e.target;
+      if (target !== null && target !== void 0 && target.closest('#context-toolbar-comment')) {
+        clickedCommentRef.current = true;
+      }
+    };
+    document.addEventListener('mousedown', handleClickCommentBtn);
+    return function () {
+      return document.removeEventListener('mousedown', handleClickCommentBtn);
+    };
+  }, []);
   var onMouseDown = (0, _react.useCallback)(function (event) {
     event.preventDefault(); // prevent toolbar from taking focus away from editor
   }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.100",
+  "version": "2.0.102",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "919aff86a263c301dad00041dcce517eb5ba5498"
+  "gitHead": "3cf1bbc8201869c439313e3504a9829e08a41abd"
 }