@seafile/sdoc-editor 0.5.46 → 0.5.47

package/dist/basic-sdk/extension/plugins/code-block/helpers.js

@@ -17,7 +17,7 @@ export const isMenuDisabled = (editor, readonly) => {
   if (hasVoid) return true;
   const isMatch = selectedElems.some(elem => {
     const type = getNodeType(elem);
-    if (type === CODE_BLOCK || type === PARAGRAPH) return true;
+    if (type === PARAGRAPH) return true;
     return false;
   });
   if (isMatch) return false; // enable

package/dist/basic-sdk/extension/plugins/code-block/plugin.js

@@ -2,7 +2,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import slugid from 'slugid';
 import isHotkey from 'is-hotkey';
 import { Transforms, Node, Range, Editor } from '@seafile/slate';
-import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement, isSelectionAtBlockStart } from '../../core';
+import { ReactEditor } from '@seafile/slate-react';
+import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement, isSelectionAtBlockStart, getSelectedElems } from '../../core';
 import { deleteBackwardByLength } from './helpers';
 import { CODE_BLOCK, PARAGRAPH, CODE_LINE, BLOCKQUOTE } from '../../constants';
 const withCodeBlock = editor => {
@@ -168,7 +169,25 @@ const withCodeBlock = editor => {
       }
     }
     if (isHotkey('tab', event)) {
-      newEditor.insertText('    ');
+      const {
+        selection
+      } = newEditor;
+      event.preventDefault();
+      // By default, tab key will insert 4 spaces
+      const indent = ' '.repeat(4);
+      if (Range.isCollapsed(selection)) {
+        newEditor.insertText(indent);
+      } else {
+        const selectedElements = getSelectedElems(newEditor);
+        selectedElements.forEach(elem => {
+          if (elem.type !== CODE_LINE) return;
+          const text = indent + Node.string(elem);
+          const insertPoint = ReactEditor.findPath(newEditor, elem);
+          Transforms.insertText(editor, text, {
+            at: insertPoint
+          });
+        });
+      }
     }
     if (isHotkey('shift+tab', event)) {
       const range = {

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

@@ -92,14 +92,24 @@ export const insertMention = (editor, collaborator) => {
 export const sortCollaborators = function (collaborators) {
   let participants = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   const loginEmail = context.getUserInfo().email;
+  const lastModifyUser = context.getSetting('last_modify_user');
+  let stickyCollaborator = null;
   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 newCollaborators = collaborators.filter(item => {
+    const isValidCollaborator = !participantsMap[item.email] && item.email !== loginEmail;
+    if (isValidCollaborator && lastModifyUser === item.email) {
+      stickyCollaborator = item;
+      return false;
+    }
+    return isValidCollaborator;
+  });
   const newParticipants = Object.values(participantsMap);
-  return [...newParticipants, ...newCollaborators];
+  const resCollaborators = stickyCollaborator ? [stickyCollaborator, ...newParticipants, ...newCollaborators] : [...newParticipants, ...newCollaborators];
+  return resCollaborators;
 };
 export const transformToText = function (editor) {
   let isFocusEnd = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;

package/dist/basic-sdk/outline/style.css

@@ -53,16 +53,15 @@
   flex: 1;
   display: flex;
   flex-direction: column;
+  word-break: break-all;
   overflow-x: hidden;
-  overflow-y: hidden;
-}
-
-.sdoc-outline-list-container:hover {
   overflow-y: auto;
 }
 
 .sdoc-outline-item {
   padding: 4px 0;
+  padding-right: 6px;
+  overflow-wrap: anywhere;
   cursor: pointer;
 }
 

package/dist/context.js

@@ -97,7 +97,10 @@ class Context {
     return this.config;
   }
   getFileContent() {
-    return this.sdocServerApi.getDocContent();
+    return this.sdocServerApi.getDocContent().then(res => {
+      this.settings['last_modify_user'] = res.data.last_modify_user;
+      return res;
+    });
   }
   normalizeSdocContent() {
     return this.sdocServerApi.normalizeSdocContent();

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.5.46",
+  "version": "0.5.47",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
   "dependencies": {
-    "@seafile/print-js": "1.6.4",
+    "@seafile/print-js": "1.6.5",
     "@seafile/react-image-lightbox": "2.0.4",
     "@seafile/slate": "0.91.8",
     "@seafile/slate-history": "0.86.2",