@atlaskit/editor-plugin-show-diff 27.0.0 → 27.0.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 27.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.0.1
+
+### Patch Changes
+
+- [`4a8b1eae7cd41`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4a8b1eae7cd41) -
+  Show contributor tags on highlighted blank-line return glyphs behind
+  `confluence_ncs_step_diffing_version_history` and `platform_editor_ai_show_diff_patch_2`.
+- Updated dependencies
+
 ## 27.0.0
 
 ### Patch Changes

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

@@ -657,10 +657,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             decorations.push((0, _createDeletedLineBreakWidget.createDeletedLineBreakDecoration)({
               attributionKey: attributionKey,
               colorScheme: changeColorScheme,
+              diffId: showContributorTags ? "blank-line-".concat(pos) : undefined,
               isActive: isActive,
               pos: pos,
               reveal: reveal,
-              side: -1
+              side: -1,
+              tagMountContext: tagMountContext
             }));
           }
         } catch (err) {

package/dist/cjs/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -254,7 +254,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     }, (shouldTagBlock || (0, _fg.fg)('platform_editor_ai_show_diff_patch_2')) && {
       'data-diff-id': diffId
     }), (0, _decorationKeys.buildDiffDecorationSpec)({
-      attributionKey: shouldTagBlock ? attributionKey : undefined,
+      attributionKey: showContributorTags ? attributionKey : undefined,
       colorScheme: colorScheme,
       decorationType: 'block',
       diffId: diffId,

package/dist/cjs/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -201,15 +201,16 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     // The blocks have no content to serialize, so the deletion is shown as one struck-through
     // return glyph per line the author removed. A single widget, not one per line: the lines are
     // gone from `newDoc`, so they all resolve to the same anchor and separate widgets would stack.
-    //
-    // No attribution: the glyph is not a tag host, matching `canTagWidget` below.
     return [(0, _createDeletedLineBreakWidget.createDeletedLineBreakDecoration)({
+      attributionKey: showContributorTags ? attributionKey : undefined,
       colorScheme: colorScheme,
       count: deletedBlankLineCount,
+      diffId: showContributorTags ? "widget-".concat(change.fromA, "-").concat(change.toA) : undefined,
       isActive: isActive,
       pos: safeInsertPos,
       reveal: reveal,
-      side: placeBelow ? 1 : -1
+      side: placeBelow ? 1 : -1,
+      tagMountContext: tagMountContext
     })];
   }
   if (shouldSkipDeletedEmptyParagraphDecoration) {

package/dist/cjs/pm-plugins/decorations/extractContributorTags.js

@@ -10,6 +10,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _baseNodeName = require("../utils/baseNodeName");
+var _taggableBlockNodes = require("../utils/taggableBlockNodes");
 var _decorationKeys = require("./decorationKeys");
 var _excluded = ["connectedToKey"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -156,6 +157,10 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
       if (!spec.attributionKey || !TAGGABLE_DECORATION_TYPES.has(spec.decorationType)) {
         continue;
       }
+      // Attribution also serves navigation; only supported blocks can host a tag of their own.
+      if (spec.decorationType === 'block' && spec.nodeName !== undefined && !(0, _taggableBlockNodes.isTaggableBlockNodeName)(spec.nodeName)) {
+        continue;
+      }
       var contributor = contributors[spec.attributionKey];
       if (!contributor) {
         continue;

package/dist/cjs/pm-plugins/decorations/utils/createDeletedLineBreakWidget.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createDeletedLineBreakWidget = exports.createDeletedLineBreakDecoration = exports.RETURN_GLYPH = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _createContributorTagWidget = require("../createContributorTagWidget");
 var _decorationKeys = require("../decorationKeys");
 var _wrapBlockNodeView = require("./wrapBlockNodeView");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -73,21 +74,38 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
   var attributionKey = _ref2.attributionKey,
     colorScheme = _ref2.colorScheme,
     count = _ref2.count,
+    _ref2$diffId = _ref2.diffId,
+    diffId = _ref2$diffId === void 0 ? crypto.randomUUID() : _ref2$diffId,
     _ref2$isActive = _ref2.isActive,
     isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
     pos = _ref2.pos,
     reveal = _ref2.reveal,
-    side = _ref2.side;
-  return _view.Decoration.widget(pos, createDeletedLineBreakWidget({
+    side = _ref2.side,
+    tagMountContext = _ref2.tagMountContext;
+  var dom = createDeletedLineBreakWidget({
     colorScheme: colorScheme,
     count: count,
     isActive: isActive,
     reveal: reveal
-  }), _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
-    attributionKey: attributionKey,
+  });
+  var tagHost = attributionKey ? (0, _createContributorTagWidget.createContributorTagHost)({
+    diffId: diffId,
+    mountContext: tagMountContext
+  }) : undefined;
+  if (tagHost) {
+    // Keep only the decorative glyph hidden; the contributor tag must remain accessible.
+    dom.removeAttribute('aria-hidden');
+    Array.from(dom.children).forEach(function (child) {
+      return child.setAttribute('aria-hidden', 'true');
+    });
+    dom.setAttribute('data-diff-id', diffId);
+    dom.prepend(tagHost.host);
+  }
+  return _view.Decoration.widget(pos, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
+    attributionKey: tagHost ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
-    diffId: crypto.randomUUID(),
+    diffId: diffId,
     isActive: isActive,
     // The glyph always stands in for removed content, whichever side of the changeset the
     // change itself landed on.
@@ -97,6 +115,9 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
   }))), {}, {
     // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
     // adjacent text. The glyph carries its own deleted styling and must not inherit them.
-    marks: []
+    marks: [],
+    destroy: function destroy() {
+      return (0, _createContributorTagWidget.unmountContributorTag)(tagHost === null || tagHost === void 0 ? void 0 : tagHost.mount);
+    }
   }));
 };

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

@@ -598,10 +598,12 @@ const calculateDiffDecorationsInner = ({
           decorations.push(createDeletedLineBreakDecoration({
             attributionKey,
             colorScheme: changeColorScheme,
+            diffId: showContributorTags ? `blank-line-${pos}` : undefined,
             isActive,
             pos,
             reveal,
-            side: -1
+            side: -1,
+            tagMountContext
           }));
         }
       }

package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -242,7 +242,7 @@ export const createBlockChangedDecoration = ({
         'data-diff-id': diffId
       })
     }, buildDiffDecorationSpec({
-      attributionKey: shouldTagBlock ? attributionKey : undefined,
+      attributionKey: showContributorTags ? attributionKey : undefined,
       colorScheme,
       decorationType: 'block',
       diffId,

package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -193,15 +193,16 @@ export const createNodeChangedDecorationWidget = ({
     // The blocks have no content to serialize, so the deletion is shown as one struck-through
     // return glyph per line the author removed. A single widget, not one per line: the lines are
     // gone from `newDoc`, so they all resolve to the same anchor and separate widgets would stack.
-    //
-    // No attribution: the glyph is not a tag host, matching `canTagWidget` below.
     return [createDeletedLineBreakDecoration({
+      attributionKey: showContributorTags ? attributionKey : undefined,
       colorScheme,
       count: deletedBlankLineCount,
+      diffId: showContributorTags ? `widget-${change.fromA}-${change.toA}` : undefined,
       isActive,
       pos: safeInsertPos,
       reveal,
-      side: placeBelow ? 1 : -1
+      side: placeBelow ? 1 : -1,
+      tagMountContext
     })];
   }
   if (shouldSkipDeletedEmptyParagraphDecoration) {

package/dist/es2019/pm-plugins/decorations/extractContributorTags.js

@@ -1,5 +1,6 @@
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { resolveBaseNodeName } from '../utils/baseNodeName';
+import { isTaggableBlockNodeName } from '../utils/taggableBlockNodes';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorationKeys';
 
 /**
@@ -120,6 +121,10 @@ export const extractContributorTags = (decorations, contributors, activeIndexPos
     if (!spec.attributionKey || !TAGGABLE_DECORATION_TYPES.has(spec.decorationType)) {
       continue;
     }
+    // Attribution also serves navigation; only supported blocks can host a tag of their own.
+    if (spec.decorationType === 'block' && spec.nodeName !== undefined && !isTaggableBlockNodeName(spec.nodeName)) {
+      continue;
+    }
     const contributor = contributors[spec.attributionKey];
     if (!contributor) {
       continue;

package/dist/es2019/pm-plugins/decorations/utils/createDeletedLineBreakWidget.js

@@ -1,4 +1,5 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { createContributorTagHost, unmountContributorTag } from '../createContributorTagWidget';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
 
@@ -63,30 +64,47 @@ export const createDeletedLineBreakDecoration = ({
   attributionKey,
   colorScheme,
   count,
+  diffId = crypto.randomUUID(),
   isActive = false,
   pos,
   reveal,
-  side
-}) => Decoration.widget(pos, createDeletedLineBreakWidget({
-  colorScheme,
-  count,
-  isActive,
-  reveal
-}), {
-  ...buildDiffDecorationSpec({
-    attributionKey,
+  side,
+  tagMountContext
+}) => {
+  const dom = createDeletedLineBreakWidget({
     colorScheme,
-    decorationType: 'widget',
-    diffId: crypto.randomUUID(),
+    count,
     isActive,
-    // The glyph always stands in for removed content, whichever side of the changeset the
-    // change itself landed on.
-    isInserted: false,
-    ...(side !== undefined && {
-      side
-    })
-  }),
-  // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
-  // adjacent text. The glyph carries its own deleted styling and must not inherit them.
-  marks: []
-});
+    reveal
+  });
+  const tagHost = attributionKey ? createContributorTagHost({
+    diffId,
+    mountContext: tagMountContext
+  }) : undefined;
+  if (tagHost) {
+    // Keep only the decorative glyph hidden; the contributor tag must remain accessible.
+    dom.removeAttribute('aria-hidden');
+    Array.from(dom.children).forEach(child => child.setAttribute('aria-hidden', 'true'));
+    dom.setAttribute('data-diff-id', diffId);
+    dom.prepend(tagHost.host);
+  }
+  return Decoration.widget(pos, dom, {
+    ...buildDiffDecorationSpec({
+      attributionKey: tagHost ? attributionKey : undefined,
+      colorScheme,
+      decorationType: 'widget',
+      diffId,
+      isActive,
+      // The glyph always stands in for removed content, whichever side of the changeset the
+      // change itself landed on.
+      isInserted: false,
+      ...(side !== undefined && {
+        side
+      })
+    }),
+    // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
+    // adjacent text. The glyph carries its own deleted styling and must not inherit them.
+    marks: [],
+    destroy: () => unmountContributorTag(tagHost === null || tagHost === void 0 ? void 0 : tagHost.mount)
+  });
+};

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

@@ -650,10 +650,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             decorations.push(createDeletedLineBreakDecoration({
               attributionKey: attributionKey,
               colorScheme: changeColorScheme,
+              diffId: showContributorTags ? "blank-line-".concat(pos) : undefined,
               isActive: isActive,
               pos: pos,
               reveal: reveal,
-              side: -1
+              side: -1,
+              tagMountContext: tagMountContext
             }));
           }
         } catch (err) {

package/dist/esm/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -247,7 +247,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     }, (shouldTagBlock || fg('platform_editor_ai_show_diff_patch_2')) && {
       'data-diff-id': diffId
     }), buildDiffDecorationSpec({
-      attributionKey: shouldTagBlock ? attributionKey : undefined,
+      attributionKey: showContributorTags ? attributionKey : undefined,
       colorScheme: colorScheme,
       decorationType: 'block',
       diffId: diffId,

package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -195,15 +195,16 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     // The blocks have no content to serialize, so the deletion is shown as one struck-through
     // return glyph per line the author removed. A single widget, not one per line: the lines are
     // gone from `newDoc`, so they all resolve to the same anchor and separate widgets would stack.
-    //
-    // No attribution: the glyph is not a tag host, matching `canTagWidget` below.
     return [createDeletedLineBreakDecoration({
+      attributionKey: showContributorTags ? attributionKey : undefined,
       colorScheme: colorScheme,
       count: deletedBlankLineCount,
+      diffId: showContributorTags ? "widget-".concat(change.fromA, "-").concat(change.toA) : undefined,
       isActive: isActive,
       pos: safeInsertPos,
       reveal: reveal,
-      side: placeBelow ? 1 : -1
+      side: placeBelow ? 1 : -1,
+      tagMountContext: tagMountContext
     })];
   }
   if (shouldSkipDeletedEmptyParagraphDecoration) {

package/dist/esm/pm-plugins/decorations/extractContributorTags.js

@@ -9,6 +9,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { resolveBaseNodeName } from '../utils/baseNodeName';
+import { isTaggableBlockNodeName } from '../utils/taggableBlockNodes';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorationKeys';
 
 /**
@@ -150,6 +151,10 @@ export var extractContributorTags = function extractContributorTags(decorations,
       if (!spec.attributionKey || !TAGGABLE_DECORATION_TYPES.has(spec.decorationType)) {
         continue;
       }
+      // Attribution also serves navigation; only supported blocks can host a tag of their own.
+      if (spec.decorationType === 'block' && spec.nodeName !== undefined && !isTaggableBlockNodeName(spec.nodeName)) {
+        continue;
+      }
       var contributor = contributors[spec.attributionKey];
       if (!contributor) {
         continue;

package/dist/esm/pm-plugins/decorations/utils/createDeletedLineBreakWidget.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { createContributorTagHost, unmountContributorTag } from '../createContributorTagWidget';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
 
@@ -67,21 +68,38 @@ export var createDeletedLineBreakDecoration = function createDeletedLineBreakDec
   var attributionKey = _ref2.attributionKey,
     colorScheme = _ref2.colorScheme,
     count = _ref2.count,
+    _ref2$diffId = _ref2.diffId,
+    diffId = _ref2$diffId === void 0 ? crypto.randomUUID() : _ref2$diffId,
     _ref2$isActive = _ref2.isActive,
     isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
     pos = _ref2.pos,
     reveal = _ref2.reveal,
-    side = _ref2.side;
-  return Decoration.widget(pos, createDeletedLineBreakWidget({
+    side = _ref2.side,
+    tagMountContext = _ref2.tagMountContext;
+  var dom = createDeletedLineBreakWidget({
     colorScheme: colorScheme,
     count: count,
     isActive: isActive,
     reveal: reveal
-  }), _objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
-    attributionKey: attributionKey,
+  });
+  var tagHost = attributionKey ? createContributorTagHost({
+    diffId: diffId,
+    mountContext: tagMountContext
+  }) : undefined;
+  if (tagHost) {
+    // Keep only the decorative glyph hidden; the contributor tag must remain accessible.
+    dom.removeAttribute('aria-hidden');
+    Array.from(dom.children).forEach(function (child) {
+      return child.setAttribute('aria-hidden', 'true');
+    });
+    dom.setAttribute('data-diff-id', diffId);
+    dom.prepend(tagHost.host);
+  }
+  return Decoration.widget(pos, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
+    attributionKey: tagHost ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
-    diffId: crypto.randomUUID(),
+    diffId: diffId,
     isActive: isActive,
     // The glyph always stands in for removed content, whichever side of the changeset the
     // change itself landed on.
@@ -91,6 +109,9 @@ export var createDeletedLineBreakDecoration = function createDeletedLineBreakDec
   }))), {}, {
     // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
     // adjacent text. The glyph carries its own deleted styling and must not inherit them.
-    marks: []
+    marks: [],
+    destroy: function destroy() {
+      return unmountContributorTag(tagHost === null || tagHost === void 0 ? void 0 : tagHost.mount);
+    }
   }));
 };

package/dist/types/pm-plugins/decorations/utils/createDeletedLineBreakWidget.d.ts

@@ -1,6 +1,7 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { RevealOptions } from '../../../showDiffPluginType';
 import type { ColorScheme } from '../colorSchemes/types';
+import { type ContributorTagMountContext } from '../createContributorTagWidget';
 /**
  * U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS — the return-key glyph.
  *
@@ -37,12 +38,14 @@ export declare const createDeletedLineBreakWidget: ({ colorScheme, count, isActi
  * the displayed document and the change lands on the *inserted* side, so the glyph is anchored
  * inside the surviving block, on the blank line itself.
  */
-export declare const createDeletedLineBreakDecoration: ({ attributionKey, colorScheme, count, isActive, pos, reveal, side, }: {
+export declare const createDeletedLineBreakDecoration: ({ attributionKey, colorScheme, count, diffId, isActive, pos, reveal, side, tagMountContext, }: {
     attributionKey?: string;
     colorScheme?: ColorScheme;
     count?: number;
+    diffId?: string;
     isActive?: boolean;
     pos: number;
     reveal?: RevealOptions;
     side?: number;
+    tagMountContext?: ContributorTagMountContext;
 }) => Decoration;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "27.0.0",
+	"version": "27.0.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.6.0",
-		"@atlaskit/tmp-editor-statsig": "^242.0.0",
+		"@atlaskit/tmp-editor-statsig": "^244.0.0",
 		"@atlaskit/tokens": "^20.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -64,14 +64,14 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^43.0.0",
-		"@atlassian/editor-plugin-ai": "^83.0.0",
+		"@atlassian/editor-plugin-ai": "^83.2.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^133.0.0",
+		"@atlaskit/editor-common": "^133.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"