@seafile/sdoc-editor 0.5.46 → 0.5.48

package/dist/basic-sdk/assets/css/sdoc-editor-plugins.css

@@ -48,7 +48,7 @@
 }
 
 .sdoc-editor-container .article .sdoc-checkbox-container .sdoc-checkbox-input-wrapper .sdoc-checkbox-content-container {
-  word-break:normal;
+  word-break: normal;
   width: calc(100% - 1em);
 }
 
@@ -57,6 +57,7 @@
   position: relative;
   display: inline-block;
   padding: 6px 6px 6px 0;
+  margin: 0 0.15em;
 }
 
 .sdoc-editor-container .article .sdoc-image-inner {

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/file-link/helpers.js

@@ -53,16 +53,8 @@ export const insertFileLink = (editor, text, uuid) => {
   if (selection == null) return;
   const isCollapsed = Range.isCollapsed(selection);
   if (isCollapsed) {
-    // Insert Spaces before and after filelinks for easy operation
-    editor.insertText(' ');
     const fileNode = generateFileNode(uuid, text);
     Transforms.insertNodes(editor, fileNode);
-
-    // Not being able to use insertText directly causes the added Spaces to be added to the linked text, as in the issue above, replaced by insertFragment
-    editor.insertFragment([{
-      id: slugid.nice(),
-      text: ' '
-    }]);
   } else {
     const selectedText = Editor.string(editor, selection); // Selected text
     if (selectedText !== text) {

package/dist/basic-sdk/extension/plugins/html/rules/text.js

@@ -2,8 +2,11 @@ import slugid from 'slugid';
 const textRule = (element, parseChild) => {
   const {
     nodeName,
-    nodeType
+    nodeType,
+    childNodes
   } = element;
+  // If the child node is not a text node, it is processed by the child node
+  if (childNodes.length && !((childNodes === null || childNodes === void 0 ? void 0 : childNodes[0]) instanceof Text)) return parseChild(childNodes);
   if (nodeName === 'SPAN') {
     return {
       id: slugid.nice(),

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

@@ -2,12 +2,14 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import urlJoin from 'url-join';
 import { Editor, Range, Transforms, Path, Node } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
+import slugId from 'slugid';
 import context from '../../../../context';
 import EventBus from '../../../utils/event-bus';
-import { generateEmptyElement, getNodeType, isTextNode, getParentNode, focusEditor, getSelectedElems } from '../../core';
+import { generateEmptyElement, getNodeType, isTextNode, getParentNode, focusEditor } from '../../core';
 import { isList } from '../../toolbar/side-toolbar/helpers';
 import { COMMENT_EDITOR, INTERNAL_EVENT } from '../../../constants';
 import { CODE_BLOCK, ELEMENT_TYPE, IMAGE, IMAGE_BLOCK, INSERT_POSITION } from '../../constants';
+import base64ToUnit8Array from '../../../../utils/base64-to-unit8array';
 export const isInsertImageMenuDisabled = (editor, readonly) => {
   if (readonly) return true;
   const {
@@ -178,4 +180,25 @@ export const selectImageWhenSelectPartial = (event, editor, imageNode, isImageSe
     }
   });
   focusEditor(editor, focusRange);
+};
+
+// Upload image when the image is pasted from the clipboard in base64
+export const handleBase64Image = (editor, path, imgData) => {
+  const unit8Array = base64ToUnit8Array(imgData.src);
+  const blob = new Blob([unit8Array.u8arr], {
+    type: unit8Array.mime
+  });
+  const file = new File([blob], "".concat(slugId.nice(), ".jpg"), {
+    type: unit8Array.mime
+  });
+  context.uploadLocalImage([file]).then(res => {
+    const _data = _objectSpread(_objectSpread({}, imgData), {}, {
+      src: res[0]
+    });
+    Transforms.setNodes(editor, {
+      data: _data
+    }, {
+      at: path
+    });
+  });
 };

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

@@ -4,7 +4,7 @@ import { ReactEditor, useSelected, useReadOnly } from '@seafile/slate-react';
 import { Transforms, Editor } from '@seafile/slate';
 import classNames from 'classnames';
 import { withTranslation } from 'react-i18next';
-import { getImageURL, selectImageWhenSelectPartial, updateImage } from './helpers';
+import { getImageURL, handleBase64Image, selectImageWhenSelectPartial, updateImage } from './helpers';
 import EventBus from '../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../constants';
 import ImageHoverMenu from './hover-menu';
@@ -171,6 +171,10 @@ const Image = _ref => {
     }
   }, [data.src]);
   const onImageLoadError = useCallback(() => {
+    // Check is due to the image is pasted from the clipboard in base64
+    if (data.src.startsWith('data:image/jpeg;base64')) {
+      return handleBase64Image(editor, path, data);
+    }
     setIsShowImagePlaceholder(true);
     // External network images do not reload after failure to load
     if (!data.src.startsWith('http')) {

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/extension/plugins/sdoc-link/helpers.js

@@ -60,14 +60,7 @@ export const insertSdocFileLink = (editor, text, uuid) => {
   removeShortCutSymbol(editor);
   const sdocFileNode = generateSdocFileNode(uuid, text);
   if (isCollapsed) {
-    // Insert Spaces before and after sdoclinks for easy operation
-    editor.insertText(' ');
     Transforms.insertNodes(editor, sdocFileNode);
-    // Not being able to use insertText directly causes the added Spaces to be added to the linked text, as in the issue above, replaced by insertFragment
-    editor.insertFragment([{
-      id: slugid.nice(),
-      text: ' '
-    }]);
   } else {
     const selectedText = Editor.string(editor, selection); // Selected text
     if (selectedText !== text) {

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/dist/utils/base64-to-unit8array.js

@@ -0,0 +1,15 @@
+const base64ToUnit8Array = base64 => {
+  const arr = base64.split(',');
+  const mime = arr[0].match(/:(.*?);/)[1];
+  const bstr = atob(arr[1]);
+  let n = bstr.length;
+  const u8arr = new Uint8Array(n);
+  while (n--) {
+    u8arr[n] = bstr.charCodeAt(n);
+  }
+  return {
+    u8arr,
+    mime
+  };
+};
+export default base64ToUnit8Array;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.5.46",
+  "version": "0.5.48",
   "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",