@seafile/sdoc-editor 0.4.17 → 0.4.19

package/dist/basic-sdk/comment/components/comment-input/helpers.js

@@ -0,0 +1,15 @@
+import context from '../../../../context';
+
+// Sort collaborators by participants, move mentioned members to the top
+export const sortCollaborators = function (collaborators) {
+  let participants = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  const loginEmail = context.getUserInfo().email;
+  const participantsMap = {};
+  participants.forEach(item => {
+    if (item.email === loginEmail) return;
+    participantsMap[item.email] = item;
+  });
+  const newCollaborators = collaborators.filter(item => !participantsMap[item.email] && item.email !== loginEmail);
+  const newParticipants = Object.values(participantsMap);
+  return [...newParticipants, ...newCollaborators];
+};

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

@@ -9,6 +9,7 @@ import { DOWN, UP, POPOVER_ADDING_HEIGHT, FONT_SIZE_WIDTH, LINE_HEIGHT } from '.
 import { eventStopPropagation } from '../../../utils/mouse-event';
 import CommentParticipantItem from './comment-participant-item';
 import { Hotkey, getSelectionCoords } from '../../../../utils';
+import { sortCollaborators } from './helpers';
 import './index.css';
 const CommentInput = forwardRef((_ref, ref) => {
   let {
@@ -27,11 +28,13 @@ const CommentInput = forwardRef((_ref, ref) => {
     collaborators
   } = useCollaborators();
   const {
-    addParticipants
+    addParticipants,
+    participants
   } = useParticipantsContext();
   const [range, setRange] = useState();
   const [searchedCollaborators, setSearchedCollaborators] = useState([]);
   const [activeCollaboratorIndex, setActiveCollaboratorIndex] = useState(-1);
+  const [validCollaborators, setValidCollaborators] = useState([]);
   const commentUtilities = new CommentUtilities();
 
   // onMount: comment content
@@ -40,6 +43,10 @@ const CommentInput = forwardRef((_ref, ref) => {
     commentRef.current.textContent = content;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  useEffect(() => {
+    const sortedCollaborators = sortCollaborators(collaborators, participants);
+    setValidCollaborators(sortedCollaborators);
+  }, [collaborators, participants]);
 
   // onMount: set input focus
   useEffect(() => {
@@ -147,11 +154,11 @@ const CommentInput = forwardRef((_ref, ref) => {
       anchorOffset
     } = _ref2;
     if (atIndex !== 0 && text[atIndex - 1] !== ' ') return [];
-    if (atIndex === anchorOffset - 1) return collaborators;
+    if (atIndex === anchorOffset - 1) return validCollaborators;
     const searchingText = text.substring(atIndex + 1);
-    if (searchingText) return searchCollaborators(collaborators, searchingText);
+    if (searchingText) return searchCollaborators(validCollaborators, searchingText);
     return [];
-  }, [collaborators]);
+  }, [validCollaborators]);
   const handleInvolvedKeyUp = useCallback(event => {
     // atIndex: Positional index of @
     const {

package/dist/basic-sdk/editor/revision-editor.js

@@ -37,6 +37,7 @@ const RevisionEditor = forwardRef((_ref, ref) => {
     editor.openConnection();
     return () => {
       editor.closeConnection();
+      editor.selection = null;
     };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/basic-sdk/editor/sdoc-editor.js

@@ -52,6 +52,7 @@ const SdocEditor = forwardRef((_ref, ref) => {
     validEditor.openConnection();
     return () => {
       validEditor.closeConnection();
+      validEditor.selection = null;
     };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -68,14 +68,16 @@ const FileLink = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowInsertHoverMenu]);
   const onClickFile = useCallback(e => {
-    e.stopPropagation();
+    if (isShowInsertHoverMenu) {
+      e.stopPropagation();
+    }
     setPosition(e.currentTarget);
     setIsShowInsertHoverMenu(true);
     setTimeout(() => {
       registerEventHandle();
     }, 0);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [isShowInsertHoverMenu]);
   const onHideInsertHoverMenu = useCallback(e => {
     setIsShowInsertHoverMenu(false);
     unregisterEventHandle();

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

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useCallback, useEffect, useState, useRef } from 'react';
-import { Range } from '@seafile/slate';
-import { useReadOnly } from '@seafile/slate-react';
+import { Range, Transforms } from '@seafile/slate';
+import { ReactEditor, useReadOnly } from '@seafile/slate-react';
 import { useScrollContext } from '../../../hooks/use-scroll-context';
 import { unwrapLinkNode, getUrl } from './helpers';
 import HoverMenu from './hover-menu';
@@ -70,14 +70,27 @@ const SdocFileLink = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowInsertHoverMenu]);
   const onClickFile = useCallback(e => {
-    e.stopPropagation();
+    if (isShowInsertHoverMenu) {
+      e.stopPropagation();
+    }
+    const path = ReactEditor.findPath(editor, element);
+    Transforms.setSelection(editor, {
+      anchor: {
+        offset: 1,
+        path: [path[0], path[1], 0]
+      },
+      focus: {
+        offset: 1,
+        path: [path[0], path[1], 0]
+      }
+    });
     setPosition(e.currentTarget);
     setIsShowInsertHoverMenu(true);
     setTimeout(() => {
       registerEventHandle();
     }, 0);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [isShowInsertHoverMenu]);
   const onHideInsertHoverMenu = useCallback(e => {
     setIsShowInsertHoverMenu(false);
     unregisterEventHandle();
@@ -118,7 +131,7 @@ const SdocFileLink = _ref => {
       e.preventDefault();
     },
     title: element.title
-  }, children))), isShowInsertHoverMenu && (!readOnly && Range.isCollapsed(editor.selection) || readOnly) && /*#__PURE__*/React.createElement(HoverMenu, {
+  }, children))), isShowInsertHoverMenu && !readOnly && editor.selection && Range.isCollapsed(editor.selection) && /*#__PURE__*/React.createElement(HoverMenu, {
     editor: editor,
     menuPosition: menuPosition,
     element: element,

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

@@ -168,11 +168,11 @@ export const getListNode = (editor, path) => {
 export const onWrapListItem = (editor, targetPath, sourcePath) => {
   const nextPath = Path.next(targetPath);
   const listNode = getListNode(editor, sourcePath);
-  Transforms.insertNodes(editor, listNode, {
-    at: nextPath
-  });
   Transforms.removeNodes(editor, {
     at: sourcePath
   });
+  Transforms.insertNodes(editor, listNode, {
+    at: nextPath
+  });
   return;
 };

package/package.json

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