prosemirror-history - npm Package Compare versions

Comparing version 1.0.1 to 1.0.2

CHANGELOG.md

@@ -0,1 +1,7 @@
+## 1.0.2 (2018-03-13)
+
+### Bug fixes
+
+Fix a bug that could corrupt the history when rebasing changes because of collaborative editing.
+
 ## 1.0.1 (2018-03-05)
@@ -2,0 +8,0 @@

dist/history.js

@@ -152,2 +152,3 @@ 'use strict';
   var eventCount = this.eventCount;
+  this.items.forEach(function (item) { if (item.selection) { eventCount--; } }, this.items.length - rebasedCount);
 
@@ -163,5 +164,5 @@ var iRebased = rebasedCount;
       var selection = item.selection && item.selection.map(mapping.slice(iRebased, pos));
+      if (selection) { eventCount++; }
       rebasedItems.push(new Item(map, step, selection));
     } else {
-      if (item.selection) { eventCount--; }
       rebasedItems.push(new Item(map));
@@ -176,2 +177,3 @@ }
   var branch = new Branch(items, eventCount);
+
   if (branch.emptyItemCount() > max_empty_items)
@@ -178,0 +180,0 @@ { branch = branch.compress(this.items.length - rebasedItems.length); }

package.json

 {
   "name": "prosemirror-history",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Undo history for ProseMirror",
@@ -5,0 +5,0 @@ "main": "dist/history.js",

src/history.js

@@ -145,2 +145,3 @@ import RopeSequence from "rope-sequence"
     let eventCount = this.eventCount
+    this.items.forEach(item => { if (item.selection) eventCount-- }, this.items.length - rebasedCount)
 
@@ -156,5 +157,5 @@ let iRebased = rebasedCount
         let selection = item.selection && item.selection.map(mapping.slice(iRebased, pos))
+        if (selection) eventCount++
         rebasedItems.push(new Item(map, step, selection))
       } else {
-        if (item.selection) eventCount--
         rebasedItems.push(new Item(map))
@@ -169,2 +170,3 @@ }
     let branch = new Branch(items, eventCount)
+
     if (branch.emptyItemCount() > max_empty_items)
@@ -171,0 +173,0 @@ branch = branch.compress(this.items.length - rebasedItems.length)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

70720

increased by0.84%

Lines of code

769

increased by0.26%

No dependency changes