@atlaskit/editor-plugin-show-diff 15.1.4 → 15.1.6

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

@@ -6,10 +6,11 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { isExtendedEnabled } from '../isExtendedEnabled';
+import { hasVisibleContent } from '../utils/hasVisibleContent';
 import { buildAtomicInlineChangedCSSVariables, buildDeletedInlineContentStyleExtended, buildDeletedInlineStyle, buildDeletedInlineStyleStandard, buildInsertStyle, buildInsertStyleActive, buildInsertStyleExtended, buildInsertStyleExtendedActive, buildInsertStyleExtendedNoUnderline, buildInsertStyleExtendedNoUnderlineActive } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
-import { createContributorTagWidget } from './createContributorTagWidget';
+import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
 import { getAtomicInlineNodeClassNameLegacy, resolveInlineChangedStyleLegacy } from './createInlineChangedDecoration.styles.legacy';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { REVEAL_ATTR, resolveRevealStyle } from './revealStyles';
@@ -134,6 +135,12 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
   // rebuilds decorations without touching the doc, and a fresh id would change the React key and the
   // tag host's key, remounting every tag mid-step. Random ids are kept when tags are off.
   var diffId = showContributorTags ? "inline-".concat(change.fromB, "-").concat(change.toB) : crypto.randomUUID();
+
+  // Whether this highlight hosts a tag. A range of nothing but whitespace has nothing to caption,
+  // so it stays unattributed: the spec is the only route attribution takes to
+  // `extractContributorTags`, so dropping the key there is what keeps a tag from being resolved for
+  // a host that is never emitted (EDITOR-8855).
+  var canTagChange = showContributorTags && !!doc && isExtendedEnabled(diffType) && isContributorTagWidgetEnabled() && hasVisibleContent(doc.slice(change.fromB, change.toB).content);
   if (shouldHideDeleted) {
     return [Decoration.inline(change.fromB, change.toB, {
       style: displayNoneStyle
@@ -178,7 +185,7 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
   }, showContributorTags && {
     'data-diff-id': diffId
   }), buildDiffDecorationSpec({
-    attributionKey: attributionKey,
+    attributionKey: canTagChange ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'inline',
     diffId: diffId,
@@ -223,7 +230,7 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
 
   // Built from the raw change range, not the anchors above: a tag lines up with the changed text,
   // while the bar's anchors are held on a block boundary when a deleted widget renders beside them.
-  if (showContributorTags && doc && isExtendedEnabled(diffType)) {
+  if (canTagChange && doc) {
     var tagWidget = createContributorTagWidget({
       doc: doc,
       from: change.fromB,

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

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../isExtendedEnabled';
+import { hasVisibleContent } from '../utils/hasVisibleContent';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
 import { createContributorTagHost, unmountContributorTag } from './createContributorTagWidget';
@@ -213,6 +214,10 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // Derived from the deleted range so it survives a recalculation — see the same reasoning in
   // `createInlineChangedDecoration`.
   var diffId = showContributorTags ? "widget-".concat(change.fromA, "-").concat(change.toA) : crypto.randomUUID();
+  // Whether this widget hosts a tag. Removing nothing but whitespace leaves no visible deleted
+  // content to caption, so the change stays unattributed — matching the inline half's rule in
+  // `createInlineChangedDecoration` (EDITOR-8855).
+  var canTagWidget = showContributorTags && hasVisibleContent(slice.content);
   var decorations = [];
   var replacementNode = newDoc.nodeAt(change.fromB);
   var firstReplacedNode = slice.content.firstChild;
@@ -348,7 +353,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // Taken down in the widget's `destroy` below: `dom` is rebuilt on every recalculation, so the tag
   // mounted into it must not outlive the copy ProseMirror is drawing.
   var tagMount;
-  if (showContributorTags) {
+  if (canTagWidget) {
     // Lets the contributor tag find the deleted content on hover.
     dom.setAttribute('data-diff-id', diffId);
 
@@ -371,7 +376,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     }
   }
   decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
-    attributionKey: attributionKey,
+    attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
     diffId: diffId,

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

@@ -7,6 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 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 { isDiffDecoration, isDiffDecorationSpec } from './decorationKeys';
 
 /**
@@ -30,6 +31,16 @@ var isSameChange = function isSameChange(widget, inline) {
   return widget.spec.attributionKey === inline.spec.attributionKey && widget.from >= inline.from && widget.from <= inline.to;
 };
 
+/**
+ * Whether a deleted-content widget is the left-most half of the replacement it belongs to, in which
+ * case it keeps the tag so the tag marks where the change begins (EDITOR-8855). `side: -1` paints
+ * the deleted content in front of the inserted text; `1` is `deletedDiffPlacement: 'bottom'` /
+ * `inlineDeletedDiffPlacement: 'after'`, where the inline half leads instead.
+ */
+var leadsReplacement = function leadsReplacement(widget) {
+  return fg('confluence_ncs_step_diffing_version_history') && widget.spec.side === -1;
+};
+
 /**
  * Whether `inner` captions the same change as the block decoration `block`, in which case only the
  * block keeps the tag — one tag per block. Containment counts in either direction: a leaf block's
@@ -42,7 +53,7 @@ var isSameBlockChange = function isSameBlockChange(inner, block) {
 /**
  * One model per diff decoration whose attribution resolves to a supplied contributor; anything
  * unattributed, untaggable or unresolved is skipped. A replacement's two decorations are collapsed
- * into the single inline tag — see `isSameChange`.
+ * into a single tag, on whichever half renders first — see `isSameChange` and `leadsReplacement`.
  */
 export var extractContributorTags = function extractContributorTags(decorations, contributors) {
   if (!contributors) {
@@ -71,7 +82,7 @@ export var extractContributorTags = function extractContributorTags(decorations,
       });
     }
 
-    // The inline decoration keeps the tag: it captions content still in the document.
+    // Candidate hosts, in the order they outrank each other: block, then leading widget, then inline.
   } catch (err) {
     _iterator.e(err);
   } finally {
@@ -85,6 +96,10 @@ export var extractContributorTags = function extractContributorTags(decorations,
     var decoration = _ref3.decoration;
     return decoration.spec.decorationType === 'block';
   });
+  var widgetTargets = targets.filter(function (_ref4) {
+    var decoration = _ref4.decoration;
+    return decoration.spec.decorationType === 'widget';
+  });
   var linkedDiffIds = new Map();
   var folded = new Set();
   var fold = function fold(host, target) {
@@ -101,19 +116,32 @@ export var extractContributorTags = function extractContributorTags(decorations,
       }
 
       // A block outranks both other kinds, so it is tried first.
-      var block = blockTargets.find(function (_ref4) {
-        var decoration = _ref4.decoration;
+      var block = blockTargets.find(function (_ref5) {
+        var decoration = _ref5.decoration;
         return isSameBlockChange(target.decoration, decoration);
       });
       if (block) {
         fold(block, target);
         return 0; // continue
       }
-      if (decorationType !== 'widget') {
+      if (decorationType === 'inline') {
+        // The deleted half renders in front of this one, so that half captions the change.
+        var leadingWidget = widgetTargets.find(function (_ref6) {
+          var decoration = _ref6.decoration;
+          return leadsReplacement(decoration) && isSameChange(decoration, target.decoration);
+        });
+        if (leadingWidget) {
+          fold(leadingWidget, target);
+        }
         return 0; // continue
       }
-      var host = inlineTargets.find(function (_ref5) {
-        var decoration = _ref5.decoration;
+
+      // A leading widget keeps its own tag; it was folded into above.
+      if (leadsReplacement(target.decoration)) {
+        return 0; // continue
+      }
+      var host = inlineTargets.find(function (_ref7) {
+        var decoration = _ref7.decoration;
         return isSameChange(target.decoration, decoration);
       });
       if (host) {
@@ -127,9 +155,9 @@ export var extractContributorTags = function extractContributorTags(decorations,
   }
   return targets.filter(function (target) {
     return !folded.has(target);
-  }).map(function (_ref6) {
-    var contributor = _ref6.contributor,
-      spec = _ref6.decoration.spec;
+  }).map(function (_ref8) {
+    var contributor = _ref8.contributor,
+      spec = _ref8.decoration.spec;
     var connected = contributor.connectedToKey ? contributors[contributor.connectedToKey] : undefined;
     var connectedContributor = connected ? toTagContributor(connected) : undefined;
     var linked = linkedDiffIds.get(spec.diffId);

package/dist/esm/pm-plugins/utils/charsByOffset.js

@@ -0,0 +1,39 @@
+/**
+ * Whitespace as the diff treats it, U+00A0 included: a non-breaking space separates words for every
+ * consumer here, so it is not a character a change can be said to start on.
+ *
+ * A Set rather than a regex, to avoid both the `require-unicode-regexp` lint rule and the TS1501
+ * error the `u` flag triggers under this package's declaration build target.
+ */
+var WHITESPACE_CHAR_SET = new Set([' ', '\t', '\n', '\r', '\f', '\v', "\xA0"]);
+export var isWhitespaceChar = function isWhitespaceChar(char) {
+  return WHITESPACE_CHAR_SET.has(char);
+};
+
+/**
+ * Build a per-content-offset view of a textblock's characters.
+ *
+ * Returns an array whose length is `parent.content.size`. For every offset that lies inside a text
+ * node, `chars[offset]` is the character at that offset; for every offset that lies inside (or on
+ * the edge of) a non-text inline node — hardBreak, mention, emoji, date, … — the entry is `null`,
+ * which acts as an *opaque single token*: it counts as one word and is never whitespace.
+ *
+ * Using doc positions to index `parent.textContent` is wrong because `textContent` strips non-text
+ * inline nodes, so every such node shifts the lookup off by its size. This per-offset view restores
+ * a 1:1 mapping between doc positions inside the textblock and the character (or "no character",
+ * i.e. a hard word boundary) at that position.
+ */
+export var buildCharsByOffset = function buildCharsByOffset(parent) {
+  var chars = new Array(parent.content.size).fill(null);
+  parent.content.forEach(function (child, offset) {
+    var _child$text;
+    if (!child.isText) {
+      return;
+    }
+    var text = (_child$text = child.text) !== null && _child$text !== void 0 ? _child$text : '';
+    for (var i = 0; i < text.length; i++) {
+      chars[offset + i] = text[i];
+    }
+  });
+  return chars;
+};

package/dist/esm/pm-plugins/utils/hasVisibleContent.js

@@ -0,0 +1,32 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { isWhitespaceChar } from './charsByOffset';
+
+/**
+ * Whether `fragment` holds anything a reader can see.
+ *
+ * Text counts once it carries a single non-whitespace character; a leaf node (mention, emoji, date,
+ * media, rule, hardBreak, …) counts in its own right, exactly as `resolveTagAnchorPos` treats one.
+ * Everything else is descended into, so a paragraph is visible when its content is.
+ *
+ * A change whose content is nothing but whitespace — a space typed between two words, a run of
+ * trailing spaces, an added blank paragraph — has no visible content for a contributor tag to
+ * caption, so it carries no tag (EDITOR-8855).
+ */
+var _hasVisibleContent = function hasVisibleContent(fragment) {
+  var visible = false;
+  fragment.forEach(function (node) {
+    if (visible) {
+      return;
+    }
+    if (node.isText) {
+      var _node$text;
+      visible = _toConsumableArray((_node$text = node.text) !== null && _node$text !== void 0 ? _node$text : '').some(function (char) {
+        return !isWhitespaceChar(char);
+      });
+      return;
+    }
+    visible = node.isLeaf || _hasVisibleContent(node.content);
+  });
+  return visible;
+};
+export { _hasVisibleContent as hasVisibleContent };

package/dist/esm/ui/ContributorTag/contributorTagController.js

@@ -87,7 +87,7 @@ var identityOf = function identityOf(model) {
  * `toDOM` for a widget it reuses: stepping to the next change republishes the tags without redrawing
  * their hosts, so anything the tag reacts to — `isActive` above all — has to arrive through a
  * subscription of its own (EDITOR-8702). Draws nothing when this diff has no tag, which is the case
- * for the deleted half of a replacement: that half is folded into the inline tag.
+ * for the folded half of a replacement: its two decorations share the one tag.
  */
 export var ContributorTagController = /*#__PURE__*/function () {
   function ContributorTagController(options) {

package/dist/esm/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/esm/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

package/dist/types/pm-plugins/calculateDiff/smart/segmentText.d.ts

@@ -1,4 +1,3 @@
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 /**
  * A half-open offset span `[from, to)` measured in *content offsets* relative to the
  * start of a textblock (i.e. the same coordinate space as `buildCharsByOffset`).
@@ -7,14 +6,6 @@ export type OffsetSpan = {
     from: number;
     to: number;
 };
-/**
- * Build a per-content-offset view of a textblock's characters.
- *
- * `chars[i]` is the character at content offset `i`, or `null` when that offset lies
- * inside a non-text inline node (mention, date, emoji, hardBreak, …). A `null` acts as an
- * *opaque single token*: it counts as one word and never terminates a sentence.
- */
-export declare const buildCharsByOffset: (parent: PMNode) => Array<string | null>;
 /**
  * Segment a textblock char-view into sentence spans (content-offset coordinates).
  * Uses Intl.Segmenter when available, otherwise a conservative regex fallback.

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

@@ -5,6 +5,7 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { ShowDiffPlugin } from '../../showDiffPluginType';
 /** Marks the host element of one tag, so a tag can be found in the document by its own diff. */
 export declare const CONTRIBUTOR_TAG_HOST_ATTRIBUTE = "data-contributor-tag-host";
+export declare const isContributorTagWidgetEnabled: () => boolean;
 /**
  * Everything a tag needs to draw itself into the document, plumbed down from the plugin. Absent in
  * unit tests that build decorations directly: the hosts are still emitted, they just stay empty.
@@ -42,9 +43,9 @@ export declare const createContributorTagHost: (diffId: string, mountContext?: C
     mount: ContributorTagMount | undefined;
 } | undefined;
 /**
- * A widget hosting the contributor tag of one diff range, placed on the first character the range
- * highlights — or, with `anchorAtRangeStart`, at `from` itself. Either way a host that would land
- * inside a code block is hoisted out in front of it; see `resolveCodeBlockStart`.
+ * A widget hosting the contributor tag of one diff range, placed on the first visible character the
+ * range highlights — or, with `anchorAtRangeStart`, at `from` itself. Either way a host that would
+ * land inside a code block is hoisted out in front of it; see `resolveCodeBlockStart`.
  *
  * The tag is mounted in `toDOM` and taken down in `destroy`, so it lives exactly as long as the host
  * element ProseMirror drew it into — see `mountContributorTag`.

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

@@ -4,6 +4,6 @@ import type { ResolvedDiffContributors } from './colorSchemes/attributions';
 /**
  * One model per diff decoration whose attribution resolves to a supplied contributor; anything
  * unattributed, untaggable or unresolved is skipped. A replacement's two decorations are collapsed
- * into the single inline tag — see `isSameChange`.
+ * into a single tag, on whichever half renders first — see `isSameChange` and `leadsReplacement`.
  */
 export declare const extractContributorTags: (decorations: DecorationSet, contributors: ResolvedDiffContributors | undefined) => ContributorTagModel[];

package/dist/types/pm-plugins/utils/charsByOffset.d.ts

@@ -0,0 +1,16 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+export declare const isWhitespaceChar: (char: string) => boolean;
+/**
+ * Build a per-content-offset view of a textblock's characters.
+ *
+ * Returns an array whose length is `parent.content.size`. For every offset that lies inside a text
+ * node, `chars[offset]` is the character at that offset; for every offset that lies inside (or on
+ * the edge of) a non-text inline node — hardBreak, mention, emoji, date, … — the entry is `null`,
+ * which acts as an *opaque single token*: it counts as one word and is never whitespace.
+ *
+ * Using doc positions to index `parent.textContent` is wrong because `textContent` strips non-text
+ * inline nodes, so every such node shifts the lookup off by its size. This per-offset view restores
+ * a 1:1 mapping between doc positions inside the textblock and the character (or "no character",
+ * i.e. a hard word boundary) at that position.
+ */
+export declare const buildCharsByOffset: (parent: PMNode) => Array<string | null>;

package/dist/types/pm-plugins/utils/hasVisibleContent.d.ts

@@ -0,0 +1,13 @@
+import type { Fragment } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Whether `fragment` holds anything a reader can see.
+ *
+ * Text counts once it carries a single non-whitespace character; a leaf node (mention, emoji, date,
+ * media, rule, hardBreak, …) counts in its own right, exactly as `resolveTagAnchorPos` treats one.
+ * Everything else is descended into, so a paragraph is visible when its content is.
+ *
+ * A change whose content is nothing but whitespace — a space typed between two words, a run of
+ * trailing spaces, an added blank paragraph — has no visible content for a contributor tag to
+ * caption, so it carries no tag (EDITOR-8855).
+ */
+export declare const hasVisibleContent: (fragment: Fragment) => boolean;

package/dist/types/ui/ContributorTag/contributorTagController.d.ts

@@ -26,7 +26,7 @@ export type ContributorTagControllerOptions = {
  * `toDOM` for a widget it reuses: stepping to the next change republishes the tags without redrawing
  * their hosts, so anything the tag reacts to — `isActive` above all — has to arrive through a
  * subscription of its own (EDITOR-8702). Draws nothing when this diff has no tag, which is the case
- * for the deleted half of a replacement: that half is folded into the inline tag.
+ * for the folded half of a replacement: its two decorations share the one tag.
  */
 export declare class ContributorTagController {
     private options;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "15.1.4",
+	"version": "15.1.6",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^184.0.0",
+		"@atlaskit/tmp-editor-statsig": "^185.0.0",
 		"@atlaskit/tokens": "^16.11.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -56,14 +56,14 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^31.0.0",
-		"@atlassian/editor-plugin-ai": "^71.2.0",
+		"@atlassian/editor-plugin-ai": "^71.3.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^121.2.0",
+		"@atlaskit/editor-common": "^121.3.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"