@seafile/sdoc-editor 0.5.29 → 0.5.30

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

@@ -41,6 +41,12 @@ const SdocEditor = forwardRef((_ref, ref) => {
     // 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 () => {
@@ -49,7 +55,6 @@ const SdocEditor = forwardRef((_ref, ref) => {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-
   // useMount: init socket connection
   useEffect(() => {
     if (propsEditor) return;
@@ -57,7 +62,6 @@ const SdocEditor = forwardRef((_ref, ref) => {
     return () => {
       validEditor.closeConnection();
     };
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 

package/dist/basic-sdk/extension/constants/index.js

@@ -46,7 +46,6 @@ export const MOUSE_ENTER_EVENT_DISABLED_MAP = {
   [CHECK_LIST_ITEM]: [CALL_OUT],
   [ORDERED_LIST]: [CALL_OUT],
   [UNORDERED_LIST]: [CALL_OUT],
-  [UNORDERED_LIST]: [CALL_OUT],
   [LIST_ITEM]: [CALL_OUT],
   [BLOCKQUOTE]: [CALL_OUT],
   [HEADER1]: [CALL_OUT],
@@ -57,4 +56,5 @@ export const MOUSE_ENTER_EVENT_DISABLED_MAP = {
   [HEADER6]: [CALL_OUT],
   [CALL_OUT]: [CALL_OUT]
 };
+export const ROOT_ELEMENT_TYPES = [PARAGRAPH, TITLE, SUBTITLE, CHECK_LIST_ITEM, ORDERED_LIST, UNORDERED_LIST, BLOCKQUOTE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, CALL_OUT, TABLE];
 export { ELEMENT_TYPE, BLOCKQUOTE, TITLE, SUBTITLE, HEADER, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, PARAGRAPH, ORDERED_LIST, UNORDERED_LIST, LIST_ITEM, CHECK_LIST_ITEM, CODE_BLOCK, CODE_LINE, TABLE, TABLE_CELL, TABLE_ROW, LINK, SDOC_LINK, FILE_LINK, IMAGE, IMAGE_BLOCK, TOP_LEVEL_TYPES, INLINE_LEVEL_TYPES, CALL_OUT, MENTION, MENTION_TEMP };

package/dist/basic-sdk/extension/render/custom-element.js

@@ -4,7 +4,7 @@ import { BLOCKQUOTE, LINK, CHECK_LIST_ITEM, HEADER1, HEADER2, HEADER3, HEADER4,
 import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, SdocLinkPlugin, ParagraphPlugin, FileLinkPlugin, CalloutPlugin, MentionPlugin } from '../plugins';
 import { onDragOver, onDragLeave, onDrop } from '../toolbar/side-toolbar/event';
 import { getParentNode } from '../core';
-import { setMouseEnter } from './helper';
+import { setDataRoot, setMouseEnter } from './helper';
 const CustomRenderElement = props => {
   const editor = useSlateStatic();
   const readonly = useReadOnly();
@@ -19,6 +19,9 @@ const CustomRenderElement = props => {
     attributes['onDrop'] = onDrop;
     attributes['className'] = 'sdoc-drag-cover';
   }
+
+  // Sets the data-root attribute to true for certain elements
+  setDataRoot(element, attributes);
   switch (element.type) {
     case PARAGRAPH:
       {

package/dist/basic-sdk/extension/render/helper.js

@@ -1,6 +1,6 @@
 import { Editor } from '@seafile/slate';
 import { findPath } from '../core';
-import { MOUSE_ENTER_EVENT_DISABLED_MAP } from '../constants';
+import { MOUSE_ENTER_EVENT_DISABLED_MAP, ROOT_ELEMENT_TYPES } from '../constants';
 import { onMouseEnter } from '../toolbar/side-toolbar/event';
 const isNeedAddMouseEnterEvent = (editor, element) => {
   const elementPath = findPath(editor, element);
@@ -18,5 +18,8 @@ const isNeedAddMouseEnterEvent = (editor, element) => {
 export const setMouseEnter = (editor, element, attributes) => {
   if (!isNeedAddMouseEnterEvent(editor, element)) return;
   attributes['onMouseEnter'] = e => onMouseEnter(e, element);
+};
+export const setDataRoot = (element, attributes) => {
+  if (!ROOT_ELEMENT_TYPES.includes(element.type)) return;
   attributes['data-root'] = 'true';
 };

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

@@ -20,11 +20,17 @@ const generatorDiffTextElement = function (textElement, diffType) {
 export const getTopLevelChanges = changes => {
   const topLevelChanges = [];
   changes.forEach(item => {
-    let dom = document.querySelectorAll("[data-id=".concat(item, "]"))[0];
+    let dom = document.querySelectorAll("[data-id=\"".concat(item, "\"]"))[0];
+    if (!dom) return [];
     while (((_dom = dom) === null || _dom === void 0 ? void 0 : (_dom$dataset = _dom.dataset) === null || _dom$dataset === void 0 ? void 0 : _dom$dataset.root) !== 'true') {
       var _dom, _dom$dataset, _dom2;
-      if (!((_dom2 = dom) === null || _dom2 === void 0 ? void 0 : _dom2.parentNode)) break;
-      dom = dom.parentNode;
+      if (!((_dom2 = dom) === null || _dom2 === void 0 ? void 0 : _dom2.parentNode) || dom instanceof Document) break;
+      const parentNode = dom.parentNode;
+      if (parentNode instanceof Document) {
+        break;
+      } else {
+        dom = parentNode;
+      }
     }
     topLevelChanges.push(dom.dataset.id);
   });

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

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import Tooltip from '../../../tooltip';
 import { getTopLevelChanges } from '../../../../basic-sdk/utils/diff';
@@ -12,18 +12,32 @@ const ChangesCount = _ref => {
   } = useTranslation();
   const [currentDiffIndex, setDiffIndex] = useState(0);
   const [topLevelChanges, setTopLevelChanges] = useState([]);
+  const intervalRef = useRef();
   useEffect(() => {
-    if (changes.length !== 0) {
-      queueMicrotask(() => {
+    // Article rendering is delayed, so we need to wait for the Article to render before we can get the changes
+    new Promise(resolve => {
+      intervalRef.current = setInterval(() => {
+        const article = document.querySelector('.article');
+        if (article) {
+          clearInterval(intervalRef.current);
+          intervalRef.current = null;
+          resolve();
+        }
+      }, 100);
+    }).then(() => {
+      if (changes.length !== 0) {
         const topLevelChanges = getTopLevelChanges(changes);
         setTopLevelChanges([...topLevelChanges]);
-      });
-    }
+      }
+    });
+    return () => {
+      intervalRef.current && clearInterval(intervalRef.current);
+    };
   }, [changes]);
   const jumpToElement = useCallback(currentDiffIndex => {
     setDiffIndex(currentDiffIndex);
     const change = topLevelChanges[currentDiffIndex];
-    const changeElement = document.querySelectorAll("[data-id=".concat(change, "]"))[0];
+    const changeElement = document.querySelectorAll("[data-id=\"".concat(change, "\"]"))[0];
     if (changeElement) {
       const scrollContainer = document.getElementById('sdoc-scroll-container');
       if (scrollContainer) {

package/dist/pages/simple-editor.js

@@ -55,8 +55,8 @@ const SimpleEditor = _ref => {
     }
 
     // Get the contents of the current revision
-    const revisionContent = editorRef.current.getSlateValue();
-    setRevisionContent(revisionContent);
+    const revisionContentValue = editorRef.current.getSlateValue();
+    setRevisionContent(revisionContentValue);
     setShowChanges(isShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [document, editorRef.current, isPublished]);

package/package.json

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