@atlaskit/editor-plugin-show-diff 13.1.4 → 13.1.5

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 13.1.5
+
+### Patch Changes
+
+- [`fd3620d4e137b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fd3620d4e137b) -
+  [CCI-18915] Surface and render formatting-only (mark) agent edits in the AI Review Moment.
+
+  Mark-only agent steps (`AddMarkStep`/`RemoveMarkStep` — e.g. making text bold, italic, or a link)
+  have an empty `StepMap`, so the agent review-segment and shimmer builders — which derived their
+  changed ranges purely from `StepMap` geometry — never produced a range for them. As a result a
+  formatting-only agent edit opened no Review Moment and showed no shimmer. Both builders now detect
+  mark steps and derive their range from `step.from`/`step.to`.
+
+  The smart-diff token encoder additionally folds each character's marks (type + attrs) into its
+  token, so once the moment opens the change renders as a real diff (e.g. a bold-only edit, or a
+  link whose `href` changes) instead of an empty one.
+
+- Updated dependencies
+
 ## 13.1.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/calculateDiff/attrAwareTokenEncoder.js

@@ -24,11 +24,33 @@ var encodeNodeWithAttrs = function encodeNodeWithAttrs(node, attrNames) {
   return "".concat(node.type.name, "|").concat(parts.join('|'));
 };
 
+// Fold a character's marks (type + attrs) into its token so a formatting-only change
+// (bold/italic/link/colour, or a link whose `href` changes) registers as a real diff.
+// The default encoder returns just the char code, so marked and unmarked text tokenise
+// identically. Marks and their attrs are sorted so the token is order-independent.
+var encodeCharacterWithMarks = function encodeCharacterWithMarks(char, marks) {
+  if (marks.length === 0) {
+    // Fast path: unmarked text keeps the numeric char code (unchanged behaviour).
+    return char;
+  }
+  var markKey = marks.map(function (mark) {
+    var _mark$attrs;
+    var attrs = (_mark$attrs = mark.attrs) !== null && _mark$attrs !== void 0 ? _mark$attrs : {};
+    var attrParts = Object.keys(attrs).sort().map(function (key) {
+      var _attrs$key;
+      return "".concat(key, "=").concat(JSON.stringify((_attrs$key = attrs[key]) !== null && _attrs$key !== void 0 ? _attrs$key : null));
+    });
+    return attrParts.length > 0 ? "".concat(mark.type.name, "(").concat(attrParts.join(','), ")") : mark.type.name;
+  }).sort().join('&');
+  return "".concat(char, "\0").concat(markKey);
+};
+
 // Like the library default, but node types with a `diffableAttrs` rule fold their
-// attrs into the open token. Chars/node-end are unchanged, hence `string | number`.
+// attrs into the open token, and text characters fold in their marks. Node-end is
+// unchanged, hence `string | number`.
 var attrAwareTokenEncoder = exports.attrAwareTokenEncoder = {
-  encodeCharacter: function encodeCharacter(char, _marks) {
-    return char;
+  encodeCharacter: function encodeCharacter(char, marks) {
+    return encodeCharacterWithMarks(char, marks);
   },
   encodeNodeStart: function encodeNodeStart(node) {
     var _node$attrs2;

package/dist/es2019/pm-plugins/calculateDiff/attrAwareTokenEncoder.js

@@ -19,10 +19,32 @@ const encodeNodeWithAttrs = (node, attrNames) => {
   return `${node.type.name}|${parts.join('|')}`;
 };
 
+// Fold a character's marks (type + attrs) into its token so a formatting-only change
+// (bold/italic/link/colour, or a link whose `href` changes) registers as a real diff.
+// The default encoder returns just the char code, so marked and unmarked text tokenise
+// identically. Marks and their attrs are sorted so the token is order-independent.
+const encodeCharacterWithMarks = (char, marks) => {
+  if (marks.length === 0) {
+    // Fast path: unmarked text keeps the numeric char code (unchanged behaviour).
+    return char;
+  }
+  const markKey = marks.map(mark => {
+    var _mark$attrs;
+    const attrs = (_mark$attrs = mark.attrs) !== null && _mark$attrs !== void 0 ? _mark$attrs : {};
+    const attrParts = Object.keys(attrs).sort().map(key => {
+      var _attrs$key;
+      return `${key}=${JSON.stringify((_attrs$key = attrs[key]) !== null && _attrs$key !== void 0 ? _attrs$key : null)}`;
+    });
+    return attrParts.length > 0 ? `${mark.type.name}(${attrParts.join(',')})` : mark.type.name;
+  }).sort().join('&');
+  return `${char}\u0000${markKey}`;
+};
+
 // Like the library default, but node types with a `diffableAttrs` rule fold their
-// attrs into the open token. Chars/node-end are unchanged, hence `string | number`.
+// attrs into the open token, and text characters fold in their marks. Node-end is
+// unchanged, hence `string | number`.
 export const attrAwareTokenEncoder = {
-  encodeCharacter: (char, _marks) => char,
+  encodeCharacter: (char, marks) => encodeCharacterWithMarks(char, marks),
   encodeNodeStart: node => {
     var _node$attrs2;
     const attrNames = getDiffableAttrNames(node.type.name, (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 ? _node$attrs2 : {});

package/dist/esm/pm-plugins/calculateDiff/attrAwareTokenEncoder.js

@@ -19,11 +19,33 @@ var encodeNodeWithAttrs = function encodeNodeWithAttrs(node, attrNames) {
   return "".concat(node.type.name, "|").concat(parts.join('|'));
 };
 
+// Fold a character's marks (type + attrs) into its token so a formatting-only change
+// (bold/italic/link/colour, or a link whose `href` changes) registers as a real diff.
+// The default encoder returns just the char code, so marked and unmarked text tokenise
+// identically. Marks and their attrs are sorted so the token is order-independent.
+var encodeCharacterWithMarks = function encodeCharacterWithMarks(char, marks) {
+  if (marks.length === 0) {
+    // Fast path: unmarked text keeps the numeric char code (unchanged behaviour).
+    return char;
+  }
+  var markKey = marks.map(function (mark) {
+    var _mark$attrs;
+    var attrs = (_mark$attrs = mark.attrs) !== null && _mark$attrs !== void 0 ? _mark$attrs : {};
+    var attrParts = Object.keys(attrs).sort().map(function (key) {
+      var _attrs$key;
+      return "".concat(key, "=").concat(JSON.stringify((_attrs$key = attrs[key]) !== null && _attrs$key !== void 0 ? _attrs$key : null));
+    });
+    return attrParts.length > 0 ? "".concat(mark.type.name, "(").concat(attrParts.join(','), ")") : mark.type.name;
+  }).sort().join('&');
+  return "".concat(char, "\0").concat(markKey);
+};
+
 // Like the library default, but node types with a `diffableAttrs` rule fold their
-// attrs into the open token. Chars/node-end are unchanged, hence `string | number`.
+// attrs into the open token, and text characters fold in their marks. Node-end is
+// unchanged, hence `string | number`.
 export var attrAwareTokenEncoder = {
-  encodeCharacter: function encodeCharacter(char, _marks) {
-    return char;
+  encodeCharacter: function encodeCharacter(char, marks) {
+    return encodeCharacterWithMarks(char, marks);
   },
   encodeNodeStart: function encodeNodeStart(node) {
     var _node$attrs2;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "13.1.4",
+	"version": "13.1.5",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^155.0.0",
+		"@atlaskit/tmp-editor-statsig": "^156.0.0",
 		"@atlaskit/tokens": "^16.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -42,7 +42,7 @@
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/dropdown-menu": "^18.1.0",
 		"@atlaskit/editor-core": "^224.2.0",
-		"@atlaskit/editor-json-transformer": "^9.4.0",
+		"@atlaskit/editor-json-transformer": "^9.5.0",
 		"@atlaskit/form": "^17.0.0",
 		"@atlaskit/primitives": "^22.3.0",
 		"@atlaskit/section-message": "^10.0.0",
@@ -54,7 +54,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.10.0",
+		"@atlaskit/editor-common": "^119.12.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {