@seafile/sdoc-editor 0.5.55 → 0.5.56

package/dist/basic-sdk/assets/css/layout.css

@@ -41,6 +41,9 @@
   width: 100%;
 }
 
+.sdoc-editor-container.mobile .sdoc-editor-content.readonly.no-outline {
+  min-width: 100%;
+}
 
 .sdoc-editor-container .sdoc-scroll-container {
   z-index: 100;

package/dist/basic-sdk/assets/css/simple-viewer.css

@@ -8,6 +8,6 @@
 }
 
 .sdoc-editor-container.mobile .sdoc-editor-content.readonly .article {
-  width: 100% !important;
+  width: 100vw !important;
   padding: 1rem;
 }

package/dist/basic-sdk/editor/editable-article.js

@@ -1,9 +1,9 @@
 import React, { useCallback, useMemo, Fragment } from 'react';
 import { Editable, ReactEditor, Slate } from '@seafile/slate-react';
-import { Editor, Node, Range } from '@seafile/slate';
+import { Editor, Node, Transforms } from '@seafile/slate';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import { renderLeaf, renderElement, ContextToolbar, SideToolbar } from '../extension';
-import { getAboveBlockNode, getNextNode, getPrevNode, isSelectionAtBlockEnd, isSelectionAtBlockStart } from '../extension/core';
+import { getAboveBlockNode, getNextNode, getPrevNode, isSelectionAtBlockEnd, isSelectionAtBlockStart, getCurrentNode, isCurrentLineEmpty, isCurrentLineHasText } from '../extension/core';
 import EventProxy from '../utils/event-handler';
 import { useCursors } from '../cursor/use-cursors';
 import { INTERNAL_EVENT } from '../constants';
@@ -14,7 +14,7 @@ import EventBus from '../utils/event-bus';
 import { ArticleContainer } from '../layout';
 import { useScrollContext } from '../hooks/use-scroll-context';
 import { SetNodeToDecorations } from '../highlight';
-import { IMAGE, IMAGE_BLOCK } from '../extension/constants';
+import { IMAGE, IMAGE_BLOCK, CODE_LINE } from '../extension/constants';
 import { isPreventResetTableSelectedRange } from '../extension/plugins/table/helpers';
 const EditableArticle = _ref => {
   let {
@@ -83,6 +83,39 @@ const EditableArticle = _ref => {
       return;
     }
     if (event.key === 'Backspace') {
+      const [currentNode] = getCurrentNode(editor);
+      let prevNode = null;
+      let prevPath = null;
+      if (getPrevNode(editor)) {
+        [prevNode, prevPath] = getPrevNode(editor);
+      }
+      // If the cursor is at the beginning, and the current line is not empty, is not a CODE_LINE, and the previous line is a CODE_LINE.
+      if (prevNode && isSelectionAtBlockStart(editor) && !isCurrentLineEmpty(editor) && prevNode.type === CODE_LINE && currentNode.type !== CODE_LINE) {
+        if (!isCurrentLineHasText(currentNode)) {
+          const prevNodeText = Node.string(prevNode);
+          Transforms.removeNodes(editor, {
+            at: prevPath
+          });
+          Transforms.insertText(editor, prevNodeText);
+          event.preventDefault();
+        } else {
+          const path = prevPath;
+          path[path.length] = 0;
+          const end = prevNode.children[0].text.length;
+          const range = {
+            anchor: {
+              path,
+              offset: end
+            },
+            focus: {
+              path,
+              offset: end
+            }
+          };
+          Transforms.select(editor, range);
+          event.preventDefault();
+        }
+      }
       const {
         y
       } = getCursorPosition();

package/dist/basic-sdk/extension/core/queries/index.js

@@ -250,6 +250,15 @@ export const getPrevNode = editor => {
   }
   return prevNode;
 };
+export const getCurrentNode = editor => {
+  if (!editor.selection) return null;
+  const [nodeEntry] = Editor.nodes(editor, {
+    at: editor.selection,
+    match: n => Element.isElement(n) && Editor.isBlock(editor, n),
+    mode: 'lowest'
+  });
+  return nodeEntry || null;
+};
 export const getNextNode = editor => {
   const [lowerNode, lowerPath] = getAboveNode(editor, {
     mode: 'lowest',
@@ -423,4 +432,18 @@ export const isHasImg = editor => {
     }
   }
   return hasImg;
+};
+export const isCurrentLineEmpty = editor => {
+  const {
+    selection
+  } = editor;
+  if (!selection || !ReactEditor.isFocused(editor)) return false;
+  const [node] = Editor.node(editor, selection.focus.path.slice(0, -1));
+  if (Element.isElement(node)) {
+    return node.children.every(child => Element.isElement(child) ? false : Node.string(child) === '');
+  }
+  return true;
+};
+export const isCurrentLineHasText = node => {
+  return Node.string(node).trim() !== '';
 };

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

@@ -37,6 +37,11 @@ const withCheckList = editor => {
       Transforms.splitNodes(editor, {
         always: true
       });
+      Transforms.setNodes(editor, {
+        checked: false
+      }, {
+        at: node[1]
+      });
       return;
     }
     insertBreak();

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

@@ -36,46 +36,31 @@ const RevisionOperations = _ref => {
     if (!isSdocRevision) return;
     if (isShowChanges) return;
     if (isPublished) return;
-    setShowTip(true);
-    setTipType(TIP_TYPE.CHECKING);
-
-    // Let users perceive the processing process
-    let timer = null;
-    timer = setTimeout(() => {
-      const revisionPromise = loadDocument();
-      const baseVersionPromise = context.getRevisionBaseVersionContent();
-      const originVersionPromise = context.getSeadocOriginFileContent();
-      Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(results => {
-        const [revisionContent, baseRes, masterRes] = results;
-        const baseContent = JSON.parse(baseRes.data.content);
-        const masterContent = JSON.parse(masterRes.data.content);
-        timer = null;
+    const revisionPromise = loadDocument();
+    const baseVersionPromise = context.getRevisionBaseVersionContent();
+    const originVersionPromise = context.getSeadocOriginFileContent();
+    Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(results => {
+      const [revisionContent, baseRes, masterRes] = results;
+      const baseContent = JSON.parse(baseRes.data.content);
+      const masterContent = JSON.parse(masterRes.data.content);
 
-        // no changes
-        if (masterContent.version === baseContent.version) {
-          setShowTip(false);
-          setTipType('');
-          return;
-        }
-        const {
-          value
-        } = getRebase(masterContent, baseContent, revisionContent);
-        setMergeValue(value);
-        setTipType(TIP_TYPE.SOURCE_DOCUMENT_CHANGED);
-      }).catch(error => {
-        timer = null;
-        if (typeof error === 'string') {
-          toaster.danger(t(error));
-          return;
-        }
-        toaster.danger(t('Error'));
-        setShowTip(false);
-        setTipType('');
-      });
-    }, 600);
-    return () => {
-      timer && clearTimeout(timer);
-    };
+      // no changes
+      if (masterContent.version === baseContent.version) return;
+      setShowTip(true);
+      const {
+        value
+      } = getRebase(masterContent, baseContent, revisionContent);
+      setMergeValue(value);
+      setTipType(TIP_TYPE.SOURCE_DOCUMENT_CHANGED);
+    }).catch(error => {
+      if (typeof error === 'string') {
+        toaster.danger(t(error));
+        return;
+      }
+      toaster.danger(t('Error'));
+      setShowTip(false);
+      setTipType('');
+    });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onDocumentReplaced = useCallback(() => {

package/dist/pages/simple-viewer.js

@@ -4,7 +4,7 @@ import { SDocViewer } from '../basic-sdk';
 import context from '../context';
 import Loading from '../components/loading';
 import Layout, { Header, Content } from '../layout';
-import { generateDefaultDocContent } from '../utils';
+import { generateDefaultDocContent, isMobile } from '../utils';
 import ErrorBoundary from './error-boundary';
 import '../assets/css/simple-viewer.css';
 class SimpleViewer extends React.Component {
@@ -64,6 +64,26 @@ class SimpleViewer extends React.Component {
       sharePermissionText,
       downloadURL
     } = context.getSettings();
+    if (isMobile) {
+      return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement("div", {
+        className: "doc-info"
+      }, /*#__PURE__*/React.createElement("h2", {
+        className: "doc-name my-0"
+      }, docName), sharePermissionText && /*#__PURE__*/React.createElement("span", {
+        className: "sdoc-share-permission ml-2"
+      }, sharePermissionText)), /*#__PURE__*/React.createElement("div", {
+        className: "doc-ops"
+      }, downloadURL && /*#__PURE__*/React.createElement("a", {
+        href: downloadURL,
+        className: "op-item"
+      }, /*#__PURE__*/React.createElement("i", {
+        className: "sdocfont sdoc-download"
+      })))), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(SDocViewer, {
+        document: document,
+        showToolbar: false,
+        showOutline: false
+      }))));
+    }
     return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement("div", {
       className: "doc-info"
     }, /*#__PURE__*/React.createElement("h2", {

package/package.json

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