@seafile/sdoc-editor 0.5.41-beta.1 → 0.5.41-beta.10

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

@@ -123,6 +123,7 @@ class DiffText {
       }, 0);
     });
     _defineProperty(this, "pushComponent", (components, added, removed) => {
+      console.log('pushComponent-add-remove', components, added, removed);
       let last = components[components.length - 1];
       if (last && last.added === added && last.removed === removed) {
         // We need to clone here as the component clone operation is just

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

@@ -32,28 +32,40 @@ export const getTopLevelChanges = changes => {
         dom = parentNode;
       }
     }
-    const changeItem = {
-      id: dom.dataset.id,
-      value: item
-    };
-    topLevelChanges.push(changeItem);
+    topLevelChanges.push(dom.dataset.id);
   });
-  return topLevelChanges;
+  return Array.from(new Set(topLevelChanges));
 };
 
 // Merge consecutive added areas or deleted areas
-export const getMergedChanges = changes => {
-  const result = [];
-  changes.forEach(item => {
-    var _result;
-    const preChange = (_result = result[result.length - 1]) === null || _result === void 0 ? void 0 : _result.value;
+export const getMergedChanges = (topLevelChanges, diffValue) => {
+  console.log('topLevelChanges', topLevelChanges);
+  const topLevelChangesValue = [];
+  const changes = [];
+  diffValue.forEach(item => {
+    if (topLevelChanges.includes(item.id)) {
+      const obj = {
+        id: item.id,
+        value: item
+      };
+      topLevelChangesValue.push(obj);
+    }
+  });
+  console.log('topLevelChangesValue', topLevelChangesValue);
+  topLevelChangesValue.forEach(item => {
+    var _changes;
+    const preChange = (_changes = changes[changes.length - 1]) === null || _changes === void 0 ? void 0 : _changes.value;
     const curChange = item.value;
+    console.log('preChange', preChange);
+    console.log('curChange', curChange);
     if ((curChange === null || curChange === void 0 ? void 0 : curChange.add) && (preChange === null || preChange === void 0 ? void 0 : preChange.add)) return;
     if ((curChange === null || curChange === void 0 ? void 0 : curChange.delete) && (preChange === null || preChange === void 0 ? void 0 : preChange.delete)) return;
-    result.push(item);
+    changes.push(item);
   });
-  console.log('result', result);
-  return result.map(item => item.id);
+  console.log('changes', changes);
+  return changes.map(item => ({
+    id: item.id
+  }));
 };
 
 // Depth facilitates each child node, adding diffType to each end node
@@ -102,6 +114,7 @@ const getTextDiff = (element, oldElement, diff) => {
   const oldText = oldElement.text;
   const textDiff = new DiffText(oldText || '', newText || '');
   const textDiffs = textDiff.getDiffs();
+  console.log('textDiffs', textDiffs);
   let newChildren = [];
   textDiffs.forEach((item, index) => {
     const id = "".concat(element.id || slugid.nice(), "-").concat(index);
@@ -267,6 +280,7 @@ const getElementDiffValue = (currentContent, oldContent) => {
     ids: oldIds
   } = generateIdMapAndIds(oldContent);
   const diffs = getIdDiffs(oldIds, currentIds);
+  console.log('diffs', diffs);
   diffs.forEach(diffItem => {
     const elementIds = diffItem.value;
     if (diffItem.removed) {

package/dist/basic-sdk/views/revision-diff-viewer.js

@@ -21,7 +21,6 @@ const RevisionDiffViewer = _ref => {
       } = res.data;
       const originContent = JSON.parse(originContentString);
       const diff = getDiff(revisionContent, originContent);
-      console.log('diff', diff);
       setDiff(diff);
       didMountCallback && didMountCallback(diff);
       setIsLoading(false);

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

@@ -5,7 +5,7 @@ import { getTopLevelChanges, getMergedChanges } from '../../../../basic-sdk/util
 import './index.css';
 const ChangesCount = _ref => {
   let {
-    changes: allChanges
+    allChanges
   } = _ref;
   const {
     t
@@ -26,8 +26,9 @@ const ChangesCount = _ref => {
       }, 100);
     }).then(() => {
       if (allChanges.length !== 0) {
-        const topLevelChanges = getTopLevelChanges(allChanges);
-        const changes = getMergedChanges(topLevelChanges);
+        console.log('allChanges', allChanges);
+        const topLevelChanges = getTopLevelChanges(allChanges.changes);
+        const changes = getMergedChanges(topLevelChanges, allChanges.value);
         setChanges(changes);
       }
     });

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

@@ -192,7 +192,7 @@ const RevisionOperations = _ref => {
     setShowTip(false);
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !isSdocRevision && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MoreRevisionOperations, null), /*#__PURE__*/React.createElement(Revisions, null)), isSdocRevision && isShowChanges && /*#__PURE__*/React.createElement(ChangesCount, {
-    changes: changes
+    allChanges: changes
   }), isSdocRevision && /*#__PURE__*/React.createElement(ViewChanges, {
     isShowChanges: isShowChanges,
     onViewChangesToggle: onViewChangesToggle

package/dist/pages/published-revision-viewer.js

@@ -50,7 +50,7 @@ const PublishedRevisionViewer = () => {
     });
   }, []);
   const setDiffChanges = useCallback(diff => {
-    setChanges((diff === null || diff === void 0 ? void 0 : diff.changes) || []);
+    setChanges(diff);
   }, []);
   const handleViewChangesToggle = useCallback(isShowChanges => {
     setShowChanges(isShowChanges);

package/dist/pages/simple-editor.js

@@ -40,7 +40,7 @@ const SimpleEditor = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const setDiffChanges = useCallback(diff => {
-    setChanges(diff.changes);
+    setChanges(diff);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
   const handleViewChangesToggle = useCallback(isShowChanges => {

package/package.json

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