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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @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
+
+- [`81ce4d8f5cd8a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/81ce4d8f5cd8a) -
+  Show blue indicators for new added paragraphs and headings
+- Updated dependencies
+
 ## 10.4.0
 
 ### Minor 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/cjs/pm-plugins/decorations/createAnchorDecorationWidgets.js

@@ -176,17 +176,7 @@ var createLeftAnchorWidget = exports.createLeftAnchorWidget = function createLef
     side: -999
   }));
 };
-var isFullNodeRange = function isFullNodeRange(doc, from, to) {
-  var matchesFullNodeRange = false;
-  doc.nodesBetween(from, to, function (node, pos) {
-    if (pos === from && pos + node.nodeSize === to) {
-      matchesFullNodeRange = true;
-      return false;
-    }
-    return true;
-  });
-  return matchesFullNodeRange;
-};
+
 /**
  * Creates invisible anchor widgets for a single block-changed diff so that the
  * `IndicatorBar` can use CSS anchor positioning to align itself with the diff.
@@ -197,8 +187,6 @@ var isFullNodeRange = function isFullNodeRange(doc, from, to) {
  * - An optional `left` anchor is placed inside a resizable container (table,
  *   layout, expand) so the bar aligns within the container boundary.
  *
- * Unlike the inline variant there is no `isFullNodeRange` guard — block diffs
- * always span exactly one block node so the anchors are always needed.
  */
 var createBlockIndicatorAnchorWidgets = exports.createBlockIndicatorAnchorWidgets = function createBlockIndicatorAnchorWidgets(_ref2) {
   var doc = _ref2.doc,
@@ -309,9 +297,6 @@ var createInlineIndicatorAnchorWidgets = exports.createInlineIndicatorAnchorWidg
     from = _ref3.from,
     to = _ref3.to,
     diffId = _ref3.diffId;
-  if (isFullNodeRange(doc, from, to)) {
-    return [];
-  }
   var leftAnchor = createLeftAnchorWidget({
     doc: doc,
     from: from,

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/es2019/pm-plugins/decorations/createAnchorDecorationWidgets.js

@@ -174,17 +174,7 @@ export const createLeftAnchorWidget = ({
     side: -999
   }));
 };
-const isFullNodeRange = (doc, from, to) => {
-  let matchesFullNodeRange = false;
-  doc.nodesBetween(from, to, (node, pos) => {
-    if (pos === from && pos + node.nodeSize === to) {
-      matchesFullNodeRange = true;
-      return false;
-    }
-    return true;
-  });
-  return matchesFullNodeRange;
-};
+
 /**
  * Creates invisible anchor widgets for a single block-changed diff so that the
  * `IndicatorBar` can use CSS anchor positioning to align itself with the diff.
@@ -195,8 +185,6 @@ const isFullNodeRange = (doc, from, to) => {
  * - An optional `left` anchor is placed inside a resizable container (table,
  *   layout, expand) so the bar aligns within the container boundary.
  *
- * Unlike the inline variant there is no `isFullNodeRange` guard — block diffs
- * always span exactly one block node so the anchors are always needed.
  */
 export const createBlockIndicatorAnchorWidgets = ({
   doc,
@@ -305,9 +293,6 @@ export const createInlineIndicatorAnchorWidgets = ({
   to,
   diffId
 }) => {
-  if (isFullNodeRange(doc, from, to)) {
-    return [];
-  }
   const leftAnchor = createLeftAnchorWidget({
     doc,
     from,

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/dist/esm/pm-plugins/decorations/createAnchorDecorationWidgets.js

@@ -171,17 +171,7 @@ export var createLeftAnchorWidget = function createLeftAnchorWidget(_ref) {
     side: -999
   }));
 };
-var isFullNodeRange = function isFullNodeRange(doc, from, to) {
-  var matchesFullNodeRange = false;
-  doc.nodesBetween(from, to, function (node, pos) {
-    if (pos === from && pos + node.nodeSize === to) {
-      matchesFullNodeRange = true;
-      return false;
-    }
-    return true;
-  });
-  return matchesFullNodeRange;
-};
+
 /**
  * Creates invisible anchor widgets for a single block-changed diff so that the
  * `IndicatorBar` can use CSS anchor positioning to align itself with the diff.
@@ -192,8 +182,6 @@ var isFullNodeRange = function isFullNodeRange(doc, from, to) {
  * - An optional `left` anchor is placed inside a resizable container (table,
  *   layout, expand) so the bar aligns within the container boundary.
  *
- * Unlike the inline variant there is no `isFullNodeRange` guard — block diffs
- * always span exactly one block node so the anchors are always needed.
  */
 export var createBlockIndicatorAnchorWidgets = function createBlockIndicatorAnchorWidgets(_ref2) {
   var doc = _ref2.doc,
@@ -304,9 +292,6 @@ export var createInlineIndicatorAnchorWidgets = function createInlineIndicatorAn
     from = _ref3.from,
     to = _ref3.to,
     diffId = _ref3.diffId;
-  if (isFullNodeRange(doc, from, to)) {
-    return [];
-  }
   var leftAnchor = createLeftAnchorWidget({
     doc: doc,
     from: from,

package/dist/types/pm-plugins/decorations/createAnchorDecorationWidgets.d.ts

@@ -31,8 +31,6 @@ export declare const createLeftAnchorWidget: ({ doc, from, diffId, }: {
  * - An optional `left` anchor is placed inside a resizable container (table,
  *   layout, expand) so the bar aligns within the container boundary.
  *
- * Unlike the inline variant there is no `isFullNodeRange` guard — block diffs
- * always span exactly one block node so the anchors are always needed.
  */
 export declare const createBlockIndicatorAnchorWidgets: ({ doc, from, to, diffId, }: {
     diffId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "10.4.0",
+	"version": "10.4.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,8 +28,8 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/tmp-editor-statsig": "^124.1.0",
-		"@atlaskit/tokens": "^15.6.0",
+		"@atlaskit/tmp-editor-statsig": "^124.4.0",
+		"@atlaskit/tokens": "^15.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"lodash": "^4.17.21",
@@ -41,7 +41,7 @@
 		"@atlaskit/button": "^24.3.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/dropdown-menu": "^17.1.0",
-		"@atlaskit/editor-core": "^221.8.0",
+		"@atlaskit/editor-core": "^221.9.0",
 		"@atlaskit/editor-json-transformer": "^9.0.0",
 		"@atlaskit/form": "^16.1.0",
 		"@atlaskit/primitives": "^20.6.0",
@@ -54,7 +54,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.25.0",
+		"@atlaskit/editor-common": "^116.27.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {