npm - @seafile/sdoc-editor - Versions diffs - 0.1.28-beta1 → 0.1.28-beta3 - Mend

@seafile/sdoc-editor 0.1.28-beta1 → 0.1.28-beta3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/assets/css/diff-viewer.css +5 -5
package/dist/basic-sdk/utils/diff.js +18 -81
package/dist/pages/diff-viewer/diff-viewer.js +27 -5
package/package.json +1 -1

package/dist/assets/css/diff-viewer.css CHANGED Viewed

@@ -1,13 +1,13 @@
-.sdoc-diff-added {
-  background-color: #e6ffed;
+.sdoc-diff {
   padding: 0 5px;
   margin: 0 -5px;
   overflow: hidden;
 }
+.sdoc-diff-added {
+  background-color: #e6ffed;
+}
 .sdoc-diff-removed {
   background-color: #ffeef0;
-  padding: 0 5px;
-  margin: 0 -5px;
-  overflow: hidden;
 }

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

@@ -40,7 +40,7 @@ var getNearestElementIndex = function getNearestElementIndex(diffDocument, oldDo
 var updateDiffDocument = function updateDiffDocument(diffDocument, element, oldElement) {
   if (!diffDocument || !element || !oldElement) return;
   if (ObjectUtils.isSameObject(element, oldElement)) {
-    diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
+    diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
       diff_type: DIFF_TYPE.COMMON
     }));
     return;
@@ -64,26 +64,11 @@ var updateDiffDocument = function updateDiffDocument(diffDocument, element, oldE
     case ELEMENT_TYPE.HEADER4:
     case ELEMENT_TYPE.HEADER5:
     case ELEMENT_TYPE.HEADER6:
-      {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
-        }));
-        break;
-      }
-    case ELEMENT_TYPE.LINK:
-      {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
-        }));
-        break;
-      }
     case ELEMENT_TYPE.BLOCKQUOTE:
+    case ELEMENT_TYPE.LINK:
+    case ELEMENT_TYPE.CHECK_LIST_ITEM:
+    case ELEMENT_TYPE.CODE_BLOCK:
+    case ELEMENT_TYPE.IMAGE:
       {
         diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
           diff_type: DIFF_TYPE.DELETE
@@ -95,61 +80,13 @@ var updateDiffDocument = function updateDiffDocument(diffDocument, element, oldE
       }
     case ELEMENT_TYPE.ORDERED_LIST:
     case ELEMENT_TYPE.UNORDERED_LIST:
-      {
-        var orderDiff = getDiffValue(element, oldElement);
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          children: orderDiff,
-          diff_type: DIFF_TYPE.MODIFY
-        }));
-        break;
-      }
     case ELEMENT_TYPE.LIST_ITEM:
-      {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
-        }));
-        break;
-      }
     case ELEMENT_TYPE.LIST_LIC:
       {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
+        var orderDiff = getElementDiffValue(element.children, oldElement.children);
         diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
-        }));
-        break;
-      }
-    case ELEMENT_TYPE.CHECK_LIST_ITEM:
-      {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
-        }));
-        break;
-      }
-    case ELEMENT_TYPE.CODE_BLOCK:
-      {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
-        }));
-        break;
-      }
-    case ELEMENT_TYPE.IMAGE:
-      {
-        diffDocument.push(_objectSpread(_objectSpread({}, oldElement), {}, {
-          diff_type: DIFF_TYPE.DELETE
-        }));
-        diffDocument.push(_objectSpread(_objectSpread({}, element), {}, {
-          diff_type: DIFF_TYPE.ADD
+          children: orderDiff,
+          diff_type: DIFF_TYPE.MODIFY
         }));
         break;
       }
@@ -165,17 +102,9 @@ var updateDiffDocument = function updateDiffDocument(diffDocument, element, oldE
       }
   }
 };
-export var getDiffValue = function getDiffValue(currentValue, oldValue) {
-  var currentVersion = currentValue.version,
-    currentChildren = currentValue.children;
-  var oldVersion = oldValue.version,
-    oldChildren = oldValue.children;
-  if (currentVersion === oldVersion) return currentChildren;
-  var diffDocument = [];
-  console.log('currentChildren: ', currentChildren);
-  console.log('oldChildren: ', oldChildren);
+var getElementDiffValue = function getElementDiffValue(currentChildren, oldChildren) {
   // init
+  var diffDocument = [];
   var currentChildrenMap = {};
   var oldChildrenMap = {};
   currentChildren.forEach(function (element) {
@@ -207,4 +136,12 @@ export var getDiffValue = function getDiffValue(currentValue, oldValue) {
     }
   });
   return diffDocument;
+};
+export var getDiffValue = function getDiffValue(currentValue, oldValue) {
+  var currentVersion = currentValue.version,
+    currentChildren = currentValue.children;
+  var oldVersion = oldValue.version,
+    oldChildren = oldValue.children;
+  if (currentVersion === oldVersion) return currentChildren;
+  return getElementDiffValue(currentChildren, oldChildren);
 };

package/dist/pages/diff-viewer/diff-viewer.js CHANGED Viewed

@@ -8,7 +8,7 @@ import { Editable, Slate } from '@seafile/slate-react';
 import editor, { renderLeaf, renderElement } from '../../basic-sdk/extension';
 import withNodeId from '../../basic-sdk/node-id';
 import { getDiffValue } from '../../basic-sdk/utils/diff';
-import { DIFF_TYPE } from '../../basic-sdk/extension/constants';
+import { DIFF_TYPE, ELEMENT_TYPE } from '../../basic-sdk/extension/constants';
 import '../../assets/css/diff-viewer.css';
 var DiffViewer = /*#__PURE__*/function (_Component) {
   _inherits(DiffViewer, _Component);
@@ -22,10 +22,18 @@ var DiffViewer = /*#__PURE__*/function (_Component) {
     };
     _this.renderElement = function (props) {
       var element = props.element;
-      var diff_type = element.diff_type;
+      var diff_type = element.diff_type,
+        type = element.type;
       if (diff_type === DIFF_TYPE.ADD) {
+        if (type === ELEMENT_TYPE.LIST_ITEM) {
+          return renderElement(_objectSpread(_objectSpread({}, props), {}, {
+            attributes: _objectSpread(_objectSpread({}, props.attributes), {}, {
+              className: 'sdoc-diff-added'
+            })
+          }), _this.editor);
+        }
         return /*#__PURE__*/React.createElement("div", {
-          className: "sdoc-diff-added"
+          className: "sdoc-diff sdoc-diff-added"
         }, renderElement(_objectSpread(_objectSpread({}, props), {}, {
           attributes: _objectSpread(_objectSpread({}, props.attributes), {}, {
             className: 'sdoc-diff-added'
@@ -33,8 +41,15 @@ var DiffViewer = /*#__PURE__*/function (_Component) {
         }), _this.editor));
       }
       if (diff_type === DIFF_TYPE.DELETE) {
+        if (type === ELEMENT_TYPE.LIST_ITEM) {
+          return renderElement(_objectSpread(_objectSpread({}, props), {}, {
+            attributes: _objectSpread(_objectSpread({}, props.attributes), {}, {
+              className: 'sdoc-diff-removed'
+            })
+          }), _this.editor);
+        }
         return /*#__PURE__*/React.createElement("div", {
-          className: "sdoc-diff-removed"
+          className: "sdoc-diff sdoc-diff-removed"
         }, renderElement(_objectSpread(_objectSpread({}, props), {}, {
           attributes: _objectSpread(_objectSpread({}, props.attributes), {}, {
             className: 'sdoc-diff-removed'
@@ -42,8 +57,15 @@ var DiffViewer = /*#__PURE__*/function (_Component) {
         }), _this.editor));
       }
       if (diff_type === DIFF_TYPE.MODIFY) {
+        if (type === ELEMENT_TYPE.ORDERED_LIST || type === ELEMENT_TYPE.UNORDERED_LIST) {
+          return renderElement(_objectSpread(_objectSpread({}, props), {}, {
+            attributes: _objectSpread(_objectSpread({}, props.attributes), {}, {
+              className: 'sdoc-diff-modify'
+            })
+          }), _this.editor);
+        }
         return /*#__PURE__*/React.createElement("div", {
-          className: "sdoc-diff-modify"
+          className: "sdoc-diff sdoc-diff-modify"
         }, renderElement(_objectSpread(_objectSpread({}, props), {}, {
           attributes: _objectSpread(_objectSpread({}, props.attributes), {}, {
             className: 'sdoc-diff-modify'

package/package.json CHANGED Viewed

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