@seafile/sdoc-editor 2.0.20 → 2.0.21

package/dist/basic-sdk/comment/components/comment-all-participants/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
+var _slateReact = require("@seafile/slate-react");
 var _useParticipants = require("../../hooks/use-participants");
 var _participantAvatar = _interopRequireDefault(require("./participant-avatar"));
 var _tooltip = _interopRequireDefault(require("../../../../components/tooltip"));
@@ -18,6 +19,7 @@ const CommentAllParticipants = () => {
   const {
     participants
   } = (0, _useParticipants.useParticipantsContext)();
+  const editor = (0, _slateReact.useSlateStatic)();
   const {
     t
   } = (0, _reactI18next.useTranslation)('sdoc-editor');
@@ -58,7 +60,8 @@ const CommentAllParticipants = () => {
     target: addParticipantId
   }, t('Add_participants'))), isDidMount && /*#__PURE__*/_react.default.createElement(_commentParticipantsEditor.default, {
     target: commentsParticipantsId,
-    ref: popoverRef
+    ref: popoverRef,
+    editor: editor
   }));
 };
 var _default = exports.default = CommentAllParticipants;

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

@@ -17,7 +17,8 @@ var _mouseEvent = require("../../../utils/mouse-event");
 require("./index.css");
 const CommentParticipantsEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   let {
-    target
+    target,
+    editor
   } = _ref;
   const popoverRef = (0, _react.useRef)();
   const {
@@ -38,10 +39,10 @@ const CommentParticipantsEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref
   const onChangeSearch = (0, _react.useCallback)(event => {
     const newSearchValue = event.target.value;
     if (searchValue === newSearchValue) return;
-    const searchedCollaborators = (0, _utils.searchCollaborators)(collaborators, newSearchValue);
+    const searchedCollaborators = (0, _utils.searchCollaborators)(collaborators, newSearchValue, editor);
     setSearchValue(newSearchValue);
     setSearchedCollaborators(searchedCollaborators);
-  }, [searchValue, collaborators]);
+  }, [searchValue, collaborators, editor]);
   return /*#__PURE__*/_react.default.createElement(_reactstrap.UncontrolledPopover, {
     target: target,
     className: "sdoc-comments-participants-popover",

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

@@ -23,14 +23,22 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _utils = require("../../../utils");
+var _helper = require("../../extension/plugins/mention/helper");
 var _constants = require("../../../constants");
 var _notificationUtils = require("./notification-utils");
 var _core = require("../../extension/core");
 var _constants2 = require("../../extension/constants");
-const searchCollaborators = (collaborators, searchValue) => {
+const searchCollaborators = (collaborators, searchValue, editor) => {
   const validSearchValue = searchValue ? searchValue.trim().toLowerCase() : '';
   const validCollaborators = Array.isArray(collaborators) && collaborators.length > 0 ? collaborators : [];
   if (!validSearchValue) return validCollaborators;
+
+  // The current character is '@' and the previous character is a null character
+  const beforeStr = (0, _helper.getPreCharacters)(editor);
+  const isEmptyStr = beforeStr.slice(-2, -1).trim().length === 0;
+  if (beforeStr.slice(-1) === '@' && isEmptyStr) {
+    return validCollaborators;
+  }
   return validCollaborators.filter(collaborator => {
     const {
       name,

package/dist/basic-sdk/extension/plugins/check-list/helpers.js

@@ -74,16 +74,24 @@ const setCheckListItemType = (editor, newType, insertPosition) => {
   }
   if (!(0, _core.isRangeAcrossBlocks)(editor)) {
     const path = _slate.Editor.path(editor, editor.selection);
+    const [currentNode] = (0, _core.getCurrentNode)(editor);
     if (path) {
       const [targetNode, targetPath] = _slate.Editor.node(editor, [path[0]]);
       if (targetNode && [_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(targetNode === null || targetNode === void 0 ? void 0 : targetNode.type)) {
         convertToCheck(editor, targetNode, targetPath);
+        if (newType === _constants.CHECK_LIST_ITEM && !_slate.Node.string(currentNode)) {
+          (0, _core.focusEditor)(editor);
+        }
         return;
       }
     }
     _slate.Transforms.setNodes(editor, {
       type: newType
     });
+    // When currentNode is empty
+    if (newType === _constants.CHECK_LIST_ITEM && !_slate.Node.string(currentNode)) {
+      (0, _core.focusEditor)(editor, path);
+    }
   } else {
     const nodes = _slate.Editor.nodes(editor, {
       match: n => {

package/dist/basic-sdk/extension/plugins/list/transforms/toggle-list.js

@@ -10,6 +10,7 @@ var _core = require("../../../core");
 var _queries = require("../queries");
 var _unwrapList = require("./unwrap-list");
 var _model = require("../model");
+var _slateReact = require("@seafile/slate-react");
 const wrapLineList = (editor, type) => {
   const list = (0, _model.generateEmptyList)(type);
   _slate.Transforms.wrapNodes(editor, list);
@@ -105,7 +106,8 @@ const wrapRangeList = (editor, type) => {
     });
   });
 };
-const toggleList = (editor, type, insertPosition) => {
+const toggleList = function (editor, type, insertPosition) {
+  let focusSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   if (insertPosition === _constants.INSERT_POSITION.AFTER) {
     const list = (0, _model.generateEmptyList)(type);
     const listContent = (0, _model.generateEmptyListContent)();
@@ -122,6 +124,7 @@ const toggleList = (editor, type, insertPosition) => {
       selection
     } = editor;
     if (!selection) return false;
+    const [currentNode] = (0, _core.getCurrentNode)(editor);
 
     // selection is collapsed, anchor === focus
     // selection is in one block
@@ -147,6 +150,11 @@ const toggleList = (editor, type, insertPosition) => {
       } else {
         wrapLineList(editor, type);
       }
+
+      // When currentNode is empty
+      if (!_slate.Node.string(currentNode) && currentNode.children.length === 1 && focusSelection) {
+        (0, _core.focusEditor)(editor, editor.selection);
+      }
       return;
     }
 

package/dist/basic-sdk/extension/plugins/markdown/plugin.js

@@ -186,7 +186,7 @@ const withMarkDown = editor => {
     _slate.Transforms.select(editor, range);
     _slate.Transforms.delete(editor);
     if (type === _constants.UNORDERED_LIST) {
-      (0, _transforms.toggleList)(editor, type);
+      (0, _transforms.toggleList)(editor, type, null, false);
       return;
     }
     if (type === _constants.BLOCKQUOTE) {

package/dist/basic-sdk/extension/plugins/mention/helper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformToText = exports.sortCollaborators = exports.insertTemporaryMentionInput = exports.insertMention = exports.getPrevMentionIptEntry = exports.getMentionTempIptEntry = exports.getMentionEntry = void 0;
+exports.transformToText = exports.sortCollaborators = exports.insertTemporaryMentionInput = exports.insertMention = exports.getPrevMentionIptEntry = exports.getPreCharacters = exports.getMentionTempIptEntry = exports.getMentionEntry = void 0;
 var _slate = require("@seafile/slate");
 var _slugid = _interopRequireDefault(require("slugid"));
 var _core = require("../../core");
@@ -163,4 +163,21 @@ const getPrevMentionIptEntry = editor => {
   }
   return;
 };
-exports.getPrevMentionIptEntry = getPrevMentionIptEntry;
+exports.getPrevMentionIptEntry = getPrevMentionIptEntry;
+const getPreCharacters = editor => {
+  const {
+    selection
+  } = editor;
+  const {
+    anchor,
+    focus
+  } = selection;
+  const path = _slate.Editor.path(editor, anchor);
+  const startPoint = _slate.Editor.start(editor, path);
+  const beforeStr = _slate.Editor.string(editor, {
+    anchor: startPoint,
+    focus
+  });
+  return beforeStr;
+};
+exports.getPreCharacters = getPreCharacters;

package/dist/basic-sdk/extension/plugins/mention/plugin.js

@@ -27,16 +27,20 @@ const withMention = editor => {
     const {
       selection
     } = editor;
-    if (text === '@' && !(0, _helper.getMentionTempIptEntry)(editor)) {
-      (0, _helper.insertTemporaryMentionInput)(newEditor);
-      const {
-        anchor
-      } = selection;
-      const path = _slate.Editor.path(editor, anchor);
-      const abovePath = path.slice(0, path.length - 1);
-      const focusPath = abovePath.concat(path.at(-1) + 1);
-      (0, _core.focusEditor)(editor, focusPath);
-      return;
+    if (text === '@') {
+      const beforeStr = (0, _helper.getPreCharacters)(editor);
+      const isEmptyStr = beforeStr.slice(-1).trim().length === 0;
+      if (!(0, _helper.getMentionTempIptEntry)(editor) && isEmptyStr) {
+        const {
+          anchor
+        } = selection;
+        const path = _slate.Editor.path(editor, anchor);
+        (0, _helper.insertTemporaryMentionInput)(newEditor);
+        const abovePath = path.slice(0, path.length - 1);
+        const focusPath = abovePath.concat(path.at(-1) + 1);
+        (0, _core.focusEditor)(editor, focusPath);
+        return;
+      }
     }
     const prevNodeEntry = _slate.Editor.previous(editor);
     if (prevNodeEntry) {

package/dist/basic-sdk/extension/plugins/mention/render-elem/participant-popover.js

@@ -109,9 +109,9 @@ const ParticipantPopover = _ref => {
   }, [collaboratorsPopoverRef]);
   const getSearchedCollaborators = (0, _react.useCallback)(searchingText => {
     if (!searchingText.length) return validCollaborators;
-    if (searchingText) return (0, _utils.searchCollaborators)(validCollaborators, searchingText);
+    if (searchingText) return (0, _utils.searchCollaborators)(validCollaborators, searchingText, editor);
     return [];
-  }, [validCollaborators]);
+  }, [editor, validCollaborators]);
   const handleInvolvedKeyUp = (0, _react.useCallback)(() => {
     const searchedCollaborators = getSearchedCollaborators(searchText);
     if (searchedCollaborators.length === 0) {
@@ -189,7 +189,7 @@ const ParticipantPopover = _ref => {
     handleInvolvedKeyUp(event);
   }, [editor, handleInvolvedKeyUp, handleSelectCollaborator, handleSelectingCollaborator]);
 
-  //Add the Enter keydown event listener during the capture phase
+  // Add the Enter keydown event listener during the capture phase
   (0, _react.useEffect)(() => {
     const handleKeydownCapture = event => {
       if (event.keyCode === _constants3.KeyCodes.Enter) {

package/dist/basic-sdk/extension/toolbar/insert-element-toolbar/index.js

@@ -140,7 +140,13 @@ const QuickInsertBlockMenu = _ref => {
   }, [editor]);
   const isDisableTable = (0, _react.useMemo)(() => {
     const callout = (0, _core.getAboveBlockNode)(editor, {
-      match: n => [_constants.ELEMENT_TYPE.ORDERED_LIST, _constants.ELEMENT_TYPE.UNORDERED_LIST, _constants.ELEMENT_TYPE.CHECK_LIST_ITEM, _constants.ELEMENT_TYPE.MULTI_COLUMN].includes(n.type)
+      match: n => [_constants.ELEMENT_TYPE.ORDERED_LIST, _constants.ELEMENT_TYPE.UNORDERED_LIST, _constants.ELEMENT_TYPE.CHECK_LIST_ITEM, _constants.ELEMENT_TYPE.MULTI_COLUMN, _constants.ELEMENT_TYPE.BLOCKQUOTE, _constants.ELEMENT_TYPE.CALL_OUT].includes(n.type)
+    });
+    return !!callout;
+  }, [editor]);
+  const isDisableMultiColumn = (0, _react.useMemo)(() => {
+    const callout = (0, _core.getAboveBlockNode)(editor, {
+      match: n => [_constants.ELEMENT_TYPE.ORDERED_LIST, _constants.ELEMENT_TYPE.UNORDERED_LIST, _constants.ELEMENT_TYPE.CHECK_LIST_ITEM, _constants.ELEMENT_TYPE.MULTI_COLUMN, _constants.ELEMENT_TYPE.BLOCKQUOTE, _constants.ELEMENT_TYPE.CALL_OUT].includes(n.type)
     });
     return !!callout;
   }, [editor]);
@@ -267,6 +273,7 @@ const QuickInsertBlockMenu = _ref => {
     _constants.SIDE_INSERT_MENUS_CONFIG[_constants.ELEMENT_TYPE.MULTI_COLUMN].forEach(item => {
       items[item.id.toLowerCase()] = /*#__PURE__*/_react.default.createElement(_dropdownMenuItem.default, {
         isHidden: !quickInsertMenuSearchMap[item.type],
+        disabled: isDisableMultiColumn,
         className: "sdoc-insert-menu-multi-column",
         key: item.id,
         menuConfig: item,
@@ -277,7 +284,7 @@ const QuickInsertBlockMenu = _ref => {
       delete items[_constants.VIDEO];
     }
     return items;
-  }, [quickInsertMenuSearchMap, isDisableImage, onInsertImageToggle, isDisableVideo, onInsertVideoToggle, isDisableTable, editor, createTable, callback, handleClosePopover, openLinkDialog, onInsertCodeBlock, isDisableCallout, onInsertCheckList, isEmptyNode, onInsertCallout, onInsertList, onInsert, createMultiColumn]);
+  }, [quickInsertMenuSearchMap, isDisableImage, onInsertImageToggle, isDisableVideo, isDisableMultiColumn, onInsertVideoToggle, isDisableTable, editor, createTable, callback, handleClosePopover, openLinkDialog, onInsertCodeBlock, isDisableCallout, onInsertCheckList, isEmptyNode, onInsertCallout, onInsertList, onInsert, createMultiColumn]);
   const getSelectItemDom = selectIndex => {
     const dropDownItemWrapper = downDownWrapperRef.current;
     const searchedDropDownItemWrapper = [];

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

@@ -185,6 +185,9 @@ const insertElement = (editor, type, insertPosition) => {
   _slate.Transforms.setNodes(editor, {
     type
   });
+  if (_constants.HEADERS.includes(type)) {
+    (0, _core.focusEditor)(editor, editor.selection);
+  }
 };
 exports.insertElement = insertElement;
 const getNodeEntry = (editor, el) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -11,7 +11,7 @@
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",
     "@seafile/slate-react": "0.92.8",
-    "axios": "^1.7.4",
+    "axios": "^1.8.2",
     "classnames": "2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "1.10.7",