@atlaskit/editor-plugin-show-diff 13.1.9 → 14.0.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.0.0
+
+### Patch Changes
+
+- [`c87074ddaa72d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c87074ddaa72d) -
+  Resolve the show-diff left anchor's document-level node once behind
+  `platform_editor_diff_plugin_extended`.
+- [`d3bb0c15d7e40`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d3bb0c15d7e40) -
+  Recognise generic node attribute changes in Smart diff behind platform_editor_ai_smart_diff.
+- [`92f6f5d3380be`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/92f6f5d3380be) -
+  Use the smart diff strategy by default for Confluence version history behind the
+  `confluence_ncs_step_diffing_version_history` feature gate.
+- Updated dependencies
+
+## 13.1.10
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.1.9
 
 ### Patch Changes

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

@@ -196,7 +196,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
     _ref4$isInverted = _ref4.isInverted,
     isInverted = _ref4$isInverted === void 0 ? false : _ref4$isInverted,
     _ref4$diffType = _ref4.diffType,
-    diffType = _ref4$diffType === void 0 ? 'inline' : _ref4$diffType,
+    diffType = _ref4$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref4$diffType,
     _ref4$hideDeletedDiff = _ref4.hideDeletedDiffs,
     hideDeletedDiffs = _ref4$hideDeletedDiff === void 0 ? false : _ref4$hideDeletedDiff,
     _ref4$hideAddedDiffsU = _ref4.hideAddedDiffsUnderline,

package/dist/cjs/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -266,6 +266,13 @@ var classifyBlockGroup = function classifyBlockGroup(group, originalDoc, newDoc,
     return [wholeBlockChange(blockA, blockB, changes)];
   }
 
+  // A meaningful attribute-only change is represented by a node-boundary token. Text analysis
+  // starts inside the block, so it cannot associate that token with a sentence and would otherwise
+  // drop the change. Promote the block before choosing text or container granularity.
+  if (!blockA.node.sameMarkup(blockB.node)) {
+    return [wholeBlockChange(blockA, blockB, changes)];
+  }
+
   // Text-bearing block → sentence / paragraph / inline.
   if (TEXT_BLOCK_TYPES.has(blockB.node.type.name)) {
     return classifyTextblock(blockA, blockB, changes, locale, thresholds);

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

@@ -61,6 +61,7 @@ var edgeCases = function edgeCases(doc, from) {
      * Layouts and Expands have extra padding around the container
      */
     return {
+      beforePos: beforePos,
       measurePos: beforePos
     };
   }
@@ -80,6 +81,7 @@ var edgeCases = function edgeCases(doc, from) {
         // Measure the first row (`nodeStart` is just inside the table, i.e. the
         // position of the first row): its width matches the table's.
         return {
+          beforePos: beforePos,
           measurePos: nodeStart
         };
       }
@@ -87,6 +89,7 @@ var edgeCases = function edgeCases(doc, from) {
     case 'expand':
       // Measure the block itself (the widget is rendered outside the block).
       return {
+        beforePos: beforePos,
         leftOffset: 12
       };
     default:
@@ -133,11 +136,7 @@ var createLeftAnchorWidget = exports.createLeftAnchorWidget = function createLef
 
   // Render the widget right before the doc-level node so it lives outside the
   // resizable block container.
-  var resolved = resolveDocLevelNode(doc, from);
-  if (!resolved) {
-    return undefined;
-  }
-  var beforePos = resolved.beforePos;
+  var beforePos = edgeCase.beforePos;
   var leftAnchorKey = (0, _decorationKeys.buildAnchorDecorationKey)({
     diffId: diffId,
     anchorType: _decorationKeys.AnchorTypeKey.left

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

@@ -10,7 +10,12 @@ exports.isDiffableAttr = exports.getRequiredIncludedDiffableAttrs = exports.getI
  * and `getAttrChangeRanges` (decoration rendering) so the two stages agree.
  */
 
-// Node types absent from this map have no attribute-level diffing.
+// `localId` is editor bookkeeping rather than user-visible content. Suggestions can regenerate it,
+// so treating it as a diff would create phantom changes.
+var DEFAULT_EXCLUDED_ATTRS = ['localId'];
+
+// Specialised rules keep existing node-specific behaviour. Node types absent from this map use the
+// generic fallback and diff every attribute except editor bookkeeping attributes.
 var DIFFABLE_ATTRS_BY_NODE_TYPE = exports.DIFFABLE_ATTRS_BY_NODE_TYPE = {
   tableCell: {
     include: ['background', 'colspan', 'rowspan']
@@ -55,11 +60,12 @@ var DIFFABLE_ATTRS_BY_NODE_TYPE = exports.DIFFABLE_ATTRS_BY_NODE_TYPE = {
   }
 };
 
-// Whether `attrName` is a meaningful change for `nodeTypeName`. False if no rule.
+// Whether `attrName` is a meaningful change for `nodeTypeName`. Nodes without a specialised rule
+// diff all attributes except editor bookkeeping attributes.
 var isDiffableAttr = exports.isDiffableAttr = function isDiffableAttr(nodeTypeName, attrName) {
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return false;
+    return !DEFAULT_EXCLUDED_ATTRS.includes(attrName);
   }
   return 'include' in rule ? rule.include.includes(attrName) : !rule.exclude.includes(attrName);
 };
@@ -83,14 +89,16 @@ var getRequiredIncludedDiffableAttrs = exports.getRequiredIncludedDiffableAttrs
 };
 
 /**
- * Concrete attr names to diff for a node instance, honouring include and exclude
- * rules; `undefined` when the type has no rule. Exclude rules read the node's
- * attrs and sort them, since key order isn't stable across the two diffed docs.
+ * Concrete attr names to diff for a node instance, honouring specialised rules and otherwise
+ * including every attribute except editor bookkeeping. Attribute names are sorted because key
+ * order is not stable across the two diffed documents.
  */
 var getDiffableAttrNames = exports.getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return undefined;
+    return Object.keys(attrs).filter(function (name) {
+      return !DEFAULT_EXCLUDED_ATTRS.includes(name);
+    }).sort();
   }
   if ('include' in rule) {
     return rule.include;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isExtendedEnabled = void 0;
+exports.isExtendedEnabled = exports.getDefaultDiffType = void 0;
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
@@ -17,4 +17,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
  */
 var isExtendedEnabled = exports.isExtendedEnabled = function isExtendedEnabled(diffType) {
   return (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff');
+};
+var getDefaultDiffType = exports.getDefaultDiffType = function getDefaultDiffType() {
+  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? 'smart' : 'inline';
 };

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

@@ -34,14 +34,15 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
     state: {
       init: function init(_, _state) {
         // We do initial setup after we setup the editor view
+        var defaultDiffType = (0, _isExtendedEnabled.getDefaultDiffType)();
         return _objectSpread({
           steps: [],
           originalDoc: undefined,
           decorations: _view.DecorationSet.empty,
           isDisplayingChanges: false
-        }, (0, _isExtendedEnabled.isExtendedEnabled)() ? {
+        }, (0, _isExtendedEnabled.isExtendedEnabled)(defaultDiffType) ? {
           isInverted: false,
-          diffType: 'inline',
+          diffType: defaultDiffType,
           hideDeletedDiffs: false,
           hideAddedDiffsUnderline: false,
           showIndicators: false,
@@ -92,7 +93,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               activeIndex: undefined
             }, (0, _isExtendedEnabled.isExtendedEnabled)(currentPluginState.diffType) ? {
               isInverted: false,
-              diffType: 'inline',
+              diffType: (0, _isExtendedEnabled.getDefaultDiffType)(),
               hideDeletedDiffs: false,
               hideAddedDiffsUnderline: false,
               diffDescriptors: []

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

@@ -14,7 +14,7 @@ import { createNodeChangedDecorationWidget } from '../decorations/createNodeChan
 import { extractDiffDescriptors } from '../decorations/decorationKeys';
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
-import { isExtendedEnabled } from '../isExtendedEnabled';
+import { getDefaultDiffType, isExtendedEnabled } from '../isExtendedEnabled';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
@@ -178,7 +178,7 @@ const calculateDiffDecorationsInner = ({
   activeIndexPos,
   api,
   isInverted = false,
-  diffType = 'inline',
+  diffType = getDefaultDiffType(),
   hideDeletedDiffs = false,
   hideAddedDiffsUnderline: hideAddedDiffsUnderlineParam = false,
   showIndicators = false,

package/dist/es2019/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -242,6 +242,13 @@ const classifyBlockGroup = (group, originalDoc, newDoc, locale, thresholds) => {
     return [wholeBlockChange(blockA, blockB, changes)];
   }
 
+  // A meaningful attribute-only change is represented by a node-boundary token. Text analysis
+  // starts inside the block, so it cannot associate that token with a sentence and would otherwise
+  // drop the change. Promote the block before choosing text or container granularity.
+  if (!blockA.node.sameMarkup(blockB.node)) {
+    return [wholeBlockChange(blockA, blockB, changes)];
+  }
+
   // Text-bearing block → sentence / paragraph / inline.
   if (TEXT_BLOCK_TYPES.has(blockB.node.type.name)) {
     return classifyTextblock(blockA, blockB, changes, locale, thresholds);

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

@@ -52,6 +52,7 @@ const edgeCases = (doc, from) => {
      * Layouts and Expands have extra padding around the container
      */
     return {
+      beforePos,
       measurePos: beforePos
     };
   }
@@ -71,6 +72,7 @@ const edgeCases = (doc, from) => {
         // Measure the first row (`nodeStart` is just inside the table, i.e. the
         // position of the first row): its width matches the table's.
         return {
+          beforePos,
           measurePos: nodeStart
         };
       }
@@ -78,6 +80,7 @@ const edgeCases = (doc, from) => {
     case 'expand':
       // Measure the block itself (the widget is rendered outside the block).
       return {
+        beforePos,
         leftOffset: 12
       };
     default:
@@ -125,13 +128,9 @@ export const createLeftAnchorWidget = ({
 
   // Render the widget right before the doc-level node so it lives outside the
   // resizable block container.
-  const resolved = resolveDocLevelNode(doc, from);
-  if (!resolved) {
-    return undefined;
-  }
   const {
     beforePos
-  } = resolved;
+  } = edgeCase;
   const leftAnchorKey = buildAnchorDecorationKey({
     diffId,
     anchorType: AnchorTypeKey.left

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

@@ -4,7 +4,12 @@
  * and `getAttrChangeRanges` (decoration rendering) so the two stages agree.
  */
 
-// Node types absent from this map have no attribute-level diffing.
+// `localId` is editor bookkeeping rather than user-visible content. Suggestions can regenerate it,
+// so treating it as a diff would create phantom changes.
+const DEFAULT_EXCLUDED_ATTRS = ['localId'];
+
+// Specialised rules keep existing node-specific behaviour. Node types absent from this map use the
+// generic fallback and diff every attribute except editor bookkeeping attributes.
 export const DIFFABLE_ATTRS_BY_NODE_TYPE = {
   tableCell: {
     include: ['background', 'colspan', 'rowspan']
@@ -49,11 +54,12 @@ export const DIFFABLE_ATTRS_BY_NODE_TYPE = {
   }
 };
 
-// Whether `attrName` is a meaningful change for `nodeTypeName`. False if no rule.
+// Whether `attrName` is a meaningful change for `nodeTypeName`. Nodes without a specialised rule
+// diff all attributes except editor bookkeeping attributes.
 export const isDiffableAttr = (nodeTypeName, attrName) => {
   const rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return false;
+    return !DEFAULT_EXCLUDED_ATTRS.includes(attrName);
   }
   return 'include' in rule ? rule.include.includes(attrName) : !rule.exclude.includes(attrName);
 };
@@ -77,14 +83,14 @@ export const getRequiredIncludedDiffableAttrs = nodeTypeName => {
 };
 
 /**
- * Concrete attr names to diff for a node instance, honouring include and exclude
- * rules; `undefined` when the type has no rule. Exclude rules read the node's
- * attrs and sort them, since key order isn't stable across the two diffed docs.
+ * Concrete attr names to diff for a node instance, honouring specialised rules and otherwise
+ * including every attribute except editor bookkeeping. Attribute names are sorted because key
+ * order is not stable across the two diffed documents.
  */
 export const getDiffableAttrNames = (nodeTypeName, attrs) => {
   const rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return undefined;
+    return Object.keys(attrs).filter(name => !DEFAULT_EXCLUDED_ATTRS.includes(name)).sort();
   }
   if ('include' in rule) {
     return rule.include;

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

@@ -9,4 +9,5 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
  * Pass the active `diffType` so callers deep in the decoration layer render the extended shape
  * when `smart` is active even if `platform_editor_diff_plugin_extended` is off.
  */
-export const isExtendedEnabled = diffType => expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && fg('platform_editor_ai_smart_diff');
+export const isExtendedEnabled = diffType => expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && fg('platform_editor_ai_smart_diff');
+export const getDefaultDiffType = () => fg('confluence_ncs_step_diffing_version_history') ? 'smart' : 'inline';

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

@@ -7,7 +7,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
 import { getScrollableDecorations } from './getScrollableDecorations';
-import { isExtendedEnabled } from './isExtendedEnabled';
+import { getDefaultDiffType, isExtendedEnabled } from './isExtendedEnabled';
 import { NodeViewSerializer } from './NodeViewSerializer';
 import { scrollToDecoration } from './scrollToDiff';
 export const showDiffPluginKey = new PluginKey('showDiffPlugin');
@@ -24,14 +24,15 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
     state: {
       init(_, _state) {
         // We do initial setup after we setup the editor view
+        const defaultDiffType = getDefaultDiffType();
         return {
           steps: [],
           originalDoc: undefined,
           decorations: DecorationSet.empty,
           isDisplayingChanges: false,
-          ...(isExtendedEnabled() ? {
+          ...(isExtendedEnabled(defaultDiffType) ? {
             isInverted: false,
-            diffType: 'inline',
+            diffType: defaultDiffType,
             hideDeletedDiffs: false,
             hideAddedDiffsUnderline: false,
             showIndicators: false,
@@ -93,7 +94,7 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
                */
               ...(isExtendedEnabled(currentPluginState.diffType) ? {
                 isInverted: false,
-                diffType: 'inline',
+                diffType: getDefaultDiffType(),
                 hideDeletedDiffs: false,
                 hideAddedDiffsUnderline: false,
                 diffDescriptors: []

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

@@ -22,7 +22,7 @@ import { createNodeChangedDecorationWidget } from '../decorations/createNodeChan
 import { extractDiffDescriptors } from '../decorations/decorationKeys';
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
-import { isExtendedEnabled } from '../isExtendedEnabled';
+import { getDefaultDiffType, isExtendedEnabled } from '../isExtendedEnabled';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
@@ -189,7 +189,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
     _ref4$isInverted = _ref4.isInverted,
     isInverted = _ref4$isInverted === void 0 ? false : _ref4$isInverted,
     _ref4$diffType = _ref4.diffType,
-    diffType = _ref4$diffType === void 0 ? 'inline' : _ref4$diffType,
+    diffType = _ref4$diffType === void 0 ? getDefaultDiffType() : _ref4$diffType,
     _ref4$hideDeletedDiff = _ref4.hideDeletedDiffs,
     hideDeletedDiffs = _ref4$hideDeletedDiff === void 0 ? false : _ref4$hideDeletedDiff,
     _ref4$hideAddedDiffsU = _ref4.hideAddedDiffsUnderline,

package/dist/esm/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -259,6 +259,13 @@ var classifyBlockGroup = function classifyBlockGroup(group, originalDoc, newDoc,
     return [wholeBlockChange(blockA, blockB, changes)];
   }
 
+  // A meaningful attribute-only change is represented by a node-boundary token. Text analysis
+  // starts inside the block, so it cannot associate that token with a sentence and would otherwise
+  // drop the change. Promote the block before choosing text or container granularity.
+  if (!blockA.node.sameMarkup(blockB.node)) {
+    return [wholeBlockChange(blockA, blockB, changes)];
+  }
+
   // Text-bearing block → sentence / paragraph / inline.
   if (TEXT_BLOCK_TYPES.has(blockB.node.type.name)) {
     return classifyTextblock(blockA, blockB, changes, locale, thresholds);

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

@@ -55,6 +55,7 @@ var edgeCases = function edgeCases(doc, from) {
      * Layouts and Expands have extra padding around the container
      */
     return {
+      beforePos: beforePos,
       measurePos: beforePos
     };
   }
@@ -74,6 +75,7 @@ var edgeCases = function edgeCases(doc, from) {
         // Measure the first row (`nodeStart` is just inside the table, i.e. the
         // position of the first row): its width matches the table's.
         return {
+          beforePos: beforePos,
           measurePos: nodeStart
         };
       }
@@ -81,6 +83,7 @@ var edgeCases = function edgeCases(doc, from) {
     case 'expand':
       // Measure the block itself (the widget is rendered outside the block).
       return {
+        beforePos: beforePos,
         leftOffset: 12
       };
     default:
@@ -127,11 +130,7 @@ export var createLeftAnchorWidget = function createLeftAnchorWidget(_ref) {
 
   // Render the widget right before the doc-level node so it lives outside the
   // resizable block container.
-  var resolved = resolveDocLevelNode(doc, from);
-  if (!resolved) {
-    return undefined;
-  }
-  var beforePos = resolved.beforePos;
+  var beforePos = edgeCase.beforePos;
   var leftAnchorKey = buildAnchorDecorationKey({
     diffId: diffId,
     anchorType: AnchorTypeKey.left

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

@@ -4,7 +4,12 @@
  * and `getAttrChangeRanges` (decoration rendering) so the two stages agree.
  */
 
-// Node types absent from this map have no attribute-level diffing.
+// `localId` is editor bookkeeping rather than user-visible content. Suggestions can regenerate it,
+// so treating it as a diff would create phantom changes.
+var DEFAULT_EXCLUDED_ATTRS = ['localId'];
+
+// Specialised rules keep existing node-specific behaviour. Node types absent from this map use the
+// generic fallback and diff every attribute except editor bookkeeping attributes.
 export var DIFFABLE_ATTRS_BY_NODE_TYPE = {
   tableCell: {
     include: ['background', 'colspan', 'rowspan']
@@ -49,11 +54,12 @@ export var DIFFABLE_ATTRS_BY_NODE_TYPE = {
   }
 };
 
-// Whether `attrName` is a meaningful change for `nodeTypeName`. False if no rule.
+// Whether `attrName` is a meaningful change for `nodeTypeName`. Nodes without a specialised rule
+// diff all attributes except editor bookkeeping attributes.
 export var isDiffableAttr = function isDiffableAttr(nodeTypeName, attrName) {
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return false;
+    return !DEFAULT_EXCLUDED_ATTRS.includes(attrName);
   }
   return 'include' in rule ? rule.include.includes(attrName) : !rule.exclude.includes(attrName);
 };
@@ -77,14 +83,16 @@ export var getRequiredIncludedDiffableAttrs = function getRequiredIncludedDiffab
 };
 
 /**
- * Concrete attr names to diff for a node instance, honouring include and exclude
- * rules; `undefined` when the type has no rule. Exclude rules read the node's
- * attrs and sort them, since key order isn't stable across the two diffed docs.
+ * Concrete attr names to diff for a node instance, honouring specialised rules and otherwise
+ * including every attribute except editor bookkeeping. Attribute names are sorted because key
+ * order is not stable across the two diffed documents.
  */
 export var getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return undefined;
+    return Object.keys(attrs).filter(function (name) {
+      return !DEFAULT_EXCLUDED_ATTRS.includes(name);
+    }).sort();
   }
   if ('include' in rule) {
     return rule.include;

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

@@ -11,4 +11,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
  */
 export var isExtendedEnabled = function isExtendedEnabled(diffType) {
   return expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && fg('platform_editor_ai_smart_diff');
+};
+export var getDefaultDiffType = function getDefaultDiffType() {
+  return fg('confluence_ncs_step_diffing_version_history') ? 'smart' : 'inline';
 };

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

@@ -10,7 +10,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
 import { getScrollableDecorations } from './getScrollableDecorations';
-import { isExtendedEnabled } from './isExtendedEnabled';
+import { getDefaultDiffType, isExtendedEnabled } from './isExtendedEnabled';
 import { NodeViewSerializer } from './NodeViewSerializer';
 import { scrollToDecoration } from './scrollToDiff';
 export var showDiffPluginKey = new PluginKey('showDiffPlugin');
@@ -27,14 +27,15 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
     state: {
       init: function init(_, _state) {
         // We do initial setup after we setup the editor view
+        var defaultDiffType = getDefaultDiffType();
         return _objectSpread({
           steps: [],
           originalDoc: undefined,
           decorations: DecorationSet.empty,
           isDisplayingChanges: false
-        }, isExtendedEnabled() ? {
+        }, isExtendedEnabled(defaultDiffType) ? {
           isInverted: false,
-          diffType: 'inline',
+          diffType: defaultDiffType,
           hideDeletedDiffs: false,
           hideAddedDiffsUnderline: false,
           showIndicators: false,
@@ -85,7 +86,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               activeIndex: undefined
             }, isExtendedEnabled(currentPluginState.diffType) ? {
               isInverted: false,
-              diffType: 'inline',
+              diffType: getDefaultDiffType(),
               hideDeletedDiffs: false,
               hideAddedDiffsUnderline: false,
               diffDescriptors: []

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

@@ -13,8 +13,8 @@ export declare const isDiffableAttr: (nodeTypeName: string, attrName: string) =>
 export declare const getIncludedDiffableAttrs: (nodeTypeName: string) => readonly string[] | undefined;
 export declare const getRequiredIncludedDiffableAttrs: (nodeTypeName: string) => readonly string[];
 /**
- * Concrete attr names to diff for a node instance, honouring include and exclude
- * rules; `undefined` when the type has no rule. Exclude rules read the node's
- * attrs and sort them, since key order isn't stable across the two diffed docs.
+ * Concrete attr names to diff for a node instance, honouring specialised rules and otherwise
+ * including every attribute except editor bookkeeping. Attribute names are sorted because key
+ * order is not stable across the two diffed documents.
  */
 export declare const getDiffableAttrNames: (nodeTypeName: string, attrs: Record<string, unknown>) => readonly string[] | undefined;

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

@@ -9,3 +9,4 @@ import type { DiffType } from '../showDiffPluginType';
  * when `smart` is active even if `platform_editor_diff_plugin_extended` is off.
  */
 export declare const isExtendedEnabled: (diffType?: DiffType) => boolean;
+export declare const getDefaultDiffType: () => DiffType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "13.1.9",
+	"version": "14.0.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -20,15 +20,15 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.0.0",
+		"@atlaskit/adf-schema": "^57.1.0",
 		"@atlaskit/custom-steps": "^1.0.0",
-		"@atlaskit/editor-plugin-analytics": "^15.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^13.0.0",
+		"@atlaskit/editor-plugin-analytics": "^16.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^14.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^159.0.0",
+		"@atlaskit/tmp-editor-statsig": "^160.0.0",
 		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -41,7 +41,7 @@
 		"@atlaskit/button": "^25.2.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/dropdown-menu": "^18.2.0",
-		"@atlaskit/editor-core": "^224.4.0",
+		"@atlaskit/editor-core": "^225.0.0",
 		"@atlaskit/editor-json-transformer": "^9.6.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
 		"@atlaskit/form": "^17.1.0",
@@ -52,14 +52,14 @@
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
-		"@atlassian/editor-ai-injected-editors": "^28.0.0",
-		"@atlassian/editor-plugin-ai": "^69.2.0",
+		"@atlassian/editor-ai-injected-editors": "^29.0.0",
+		"@atlassian/editor-plugin-ai": "^70.0.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.16.0",
+		"@atlaskit/editor-common": "^120.0.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {
@@ -101,6 +101,9 @@
 	"platform-feature-flags": {
 		"platform_editor_ai_smart_diff": {
 			"type": "boolean"
+		},
+		"confluence_ncs_step_diffing_version_history": {
+			"type": "boolean"
 		}
 	}
 }