@seafile/sdoc-editor 0.1.104 → 0.1.105

package/dist/basic-sdk/editor.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState, forwardRef, useImperativeHandle } from 'react';
 import { Editable, ReactEditor, Slate } from '@seafile/slate-react';
 import defaultEditor, { renderLeaf, renderElement, Toolbar, ContextToolbar } from './extension';
 import { focusEditor, getAboveBlockNode, getNextNode, getPrevNode, isSelectionAtBlockEnd, isSelectionAtBlockStart } from './extension/core';
@@ -20,7 +20,7 @@ import { ColorProvider } from './hooks/use-color-context';
 import './assets/css/layout.css';
 import './assets/css/sdoc-editor-plugins.css';
 import './assets/css/dropdown-menu.css';
-var SDocEditor = function SDocEditor(_ref) {
+var SDocEditor = forwardRef(function (_ref, ref) {
   var document = _ref.document,
     config = _ref.config;
   // init editor
@@ -51,6 +51,16 @@ var SDocEditor = function SDocEditor(_ref) {
     return new EventProxy(editor);
   }, []);
 
+  // The parent component can call the method of this component through ref
+  useImperativeHandle(ref, function () {
+    return {
+      // get latest value
+      getValue: function getValue() {
+        return slateValue;
+      }
+    };
+  }, [slateValue]);
+
   // useMount: init socket connection
   useEffect(function () {
     editor.openConnection();
@@ -246,5 +256,5 @@ var SDocEditor = function SDocEditor(_ref) {
     decorate: decorate,
     onCut: eventProxy.onCut
   })), /*#__PURE__*/React.createElement(CommentWrapper, null)))))))))));
-};
+});
 export default SDocEditor;

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

@@ -89,6 +89,7 @@ var CodeBlock = function CodeBlock(_ref) {
   }, []);
   var onScroll = useCallback(function (e) {
     if (readOnly) return;
+    if (!showHoverMenu) return;
     if (e.currentTarget.scrollTop) {
       var _codeBlockRef$current2 = codeBlockRef.current.getBoundingClientRect(),
         top = _codeBlockRef$current2.top,
@@ -101,17 +102,18 @@ var CodeBlock = function CodeBlock(_ref) {
 
       setMenuPosition(newMenuPosition);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [readOnly, showHoverMenu]);
   useEffect(function () {
     if (readOnly) return;
-    if (showHoverMenu) {
-      scrollRef.current && scrollRef.current.addEventListener('scroll', onScroll);
-    } else {
-      scrollRef.current && scrollRef.current.removeEventListener('scroll', onScroll);
+    var observerRefValue = null;
+    if (scrollRef.current) {
+      scrollRef.current.addEventListener('scroll', onScroll);
+      observerRefValue = scrollRef.current;
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [showHoverMenu]);
+    return function () {
+      observerRefValue.removeEventListener('scroll', onScroll);
+    };
+  }, [onScroll, readOnly, scrollRef]);
   var isEntering = useCallback(function (e) {
     return !editor.operations.every(function (operation) {
       return operation.type === 'set_selection';

package/dist/pages/simple-editor.js

@@ -1,6 +1,8 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withTranslation } from 'react-i18next';
+import deepCopy from 'deep-copy';
 import { SDocEditor } from '../basic-sdk';
 import Loading from '../components/loading';
 import DocInfo from '../components/doc-info';
@@ -15,6 +17,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
   var isStarred = _ref.isStarred,
     isDraft = _ref.isDraft,
     t = _ref.t;
+  var editorRef = useRef(null);
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     isFirstLoad = _useState2[0],
@@ -77,35 +80,28 @@ var SimpleEditor = function SimpleEditor(_ref) {
   var initChangesData = useCallback(function () {
     setShowChanges(true);
     context.getSeadocRevisionDownloadLinks().then(function (res) {
-      var _res$data = res.data,
-        fileDownloadLink = _res$data.file_download_link,
-        originFileDownloadLink = _res$data.origin_file_download_link;
-      fetch(fileDownloadLink).then(function (res) {
-        return res.json();
-      }).then(function (revisionContent) {
-        fetch(originFileDownloadLink).then(function (res) {
-          return res.json();
-        }).then(function (originContent) {
-          setCurrentContent(revisionContent);
-          setLastContent(originContent);
-          setErrorMessage(null);
-          setContextInit(true);
-        }).catch(function (error) {
-          setErrorMessage('Load_doc_content_error');
-          setContextInit(true);
-        });
-      }).catch(function (error) {
-        setErrorMessage('Load_doc_content_error');
-        setContextInit(true);
-      });
+      var originFileDownloadLink = res.data.origin_file_download_link;
+      return fetch(originFileDownloadLink);
+    }).then(function (res) {
+      return res.json();
+    }).then(function (originContent) {
+      setLastContent(originContent);
+      setErrorMessage(null);
+      setContextInit(true);
     }).catch(function (error) {
       setErrorMessage('Load_doc_content_error');
       setContextInit(true);
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [document]);
   var toggleViewChanges = useCallback(function (isShowChanges) {
+    if (isShowChanges) {
+      var newestValue = editorRef.current.getValue();
+      setCurrentContent(deepCopy(_objectSpread(_objectSpread({}, document), {}, {
+        children: newestValue
+      })));
+    }
     setContextInit(false);
     if (isShowChanges) {
       initChangesData();
@@ -114,7 +110,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     initDocumentData(false);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [document]);
   if (isFirstLoad && !isContextInit) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
@@ -140,6 +136,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }) : /*#__PURE__*/React.createElement(SDocEditor, {
     config: context.getEditorConfig(),
     document: document,
+    ref: editorRef,
     isOpenSocket: context.getSetting('isOpenSocket')
   })))));
 };

package/package.json

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