@atlaskit/editor-plugin-show-diff 12.1.0 → 12.1.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 12.1.2
+
+### Patch Changes
+
+- [`3d45d0ef1fb3f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3d45d0ef1fb3f) -
+  Prevent block diff content from overlapping preceding editor nodes
+
+## 12.1.1
+
+### Patch Changes
+
+- [`3a38a59a355f5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3a38a59a355f5) -
+  Add a feature-gated platform experiments strangler entry point and migrate the inline-diffs
+  experiment as its first consumer.
+
+  ```ts
+  import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
+  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+  const isEnabled = isExperimentEnabled('platform_editor_example', () =>
+  	expValEquals('platform_editor_example', 'isEnabled', true),
+  );
+  ```
+
+- Updated dependencies
+
 ## 12.1.0
 
 ### Minor Changes

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

@@ -11,6 +11,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
+var _deprecatedPlatformFeatureExperiments = require("@atlaskit/editor-common/deprecated-platform-feature-experiments");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -471,7 +472,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
-      var isAtomicInlineNodeFlag = (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      var isAtomicInlineNodeFlag = (0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
+        return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      });
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
         change: change,
         colorScheme: colorScheme,
@@ -486,7 +489,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       })));
       // If we have the original node position, also render the old node as a "deleted" widget
       // so the user can see what it looked like before the change.
-      if (change.fromA !== undefined && change.toA !== undefined && (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true)) {
+      if (change.fromA !== undefined && change.toA !== undefined && (0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
+        return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      })) {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)({
           change: {
             fromA: change.fromA,

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

@@ -20,7 +20,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * that is not in the current document.
  */
 var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidget = function createNodeChangedDecorationWidget(_ref) {
-  var _slice$content, _slice$content2, _slice$content3, _slice$content$firstC;
+  var _slice$content, _slice$content2, _slice$content3, _$safeInsertPos$nodeB, _slice$content$firstC;
   var change = _ref.change,
     doc = _ref.doc,
     nodeViewSerializer = _ref.nodeViewSerializer,
@@ -77,6 +77,14 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
 
   // For non-table content, use the existing span wrapper approach
   var dom = document.createElement('span');
+  var $safeInsertPos = newDoc.resolve(safeInsertPos);
+  var isTopLevelInsert = $safeInsertPos.depth === 0;
+  var hasPreviousBlock = ((_$safeInsertPos$nodeB = $safeInsertPos.nodeBefore) === null || _$safeInsertPos$nodeB === void 0 ? void 0 : _$safeInsertPos$nodeB.isBlock) === true;
+  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isTopLevelInsert && hasPreviousBlock) {
+    // Editor CSS removes the top margin from a block when it is its parent's first child.
+    // Keep the serialized block as a subsequent child so each block type retains its own margin.
+    dom.append(dom.ownerDocument.createElement('div'));
+  }
   // When mediaSingle nodes are rendered inside a widget decoration (e.g. as part of
   // a replaced panel), the centering CSS (margin-left: 50%; transform: translateX(-50%))
   // incorrectly applies because isNestedNode resolves to false (getPos returns 0).

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.stepIsValidAttrChange = exports.getAttrChangeRanges = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
+var _deprecatedPlatformFeatureExperiments = require("@atlaskit/editor-common/deprecated-platform-feature-experiments");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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; }
@@ -70,7 +71,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     // date node: timestamp attribute change — highlight the date node itself (inline)
     if (stepAttrs.some(function (v) {
       return dateAttrs.includes(v);
-    }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !(0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true)) {
+    }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !(0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
+      return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
+    })) {
       return {
         fromB: step.pos,
         toB: step.pos + nodeAtPos.nodeSize,
@@ -82,7 +85,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     // The following inline node attr changes are gated behind platform_editor_improve_inline_diffs.
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
-    if ((0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true) && nodeAtPos) {
+    if ((0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
+      return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
+    }) && nodeAtPos) {
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
@@ -143,7 +148,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
   // Gated behind the same experiment as the inline node attr changes that introduced
   // the possibility of multiple ranges for the same node position.
   .filter(function (range, i, arr) {
-    return !(0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true) || arr.findIndex(function (r) {
+    return !(0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
+      return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
+    }) || arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

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

@@ -2,6 +2,7 @@
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -434,7 +435,7 @@ const calculateDiffDecorationsInner = ({
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
-      const isAtomicInlineNodeFlag = expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      const isAtomicInlineNodeFlag = isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true));
       decorations.push(...createInlineChangedDecoration({
         change,
         colorScheme,
@@ -449,7 +450,7 @@ const calculateDiffDecorationsInner = ({
       }));
       // If we have the original node position, also render the old node as a "deleted" widget
       // so the user can see what it looked like before the change.
-      if (change.fromA !== undefined && change.toA !== undefined && expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true)) {
+      if (change.fromA !== undefined && change.toA !== undefined && isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true))) {
         decorations.push(...createNodeChangedDecorationWidget({
           change: {
             fromA: change.fromA,

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

@@ -28,7 +28,7 @@ export const createNodeChangedDecorationWidget = ({
   diffType,
   hideAddedDiffsUnderline = false
 }) => {
-  var _slice$content, _slice$content2, _slice$content2$first, _slice$content3, _slice$content3$first, _slice$content$firstC;
+  var _slice$content, _slice$content2, _slice$content2$first, _slice$content3, _slice$content3$first, _$safeInsertPos$nodeB, _slice$content$firstC;
   const slice = doc.slice(change.fromA, change.toA);
   const shouldSkipDeletedEmptyParagraphDecoration = !isInserted && (slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.childCount) === 1 && (slice === null || slice === void 0 ? void 0 : (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : (_slice$content2$first = _slice$content2.firstChild) === null || _slice$content2$first === void 0 ? void 0 : _slice$content2$first.type.name) === 'paragraph' && (slice === null || slice === void 0 ? void 0 : (_slice$content3 = slice.content) === null || _slice$content3 === void 0 ? void 0 : (_slice$content3$first = _slice$content3.firstChild) === null || _slice$content3$first === void 0 ? void 0 : _slice$content3$first.content.size) === 0;
   // Widget decoration used for deletions as the content is not in the document
@@ -61,6 +61,14 @@ export const createNodeChangedDecorationWidget = ({
 
   // For non-table content, use the existing span wrapper approach
   const dom = document.createElement('span');
+  const $safeInsertPos = newDoc.resolve(safeInsertPos);
+  const isTopLevelInsert = $safeInsertPos.depth === 0;
+  const hasPreviousBlock = ((_$safeInsertPos$nodeB = $safeInsertPos.nodeBefore) === null || _$safeInsertPos$nodeB === void 0 ? void 0 : _$safeInsertPos$nodeB.isBlock) === true;
+  if (isExtendedEnabled(diffType) && isTopLevelInsert && hasPreviousBlock) {
+    // Editor CSS removes the top margin from a block when it is its parent's first child.
+    // Keep the serialized block as a subsequent child so each block type retains its own margin.
+    dom.append(dom.ownerDocument.createElement('div'));
+  }
   // When mediaSingle nodes are rendered inside a widget decoration (e.g. as part of
   // a replaced panel), the centering CSS (margin-left: 50%; transform: translateX(-50%))
   // incorrectly applies because isNestedNode resolves to false (getPos returns 0).

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

@@ -1,4 +1,5 @@
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const filterUndefined = x => !!x;
@@ -54,7 +55,7 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
     const nodeAtPos = doc.nodeAt(step.pos);
 
     // date node: timestamp attribute change — highlight the date node itself (inline)
-    if (stepAttrs.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true)) {
+    if (stepAttrs.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true))) {
       return {
         fromB: step.pos,
         toB: step.pos + nodeAtPos.nodeSize,
@@ -66,7 +67,7 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
     // The following inline node attr changes are gated behind platform_editor_improve_inline_diffs.
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
-    if (expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true) && nodeAtPos) {
+    if (isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true)) && nodeAtPos) {
       const nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         const watchedAttrs = inlineNodeAttrMap[nodeName];
@@ -119,7 +120,7 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
   // should produce only one decoration, not one per step.
   // Gated behind the same experiment as the inline node attr changes that introduced
   // the possibility of multiple ranges for the same node position.
-  .filter((range, i, arr) => !expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true) || arr.findIndex(r => r.fromB === range.fromB) === i);
+  .filter((range, i, arr) => !isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true)) || arr.findIndex(r => r.fromB === range.fromB) === i);
 };
 
 /**

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

@@ -10,6 +10,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -465,7 +466,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
-      var isAtomicInlineNodeFlag = expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      var isAtomicInlineNodeFlag = isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
+        return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      });
       decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
         change: change,
         colorScheme: colorScheme,
@@ -480,7 +483,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       })));
       // If we have the original node position, also render the old node as a "deleted" widget
       // so the user can see what it looked like before the change.
-      if (change.fromA !== undefined && change.toA !== undefined && expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true)) {
+      if (change.fromA !== undefined && change.toA !== undefined && isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
+        return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+      })) {
         decorations.push.apply(decorations, _toConsumableArray(createNodeChangedDecorationWidget({
           change: {
             fromA: change.fromA,

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

@@ -14,7 +14,7 @@ import { wrapBlockNodeView, injectInnerWrapper, createContentWrapper } from './u
  * that is not in the current document.
  */
 export var createNodeChangedDecorationWidget = function createNodeChangedDecorationWidget(_ref) {
-  var _slice$content, _slice$content2, _slice$content3, _slice$content$firstC;
+  var _slice$content, _slice$content2, _slice$content3, _$safeInsertPos$nodeB, _slice$content$firstC;
   var change = _ref.change,
     doc = _ref.doc,
     nodeViewSerializer = _ref.nodeViewSerializer,
@@ -71,6 +71,14 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
 
   // For non-table content, use the existing span wrapper approach
   var dom = document.createElement('span');
+  var $safeInsertPos = newDoc.resolve(safeInsertPos);
+  var isTopLevelInsert = $safeInsertPos.depth === 0;
+  var hasPreviousBlock = ((_$safeInsertPos$nodeB = $safeInsertPos.nodeBefore) === null || _$safeInsertPos$nodeB === void 0 ? void 0 : _$safeInsertPos$nodeB.isBlock) === true;
+  if (isExtendedEnabled(diffType) && isTopLevelInsert && hasPreviousBlock) {
+    // Editor CSS removes the top margin from a block when it is its parent's first child.
+    // Keep the serialized block as a subsequent child so each block type retains its own margin.
+    dom.append(dom.ownerDocument.createElement('div'));
+  }
   // When mediaSingle nodes are rendered inside a widget decoration (e.g. as part of
   // a replaced panel), the centering CSS (margin-left: 50%; transform: translateX(-50%))
   // incorrectly applies because isNestedNode resolves to false (getPos returns 0).

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

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var filterUndefined = function filterUndefined(x) {
@@ -63,7 +64,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps, origin
     // date node: timestamp attribute change — highlight the date node itself (inline)
     if (stepAttrs.some(function (v) {
       return dateAttrs.includes(v);
-    }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true)) {
+    }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
+      return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+    })) {
       return {
         fromB: step.pos,
         toB: step.pos + nodeAtPos.nodeSize,
@@ -75,7 +78,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps, origin
     // The following inline node attr changes are gated behind platform_editor_improve_inline_diffs.
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
-    if (expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true) && nodeAtPos) {
+    if (isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
+      return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+    }) && nodeAtPos) {
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
@@ -136,7 +141,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps, origin
   // Gated behind the same experiment as the inline node attr changes that introduced
   // the possibility of multiple ranges for the same node position.
   .filter(function (range, i, arr) {
-    return !expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true) || arr.findIndex(function (r) {
+    return !isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
+      return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
+    }) || arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "12.1.0",
+	"version": "12.1.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -53,7 +53,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^118.4.0",
+		"@atlaskit/editor-common": "^118.5.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {