@seafile/sdoc-editor 0.5.5 → 0.5.6

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

@@ -67,13 +67,13 @@ const withBlockquote = editor => {
       if (currentLineIndex === 0 && isBlockAboveEmpty(newEditor)) {
         const emptyParagraph = generateEmptyElement(PARAGRAPH);
         Transforms.removeNodes(editor, {
-          at: currentLineEntry[1]
+          at: blockQuoteEntry[1]
         });
         Transforms.insertNodes(newEditor, emptyParagraph, {
           at: blockQuoteEntry[1]
         });
-        const previous = Path.previous(blockQuoteEntry[1]);
-        focusEditor(newEditor, Path.next(previous).concat(0));
+        const focusPoint = Editor.end(newEditor, blockQuoteEntry[1]);
+        focusEditor(newEditor, focusPoint);
         return;
       }
       // Merge with previous line when Select at the beginning of the line

package/dist/basic-sdk/extension/plugins/callout/helper.js

@@ -1,5 +1,5 @@
 import { Editor, Node, Path, Transforms } from '@seafile/slate';
-import { CALL_OUT } from '../../constants/element-type';
+import { CALL_OUT, PARAGRAPH } from '../../constants/element-type';
 import { focusEditor, generateEmptyElement, getSelectedElems, isRangeAcrossBlocks } from '../../core';
 import { CALLOUT_ALLOWED_INSIDE_TYPES, CALLOUT_COLOR_MAP } from './constant';
 export const isMenuActive = editor => {
@@ -110,7 +110,10 @@ export const getCalloutEntry = function (editor) {
 export const isCalloutContentEmpty = calloutEntry => {
   const [calloutNode] = calloutEntry;
   const contentString = Node.string(calloutNode);
-  return calloutNode.children.length === 1 && contentString.length === 0;
+  const calloutChildren = calloutNode.children;
+  const isSingleParagraph = calloutChildren.length === 1 && calloutChildren[0].type === PARAGRAPH;
+  const isEmptyContent = contentString.length === 0;
+  return isSingleParagraph && isEmptyContent;
 };
 
 // Insert a new element at new line in callout after current path

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

@@ -17,6 +17,19 @@ const generatorDiffTextElement = function (textElement, diffType) {
     [diffType]: true
   }, style);
 };
+export const getTopLevelChanges = changes => {
+  const topLevelChanges = [];
+  changes.forEach(item => {
+    let dom = document.querySelectorAll("[data-id=".concat(item, "]"))[0];
+    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;
+    }
+    topLevelChanges.push(dom.dataset.id);
+  });
+  return Array.from(new Set(topLevelChanges));
+};
 
 // Depth facilitates each child node, adding diffType to each end node
 const generatorDiffElement = function (element, diffType) {

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

@@ -1,6 +1,7 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import Tooltip from '../../../tooltip';
+import { getTopLevelChanges } from '../../../../basic-sdk/utils/diff';
 import './index.css';
 const ChangesCount = _ref => {
   let {
@@ -10,9 +11,18 @@ const ChangesCount = _ref => {
     t
   } = useTranslation();
   const [currentDiffIndex, setDiffIndex] = useState(0);
+  const [topLevelChanges, setTopLevelChanges] = useState([]);
+  useEffect(() => {
+    if (changes.length !== 0) {
+      queueMicrotask(() => {
+        const topLevelChanges = getTopLevelChanges(changes);
+        setTopLevelChanges([...topLevelChanges]);
+      });
+    }
+  }, [changes]);
   const jumpToElement = useCallback(currentDiffIndex => {
     setDiffIndex(currentDiffIndex);
-    const change = changes[currentDiffIndex];
+    const change = topLevelChanges[currentDiffIndex];
     const changeElement = document.querySelectorAll("[data-id=".concat(change, "]"))[0];
     if (changeElement) {
       const scrollContainer = document.getElementById('sdoc-scroll-container');
@@ -22,31 +32,31 @@ const ChangesCount = _ref => {
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [changes, currentDiffIndex]);
+  }, [topLevelChanges, currentDiffIndex]);
   const lastChange = useCallback(() => {
     if (currentDiffIndex === 0) {
-      jumpToElement(changes.length - 1);
+      jumpToElement(topLevelChanges.length - 1);
       return;
     }
     jumpToElement(currentDiffIndex - 1);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [changes, currentDiffIndex]);
+  }, [topLevelChanges, currentDiffIndex]);
   const nextChange = useCallback(() => {
-    if (currentDiffIndex === changes.length - 1) {
+    if (currentDiffIndex === topLevelChanges.length - 1) {
       jumpToElement(0);
       return;
     }
     jumpToElement(currentDiffIndex + 1);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [changes, currentDiffIndex]);
-  if (!Array.isArray(changes) || changes.length === 0) {
+  }, [topLevelChanges, currentDiffIndex]);
+  if (!Array.isArray(topLevelChanges) || topLevelChanges.length === 0) {
     return /*#__PURE__*/React.createElement("div", {
       className: "sdoc-revision-changes-container d-flex align-items-center pl-2 pr-2 ml-4"
     }, t('No_changes'));
   }
-  const changesCount = changes.length;
+  const changesCount = topLevelChanges.length;
   return /*#__PURE__*/React.createElement("div", {
     className: "sdoc-revision-changes-container d-flex align-items-center ml-4"
   }, /*#__PURE__*/React.createElement("div", {

package/package.json

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