@seafile/sdoc-editor 2.0.44 → 2.0.46

package/dist/basic-sdk/comment/components/comment-delete-popover.js

@@ -1,47 +1,72 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
+var _utils = require("../../extension/plugins/seatable-tables/seatable-settings/utils/utils");
 require("./comment-list.css");
 const CommentDeletePopover = _ref => {
   let {
     type,
-    setIsShowDeleteModal,
+    setIsShowDeletePopover,
     deleteConfirm,
     targetId,
     parentDom
   } = _ref;
+  const popoverRef = (0, _react.useRef)(null);
+  const hide = (0, _react.useCallback)(event => {
+    if (popoverRef.current && !(0, _utils.getEventClassName)(event).includes('popover') && !popoverRef.current.contains(event.target)) {
+      setIsShowDeletePopover(false);
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    }
+  }, [setIsShowDeletePopover]);
+  const onHotKey = (0, _react.useCallback)(event => {
+    if ((0, _isHotkey.default)('esc', event)) {
+      event.preventDefault();
+      setIsShowDeletePopover(false);
+    }
+  }, [setIsShowDeletePopover]);
+  (0, _react.useEffect)(() => {
+    document.addEventListener('click', hide, true);
+    document.addEventListener('keydown', onHotKey);
+    return () => {
+      document.removeEventListener('click', hide, true);
+      document.removeEventListener('keydown', onHotKey);
+    };
+  }, []);
   const {
     t
   } = (0, _reactI18next.useTranslation)('sdoc-editor');
   const onDeleteCancel = (0, _react.useCallback)(event => {
     event.stopPropagation();
-    setIsShowDeleteModal(false);
-  }, [setIsShowDeleteModal]);
+    setIsShowDeletePopover(false);
+  }, [setIsShowDeletePopover]);
   const handleConfirm = (0, _react.useCallback)(event => {
     event.stopPropagation();
     deleteConfirm();
   }, [deleteConfirm]);
-  const message = type === 'comment' ? 'comment' : 'reply';
-  const content = t(`Are_you_sure_to_delete_this_${message}`);
   return /*#__PURE__*/_react.default.createElement(_reactstrap.UncontrolledPopover, {
     container: parentDom,
     target: targetId,
     onClick: event => event.stopPropagation(),
-    placement: "bottom",
+    placement: "left",
     className: "comment-delete-popover",
     isOpen: true
-  }, /*#__PURE__*/_react.default.createElement(_reactstrap.PopoverBody, {
-    className: "comment-delete-popover-container"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "comment-delete-popover-container",
+    ref: popoverRef
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "delete-tip"
-  }, content), /*#__PURE__*/_react.default.createElement("div", {
+  }, t(`Are_you_sure_to_delete_this_${type === 'comment' ? 'comment' : 'reply'}`)), /*#__PURE__*/_react.default.createElement("div", {
     className: "delete-control mt-5"
   }, /*#__PURE__*/_react.default.createElement("button", {
     className: "btn btn-secondary mr-2",

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

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _context = _interopRequireDefault(require("../../../context"));
 var _commentEditor = _interopRequireDefault(require("./comment-editor"));
 var _tooltip = _interopRequireDefault(require("../../../components/tooltip"));
 var _notificationHooks = require("../hooks/notification-hooks");
@@ -79,6 +80,7 @@ const CommentItemContent = _ref => {
     updateCommentResolved(false);
   }, [updateCommentResolved]);
   const menuId = (0, _react.useMemo)(() => `comment_${comment.id}`, [comment]);
+  const user = _context.default.getUserInfo();
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-item"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -100,7 +102,7 @@ const CommentItemContent = _ref => {
     className: "comment-success-resolved sdocfont sdoc-mark-as-resolved"
   })))), isUnseen && !isActive && /*#__PURE__*/_react.default.createElement("span", {
     className: "sdoc-unread-message-tip"
-  }), isActive && /*#__PURE__*/_react.default.createElement("div", {
+  }), isActive && comment.user_email === 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", {
     id: `tooltip_${menuId}`,

package/dist/basic-sdk/comment/components/comment-item-reply.js

@@ -37,10 +37,10 @@ const CommentItemReply = _ref => {
     event.stopPropagation();
     setIsEditing(true);
   }, []);
-  const [isShowDeleteDialog, setIsShowDeleteDialog] = (0, _react.useState)(false);
+  const [isShowDeletePopover, setIsShowDeletePopover] = (0, _react.useState)(false);
   const onDeleteToggle = (0, _react.useCallback)(event => {
     event.stopPropagation();
-    setIsShowDeleteDialog(true);
+    setIsShowDeletePopover(true);
   }, []);
   const transferHtml = async mdString => {
     const htmlString = await _mdToHtml.default.process(mdString);
@@ -52,7 +52,7 @@ const CommentItemReply = _ref => {
   }, [reply.reply]);
   const _deleteReply = (0, _react.useCallback)(() => {
     deleteReply(reply.id);
-    setIsShowDeleteDialog(false);
+    setIsShowDeletePopover(false);
   }, [reply.id, deleteReply]);
   const updateContent = (0, _react.useCallback)(content => {
     if (reply.reply !== content) {
@@ -118,11 +118,11 @@ const CommentItemReply = _ref => {
     content: editorContent,
     updateContent: updateContent,
     setIsEditing: setIsEditing
-  }), isShowDeleteDialog && isActive && /*#__PURE__*/_react.default.createElement(_commentDeletePopover.default, {
+  }), isShowDeletePopover && isActive && /*#__PURE__*/_react.default.createElement(_commentDeletePopover.default, {
     parentDom: itemRef.current,
     type: "reply",
     deleteConfirm: _deleteReply,
-    setIsShowDeleteModal: setIsShowDeleteDialog,
+    setIsShowDeletePopover: setIsShowDeletePopover,
     targetId: replyOpToolsId
   }));
 };

package/dist/basic-sdk/comment/components/comment-item-wrapper.js

@@ -37,7 +37,7 @@ const CommentItemWrapper = _ref => {
     dispatch
   } = (0, _useCommentContext.useCommentContext)();
   const scrollRef = (0, _react.useRef)(document.querySelector('.sdoc-scroll-container'));
-  const [isShowDeleteDialog, setIsShowDeleteDialog] = (0, _react.useState)(false);
+  const [isShowDeletePopover, setIsShowDeletePopover] = (0, _react.useState)(false);
   const commentOpToolsId = `commentOpTools_${comment === null || comment === void 0 ? void 0 : comment.id}`;
   const style = !isGlobalComment && isCollapseCommentEditor ? {
     maxHeight: '341px'
@@ -238,16 +238,16 @@ const CommentItemWrapper = _ref => {
     onCommentClick && onCommentClick(comment);
   }, [comment, onCommentClick]);
   const onDeleteComment = (0, _react.useCallback)(() => {
-    setIsShowDeleteDialog(true);
+    setIsShowDeletePopover(true);
   }, []);
   const _deleteComment = (0, _react.useCallback)(() => {
     deleteComment(comment.id);
-    setIsShowDeleteDialog(false);
+    setIsShowDeletePopover(false);
     setCurrentCommentGroup && setCurrentCommentGroup(null);
   }, [comment.id, deleteComment, setCurrentCommentGroup]);
   (0, _react.useEffect)(() => {
     if (!isActive) {
-      setIsShowDeleteDialog(false);
+      setIsShowDeletePopover(false);
     }
   }, [isActive]);
   const className = (0, _classnames.default)('comment-ui-container', {
@@ -300,12 +300,11 @@ const CommentItemWrapper = _ref => {
       updateReply
     };
     return /*#__PURE__*/_react.default.createElement(_commentItemReply.default, props);
-  })), isShowDeleteDialog && isActive && /*#__PURE__*/_react.default.createElement(_commentDeletePopover.default, {
+  })), isShowDeletePopover && isActive && /*#__PURE__*/_react.default.createElement(_commentDeletePopover.default, {
     type: "comment",
-    setIsShowDeleteDialog: setIsShowDeleteDialog,
     targetId: commentOpToolsId,
     deleteConfirm: _deleteComment,
-    setIsShowDeleteModal: setIsShowDeleteDialog,
+    setIsShowDeletePopover: setIsShowDeletePopover,
     parentDom: listRef.current
   }));
 };

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

@@ -51,7 +51,7 @@
   padding: 16px;
 }
 
-.comment-delete-popover-container .delete-control {
+.comment-delete-popover .comment-delete-popover-container .delete-control {
   display: flex;
   justify-content: flex-end;
   width: 100%;

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

@@ -19,7 +19,6 @@ var _constants = require("../../extension/constants");
 var _constants2 = require("../../constants");
 const EditorComment = _ref => {
   let {
-    deleteUnseenNotifications,
     editor
   } = _ref;
   (0, _useSelectionUpdate.default)();

package/dist/basic-sdk/comment/components/elements-comment-count/index.js

@@ -24,11 +24,10 @@ const ElementsCommentCount = _ref => {
     const unresolvedComment = comments.filter(item => !item.resolved);
     const unresolvedCommentCount = unresolvedComment.length;
     if (unresolvedCommentCount === 0) return null;
-    const isSelected = selectionElement && selectionElement.id === elementId;
     return /*#__PURE__*/_react.default.createElement(_elementCommentCount.default, {
       key: elementId,
       elementId: elementId,
-      isElementSelected: isSelected,
+      isElementSelected: selectionElement && selectionElement.id === elementId,
       commentsCount: unresolvedCommentCount,
       editor: editor,
       onSelectElement: onSelectElement

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

@@ -56,7 +56,6 @@ const CommentWrapper = _ref => {
   } = _context.default.getSettings('isFreezed');
   if (commentsInfo.isFetching) return null;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, type === 'editor' && !isFreezed && /*#__PURE__*/_react.default.createElement(_components.EditorComment, {
-    deleteUnseenNotifications: deleteUnseenNotifications,
     editor: editor
   }), type === 'global' && /*#__PURE__*/_react.default.createElement(_components.GlobalComment, {
     deleteUnseenNotifications: deleteUnseenNotifications,

package/dist/slate-convert/html-to-slate/rules/paragraph.js

@@ -13,6 +13,16 @@ const paragraphRule = (element, parseChild) => {
     childNodes
   } = element;
   if (nodeName === 'P' && element.parentElement.nodeName !== 'LI') {
+    if (childNodes.length === 0) {
+      return {
+        id: _slugid.default.nice(),
+        type: _constants.PARAGRAPH,
+        children: [{
+          id: _slugid.default.nice(),
+          text: ''
+        }]
+      };
+    }
     return {
       id: _slugid.default.nice(),
       type: _constants.PARAGRAPH,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.44",
+  "version": "2.0.46",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -25,6 +25,7 @@
     "randomcolor": "0.6.2",
     "react-color": "2.19.3",
     "react-cookies": "0.1.1",
+    "react-transition-group": "4.4.5",
     "reactstrap": "9.2.3",
     "rehype-format": "5.0.0",
     "rehype-mathjax": "5.0.0",
@@ -38,7 +39,7 @@
     "remark-parse": "11.0.0",
     "remark-rehype": "11.0.0",
     "remark-stringify": "11.0.0",
-    "sea-chart": "2.0.8",
+    "sea-chart": "1.1.82",
     "slugid": "3.2.0",
     "socket.io-client": "4.8.1",
     "type-of": "2.0.1",