@seafile/sdoc-editor 0.3.28 → 0.4.0

package/dist/api/seafile-api.js

@@ -33,11 +33,13 @@ class SeafileAPI {
     const url = '/api/v2.1/seadoc/upload-image/' + docUuid + '/';
     const form = new FormData();
     for (const fileItem of imageFiles) {
-      const fileName = this.getImageFileNameWithTimestamp(fileItem);
-      const file = new File([fileItem], fileName, {
-        type: fileItem.type
-      });
-      form.append('file', file);
+      if (fileItem.type.startsWith('image/')) {
+        const fileName = this.getImageFileNameWithTimestamp(fileItem);
+        const file = new File([fileItem], fileName, {
+          type: fileItem.type
+        });
+        form.append('file', file);
+      }
     }
     return this.req.post(url, form);
   }

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

@@ -141,4 +141,9 @@ export const isSingleImage = data => {
   if (Node.string(data[0]).length !== 0) return false;
   if (data[0].children.filter(item => (item === null || item === void 0 ? void 0 : item.type) === IMAGE).length !== 1) return false;
   return true;
+};
+export const insertImageFiles = (files, editor, targetPath) => {
+  context.uploadLocalImage(files).then(fileUrl => {
+    insertImage(editor, fileUrl, targetPath, INSERT_POSITION.AFTER);
+  });
 };

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

@@ -151,10 +151,16 @@ export const getBeforeText = editor => {
   };
 };
 export const isTriggeredByShortCut = editor => {
+  const {
+    selection
+  } = editor;
+  const {
+    anchor
+  } = selection;
   const {
     beforeText
   } = getBeforeText(editor);
-  return beforeText.slice(-2) === '[[';
+  return beforeText.slice(-1) === '[' && Editor.isEnd(editor, anchor, anchor.path);
 };
 
 // If insert operation is triggered by shortcut, remove the '[[' symbol
@@ -167,12 +173,12 @@ export const removeShortCutSymbol = editor => {
     beforeText,
     range: beforeRange
   } = getBeforeText(editor);
-  const isTrrigeredByShortCut = beforeText.slice(-3) === '[[ ';
+  const isTrrigeredByShortCut = beforeText.slice(-2) === '[[';
   isTrrigeredByShortCut && Transforms.delete(editor, {
     at: {
       anchor: {
         path: beforeRange.focus.path,
-        offset: beforeText.length - 3
+        offset: beforeText.length - 2
       },
       focus: _objectSpread({}, selection.focus)
     },

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

@@ -49,8 +49,8 @@ const withSdocLink = editor => {
     const {
       key
     } = event;
-    if (key !== ' ') return onHotKeyDown && onHotKeyDown(event);
-    // If user press whitespace after '[[', open file modal
+    if (key !== '[') return onHotKeyDown && onHotKeyDown(event);
+    // If user press '[[', open file modal
     const eventBus = EventBus.getInstance();
     if (isTriggeredByShortCut(newEditor)) {
       eventBus.dispatch(INTERNAL_EVENT.INSERT_ELEMENT, {

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

@@ -7,6 +7,7 @@ import EventBus from '../../../utils/event-bus';
 import { useScrollContext } from '../../../hooks/use-scroll-context';
 import { focusEditor } from '../../core';
 import { getDomTopHeight, setSelection, isVoidNode, getNodeEntry, isBlockquote, isList, onWrapListItem } from './helpers';
+import { insertImageFiles } from '../../plugins/image/helpers';
 import { INTERNAL_EVENT } from '../../../constants';
 import { CODE_BLOCK, TABLE, BLOCKQUOTE, CHECK_LIST_ITEM, CALL_OUT } from '../../constants';
 import { getCalloutEntry } from '../../plugins/callout/helper';
@@ -106,6 +107,13 @@ const SideToolbar = () => {
   const drop = useCallback(event => {
     targetElement = event.currentTarget;
     targetElement.classList.remove('sdoc-draging');
+
+    // Drag local image files to sdoc
+    if (event.dataTransfer.files.length > 0) {
+      const [, targetPath] = getNodeEntry(editor, targetElement);
+      insertImageFiles(event.dataTransfer.files, editor, targetPath);
+      return;
+    }
     const [sourceNode, sourcePath] = getNodeEntry(editor, sourceElement);
     const [, targetPath] = getNodeEntry(editor, targetElement);
 

package/dist/components/doc-operations/revision-operations/index.js

@@ -28,6 +28,7 @@ const RevisionOperations = _ref => {
   const [isShowTip, setShowTip] = useState(false);
   const [tipType, setTipType] = useState('');
   const [mergeValue, setMergeValue] = useState(null);
+  const [isLoading, setLoading] = useState(false);
   const {
     loadDocument
   } = useDocument();
@@ -72,6 +73,8 @@ const RevisionOperations = _ref => {
 
   // solve show change view in revision editor
   const onViewChangesToggle = useCallback(isShowChanges => {
+    if (isLoading) return;
+    setLoading(true);
     if (!isPublished && isShowChanges) {
       // The trick here is to send one more api request in order to use the same information box.
       loadDocument().then(revisionContent => {
@@ -82,13 +85,16 @@ const RevisionOperations = _ref => {
         } else {
           handleViewChangesToggle(isShowChanges);
         }
+        setLoading(false);
       }).catch(errorMessage => {
         toaster.danger(t(errorMessage));
+        setLoading(false);
       });
       return;
     }
     handleViewChangesToggle(isShowChanges);
-  }, [handleViewChangesToggle, loadDocument, t, isPublished]);
+    setLoading(false);
+  }, [handleViewChangesToggle, loadDocument, t, isPublished, isLoading]);
 
   // publish revision
   const publishRevision = useCallback(() => {

package/package.json

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