@seafile/sdoc-editor 0.5.68 → 0.5.70

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

@@ -25,8 +25,7 @@ const SdocEditor = forwardRef((_ref, ref) => {
     isReloading,
     showComment,
     isShowHeaderToolbar = true,
-    showOutline = true,
-    isWikiReadOnly
+    showOutline = true
   } = _ref;
   const validEditor = propsEditor || useMemo(() => {
     const defaultEditor = createDefaultEditor();
@@ -167,22 +166,6 @@ const SdocEditor = forwardRef((_ref, ref) => {
   }
   const isShowComment = typeof showComment === 'boolean' ? showComment : true;
   const Provider = isShowComment ? CollaboratorsProvider : Fragment;
-  if (isWikiReadOnly) {
-    return /*#__PURE__*/React.createElement(EditorContainer, {
-      editor: validEditor,
-      readonly: isWikiReadOnly
-    }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(EditorContent, {
-      docValue: slateValue,
-      showOutline: showOutline !== null && showOutline !== void 0 ? showOutline : true,
-      readonly: isWikiReadOnly,
-      editor: validEditor,
-      showComment: isShowComment
-    }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
-      editor: validEditor,
-      slateValue: slateValue,
-      showComment: isShowComment
-    }))));
-  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
     editor: validEditor
   }, /*#__PURE__*/React.createElement(Provider, null, /*#__PURE__*/React.createElement(ColorProvider, null, isShowHeaderToolbar && /*#__PURE__*/React.createElement(HeaderToolbar, {

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

@@ -0,0 +1,161 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import React, { useEffect, useState, useImperativeHandle, forwardRef, useMemo, useCallback } from 'react';
+import { Editor } from '@seafile/slate';
+import deepCopy from 'deep-copy';
+import context from '../../context';
+import CommonLoading from '../../components/common-loading';
+import { INTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from '../constants';
+import { createDefaultEditor } from '../extension';
+import withNodeId from '../node-id';
+import { withSocketIO } from '../socket';
+import { focusEditor } from '../extension/core';
+import InsertElementDialog from '../extension/commons/insert-element-dialog';
+import { EditorContainer, EditorContent } from '../layout';
+import EditableArticle from './editable-article';
+import { ColorProvider } from '../hooks/use-color-context';
+import ReadOnlyArticle from '../views/readonly-article';
+import { isMobile } from '../../utils';
+import { EventBus } from '../../basic-sdk';
+import { EXTERNAL_EVENT } from '../../constants';
+const WikiEditor = forwardRef((_ref, ref) => {
+  let {
+    editor: propsEditor,
+    document,
+    isReloading,
+    isWikiReadOnly,
+    topSlot
+  } = _ref;
+  const validEditor = propsEditor || useMemo(() => {
+    const defaultEditor = createDefaultEditor();
+    const editorConfig = context.getEditorConfig();
+    const newEditor = withNodeId(withSocketIO(defaultEditor, {
+      document,
+      config: editorConfig
+    }));
+    const {
+      cursors
+    } = document;
+    newEditor.cursors = cursors || {};
+    newEditor.width = PAGE_EDIT_AREA_WIDTH; // default width
+    return newEditor;
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const [slateValue, setSlateValue] = useState(document.children);
+
+  // Fix: The editor's children are not updated when the document is updated in revision
+  // In revision mode, the document is updated, but the editor's children are not updated,as onValueChange override the new document.children. This unexpected action cause the editor to display the old content
+  useEffect(() => {
+    setSlateValue(document.children);
+  }, [document.children]);
+  useEffect(() => {
+    validEditor.readonly = false;
+    return () => {
+      validEditor.selection = null;
+    };
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  // useMount: init socket connection
+  useEffect(() => {
+    if (propsEditor) return;
+    validEditor.openConnection();
+    return () => {
+      validEditor.closeConnection();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // useMount: focus editor
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      const [firstNode] = validEditor.children;
+      if (firstNode) {
+        const [firstNodeFirstChild] = firstNode.children;
+        if (firstNodeFirstChild) {
+          const endOfFirstNode = Editor.end(validEditor, [0, 0]);
+          const range = {
+            anchor: endOfFirstNode,
+            focus: endOfFirstNode
+          };
+          focusEditor(validEditor, range);
+        }
+      }
+    }, 300);
+    return () => {
+      clearTimeout(timer);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const onRefreshDocument = useCallback(() => {
+    window.location.reload();
+  }, []);
+
+  // useMount: refresh document
+  useEffect(() => {
+    const eventBus = EventBus.getInstance();
+    eventBus.subscribe(EXTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
+  }, [onRefreshDocument]);
+
+  // The parent component can call the method of this component through ref
+  useImperativeHandle(ref, () => ({
+    setSlateValue: document => {
+      // Force update of editor's child elements
+      validEditor.children = document.children;
+      setSlateValue([...document.children]);
+    },
+    updateDocumentVersion: document => {
+      validEditor.updateDocumentVersion(document);
+    },
+    // get value
+    getSlateValue: () => {
+      return deepCopy(_objectSpread(_objectSpread({}, document), {}, {
+        children: slateValue
+      }));
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }), [document, validEditor, slateValue]);
+  const onValueChange = value => {
+    const eventBus = EventBus.getInstance();
+    eventBus.dispatch(INTERNAL_EVENT.UPDATE_SEARCH_REPLACE_HIGHLIGHT, value);
+    setSlateValue(value);
+  };
+  if (isReloading) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "h-100 w-100 d-flex align-items-center justify-content-center"
+    }, /*#__PURE__*/React.createElement(CommonLoading, null));
+  }
+  if (isMobile || isWikiReadOnly) {
+    return /*#__PURE__*/React.createElement(EditorContainer, {
+      editor: validEditor,
+      readonly: true
+    }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(EditorContent, {
+      docValue: slateValue,
+      readonly: true,
+      showOutline: false,
+      editor: validEditor,
+      showComment: false
+    }, topSlot, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
+      editor: validEditor,
+      slateValue: slateValue,
+      showComment: false
+    }))));
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
+    editor: validEditor
+  }, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(EditorContent, {
+    docValue: slateValue,
+    showOutline: false,
+    editor: validEditor,
+    showComment: false
+  }, topSlot, /*#__PURE__*/React.createElement(EditableArticle, {
+    editor: validEditor,
+    slateValue: slateValue,
+    updateSlateValue: onValueChange,
+    showComment: false
+  })))), /*#__PURE__*/React.createElement(InsertElementDialog, {
+    editor: validEditor
+  }));
+});
+export default WikiEditor;

package/dist/basic-sdk/extension/plugins/header/menu/index.js

@@ -81,7 +81,7 @@ class HeaderMenu extends React.Component {
       this.menu = ref;
     });
     _defineProperty(this, "getToolTip", type => {
-      return isMac ? MAC_HOTKEYS[type] : WIN_HOTKEYS[type];
+      return isMac() ? MAC_HOTKEYS[type] : WIN_HOTKEYS[type];
     });
     this.state = {
       isShowHeaderPopover: false

package/dist/basic-sdk/extension/plugins/link/menu/index.js

@@ -42,15 +42,15 @@ const LinkMenu = _ref => {
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const printShortCutTexts = useMemo(() => {
-    const printTexts = isMac ? ['⌘', 'k'] : ['Ctrl', 'k'];
+  const linkShortCutTexts = useMemo(() => {
+    const printTexts = isMac() ? ['⌘', 'k'] : ['Ctrl', 'k'];
     return printTexts;
   }, []);
   return /*#__PURE__*/React.createElement(DropdownMenuItem, {
     disabled: disabled,
     menuConfig: menuConfig,
     onClick: openLinkDialog,
-    shortcut: printShortCutTexts
+    shortcut: linkShortCutTexts
   });
 };
 export default LinkMenu;

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

@@ -73,6 +73,8 @@ const withLink = editor => {
     } = newEditor;
     const isCollapsed = Range.isCollapsed(selection);
     if (isHotkey('mod+k', e) && isCollapsed) {
+      // Prevent edge behavior
+      e.preventDefault();
       const eventBus = EventBus.getInstance();
       eventBus.dispatch(INTERNAL_EVENT.INSERT_ELEMENT, {
         type: ELEMENT_TYPE.LINK,

package/dist/basic-sdk/extension/plugins/table/plugin.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import isHotkey from 'is-hotkey';
 import { Editor, Transforms, Path, Element } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
-import { getNodeType, getParentNode, getSelectedNodeByType, isLastNode, generateEmptyElement, focusEditor } from '../../core';
+import { getNodeType, getParentNode, getSelectedNodeByType, isLastNode, generateEmptyElement, focusEditor, getAboveBlockNode } from '../../core';
 import { ELEMENT_TYPE, KEYBOARD, PARAGRAPH, CLIPBOARD_FORMAT_KEY, CHECK_LIST_ITEM, ORDERED_LIST, UNORDERED_LIST, TABLE_ROW, TABLE, TABLE_CELL } from '../../constants';
 import { TABLE_MAX_ROWS, EMPTY_SELECTED_RANGE, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, TABLE_CELL_MIN_WIDTH, TABLE_ROW_MIN_HEIGHT } from './constants';
 import ObjectUtils from '../../../utils/object-utils';
@@ -58,6 +58,13 @@ const withTable = editor => {
     if (isHotkey('tab', event)) {
       event.preventDefault();
     }
+    if (isHotkey('shift+enter', event)) {
+      event.preventDefault();
+      const [, tablePath] = getAboveBlockNode(newEditor);
+      const focusPath = [tablePath[0] + 1];
+      const focusPoint = Editor.start(newEditor, focusPath);
+      focusEditor(newEditor, focusPoint);
+    }
   };
   newEditor.insertBreak = () => {
     const selectedNode = getSelectedNodeByType(newEditor, ELEMENT_TYPE.TABLE);

package/dist/basic-sdk/utils/dom-utils.js

@@ -58,8 +58,7 @@ export const getHeaderHeight = editor => {
   } = editor;
   switch (editorType) {
     case WIKI_EDITOR:
-      // sdoc-editor-page-header height = 49
-      return 49;
+      return 113.2;
     default:
       // sdoc-editor-page-header height = 56
       // sdoc-editor-toolbar height = 37

package/dist/components/doc-operations/more-operations.js

@@ -56,8 +56,8 @@ const MoreOperations = _ref => {
     event.nativeEvent.stopImmediatePropagation();
     window.location.href = historyURL;
   }, [docPerm, historyURL, isSdocRevision]);
-  const printShortCutTexts = useMemo(() => {
-    const printTexts = isMac ? ['⌘', 'P'] : ['Ctrl', 'P'];
+  const printShortcutTexts = useMemo(() => {
+    const printTexts = isMac() ? ['⌘', 'P'] : ['Ctrl', 'P'];
     return printTexts;
   }, []);
   return /*#__PURE__*/React.createElement(Dropdown, {
@@ -78,7 +78,7 @@ const MoreOperations = _ref => {
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-dropdown-print-container"
   }, /*#__PURE__*/React.createElement("div", null, t('Print')), /*#__PURE__*/React.createElement(MenuShortcutPrompt, {
-    shortcuts: printShortCutTexts
+    shortcuts: printShortcutTexts
   }))), isPro && isFreezed && /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     onClick: unFreeze

package/dist/pages/sdoc-wiki-viewer.js

@@ -2,21 +2,25 @@ import React, { useEffect, useMemo } from 'react';
 import { withTranslation } from 'react-i18next';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
-import { SDocEditor } from '../basic-sdk';
 import { PAGE_EDIT_AREA_WIDTH, WIKI_EDITOR } from '../basic-sdk/constants';
 import { createWikiEditor } from '../basic-sdk/extension';
 import withNodeId from '../basic-sdk/node-id';
 import { withSocketIO } from '../basic-sdk/socket';
+import { TITLE } from '../basic-sdk/extension/constants';
+import WikiEditor from '../basic-sdk/editor/wiki-editor';
 import '../assets/css/simple-viewer.css';
 const SdocWikiViewer = _ref => {
   let {
     document,
-    showOutline,
-    scrollRef,
     docUuid,
-    isWikiReadOnly
+    isWikiReadOnly,
+    topSlot
   } = _ref;
   context.initApi();
+
+  // Wiki editor need filter initialized title node
+  const [firstNode, ...restNodes] = document.children;
+  if (firstNode.type === TITLE) document.children = restNodes;
   const validEditor = useMemo(() => {
     const defaultEditor = createWikiEditor();
     // getEditorConfig cashe the config, so we need to update the uuid,for wiki editor
@@ -42,15 +46,12 @@ const SdocWikiViewer = _ref => {
       validEditor.closeConnection();
     };
   }, [validEditor]);
-  return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(SDocEditor, {
-    showComment: false,
+  return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(WikiEditor, {
     document: document,
-    showOutline: showOutline,
-    scrollRef: scrollRef,
     docUuid: docUuid,
-    isShowHeaderToolbar: false,
     editor: validEditor,
-    isWikiReadOnly: isWikiReadOnly
+    isWikiReadOnly: isWikiReadOnly,
+    topSlot: topSlot
   }));
 };
 export default withTranslation('sdoc-editor')(SdocWikiViewer);

package/package.json

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