@atlaskit/editor-plugin-show-diff 30.0.7 → 30.0.9

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 30.0.9
+
+### Patch Changes
+
+- [`202f9b8386f13`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/202f9b8386f13) -
+  Migrate attributed version history checks to the platform_editor_attributed_version_history
+  experiment.
+- Updated dependencies
+
+## 30.0.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 30.0.7
 
 ### Patch Changes

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

@@ -138,7 +138,7 @@ var isRangeActive = function isRangeActive(activeIndexPos, from, to, attribution
   if (activeIndexPos === undefined) {
     return undefined;
   }
-  if (!(0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+  if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history')) {
     return from === activeIndexPos.from && to === activeIndexPos.to;
   }
   return from <= activeIndexPos.to && activeIndexPos.from <= to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey);
@@ -499,7 +499,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // The attribute-aware encoder is needed by the smart classifier and is gated with it.
   // The NCS version-history path also uses it so the main diff calculation detects attribute-only
   // node replacements, e.g. changing an emoji or mention without changing the node type.
-  var _selectTokenEncoder = (0, _selectTokenEncoder2.selectTokenEncoder)(diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') || (0, _fg.fg)('confluence_ncs_step_diffing_version_history')),
+  var _selectTokenEncoder = (0, _selectTokenEncoder2.selectTokenEncoder)(diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history')),
     tokenEncoder = _selectTokenEncoder.tokenEncoder,
     shouldHideMarkOnlyDeletions = _selectTokenEncoder.shouldHideMarkOnlyDeletions;
   var changes;
@@ -867,12 +867,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // The attribute-aware token encoder already reports mark-only changes as regular changes in the
   // smart path and the NCS version-history path. For NCS version history, only skip the step-range
   // highlight if the main diff covers it or the remaining content has unchanged formatting.
-  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
+  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
     return !isHandledByTable(fromB, toB);
   }).filter(function (range) {
-    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+    return !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') || !changes.some(function (change) {
       return change.fromB <= range.fromB && change.toB >= range.toB;
     }) && hasUnhighlightedMarkChanges(range);
   }).forEach(function (change) {
@@ -899,7 +899,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     var fromB = _ref13.fromB,
       toB = _ref13.toB,
       isInline = _ref13.isInline;
-    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(function (change) {
+    return !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') || !isInline || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
   }).forEach(function (change) {

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

@@ -319,7 +319,7 @@ var collapse = function collapse(changes) {
  * Both leave ranges that only touch, so they survive the collapse.
  *
  * Carries no gate of its own: the only caller reaches it through the attributed changeset, which
- * already requires `confluence_ncs_step_diffing_version_history`.
+ * already requires `platform_editor_attributed_version_history`.
  */
 var collapseOverlappingChanges = exports.collapseOverlappingChanges = function collapseOverlappingChanges(changes, doc) {
   return collapse(splitContainedChanges(splitMixedIdentityChanges(changes, doc), doc));

package/dist/cjs/pm-plugins/decorations/colorSchemes/attributions.js

@@ -12,7 +12,6 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _getThirdPartyAgentColor = require("@atlaskit/agent-color/get-third-party-agent-color");
 var _utils = require("@atlaskit/editor-shared-styles/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _showDiffPluginType = require("../../../showDiffPluginType");
 var _types = require("./types");
 var _excluded = ["attribution", "connectedTo"];
@@ -31,7 +30,7 @@ var HASHED_PARTICIPANT_COLOR_SCHEMES = [].concat((0, _toConsumableArray2.default
 /**
  * Red means "deleted" in both public schemes, so it never identifies an actor. Reserving it here
  * covers every path into an attribution colour; `createAttributionColorMap` is the only caller, and
- * it is gated on `confluence_ncs_step_diffing_version_history` plus
+ * it is gated on `platform_editor_attributed_version_history` plus
  * `platform_editor_show_diff_color_scheme_refactor`.
  */
 var RESERVED_ATTRIBUTION_COLORS = new Set(['red']);
@@ -118,7 +117,7 @@ var resolveContributors = exports.resolveContributors = function resolveContribu
   return Object.keys(resolved).length > 0 ? resolved : undefined;
 };
 var areAttributionColorGatesEnabled = exports.areAttributionColorGatesEnabled = function areAttributionColorGatesEnabled() {
-  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor');
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor');
 };
 var isAttributionColoringEnabled = exports.isAttributionColoringEnabled = function isAttributionColoringEnabled(stepAttributions) {
   if (!areAttributionColorGatesEnabled() || !(stepAttributions !== null && stepAttributions !== void 0 && stepAttributions.length)) {
@@ -239,7 +238,7 @@ var getAttributionKeyForChanges = function getAttributionKeyForChanges(changes)
  */
 var getAttributionKeyForChange = exports.getAttributionKeyForChange = function getAttributionKeyForChange(change, attributedChanges) {
   var directKey = getAttributionKeyForChanges([change]);
-  return directKey !== null && directKey !== void 0 ? directKey : (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? undefined : getAttributionKeyForChanges(attributedChanges.filter(function (attributedChange) {
+  return directKey !== null && directKey !== void 0 ? directKey : (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? undefined : getAttributionKeyForChanges(attributedChanges.filter(function (attributedChange) {
     return changesOverlap(change, attributedChange);
   }));
 };

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createLeftAnchorWidget = exports.createInlineIndicatorAnchorWidgets = exports.createDocMarginAnchorWidget = exports.createBlockIndicatorAnchorWidgets = exports.createAnchorNameSpan = exports.clampAnchorPosIntoCell = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -574,7 +575,7 @@ var createInlineIndicatorAnchorWidgets = exports.createInlineIndicatorAnchorWidg
   // Gated purely so the `createAnchorSpanWidget` rewrite can be rolled back independently of the
   // contributor-tag anchors it was extracted for: both branches build the same two widgets at the
   // same positions. Drop the fallback with the gate.
-  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history')) {
     return [createAnchorSpanWidget({
       pos: fromPos,
       diffId: diffId,

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unmountContributorTag = exports.resolveHoistedCodeBlockAnchor = exports.resolveCodeBlockStart = exports.mountContributorTag = exports.isContributorTagWidgetEnabled = exports.createContributorTagWidget = exports.createContributorTagHost = exports.CONTRIBUTOR_TAG_HOST_ATTRIBUTE = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _contributorTagController = require("../../ui/ContributorTag/contributorTagController");
 var _baseNodeName = require("../utils/baseNodeName");
 var _charsByOffset = require("../utils/charsByOffset");
@@ -20,7 +20,7 @@ var CONTRIBUTOR_TAG_HOST_ATTRIBUTE = exports.CONTRIBUTOR_TAG_HOST_ATTRIBUTE = 'd
 
 // Contributor tags only render behind this gate — see `areAttributionColorGatesEnabled`.
 var isContributorTagWidgetEnabled = exports.isContributorTagWidgetEnabled = function isContributorTagWidgetEnabled() {
-  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history');
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history');
 };
 
 /**

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

@@ -195,7 +195,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   // node renders beneath its replacement; otherwise anchor at the start (change.fromB).
   var anchorPos = placeBelow ? change.toB : change.fromB;
   var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, anchorPos, slice);
-  var isActive = activeIndexPos && ((0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey) : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
+  var isActive = activeIndexPos && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey) : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
   if (deletedBlankLineCount > 0) {
     // 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
@@ -427,7 +427,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     var $sourcePos = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? getSourcePos(doc, $changeFromA, slice.openStart, index) : null;
     var nodeView = serializer.tryCreateNodeView(node, 0, $sourcePos !== null && $sourcePos !== void 0 ? $sourcePos : undefined, isInserted, colorScheme);
     if (nodeView) {
-      if (canTagWidget && contributorTagAnchorName === undefined && (0, _baseNodeName.resolveBaseNodeName)(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && (0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+      if (canTagWidget && contributorTagAnchorName === undefined && (0, _baseNodeName.resolveBaseNodeName)(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history')) {
         // The deleted column is rendered inside this widget; anchor to its box.
         contributorTagAnchorName = (0, _decorationKeys.buildAnchorDecorationKey)({
           diffId: diffId,
@@ -550,7 +550,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     })));
     // `dom` is inline, so its box fragments across a line wrap and `anchor()` resolves to the
     // wrong edge. The tag anchors to its own point marker instead (EDITOR-9286).
-    if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history') && !contributorTagAnchorName) {
+    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && !contributorTagAnchorName) {
       var tagPointAnchorName = (0, _decorationKeys.buildAnchorDecorationKey)({
         diffId: diffId,
         anchorType: _decorationKeys.AnchorTypeKey.tag

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

@@ -8,7 +8,7 @@ exports.extractContributorTags = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _baseNodeName = require("../utils/baseNodeName");
 var _taggableBlockNodes = require("../utils/taggableBlockNodes");
 var _decorationKeys = require("./decorationKeys");
@@ -46,7 +46,7 @@ var isSameChange = function isSameChange(widget, inline) {
  * `inlineDeletedDiffPlacement: 'after'`, where the inline half leads instead.
  */
 var leadsReplacement = function leadsReplacement(widget) {
-  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') && widget.spec.side === -1;
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && widget.spec.side === -1;
 };
 
 /**
@@ -82,7 +82,7 @@ var byLeadingPosition = function byLeadingPosition(a, b) {
 /** Select the first layout column only when the inline layout range starts immediately before it. */
 var navigationLeader = function navigationLeader(members) {
   var ordered = (0, _toConsumableArray2.default)(members).sort(byLeadingPosition);
-  var layoutColumn = (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? ordered.find(function (_ref2) {
+  var layoutColumn = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? ordered.find(function (_ref2) {
     var _decoration$spec$node;
     var decoration = _ref2.decoration;
     return decoration.spec.decorationType === 'block' && (0, _baseNodeName.resolveBaseNodeName)((_decoration$spec$node = decoration.spec.nodeName) !== null && _decoration$spec$node !== void 0 ? _decoration$spec$node : '') === 'layoutColumn';
@@ -124,7 +124,7 @@ var owningStop = function owningStop(target, stops) {
  */
 var resolveActiveTarget = function resolveActiveTarget(surviving, activeIndexPos) {
   return containedBy(surviving, activeIndexPos).find(function (target) {
-    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !('attributionKey' in activeIndexPos) || target.decoration.spec.attributionKey === activeIndexPos.attributionKey;
+    return !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') || !('attributionKey' in activeIndexPos) || target.decoration.spec.attributionKey === activeIndexPos.attributionKey;
   });
 };
 
@@ -253,7 +253,7 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
   }
 
   // A nested block folds into the outermost one of the same contributor, so nesting adds no tags.
-  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history')) {
     var blocksByContributor = new Map();
     var _iterator2 = _createForOfIteratorHelper(blockTargets),
       _step2;

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isDiffableAttr = exports.getRequiredIncludedDiffableAttrs = exports.getIncludedDiffableAttrs = exports.getDiffableAttrNames = exports.DIFFABLE_ATTRS_BY_NODE_TYPE = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -96,8 +96,8 @@ var getRequiredIncludedDiffableAttrs = exports.getRequiredIncludedDiffableAttrs
  */
 var getDiffableAttrNames = exports.getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
   // Adding a column updates existing widths, ignore this attribute change. Move this into
-  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
-  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && (0, _fg.fg)('confluence_ncs_step_diffing_version_history');
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up platform_editor_attributed_version_history
+  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history');
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(function (name) {

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stepIsValidAttrChange = exports.isInlineAttrChangeNodeName = exports.getAttrChangeRanges = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
 var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _diffableAttrs = require("./diffableAttrs");
 var _excerptIncludeAttrs = require("./excerptIncludeAttrs");
 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; }
@@ -92,7 +92,7 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
     var hasChangedAttr = function hasChangedAttr(watchedAttrs) {
       return attrsToCheck.some(function (attr) {
-        return watchedAttrs.includes(attr) && (!(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !(0, _isEqual.default)(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
+        return watchedAttrs.includes(attr) && (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !(0, _isEqual.default)(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
       });
     };
 
@@ -182,7 +182,7 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
   .filter(function (range, i, arr) {
-    return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? !arr.some(function (r, nextIndex) {
+    return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? !arr.some(function (r, nextIndex) {
       return nextIndex > i && r.fromB === range.fromB;
     }) : arr.findIndex(function (r) {
       return r.fromB === range.fromB;

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

@@ -374,7 +374,7 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref9
   // should not also get the inline content style (borderBottom underline) on their container.
   var shouldSkipContentStyle = isInserted && nodeStyle !== undefined;
   var contentStyle = shouldSkipContentStyle ? '' : (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
-  var isEmptyDeletedLayoutColumn = !isInserted && (0, _baseNodeName.resolveBaseNodeName)(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && (0, _fg.fg)('confluence_ncs_step_diffing_version_history');
+  var isEmptyDeletedLayoutColumn = !isInserted && (0, _baseNodeName.resolveBaseNodeName)(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history');
   if (isEmptyDeletedLayoutColumn && nodeView instanceof HTMLElement) {
     var _nodeView$querySelect;
     // Give an empty deleted column height so its diff box doesn't collapse

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

@@ -60,7 +60,7 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
   // Text-like blocks (heading, lists, blockquote) render their deleted content through this
   // getter rather than `getDeletedContentStyle`, so without this they never receive the
   // glyphTint background + underline that plain deleted text already gets.
-  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
     return base + (0, _factory.buildDeletedInlineContentStyleExtended)(colors, isActive);
   }
   return base;

package/dist/cjs/pm-plugins/getScrollableDecorations.js

@@ -8,6 +8,7 @@ exports.getScrollableDecorations = void 0;
 exports.isInlineDiffDecorationRenderableInDoc = isInlineDiffDecorationRenderableInDoc;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _decorationKeys = require("./decorations/decorationKeys");
@@ -190,7 +191,7 @@ function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ * 5. When `platform_editor_attributed_version_history` is enabled, groups overlapping or
  *    directly touching ranges across decoration types into one result per contributor, using the
  *    union of all grouped ranges
  *    (zero-width widgets can join a group without extending it). Under
@@ -227,10 +228,14 @@ var getScrollableDecorations = exports.getScrollableDecorations = function getSc
     if (isBlockDecoration(dec)) {
       var _dec$spec, _dec$spec$nodeName;
       // Skip listItem blocks as they are not scrollable
-      if (((_dec$spec = dec.spec) === null || _dec$spec === void 0 ? void 0 : _dec$spec.nodeName) === 'listItem') return false;
+      if (((_dec$spec = dec.spec) === null || _dec$spec === void 0 ? void 0 : _dec$spec.nodeName) === 'listItem') {
+        return false;
+      }
       var key = "".concat(dec.from, "-").concat(dec.to, "-").concat((_dec$spec$nodeName = dec.spec.nodeName) !== null && _dec$spec$nodeName !== void 0 ? _dec$spec$nodeName : '');
       // Skip blocks that have already been seen
-      if (seenBlockKeys.has(key)) return false;
+      if (seenBlockKeys.has(key)) {
+        return false;
+      }
       seenBlockKeys.add(key);
     }
     return true;
@@ -244,7 +249,7 @@ var getScrollableDecorations = exports.getScrollableDecorations = function getSc
   }) : rawInlines;
   var widgets = filtered.filter(isWidgetDecoration);
   var result;
-  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history')) {
     // Group overlapping or directly touching ranges into one customer-facing edit.
     result = groupTouchingDecorations([].concat((0, _toConsumableArray2.default)(blocks), (0, _toConsumableArray2.default)(inlines), (0, _toConsumableArray2.default)(widgets)), isInlineDecoration, doc);
   } else {

package/dist/cjs/pm-plugins/main.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.showDiffPluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expand = require("@atlaskit/editor-common/expand");
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
@@ -167,7 +168,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
                 activeIndexPos: activeDecoration ? _objectSpread({
                   from: activeDecoration.from,
                   to: activeDecoration.to
-                }, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? {
+                }, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? {
                   attributionKey: (0, _decorationKeys.isDiffDecoration)(activeDecoration) ? activeDecoration.spec.attributionKey : undefined
                 } : {}) : undefined
               });

package/dist/cjs/pm-plugins/utils/baseNodeName.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveBaseNodeName = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 /**
  * A node type's base name, with a schema variant's suffix stripped: `panel`, `panel_c1` and
  * `panel_c1_root_only` all resolve to `panel`.
@@ -21,5 +21,5 @@ var _fg = require("@atlaskit/platform-feature-flags/fg");
  * in the styling decisions would move the legacy diff for readers who see no tags.
  */
 var resolveBaseNodeName = exports.resolveBaseNodeName = function resolveBaseNodeName(name) {
-  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? name.split('_')[0] : name;
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? name.split('_')[0] : name;
 };

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

@@ -125,7 +125,7 @@ const isRangeActive = (activeIndexPos, from, to, attributionKey) => {
   if (activeIndexPos === undefined) {
     return undefined;
   }
-  if (!fg('confluence_ncs_step_diffing_version_history')) {
+  if (!isExperimentEnabled('platform_editor_attributed_version_history')) {
     return from === activeIndexPos.from && to === activeIndexPos.to;
   }
   return from <= activeIndexPos.to && activeIndexPos.from <= to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey);
@@ -455,7 +455,7 @@ const calculateDiffDecorationsInner = ({
   const {
     tokenEncoder,
     shouldHideMarkOnlyDeletions
-  } = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || fg('confluence_ncs_step_diffing_version_history'));
+  } = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || isExperimentEnabled('platform_editor_attributed_version_history'));
   let changes;
   let contentChanges;
   let attributedChanges = [];
@@ -782,10 +782,10 @@ const calculateDiffDecorationsInner = ({
   // The attribute-aware token encoder already reports mark-only changes as regular changes in the
   // smart path and the NCS version-history path. For NCS version history, only skip the step-range
   // highlight if the main diff covers it or the remaining content has unchanged formatting.
-  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(({
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, isExperimentEnabled('platform_editor_attributed_version_history') ? stepMaps : undefined).filter(({
     fromB,
     toB
-  }) => !isHandledByTable(fromB, toB)).filter(range => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB <= range.fromB && change.toB >= range.toB) && hasUnhighlightedMarkChanges(range)).forEach(change => {
+  }) => !isHandledByTable(fromB, toB)).filter(range => !isExperimentEnabled('platform_editor_attributed_version_history') || !changes.some(change => change.fromB <= range.fromB && change.toB >= range.toB) && hasUnhighlightedMarkChanges(range)).forEach(change => {
     var _attributionColors$ge, _attributionColors;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
     const attributionKey = showContributorTags ? change.attributionKey : undefined;
@@ -808,7 +808,7 @@ const calculateDiffDecorationsInner = ({
     fromB,
     toB,
     isInline
-  }) => !fg('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+  }) => !isExperimentEnabled('platform_editor_attributed_version_history') || !isInline || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
     var _attributionColors$ge2, _attributionColors2;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge2 = (_attributionColors2 = attributionColors) === null || _attributionColors2 === void 0 ? void 0 : _attributionColors2.get(change.attributionKey)) !== null && _attributionColors$ge2 !== void 0 ? _attributionColors$ge2 : colorScheme : colorScheme;
     const attributionKey = showContributorTags ? change.attributionKey : undefined;

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

@@ -259,7 +259,7 @@ const collapse = changes => {
  * Both leave ranges that only touch, so they survive the collapse.
  *
  * Carries no gate of its own: the only caller reaches it through the attributed changeset, which
- * already requires `confluence_ncs_step_diffing_version_history`.
+ * already requires `platform_editor_attributed_version_history`.
  */
 export const collapseOverlappingChanges = (changes, doc) => collapse(splitContainedChanges(splitMixedIdentityChanges(changes, doc), doc));
 

package/dist/es2019/pm-plugins/decorations/colorSchemes/attributions.js

@@ -1,7 +1,6 @@
 import { getThirdPartyAgentColor } from '@atlaskit/agent-color/get-third-party-agent-color';
 import { getParticipantColor } from '@atlaskit/editor-shared-styles/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { DIFF_AGENT_BRANDS } from '../../../showDiffPluginType';
 import { PARTICIPANT_COLOR_SCHEMES } from './types';
 
@@ -15,7 +14,7 @@ const HASHED_PARTICIPANT_COLOR_SCHEMES = [...PARTICIPANT_COLOR_SCHEMES, 'blue',
 /**
  * Red means "deleted" in both public schemes, so it never identifies an actor. Reserving it here
  * covers every path into an attribution colour; `createAttributionColorMap` is the only caller, and
- * it is gated on `confluence_ncs_step_diffing_version_history` plus
+ * it is gated on `platform_editor_attributed_version_history` plus
  * `platform_editor_show_diff_color_scheme_refactor`.
  */
 const RESERVED_ATTRIBUTION_COLORS = new Set(['red']);
@@ -92,7 +91,7 @@ export const resolveContributors = contributors => {
   }
   return Object.keys(resolved).length > 0 ? resolved : undefined;
 };
-export const areAttributionColorGatesEnabled = () => fg('confluence_ncs_step_diffing_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
+export const areAttributionColorGatesEnabled = () => isExperimentEnabled('platform_editor_attributed_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
 export const isAttributionColoringEnabled = stepAttributions => {
   if (!areAttributionColorGatesEnabled() || !(stepAttributions !== null && stepAttributions !== void 0 && stepAttributions.length)) {
     return false;
@@ -178,7 +177,7 @@ const getAttributionKeyForChanges = changes => getAttributionKey(getLatestAttrib
  */
 export const getAttributionKeyForChange = (change, attributedChanges) => {
   const directKey = getAttributionKeyForChanges([change]);
-  return directKey !== null && directKey !== void 0 ? directKey : fg('confluence_ncs_step_diffing_version_history') ? undefined : getAttributionKeyForChanges(attributedChanges.filter(attributedChange => changesOverlap(change, attributedChange)));
+  return directKey !== null && directKey !== void 0 ? directKey : isExperimentEnabled('platform_editor_attributed_version_history') ? undefined : getAttributionKeyForChanges(attributedChanges.filter(attributedChange => changesOverlap(change, attributedChange)));
 };
 export const getColorSchemeForChange = (change, attributedChanges, attributionColors, fallback) => {
   var _attributionColors$ge;

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

@@ -1,3 +1,4 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -549,7 +550,7 @@ export const createInlineIndicatorAnchorWidgets = ({
   // Gated purely so the `createAnchorSpanWidget` rewrite can be rolled back independently of the
   // contributor-tag anchors it was extracted for: both branches build the same two widgets at the
   // same positions. Drop the fallback with the gate.
-  if (fg('confluence_ncs_step_diffing_version_history')) {
+  if (isExperimentEnabled('platform_editor_attributed_version_history')) {
     return [createAnchorSpanWidget({
       pos: fromPos,
       diffId,

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

@@ -1,5 +1,5 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ContributorTagController } from '../../ui/ContributorTag/contributorTagController';
 import { resolveBaseNodeName } from '../utils/baseNodeName';
 import { buildCharsByOffset, isWhitespaceChar } from '../utils/charsByOffset';
@@ -10,7 +10,7 @@ import { AnchorTypeKey, buildAnchorDecorationKey, buildAnchorDecorationSpec, bui
 export const CONTRIBUTOR_TAG_HOST_ATTRIBUTE = 'data-contributor-tag-host';
 
 // Contributor tags only render behind this gate — see `areAttributionColorGatesEnabled`.
-export const isContributorTagWidgetEnabled = () => fg('confluence_ncs_step_diffing_version_history');
+export const isContributorTagWidgetEnabled = () => isExperimentEnabled('platform_editor_attributed_version_history');
 
 /**
  * Everything a tag needs to draw itself into the document, plumbed down from the plugin. Absent in

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

@@ -187,7 +187,7 @@ export const createNodeChangedDecorationWidget = ({
   // node renders beneath its replacement; otherwise anchor at the start (change.fromB).
   const anchorPos = placeBelow ? change.toB : change.fromB;
   const safeInsertPos = findSafeInsertPos(newDoc, anchorPos, slice);
-  const isActive = activeIndexPos && (fg('confluence_ncs_step_diffing_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey) : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
+  const isActive = activeIndexPos && (isExperimentEnabled('platform_editor_attributed_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey) : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
   if (deletedBlankLineCount > 0) {
     // 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
@@ -413,7 +413,7 @@ export const createNodeChangedDecorationWidget = ({
     const $sourcePos = fg('platform_editor_ai_show_diff_patch_2') ? getSourcePos(doc, $changeFromA, slice.openStart, index) : null;
     const nodeView = serializer.tryCreateNodeView(node, 0, $sourcePos !== null && $sourcePos !== void 0 ? $sourcePos : undefined, isInserted, colorScheme);
     if (nodeView) {
-      if (canTagWidget && contributorTagAnchorName === undefined && resolveBaseNodeName(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && fg('confluence_ncs_step_diffing_version_history')) {
+      if (canTagWidget && contributorTagAnchorName === undefined && resolveBaseNodeName(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && isExperimentEnabled('platform_editor_attributed_version_history')) {
         // The deleted column is rendered inside this widget; anchor to its box.
         contributorTagAnchorName = buildAnchorDecorationKey({
           diffId,
@@ -536,7 +536,7 @@ export const createNodeChangedDecorationWidget = ({
     })}`);
     // `dom` is inline, so its box fragments across a line wrap and `anchor()` resolves to the
     // wrong edge. The tag anchors to its own point marker instead (EDITOR-9286).
-    if (fg('confluence_ncs_step_diffing_version_history') && !contributorTagAnchorName) {
+    if (isExperimentEnabled('platform_editor_attributed_version_history') && !contributorTagAnchorName) {
       const tagPointAnchorName = buildAnchorDecorationKey({
         diffId,
         anchorType: AnchorTypeKey.tag

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

@@ -1,4 +1,4 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { resolveBaseNodeName } from '../utils/baseNodeName';
 import { isTaggableBlockNodeName } from '../utils/taggableBlockNodes';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorationKeys';
@@ -27,7 +27,7 @@ const isSameChange = (widget, inline) => widget.spec.attributionKey === inline.s
  * the deleted content in front of the inserted text; `1` is `deletedDiffPlacement: 'bottom'` /
  * `inlineDeletedDiffPlacement: 'after'`, where the inline half leads instead.
  */
-const leadsReplacement = widget => fg('confluence_ncs_step_diffing_version_history') && widget.spec.side === -1;
+const leadsReplacement = widget => isExperimentEnabled('platform_editor_attributed_version_history') && widget.spec.side === -1;
 
 /**
  * Whether `inner` captions the same change as the block decoration `block`, in which case only the
@@ -58,7 +58,7 @@ const byLeadingPosition = (a, b) => {
 /** Select the first layout column only when the inline layout range starts immediately before it. */
 const navigationLeader = members => {
   const ordered = [...members].sort(byLeadingPosition);
-  const layoutColumn = fg('confluence_ncs_step_diffing_version_history') ? ordered.find(({
+  const layoutColumn = isExperimentEnabled('platform_editor_attributed_version_history') ? ordered.find(({
     decoration
   }) => {
     var _decoration$spec$node;
@@ -92,7 +92,7 @@ const owningStop = (target, stops) => stops.reduce((narrowest, stop) => stop.fro
  * group's union range touches, so several tags revealed over each other (EDITOR-8971). Hence
  * containment, and the leading change of what it covers.
  */
-const resolveActiveTarget = (surviving, activeIndexPos) => containedBy(surviving, activeIndexPos).find(target => !fg('confluence_ncs_step_diffing_version_history') || !('attributionKey' in activeIndexPos) || target.decoration.spec.attributionKey === activeIndexPos.attributionKey);
+const resolveActiveTarget = (surviving, activeIndexPos) => containedBy(surviving, activeIndexPos).find(target => !isExperimentEnabled('platform_editor_attributed_version_history') || !('attributionKey' in activeIndexPos) || target.decoration.spec.attributionKey === activeIndexPos.attributionKey);
 
 /**
  * One model per diff decoration whose attribution resolves to a supplied contributor; anything
@@ -202,7 +202,7 @@ export const extractContributorTags = (decorations, contributors, activeIndexPos
   }
 
   // A nested block folds into the outermost one of the same contributor, so nesting adds no tags.
-  if (fg('confluence_ncs_step_diffing_version_history')) {
+  if (isExperimentEnabled('platform_editor_attributed_version_history')) {
     const blocksByContributor = new Map();
     for (const target of blockTargets) {
       var _target$decoration$sp, _blocksByContributor$;

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

@@ -1,4 +1,4 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 
 /**
  * Single source of truth for which attributes of a node type represent a
@@ -91,8 +91,8 @@ export const getRequiredIncludedDiffableAttrs = nodeTypeName => {
  */
 export const getDiffableAttrNames = (nodeTypeName, attrs) => {
   // Adding a column updates existing widths, ignore this attribute change. Move this into
-  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
-  const ignoreColumnWidth = nodeTypeName === 'layoutColumn' && fg('confluence_ncs_step_diffing_version_history');
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up platform_editor_attributed_version_history
+  const ignoreColumnWidth = nodeTypeName === 'layoutColumn' && isExperimentEnabled('platform_editor_attributed_version_history');
   const rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(name => !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width')).sort();

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

@@ -1,9 +1,9 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getRequiredIncludedDiffableAttrs, isDiffableAttr } from './diffableAttrs';
 import { getComparableExcerptIncludeAttrs, getReferencedContentId, isExcerptInclude } from './excerptIncludeAttrs';
 const filterUndefined = x => !!x;
@@ -74,7 +74,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
     const $pos = doc.resolve(finalPos);
     const nodeAtPos = doc.nodeAt(finalPos);
     const originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
-    const hasChangedAttr = watchedAttrs => attrsToCheck.some(attr => watchedAttrs.includes(attr) && (!fg('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr])));
+    const hasChangedAttr = watchedAttrs => attrsToCheck.some(attr => watchedAttrs.includes(attr) && (!isExperimentEnabled('platform_editor_attributed_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr])));
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -162,7 +162,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
   // Deduplicate by node position: multiple AttrSteps on the same node
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
-  .filter((range, i, arr) => fg('confluence_ncs_step_diffing_version_history') ? !arr.some((r, nextIndex) => nextIndex > i && r.fromB === range.fromB) : arr.findIndex(r => r.fromB === range.fromB) === i);
+  .filter((range, i, arr) => isExperimentEnabled('platform_editor_attributed_version_history') ? !arr.some((r, nextIndex) => nextIndex > i && r.fromB === range.fromB) : arr.findIndex(r => r.fromB === range.fromB) === i);
 };
 
 /**

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

@@ -362,7 +362,7 @@ const createBlockNodeContentWrapper = ({
   // should not also get the inline content style (borderBottom underline) on their container.
   const shouldSkipContentStyle = isInserted && nodeStyle !== undefined;
   const contentStyle = shouldSkipContentStyle ? '' : getChangedContentStyle(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
-  const isEmptyDeletedLayoutColumn = !isInserted && resolveBaseNodeName(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && fg('confluence_ncs_step_diffing_version_history');
+  const isEmptyDeletedLayoutColumn = !isInserted && resolveBaseNodeName(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && isExperimentEnabled('platform_editor_attributed_version_history');
   if (isEmptyDeletedLayoutColumn && nodeView instanceof HTMLElement) {
     var _nodeView$querySelect;
     // Give an empty deleted column height so its diff box doesn't collapse

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

@@ -46,7 +46,7 @@ const getChangedContentStyleNext = (colorScheme, isActive = false, isInserted =
   // Text-like blocks (heading, lists, blockquote) render their deleted content through this
   // getter rather than `getDeletedContentStyle`, so without this they never receive the
   // glyphTint background + underline that plain deleted text already gets.
-  if (fg('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
+  if (isExperimentEnabled('platform_editor_attributed_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
     return base + buildDeletedInlineContentStyleExtended(colors, isActive);
   }
   return base;

package/dist/es2019/pm-plugins/getScrollableDecorations.js

@@ -1,3 +1,4 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
@@ -164,7 +165,7 @@ function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ * 5. When `platform_editor_attributed_version_history` is enabled, groups overlapping or
  *    directly touching ranges across decoration types into one result per contributor, using the
  *    union of all grouped ranges
  *    (zero-width widgets can join a group without extending it). Under
@@ -195,10 +196,14 @@ export const getScrollableDecorations = (set, doc) => {
     if (isBlockDecoration(dec)) {
       var _dec$spec, _dec$spec$nodeName;
       // Skip listItem blocks as they are not scrollable
-      if (((_dec$spec = dec.spec) === null || _dec$spec === void 0 ? void 0 : _dec$spec.nodeName) === 'listItem') return false;
+      if (((_dec$spec = dec.spec) === null || _dec$spec === void 0 ? void 0 : _dec$spec.nodeName) === 'listItem') {
+        return false;
+      }
       const key = `${dec.from}-${dec.to}-${(_dec$spec$nodeName = dec.spec.nodeName) !== null && _dec$spec$nodeName !== void 0 ? _dec$spec$nodeName : ''}`;
       // Skip blocks that have already been seen
-      if (seenBlockKeys.has(key)) return false;
+      if (seenBlockKeys.has(key)) {
+        return false;
+      }
       seenBlockKeys.add(key);
     }
     return true;
@@ -210,7 +215,7 @@ export const getScrollableDecorations = (set, doc) => {
   const inlines = doc !== undefined ? rawInlines.filter(d => isInlineDiffDecorationRenderableInDoc(doc, d.from, d.to)) : rawInlines;
   const widgets = filtered.filter(isWidgetDecoration);
   let result;
-  if (fg('confluence_ncs_step_diffing_version_history')) {
+  if (isExperimentEnabled('platform_editor_attributed_version_history')) {
     // Group overlapping or directly touching ranges into one customer-facing edit.
     result = groupTouchingDecorations([...blocks, ...inlines, ...widgets], isInlineDecoration, doc);
   } else {

package/dist/es2019/pm-plugins/main.js

@@ -1,3 +1,4 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { toggleExpandRange } from '@atlaskit/editor-common/expand';
 import { processRawValue } from '@atlaskit/editor-common/process-raw-value';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -161,7 +162,7 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
                 activeIndexPos: activeDecoration ? {
                   from: activeDecoration.from,
                   to: activeDecoration.to,
-                  ...(fg('confluence_ncs_step_diffing_version_history') ? {
+                  ...(isExperimentEnabled('platform_editor_attributed_version_history') ? {
                     attributionKey: isDiffDecoration(activeDecoration) ? activeDecoration.spec.attributionKey : undefined
                   } : {})
                 } : undefined

package/dist/es2019/pm-plugins/utils/baseNodeName.js

@@ -1,4 +1,4 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 
 /**
  * A node type's base name, with a schema variant's suffix stripped: `panel`, `panel_c1` and
@@ -15,4 +15,4 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
  * For taggability only — this gate is weaker than the ones attribution needs, so resolving a variant
  * in the styling decisions would move the legacy diff for readers who see no tags.
  */
-export const resolveBaseNodeName = name => fg('confluence_ncs_step_diffing_version_history') ? name.split('_')[0] : name;
+export const resolveBaseNodeName = name => isExperimentEnabled('platform_editor_attributed_version_history') ? name.split('_')[0] : name;

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

@@ -131,7 +131,7 @@ var isRangeActive = function isRangeActive(activeIndexPos, from, to, attribution
   if (activeIndexPos === undefined) {
     return undefined;
   }
-  if (!fg('confluence_ncs_step_diffing_version_history')) {
+  if (!isExperimentEnabled('platform_editor_attributed_version_history')) {
     return from === activeIndexPos.from && to === activeIndexPos.to;
   }
   return from <= activeIndexPos.to && activeIndexPos.from <= to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey);
@@ -492,7 +492,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // The attribute-aware encoder is needed by the smart classifier and is gated with it.
   // The NCS version-history path also uses it so the main diff calculation detects attribute-only
   // node replacements, e.g. changing an emoji or mention without changing the node type.
-  var _selectTokenEncoder = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || fg('confluence_ncs_step_diffing_version_history')),
+  var _selectTokenEncoder = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || isExperimentEnabled('platform_editor_attributed_version_history')),
     tokenEncoder = _selectTokenEncoder.tokenEncoder,
     shouldHideMarkOnlyDeletions = _selectTokenEncoder.shouldHideMarkOnlyDeletions;
   var changes;
@@ -860,12 +860,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // The attribute-aware token encoder already reports mark-only changes as regular changes in the
   // smart path and the NCS version-history path. For NCS version history, only skip the step-range
   // highlight if the main diff covers it or the remaining content has unchanged formatting.
-  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, isExperimentEnabled('platform_editor_attributed_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
     return !isHandledByTable(fromB, toB);
   }).filter(function (range) {
-    return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+    return !isExperimentEnabled('platform_editor_attributed_version_history') || !changes.some(function (change) {
       return change.fromB <= range.fromB && change.toB >= range.toB;
     }) && hasUnhighlightedMarkChanges(range);
   }).forEach(function (change) {
@@ -892,7 +892,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     var fromB = _ref13.fromB,
       toB = _ref13.toB,
       isInline = _ref13.isInline;
-    return !fg('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(function (change) {
+    return !isExperimentEnabled('platform_editor_attributed_version_history') || !isInline || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
   }).forEach(function (change) {

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

@@ -313,7 +313,7 @@ var collapse = function collapse(changes) {
  * Both leave ranges that only touch, so they survive the collapse.
  *
  * Carries no gate of its own: the only caller reaches it through the attributed changeset, which
- * already requires `confluence_ncs_step_diffing_version_history`.
+ * already requires `platform_editor_attributed_version_history`.
  */
 export var collapseOverlappingChanges = function collapseOverlappingChanges(changes, doc) {
   return collapse(splitContainedChanges(splitMixedIdentityChanges(changes, doc), doc));

package/dist/esm/pm-plugins/decorations/colorSchemes/attributions.js

@@ -11,7 +11,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import { getThirdPartyAgentColor } from '@atlaskit/agent-color/get-third-party-agent-color';
 import { getParticipantColor } from '@atlaskit/editor-shared-styles/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { DIFF_AGENT_BRANDS } from '../../../showDiffPluginType';
 import { PARTICIPANT_COLOR_SCHEMES } from './types';
 
@@ -25,7 +24,7 @@ var HASHED_PARTICIPANT_COLOR_SCHEMES = [].concat(_toConsumableArray(PARTICIPANT_
 /**
  * Red means "deleted" in both public schemes, so it never identifies an actor. Reserving it here
  * covers every path into an attribution colour; `createAttributionColorMap` is the only caller, and
- * it is gated on `confluence_ncs_step_diffing_version_history` plus
+ * it is gated on `platform_editor_attributed_version_history` plus
  * `platform_editor_show_diff_color_scheme_refactor`.
  */
 var RESERVED_ATTRIBUTION_COLORS = new Set(['red']);
@@ -112,7 +111,7 @@ export var resolveContributors = function resolveContributors(contributors) {
   return Object.keys(resolved).length > 0 ? resolved : undefined;
 };
 export var areAttributionColorGatesEnabled = function areAttributionColorGatesEnabled() {
-  return fg('confluence_ncs_step_diffing_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
+  return isExperimentEnabled('platform_editor_attributed_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
 };
 export var isAttributionColoringEnabled = function isAttributionColoringEnabled(stepAttributions) {
   if (!areAttributionColorGatesEnabled() || !(stepAttributions !== null && stepAttributions !== void 0 && stepAttributions.length)) {
@@ -233,7 +232,7 @@ var getAttributionKeyForChanges = function getAttributionKeyForChanges(changes)
  */
 export var getAttributionKeyForChange = function getAttributionKeyForChange(change, attributedChanges) {
   var directKey = getAttributionKeyForChanges([change]);
-  return directKey !== null && directKey !== void 0 ? directKey : fg('confluence_ncs_step_diffing_version_history') ? undefined : getAttributionKeyForChanges(attributedChanges.filter(function (attributedChange) {
+  return directKey !== null && directKey !== void 0 ? directKey : isExperimentEnabled('platform_editor_attributed_version_history') ? undefined : getAttributionKeyForChanges(attributedChanges.filter(function (attributedChange) {
     return changesOverlap(change, attributedChange);
   }));
 };

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

@@ -5,6 +5,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; }
 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -568,7 +569,7 @@ export var createInlineIndicatorAnchorWidgets = function createInlineIndicatorAn
   // Gated purely so the `createAnchorSpanWidget` rewrite can be rolled back independently of the
   // contributor-tag anchors it was extracted for: both branches build the same two widgets at the
   // same positions. Drop the fallback with the gate.
-  if (fg('confluence_ncs_step_diffing_version_history')) {
+  if (isExperimentEnabled('platform_editor_attributed_version_history')) {
     return [createAnchorSpanWidget({
       pos: fromPos,
       diffId: diffId,

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

@@ -1,8 +1,8 @@
 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ContributorTagController } from '../../ui/ContributorTag/contributorTagController';
 import { resolveBaseNodeName } from '../utils/baseNodeName';
 import { buildCharsByOffset, isWhitespaceChar } from '../utils/charsByOffset';
@@ -14,7 +14,7 @@ export var CONTRIBUTOR_TAG_HOST_ATTRIBUTE = 'data-contributor-tag-host';
 
 // Contributor tags only render behind this gate — see `areAttributionColorGatesEnabled`.
 export var isContributorTagWidgetEnabled = function isContributorTagWidgetEnabled() {
-  return fg('confluence_ncs_step_diffing_version_history');
+  return isExperimentEnabled('platform_editor_attributed_version_history');
 };
 
 /**

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

@@ -189,7 +189,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // node renders beneath its replacement; otherwise anchor at the start (change.fromB).
   var anchorPos = placeBelow ? change.toB : change.fromB;
   var safeInsertPos = findSafeInsertPos(newDoc, anchorPos, slice);
-  var isActive = activeIndexPos && (fg('confluence_ncs_step_diffing_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey) : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
+  var isActive = activeIndexPos && (isExperimentEnabled('platform_editor_attributed_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to && (!('attributionKey' in activeIndexPos) || activeIndexPos.attributionKey === attributionKey) : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
   if (deletedBlankLineCount > 0) {
     // 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
@@ -421,7 +421,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     var $sourcePos = fg('platform_editor_ai_show_diff_patch_2') ? getSourcePos(doc, $changeFromA, slice.openStart, index) : null;
     var nodeView = serializer.tryCreateNodeView(node, 0, $sourcePos !== null && $sourcePos !== void 0 ? $sourcePos : undefined, isInserted, colorScheme);
     if (nodeView) {
-      if (canTagWidget && contributorTagAnchorName === undefined && resolveBaseNodeName(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && fg('confluence_ncs_step_diffing_version_history')) {
+      if (canTagWidget && contributorTagAnchorName === undefined && resolveBaseNodeName(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && isExperimentEnabled('platform_editor_attributed_version_history')) {
         // The deleted column is rendered inside this widget; anchor to its box.
         contributorTagAnchorName = buildAnchorDecorationKey({
           diffId: diffId,
@@ -544,7 +544,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     })));
     // `dom` is inline, so its box fragments across a line wrap and `anchor()` resolves to the
     // wrong edge. The tag anchors to its own point marker instead (EDITOR-9286).
-    if (fg('confluence_ncs_step_diffing_version_history') && !contributorTagAnchorName) {
+    if (isExperimentEnabled('platform_editor_attributed_version_history') && !contributorTagAnchorName) {
       var tagPointAnchorName = buildAnchorDecorationKey({
         diffId: diffId,
         anchorType: AnchorTypeKey.tag

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

@@ -7,7 +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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { resolveBaseNodeName } from '../utils/baseNodeName';
 import { isTaggableBlockNodeName } from '../utils/taggableBlockNodes';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorationKeys';
@@ -40,7 +40,7 @@ var isSameChange = function isSameChange(widget, inline) {
  * `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;
+  return isExperimentEnabled('platform_editor_attributed_version_history') && widget.spec.side === -1;
 };
 
 /**
@@ -76,7 +76,7 @@ var byLeadingPosition = function byLeadingPosition(a, b) {
 /** Select the first layout column only when the inline layout range starts immediately before it. */
 var navigationLeader = function navigationLeader(members) {
   var ordered = _toConsumableArray(members).sort(byLeadingPosition);
-  var layoutColumn = fg('confluence_ncs_step_diffing_version_history') ? ordered.find(function (_ref2) {
+  var layoutColumn = isExperimentEnabled('platform_editor_attributed_version_history') ? ordered.find(function (_ref2) {
     var _decoration$spec$node;
     var decoration = _ref2.decoration;
     return decoration.spec.decorationType === 'block' && resolveBaseNodeName((_decoration$spec$node = decoration.spec.nodeName) !== null && _decoration$spec$node !== void 0 ? _decoration$spec$node : '') === 'layoutColumn';
@@ -118,7 +118,7 @@ var owningStop = function owningStop(target, stops) {
  */
 var resolveActiveTarget = function resolveActiveTarget(surviving, activeIndexPos) {
   return containedBy(surviving, activeIndexPos).find(function (target) {
-    return !fg('confluence_ncs_step_diffing_version_history') || !('attributionKey' in activeIndexPos) || target.decoration.spec.attributionKey === activeIndexPos.attributionKey;
+    return !isExperimentEnabled('platform_editor_attributed_version_history') || !('attributionKey' in activeIndexPos) || target.decoration.spec.attributionKey === activeIndexPos.attributionKey;
   });
 };
 
@@ -247,7 +247,7 @@ export var extractContributorTags = function extractContributorTags(decorations,
   }
 
   // A nested block folds into the outermost one of the same contributor, so nesting adds no tags.
-  if (fg('confluence_ncs_step_diffing_version_history')) {
+  if (isExperimentEnabled('platform_editor_attributed_version_history')) {
     var blocksByContributor = new Map();
     var _iterator2 = _createForOfIteratorHelper(blockTargets),
       _step2;

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

@@ -1,4 +1,4 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 
 /**
  * Single source of truth for which attributes of a node type represent a
@@ -91,8 +91,8 @@ export var getRequiredIncludedDiffableAttrs = function getRequiredIncludedDiffab
  */
 export var getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
   // Adding a column updates existing widths, ignore this attribute change. Move this into
-  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
-  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && fg('confluence_ncs_step_diffing_version_history');
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up platform_editor_attributed_version_history
+  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && isExperimentEnabled('platform_editor_attributed_version_history');
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(function (name) {

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

@@ -1,12 +1,12 @@
 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getRequiredIncludedDiffableAttrs, isDiffableAttr } from './diffableAttrs';
 import { getComparableExcerptIncludeAttrs, getReferencedContentId, isExcerptInclude } from './excerptIncludeAttrs';
 var filterUndefined = function filterUndefined(x) {
@@ -85,7 +85,7 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
     var hasChangedAttr = function hasChangedAttr(watchedAttrs) {
       return attrsToCheck.some(function (attr) {
-        return watchedAttrs.includes(attr) && (!fg('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
+        return watchedAttrs.includes(attr) && (!isExperimentEnabled('platform_editor_attributed_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
       });
     };
 
@@ -175,7 +175,7 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
   .filter(function (range, i, arr) {
-    return fg('confluence_ncs_step_diffing_version_history') ? !arr.some(function (r, nextIndex) {
+    return isExperimentEnabled('platform_editor_attributed_version_history') ? !arr.some(function (r, nextIndex) {
       return nextIndex > i && r.fromB === range.fromB;
     }) : arr.findIndex(function (r) {
       return r.fromB === range.fromB;

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

@@ -367,7 +367,7 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref9
   // should not also get the inline content style (borderBottom underline) on their container.
   var shouldSkipContentStyle = isInserted && nodeStyle !== undefined;
   var contentStyle = shouldSkipContentStyle ? '' : getChangedContentStyle(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
-  var isEmptyDeletedLayoutColumn = !isInserted && resolveBaseNodeName(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && fg('confluence_ncs_step_diffing_version_history');
+  var isEmptyDeletedLayoutColumn = !isInserted && resolveBaseNodeName(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && isExperimentEnabled('platform_editor_attributed_version_history');
   if (isEmptyDeletedLayoutColumn && nodeView instanceof HTMLElement) {
     var _nodeView$querySelect;
     // Give an empty deleted column height so its diff box doesn't collapse

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

@@ -54,7 +54,7 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
   // Text-like blocks (heading, lists, blockquote) render their deleted content through this
   // getter rather than `getDeletedContentStyle`, so without this they never receive the
   // glyphTint background + underline that plain deleted text already gets.
-  if (fg('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
+  if (isExperimentEnabled('platform_editor_attributed_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
     return base + buildDeletedInlineContentStyleExtended(colors, isActive);
   }
   return base;

package/dist/esm/pm-plugins/getScrollableDecorations.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
@@ -183,7 +184,7 @@ function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ * 5. When `platform_editor_attributed_version_history` is enabled, groups overlapping or
  *    directly touching ranges across decoration types into one result per contributor, using the
  *    union of all grouped ranges
  *    (zero-width widgets can join a group without extending it). Under
@@ -220,10 +221,14 @@ export var getScrollableDecorations = function getScrollableDecorations(set, doc
     if (isBlockDecoration(dec)) {
       var _dec$spec, _dec$spec$nodeName;
       // Skip listItem blocks as they are not scrollable
-      if (((_dec$spec = dec.spec) === null || _dec$spec === void 0 ? void 0 : _dec$spec.nodeName) === 'listItem') return false;
+      if (((_dec$spec = dec.spec) === null || _dec$spec === void 0 ? void 0 : _dec$spec.nodeName) === 'listItem') {
+        return false;
+      }
       var key = "".concat(dec.from, "-").concat(dec.to, "-").concat((_dec$spec$nodeName = dec.spec.nodeName) !== null && _dec$spec$nodeName !== void 0 ? _dec$spec$nodeName : '');
       // Skip blocks that have already been seen
-      if (seenBlockKeys.has(key)) return false;
+      if (seenBlockKeys.has(key)) {
+        return false;
+      }
       seenBlockKeys.add(key);
     }
     return true;
@@ -237,7 +242,7 @@ export var getScrollableDecorations = function getScrollableDecorations(set, doc
   }) : rawInlines;
   var widgets = filtered.filter(isWidgetDecoration);
   var result;
-  if (fg('confluence_ncs_step_diffing_version_history')) {
+  if (isExperimentEnabled('platform_editor_attributed_version_history')) {
     // Group overlapping or directly touching ranges into one customer-facing edit.
     result = groupTouchingDecorations([].concat(_toConsumableArray(blocks), _toConsumableArray(inlines), _toConsumableArray(widgets)), isInlineDecoration, doc);
   } else {

package/dist/esm/pm-plugins/main.js

@@ -1,6 +1,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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { toggleExpandRange } from '@atlaskit/editor-common/expand';
 import { processRawValue } from '@atlaskit/editor-common/process-raw-value';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -160,7 +161,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
                 activeIndexPos: activeDecoration ? _objectSpread({
                   from: activeDecoration.from,
                   to: activeDecoration.to
-                }, fg('confluence_ncs_step_diffing_version_history') ? {
+                }, isExperimentEnabled('platform_editor_attributed_version_history') ? {
                   attributionKey: isDiffDecoration(activeDecoration) ? activeDecoration.spec.attributionKey : undefined
                 } : {}) : undefined
               });

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

@@ -1,4 +1,4 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 
 /**
  * A node type's base name, with a schema variant's suffix stripped: `panel`, `panel_c1` and
@@ -16,5 +16,5 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
  * in the styling decisions would move the legacy diff for readers who see no tags.
  */
 export var resolveBaseNodeName = function resolveBaseNodeName(name) {
-  return fg('confluence_ncs_step_diffing_version_history') ? name.split('_')[0] : name;
+  return isExperimentEnabled('platform_editor_attributed_version_history') ? name.split('_')[0] : name;
 };

package/dist/types/pm-plugins/calculateDiff/simplifyChangesWithAttribution.d.ts

@@ -25,7 +25,7 @@ export type AttributedChange = Change & {
  * Both leave ranges that only touch, so they survive the collapse.
  *
  * Carries no gate of its own: the only caller reaches it through the attributed changeset, which
- * already requires `confluence_ncs_step_diffing_version_history`.
+ * already requires `platform_editor_attributed_version_history`.
  */
 export declare const collapseOverlappingChanges: (changes: Change[], doc?: PMNode) => AttributedChange[];
 /**

package/dist/types/pm-plugins/getScrollableDecorations.d.ts

@@ -16,7 +16,7 @@ export declare function isInlineDiffDecorationRenderableInDoc(doc: PMNode, from:
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ * 5. When `platform_editor_attributed_version_history` is enabled, groups overlapping or
  *    directly touching ranges across decoration types into one result per contributor, using the
  *    union of all grouped ranges
  *    (zero-width widgets can join a group without extending it). Under

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "30.0.7",
+	"version": "30.0.9",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,12 +34,12 @@
 		"@atlaskit/editor-plugin-limited-mode": "^27.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^28.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
-		"@atlaskit/editor-shared-styles": "^5.0.0",
+		"@atlaskit/editor-shared-styles": "^5.1.0",
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.6.0",
-		"@atlaskit/tmp-editor-statsig": "^256.0.0",
+		"@atlaskit/tmp-editor-statsig": "^258.0.0",
 		"@atlaskit/tokens": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -65,7 +65,7 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^46.0.0",
-		"@atlassian/editor-plugin-ai": "^84.5.0",
+		"@atlassian/editor-plugin-ai": "^84.6.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
@@ -97,9 +97,6 @@
 		"platform_editor_ai_suggested_edits_smart_diff": {
 			"type": "boolean",
 			"referenceOnly": true
-		},
-		"confluence_ncs_step_diffing_version_history": {
-			"type": "boolean"
 		}
 	}
 }