@atlaskit/editor-plugin-show-diff 10.4.1 → 10.4.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 10.4.2
+
+### Patch Changes
+
+- [`a41c9b243974d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a41c9b243974d) -
+  Fix smart diff fabricating a phantom whole-block deletion when a new block is inserted at a
+  top-level boundary (e.g. a paragraph added immediately before a bulletList). topLevelBlocksInRange
+  now treats a zero-width insertion anchor sitting exactly on a top-level block boundary as touching
+  no block, so a pure insertion is no longer mis-paired with the following block and converted into
+  a whole-block replacement. This also lets pure whole-block deletions surface under smart diff.
+- Updated dependencies
+
 ## 10.4.1
 
 ### Patch Changes

package/dist/cjs/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -168,14 +168,24 @@ var topLevelBlocksInRange = function topLevelBlocksInRange(doc, from, to) {
     var node = doc.child(i);
     var blockFrom = offset;
     var blockTo = offset + node.nodeSize;
-    // Overlap test; include a zero-width touch at the block start (pure insertion point).
-    if (blockFrom < hi && blockTo > lo) {
-      refs.push({
-        node: node,
-        from: blockFrom,
-        to: blockTo
-      });
-    } else if (blockFrom === lo && blockFrom === hi) {
+    // Non-empty range: standard half-open overlap test.
+    if (lo < hi) {
+      if (blockFrom < hi && blockTo > lo) {
+        refs.push({
+          node: node,
+          from: blockFrom,
+          to: blockTo
+        });
+      }
+    } else if (blockFrom < lo && lo < blockTo) {
+      // Zero-width range (an insertion anchor): only match a block whose INTERIOR strictly
+      // contains the point. A point sitting exactly on a top-level block boundary
+      // (`blockFrom === lo`, i.e. between two sibling blocks) is a pure insertion BETWEEN
+      // blocks — it must resolve to NO block, otherwise `groupByTopLevelBlock` pairs the
+      // insertion with the following block and `classifyBlockGroup` converts the insert into a
+      // whole-block replacement, fabricating a phantom deletion of that untouched block.
+      // Interior points (a nested insertion inside a container being edited) still resolve
+      // their container so the classifier can recurse into it.
       refs.push({
         node: node,
         from: blockFrom,

package/dist/es2019/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -141,14 +141,24 @@ const topLevelBlocksInRange = (doc, from, to) => {
     const node = doc.child(i);
     const blockFrom = offset;
     const blockTo = offset + node.nodeSize;
-    // Overlap test; include a zero-width touch at the block start (pure insertion point).
-    if (blockFrom < hi && blockTo > lo) {
-      refs.push({
-        node,
-        from: blockFrom,
-        to: blockTo
-      });
-    } else if (blockFrom === lo && blockFrom === hi) {
+    // Non-empty range: standard half-open overlap test.
+    if (lo < hi) {
+      if (blockFrom < hi && blockTo > lo) {
+        refs.push({
+          node,
+          from: blockFrom,
+          to: blockTo
+        });
+      }
+    } else if (blockFrom < lo && lo < blockTo) {
+      // Zero-width range (an insertion anchor): only match a block whose INTERIOR strictly
+      // contains the point. A point sitting exactly on a top-level block boundary
+      // (`blockFrom === lo`, i.e. between two sibling blocks) is a pure insertion BETWEEN
+      // blocks — it must resolve to NO block, otherwise `groupByTopLevelBlock` pairs the
+      // insertion with the following block and `classifyBlockGroup` converts the insert into a
+      // whole-block replacement, fabricating a phantom deletion of that untouched block.
+      // Interior points (a nested insertion inside a container being edited) still resolve
+      // their container so the classifier can recurse into it.
       refs.push({
         node,
         from: blockFrom,

package/dist/esm/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -161,14 +161,24 @@ var topLevelBlocksInRange = function topLevelBlocksInRange(doc, from, to) {
     var node = doc.child(i);
     var blockFrom = offset;
     var blockTo = offset + node.nodeSize;
-    // Overlap test; include a zero-width touch at the block start (pure insertion point).
-    if (blockFrom < hi && blockTo > lo) {
-      refs.push({
-        node: node,
-        from: blockFrom,
-        to: blockTo
-      });
-    } else if (blockFrom === lo && blockFrom === hi) {
+    // Non-empty range: standard half-open overlap test.
+    if (lo < hi) {
+      if (blockFrom < hi && blockTo > lo) {
+        refs.push({
+          node: node,
+          from: blockFrom,
+          to: blockTo
+        });
+      }
+    } else if (blockFrom < lo && lo < blockTo) {
+      // Zero-width range (an insertion anchor): only match a block whose INTERIOR strictly
+      // contains the point. A point sitting exactly on a top-level block boundary
+      // (`blockFrom === lo`, i.e. between two sibling blocks) is a pure insertion BETWEEN
+      // blocks — it must resolve to NO block, otherwise `groupByTopLevelBlock` pairs the
+      // insertion with the following block and `classifyBlockGroup` converts the insert into a
+      // whole-block replacement, fabricating a phantom deletion of that untouched block.
+      // Interior points (a nested insertion inside a container being edited) still resolve
+      // their container so the classifier can recurse into it.
       refs.push({
         node: node,
         from: blockFrom,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "10.4.1",
+	"version": "10.4.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/tmp-editor-statsig": "^124.3.0",
+		"@atlaskit/tmp-editor-statsig": "^124.4.0",
 		"@atlaskit/tokens": "^15.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",