@seafile/sdoc-editor 0.5.41-beta.11 → 0.5.41-beta.3

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

@@ -3,7 +3,6 @@ import ObjectUtils from './object-utils';
 const extendedWordChars = 'a-zA-Z\\u{C0}-\\u{FF}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}\\u{4e00}-\\u{9fa5}';
 const tokenizeIncludingWhitespace = new RegExp("[".concat(extendedWordChars, "]+|\\s+|[^").concat(extendedWordChars, "]"), 'ug');
 const buildValues = (diff, components, newString, oldString, valueType, useLongestToken) => {
-  console.log('buildValues', diff, components, newString, oldString, valueType, useLongestToken);
   let componentPos = 0;
   let componentLen = components.length;
   let newPos = 0;

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

@@ -32,38 +32,30 @@ export const getTopLevelChanges = changes => {
         dom = parentNode;
       }
     }
-    topLevelChanges.push(dom.dataset.id);
+    const changeItem = {
+      id: dom.dataset.id,
+      value: item
+    };
+    topLevelChanges.push(changeItem);
   });
-  return Array.from(new Set(topLevelChanges));
+  return topLevelChanges;
 };
 
 // Merge consecutive added areas or deleted areas
-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;
+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;
     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;
-    changes.push(item);
+    result.push(item);
   });
-  console.log('changes', changes);
-  return changes.map(item => ({
+  console.log('result', result);
+  return result.map(item => ({
     id: item.id
   }));
 };
@@ -114,7 +106,6 @@ 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);
@@ -280,7 +271,6 @@ 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/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 {
-    allChanges
+    changes: allChanges
   } = _ref;
   const {
     t
@@ -26,9 +26,8 @@ const ChangesCount = _ref => {
       }, 100);
     }).then(() => {
       if (allChanges.length !== 0) {
-        console.log('allChanges', allChanges);
-        const topLevelChanges = getTopLevelChanges(allChanges.changes);
-        const changes = getMergedChanges(topLevelChanges, allChanges.value);
+        const topLevelChanges = getTopLevelChanges(allChanges);
+        const changes = getMergedChanges(topLevelChanges);
         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, {
-    allChanges: changes
+    changes: 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);
+    setChanges((diff === null || diff === void 0 ? void 0 : diff.changes) || []);
   }, []);
   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);
+    setChanges(diff.changes);
     // 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.11",
+  "version": "0.5.41-beta.3",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",