@seafile/sdoc-editor 3.0.197 → 3.0.198

package/dist/assets/css/dropdown-menu.css

@@ -80,7 +80,7 @@
 }
 
 .sdoc-dropdown-menu .sdoc-dropdown-item-content .sdoc-dropdown-item-content-icon {
-  margin-right: 12px;
+  margin-right: 8px;
 }
 
 .sdoc-dropdown-menu .sdoc-arrow-right {

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

@@ -168,7 +168,7 @@ var CommentItemContent = function CommentItemContent(_ref) {
     onClick: markAsResolved
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdocfont sdoc-check-mark"
-  })), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), !isDropdownOpen && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "tooltip_".concat(menuId)
   }, t('Resolved_tip'))), /*#__PURE__*/_react["default"].createElement(_reactstrap.Dropdown, {
     id: targetId,

package/dist/comment/components/global-comment/global-comment-header.js

@@ -131,7 +131,7 @@ var GlobalCommentHeader = function GlobalCommentHeader(_ref2) {
     id: "comment-types"
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdocfont sdoc-filter1"
-  }), isMounted && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }), isMounted && !isDropdownOpen && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "comment-types"
   }, t('Filter'))), /*#__PURE__*/_react["default"].createElement(_reactstrap.DropdownMenu, {
     className: "sdoc-dropdown-menu sdoc-comment-filter-dropdown",

package/dist/extension/commons/color-menu/index.js

@@ -145,7 +145,7 @@ var ColorMenu = function ColorMenu(_ref) {
     className: "sdoc-color-toggle sdoc-menu-with-dropdown-triangle"
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdoc-menu-with-dropdown-triangle-icon sdocfont sdoc-".concat(isShowMenu ? 'arrow-up' : 'arrow-down')
-  }))), text && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), text && !isShowMenu && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: buttonId
   }, t(text)), !disabled && /*#__PURE__*/_react["default"].createElement(_reactstrap.UncontrolledPopover, {
     target: id,

package/dist/extension/commons/menu/menu-item.js

@@ -23,7 +23,9 @@ var MenuItem = function MenuItem(_ref) {
     iconClass = _ref.iconClass,
     id = _ref.id,
     text = _ref.text,
-    ariaLabel = _ref.ariaLabel;
+    ariaLabel = _ref.ariaLabel,
+    _ref$isShowPopover = _ref.isShowPopover,
+    isShowPopover = _ref$isShowPopover === void 0 ? false : _ref$isShowPopover;
   var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
     t = _useTranslation.t;
   var onClick = (0, _react.useCallback)(function (event) {
@@ -52,7 +54,7 @@ var MenuItem = function MenuItem(_ref) {
     className: "sdoc-link-menu-item"
   }, /*#__PURE__*/_react["default"].createElement("span", null, t(text)), /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdocfont sdoc-arrow-down"
-  }))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), !isShowPopover && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: id
   }, t(text)));
 };

package/dist/extension/commons/more-dropdown/index.js

@@ -1,11 +1,13 @@
 "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["default"] = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -17,6 +19,7 @@ var MoreDropdown = function MoreDropdown(_ref) {
     className = _ref$className === void 0 ? 'menu-group-item' : _ref$className,
     disabled = _ref.disabled,
     children = _ref.children;
+  var popoverRef = (0, _react.useRef)(null);
   var validClassName = (0, _classnames["default"])(className, 'sdoc-more-text-button', {
     'disabled': disabled,
     'rich-icon-btn': isRichEditor,
@@ -27,6 +30,16 @@ var MoreDropdown = function MoreDropdown(_ref) {
   var buttonId = 'sdoc-more-text-operations';
   var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
     t = _useTranslation.t;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isShowMenu = _useState2[0],
+    setIsShowMenu = _useState2[1];
+  var toggle = (0, _react.useCallback)(function (event) {
+    popoverRef.current.toggle();
+    setIsShowMenu(!isShowMenu);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isShowMenu]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("button", {
     className: validClassName,
     type: "button",
@@ -34,7 +47,7 @@ var MoreDropdown = function MoreDropdown(_ref) {
     id: buttonId
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdocfont sdoc-more"
-  }), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }), !isShowMenu && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: buttonId
   }, t('More_operation'))), /*#__PURE__*/_react["default"].createElement(_reactstrap.UncontrolledPopover, {
     target: buttonId,
@@ -43,7 +56,9 @@ var MoreDropdown = function MoreDropdown(_ref) {
     trigger: "legacy",
     placement: "bottom-end",
     hideArrow: true,
-    fade: false
+    toggle: toggle,
+    fade: false,
+    ref: popoverRef
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "menu-group"
   }, children)));

package/dist/extension/plugins/callout/render-elem/callout-hover-menu/index.js

@@ -77,7 +77,7 @@ function CalloutHoverMenu(_ref) {
     className: "sdocfont sdoc-callout-color mr-1"
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "sdocfont sdoc-arrow-down"
-  })), isShowTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), isShowTooltip && !isShowColorSelector && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "select_callout_color",
     placement: "top",
     fade: true
@@ -91,7 +91,7 @@ function CalloutHoverMenu(_ref) {
     className: "sdocfont sdoc-callout-icon mr-1"
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "sdocfont sdoc-arrow-down"
-  })), isShowTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), isShowTooltip && !isShowIcon && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "select_callout_icon",
     placement: "top",
     fade: true

package/dist/extension/plugins/file-link/hover-menu/index.css

@@ -80,14 +80,23 @@
   position: absolute;
   top: 32px;
   left: 0px;
-  padding: 8px 0;
   background-color: #fff;
-  border: 1px solid #e5e6e8;
-  border-radius: 2px;
-  box-shadow: 0 0 10px #ccc;
+  border: 1px solid #eee;
+  border-radius: 8px;
+  box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.1);
   display: flex;
   flex-direction: column;
   align-items: flex-start;
   z-index: 101;
   white-space: nowrap;
 }
+
+.sdoc-file-link-hover-menu-container .sdoc-file-display-style-popover .sdoc-dropdown-menu-item {
+  padding: 0 12px 0 38px;
+  position: relative;
+}
+
+.sdoc-file-link-hover-menu-container .sdoc-file-display-style-popover .sdoc-dropdown-menu-item .sdoc-check-mark {
+  position: absolute;
+  left: 12px;
+}

package/dist/extension/plugins/file-link/hover-menu/index.js

@@ -50,8 +50,8 @@ var FileLinkHoverMenu = function FileLinkHoverMenu(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var onShowProver = (0, _react.useCallback)(function (e) {
-    setIsShowDisplayStylePopover(true);
-  }, []);
+    setIsShowDisplayStylePopover(!isShowDisplayStylePopover);
+  }, [isShowDisplayStylePopover]);
   var onSelect = (0, _react.useCallback)(function (event, value) {
     event.stopPropagation();
     var path = _slateReact.ReactEditor.findPath(editor, element);
@@ -117,7 +117,7 @@ var FileLinkHoverMenu = function FileLinkHoverMenu(_ref) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: fileLinkType,
       "date-type": fileLinkType,
-      className: "sdoc-dropdown-menu-item sdoc-dropdown-item-with-left-icon pr-2",
+      className: "sdoc-dropdown-menu-item",
       onClick: function onClick(event) {
         return onSelect(event, fileLinkType);
       }
@@ -128,7 +128,7 @@ var FileLinkHoverMenu = function FileLinkHoverMenu(_ref) {
     }), /*#__PURE__*/_react["default"].createElement("span", null, t(_constants2.FILE_LINK_TYPE_CONFIG[fileLinkType].text))), selectedType === fileLinkType && /*#__PURE__*/_react["default"].createElement("i", {
       className: "sdocfont sdoc-check-mark sdoc-dropdown-item-right-icon"
     }));
-  }))), isShowTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), isShowTooltip && !isShowDisplayStylePopover && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "select_style",
     placement: "top",
     fade: true

package/dist/extension/plugins/font/menu/font-family/index.js

@@ -115,7 +115,7 @@ var FontFamily = function FontFamily(_ref) {
     className: "sdoc-menu-with-dropdown-triangle"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: caretIconClass
-  }))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), !isShowMenu && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: fontSizeButtonId
   }, t('Font')), !disabled && /*#__PURE__*/_react["default"].createElement(_reactstrap.UncontrolledPopover, {
     target: fontSizeButtonId,

package/dist/extension/plugins/font/menu/font-size/index.js

@@ -73,7 +73,7 @@ var FontSize = function FontSize(_ref) {
     className: "sdoc-menu-with-dropdown-triangle"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: caretIconClass
-  }))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), !isShowMenu && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: fontSizeButtonId
   }, t('Font_size')), !disabled && /*#__PURE__*/_react["default"].createElement(_reactstrap.UncontrolledPopover, {
     target: fontSizeButtonId,

package/dist/extension/plugins/header/menu/index.js

@@ -36,6 +36,9 @@ var HeaderMenu = /*#__PURE__*/function (_React$Component) {
       var menu = _this.menu;
       var clickIsInMenu = menu && menu.contains(e.target) && menu !== e.target;
       if (clickIsInMenu) return;
+
+      // in menu toggle
+      if (_this.menuToggle && _this.menuToggle.contains(e.target)) return;
       _this.setState({
         isShowHeaderPopover: false
       }, function () {
@@ -90,6 +93,9 @@ var HeaderMenu = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2["default"])(_this, "setMenuRef", function (ref) {
       _this.menu = ref;
     });
+    (0, _defineProperty2["default"])(_this, "setMenuToggle", function (ref) {
+      _this.menuToggle = ref;
+    });
     (0, _defineProperty2["default"])(_this, "getToolTip", function (type) {
       return (0, _commonUtils.isMac)() ? _constants.MAC_HOTKEYS[type] : _constants.WIN_HOTKEYS[type];
     });
@@ -112,6 +118,7 @@ var HeaderMenu = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "header-menu"
       }, /*#__PURE__*/_react["default"].createElement("div", {
+        ref: this.setMenuToggle,
         className: (0, _classnames["default"])('header-toggle', {
           'header-toggle-disabled': disabled
         }),

package/dist/extension/plugins/image/hover-menu/index.js

@@ -232,7 +232,7 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
     }), align === item.type && /*#__PURE__*/_react["default"].createElement("i", {
       className: "sdocfont sdoc-check-mark"
     }));
-  })), isShowTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), isShowTooltip && !popoverState.alignPopover && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "sdoc_image_alignment",
     placement: "top",
     fade: true
@@ -270,7 +270,7 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
     }), border_type === item.type && /*#__PURE__*/_react["default"].createElement("i", {
       className: "sdocfont sdoc-check-mark sdoc-dropdown-item-right-icon"
     })));
-  })), isShowTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), isShowTooltip && !popoverState.borderPopover && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "sdoc_image_border",
     placement: "top",
     fade: true

package/dist/extension/plugins/sdoc-link/hover-menu/index.css

@@ -80,14 +80,23 @@
   position: absolute;
   top: 32px;
   left: 0px;
-  padding: 8px 0;
   background-color: #fff;
-  border: 1px solid #e5e6e8;
-  border-radius: 2px;
-  box-shadow: 0 0 10px #ccc;
+  border: 1px solid #eee;
+  border-radius: 8px;
+  box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.1);
   display: flex;
   flex-direction: column;
   align-items: flex-start;
   z-index: 101;
   white-space: nowrap;
 }
+
+.sdoc-file-link-hover-menu-container .sdoc-file-display-style-popover .sdoc-dropdown-item {
+  padding: 0 12px 0 38px;
+  position: relative;
+}
+
+.sdoc-file-link-hover-menu-container .sdoc-file-display-style-popover .sdoc-dropdown-menu-item .sdoc-check-mark {
+  position: absolute;
+  left: 12px;
+}

package/dist/extension/plugins/sdoc-link/hover-menu/index.js

@@ -56,8 +56,8 @@ var SdocLinkHoverMenu = function SdocLinkHoverMenu(_ref) {
   }, []);
   var onShowProver = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
-    setIsShowDisplayStylePopover(true);
-  }, []);
+    setIsShowDisplayStylePopover(!isShowDisplayStylePopover);
+  }, [isShowDisplayStylePopover]);
   var onSelect = (0, _react.useCallback)(function (event, value) {
     event.stopPropagation();
     var path = _slateReact.ReactEditor.findPath(editor, element);
@@ -152,7 +152,7 @@ var SdocLinkHoverMenu = function SdocLinkHoverMenu(_ref) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: sdocLinkType,
       "date-type": sdocLinkType,
-      className: "sdoc-dropdown-menu-item sdoc-dropdown-item-with-left-icon pr-2",
+      className: "sdoc-dropdown-menu-item",
       onClick: function onClick(event) {
         return onSelect(event, sdocLinkType);
       }
@@ -163,7 +163,7 @@ var SdocLinkHoverMenu = function SdocLinkHoverMenu(_ref) {
     }), /*#__PURE__*/_react["default"].createElement("span", null, t(_constants2.SDOC_LINK_TYPE_CONFIG[sdocLinkType].text))), selectedType === sdocLinkType && /*#__PURE__*/_react["default"].createElement("i", {
       className: "sdocfont sdoc-check-mark sdoc-dropdown-item-right-icon"
     }));
-  }))), isShowTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), isShowTooltip && !isShowDisplayStylePopover && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "display_sdoc_link",
     placement: "top",
     fade: true

package/dist/extension/plugins/search-replace/menu/index.js

@@ -77,6 +77,7 @@ var SearchReplaceMenu = function SearchReplaceMenu(_ref) {
     ariaLabel: "search",
     disabled: false,
     isActive: isOpenPopover,
+    isShowPopover: isOpenPopover,
     onMouseDown: onMouseDown
   }, menuConfig)), isOpenPopover && /*#__PURE__*/_react["default"].createElement(_popover["default"], {
     editor: editor,

package/dist/extension/plugins/text-align/menu/index.js

@@ -74,7 +74,7 @@ var TextAlignMenu = function TextAlignMenu(_ref) {
     className: "sdoc-menu-with-dropdown-triangle"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: caretIconClass
-  }))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), !isShowMenu && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: buttonId
   }, t('Alignment_type')), !disabled && /*#__PURE__*/_react["default"].createElement(_reactstrap.UncontrolledPopover, {
     target: buttonId,

package/dist/extension/toolbar/header-toolbar/insert-toolbar/index.js

@@ -88,7 +88,7 @@ var InsertToolbar = function InsertToolbar(_ref) {
     className: "sdoc-menu-with-dropdown-triangle"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: caretIconClass
-  }))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }))), !isShowMenu && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: insertToolbarId
   }, t('Insert')), !disabled && /*#__PURE__*/_react["default"].createElement(_reactstrap.UncontrolledPopover, {
     target: insertToolbarId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.197",
+  "version": "3.0.198",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "883ff8d09d29e0cbe27254150e1a815f895d7700"
+  "gitHead": "8f8ef33b66b8529d76b564b109b81d4f7f0793f7"
 }