@seafile/sdoc-editor 1.0.169 → 1.0.171

package/dist/basic-sdk/extension/plugins/file-link/helpers.js

@@ -21,7 +21,7 @@ const isMenuDisabled = (editor, readonly) => {
       type
     } = elem;
     if (editor.isVoid(elem)) return true;
-    if ([_constants.CODE_BLOCK, _constants.CODE_LINE, _constants.LINK].includes(type)) return true;
+    if ([_constants.CODE_BLOCK, _constants.CODE_LINE, _constants.LINK, ..._constants.HEADERS].includes(type)) return true;
     return false;
   });
   if (notMatch) return true; // disabled

package/dist/basic-sdk/extension/plugins/header/helpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setHeaderType = exports.isMenuDisabled = exports.getHeaderType = void 0;
+exports.setHeaderType = exports.isSelectionInHeader = exports.isMenuDisabled = exports.getHeaderType = void 0;
 var _slate = require("@seafile/slate");
 var _core = require("../../core");
 var _constants = require("../../constants");
@@ -44,6 +44,22 @@ const getHeaderType = editor => {
   return (0, _core.getNodeType)(n);
 };
 exports.getHeaderType = getHeaderType;
+const isSelectionInHeader = editor => {
+  const [match] = _slate.Editor.nodes(editor, {
+    match: n => {
+      if (!_slate.Element.isElement(n)) return false;
+      if (!n.type) return false;
+      if (n.type.startsWith(_constants.HEADER)) return true;
+      if (n.type === _constants.TITLE) return true;
+      if (n.type === _constants.SUBTITLE) return true;
+      return false;
+    },
+    // Matches nodes whose node.type starts with header
+    universal: true
+  });
+  return match;
+};
+exports.isSelectionInHeader = isSelectionInHeader;
 const setHeaderType = (editor, type) => {
   if (!type) return;
   _slate.Transforms.setNodes(editor, {

package/dist/basic-sdk/extension/plugins/quick-insert/helper.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformToText = exports.getQuickInsertEntity = exports.genQuickInsert = void 0;
+exports.transformToText = exports.isSelectionSameWithInsert = exports.getQuickInsertEntity = exports.genQuickInsert = void 0;
 var _slate = require("@seafile/slate");
 var _constants = require("../../constants");
 var _core = require("../../core");
@@ -37,4 +37,15 @@ const transformToText = (editor, quickInsertNode) => {
   });
   return insertPathRef.unref();
 };
-exports.transformToText = transformToText;
+exports.transformToText = transformToText;
+const isSelectionSameWithInsert = (editor, element) => {
+  if (!editor.selection) return;
+  if (!_slate.Range.isCollapsed(editor.selection)) return;
+  const {
+    anchor
+  } = editor.selection;
+  const path = _slateReact.ReactEditor.findPath(editor, element);
+  const lastPoint = _slate.Editor.end(editor, path);
+  return _slate.Point.equals(anchor, lastPoint);
+};
+exports.isSelectionSameWithInsert = isSelectionSameWithInsert;

package/dist/basic-sdk/extension/plugins/quick-insert/render-elem.js

@@ -32,6 +32,7 @@ const RenderQuickInsert = (_ref, editor, readonly) => {
   const insertElmRef = (0, _react.useRef)(null);
   const aboveBlockNode = (0, _core.getAboveBlockNode)(editor);
   const isEmptyNode = (0, _helpers.isVoidNode)(aboveBlockNode === null || aboveBlockNode === void 0 ? void 0 : aboveBlockNode[0]);
+  const [isShowPopover] = (0, _react.useState)((0, _helper.isSelectionSameWithInsert)(editor, element));
   const handleClick = (0, _react.useCallback)(e => {
     // Click the search input
     if (sideMenuRef.current.contains(e.target) && e.target.tagName === 'INPUT') return;
@@ -39,14 +40,17 @@ const RenderQuickInsert = (_ref, editor, readonly) => {
       (0, _helper.transformToText)(editor, element);
     }
   }, [editor, element]);
-  const genStyle = (top, left) => {
-    if (editor.isRemote) return null;
+  const genStyle = (0, _react.useCallback)((top, left) => {
     const overflowY = top + sideMenuRef.current.offsetHeight - document.body.clientHeight;
     if (overflowY > 0) {
       top = top - overflowY - 10;
     }
+    const overflowX = left - sideMenuRef.current.offsetWidth;
+    if (overflowX < 0) {
+      left = sideMenuRef.current.offsetWidth + 10;
+    }
     return `top: ${top}px; left: ${left}px`;
-  };
+  }, []);
   const handleInsertMenuStyle = (0, _react.useCallback)(() => {
     const currentDom = _slateReact.ReactEditor.toDOMNode(editor, element);
     const {
@@ -55,12 +59,13 @@ const RenderQuickInsert = (_ref, editor, readonly) => {
     } = currentDom.getBoundingClientRect();
     const style = genStyle(top, left - 10);
     setMenuStyle(style);
-  }, [editor, element]);
+  }, [editor, element, genStyle]);
   const handleScroll = (0, _react.useCallback)(e => {
     handleInsertMenuStyle();
   }, [handleInsertMenuStyle]);
   (0, _react.useEffect)(() => {
     if (readonly) return;
+    if (!sideMenuRef.current) return;
     const scrollDom = scrollRef.current;
     handleInsertMenuStyle();
     document.addEventListener('click', handleClick);
@@ -79,7 +84,7 @@ const RenderQuickInsert = (_ref, editor, readonly) => {
     ref: insertElmRef
   }, /*#__PURE__*/_react.default.createElement("span", Object.assign({}, attributes, {
     className: ""
-  }), /*#__PURE__*/_react.default.createElement(_InlineBugFixWrapper.default, null), /*#__PURE__*/_react.default.createElement("span", null, "/", children), /*#__PURE__*/_react.default.createElement(_InlineBugFixWrapper.default, null), !readonly && /*#__PURE__*/_react.default.createElement(_commons.ElementPopover, {
+  }), /*#__PURE__*/_react.default.createElement(_InlineBugFixWrapper.default, null), /*#__PURE__*/_react.default.createElement("span", null, "/", children), /*#__PURE__*/_react.default.createElement(_InlineBugFixWrapper.default, null), !readonly && isShowPopover && /*#__PURE__*/_react.default.createElement(_commons.ElementPopover, {
     className: "sdoc-side-menu-popover",
     style: menuStyle
   }, /*#__PURE__*/_react.default.createElement("div", {

package/dist/basic-sdk/extension/plugins/sdoc-link/helpers.js

@@ -12,6 +12,7 @@ var _copyToClipboard = _interopRequireDefault(require("copy-to-clipboard"));
 var _context = _interopRequireDefault(require("../../../../context"));
 var _core = require("../../core");
 var _constants = require("../../constants");
+var _helpers = require("../header/helpers");
 const isMenuDisabled = (editor, readonly) => {
   if (readonly) return true;
   if (editor.selection == null) return true;
@@ -21,7 +22,7 @@ const isMenuDisabled = (editor, readonly) => {
       type
     } = elem;
     if (editor.isVoid(elem)) return true;
-    if ([_constants.CODE_BLOCK, _constants.CODE_LINE, _constants.LINK].includes(type)) return true;
+    if ([_constants.CODE_BLOCK, _constants.CODE_LINE, _constants.LINK, ..._constants.HEADERS].includes(type)) return true;
     return false;
   });
   if (notMatch) return true; // disabled
@@ -157,6 +158,9 @@ const getBeforeText = editor => {
 };
 exports.getBeforeText = getBeforeText;
 const isTriggeredByShortcut = editor => {
+  if ((0, _helpers.isSelectionInHeader)(editor)) {
+    return false;
+  }
   const {
     beforeText
   } = getBeforeText(editor);

package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js

@@ -69,13 +69,18 @@ const SideMenu = (_ref, ref) => {
   }, [onReset, slateNode.id, t]);
   const onUpdateMenuLocation = (0, _react.useCallback)(() => {
     let top = menuPosition.top;
+    let left = menuPosition.left;
     if (sideMenuRef.current) {
       const overflowY = menuPosition.top + sideMenuRef.current.offsetHeight - document.body.clientHeight;
       if (overflowY > 0) {
         top = menuPosition.top - overflowY - 10;
       }
+      const overflowX = menuPosition.left - sideMenuRef.current.offsetWidth;
+      if (overflowX < 0) {
+        left = sideMenuRef.current.offsetWidth + 10;
+      }
     }
-    setMenuStyle(`top: ${top}px; left: ${menuPosition.left}px`);
+    setMenuStyle(`top: ${top}px; left: ${left}px`);
   }, [menuPosition.left, menuPosition.top]);
   (0, _react.useEffect)(() => {
     onUpdateMenuLocation();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "1.0.169",
+  "version": "1.0.171",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",