@atlaskit/editor-plugin-show-diff 8.4.5 → 8.4.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 8.4.6
+
+### Patch Changes
+
+- [`5e34be0ba10b6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5e34be0ba10b6) -
+  Cleanup show diff experiments
+- Updated dependencies
+
 ## 8.4.5
 
 ### Patch Changes

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.areDocsEqualByBlockStructureAndText = areDocsEqualByBlockStructureAndText;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
  * Returns a copy of the document with all marks removed from all text.
  * This normalises mark fragmentation — e.g. annotation marks reordering can split
@@ -47,13 +46,10 @@ function areDocsEqualByBlockStructureAndText(doc1, doc2) {
   if (doc1.textContent !== doc2.textContent) {
     return false;
   }
-  if ((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true)) {
-    // Strip marks before comparing so that mark-driven text fragmentation
-    // (e.g. annotation mark reordering producing different childCounts) does not
-    // cause false inequalities.
-    var stripped1 = stripMarks(doc1);
-    var stripped2 = stripMarks(doc2);
-    return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
-  }
-  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
+  // Strip marks before comparing so that mark-driven text fragmentation
+  // (e.g. annotation mark reordering producing different childCounts) does not
+  // cause false inequalities.
+  var stripped1 = stripMarks(doc1);
+  var stripped2 = stripMarks(doc2);
+  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
 }

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

@@ -13,7 +13,6 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _areDocsEqualByBlockStructureAndText = require("../areDocsEqualByBlockStructureAndText");
 var _createBlockChangedDecoration = require("../decorations/createBlockChangedDecoration");
@@ -131,25 +130,19 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     _iterator.f();
   }
   if (!(0, _document.areNodesEqualIgnoreAttrs)(steppedDoc, tr.doc)) {
-    var recoveredViaContentEquality = (0, _platformFeatureFlags.fg)('platform_editor_show_diff_equality_fallback') ? (0, _areDocsEqualByBlockStructureAndText.areDocsEqualByBlockStructureAndText)(steppedDoc, tr.doc) : undefined;
-    if ((0, _expValEquals.expValEquals)('platform_editor_are_nodes_equal_ignore_mark_order', 'isEnabled', true)) {
-      var _api$analytics;
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
-        eventType: 'track',
-        action: 'nodesNotEqual',
-        actionSubject: 'showDiff',
-        attributes: {
-          docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
-          colorScheme: colorScheme,
-          recoveredViaContentEquality: recoveredViaContentEquality
-        }
-      });
-    }
-    if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_equality_fallback')) {
-      if (!recoveredViaContentEquality) {
-        return _view.DecorationSet.empty;
+    var _api$analytics;
+    var recoveredViaContentEquality = (0, _areDocsEqualByBlockStructureAndText.areDocsEqualByBlockStructureAndText)(steppedDoc, tr.doc);
+    api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
+      eventType: 'track',
+      action: 'nodesNotEqual',
+      actionSubject: 'showDiff',
+      attributes: {
+        docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
+        colorScheme: colorScheme,
+        recoveredViaContentEquality: recoveredViaContentEquality
       }
-    } else {
+    });
+    if (!recoveredViaContentEquality) {
       return _view.DecorationSet.empty;
     }
   }
@@ -221,7 +214,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     }));
   });
   (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrSteps).forEach(function (change) {
-    if ((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true) && change.isInline) {
+    if (change.isInline) {
       // Inline nodes (e.g. date) need an inline decoration rather than a block decoration
       var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
       decorations.push((0, _createInlineChangedDecoration.createInlineChangedDecoration)({

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

@@ -1,14 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBlockChangedDecoration = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _standard = require("./colorSchemes/standard");
 var _traditional = require("./colorSchemes/traditional");
@@ -35,7 +32,7 @@ var getBlockNodeStyle = function getBlockNodeStyle(_ref) {
   // Handle table separately to avoid border issues
   'tableRow', 'paragraph',
   // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList'].concat((0, _toConsumableArray2.default)((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true) ? [] : ['taskItem']), ['bulletList', 'orderedList', 'layoutSection']).includes(nodeName)) {
+  'heading', 'hardBreak', 'decisionList', 'taskList', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
     // Layout nodes do not need special styling
     return undefined;
   }
@@ -52,51 +49,51 @@ var getBlockNodeStyle = function getBlockNodeStyle(_ref) {
   if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
     if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional && isActive ? _traditional.traditionalDecorationMarkerVariableActive : isTraditional ? (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalDecorationMarkerVariableNew : _traditional.traditionalDecorationMarkerVariable : _standard.standardDecorationMarkerVariable;
+        return isTraditional && isActive ? _traditional.traditionalDecorationMarkerVariableActive : isTraditional ? _traditional.traditionalDecorationMarkerVariableNew : _standard.standardDecorationMarkerVariable;
       } else {
-        return isTraditional && isActive ? _traditional.traditionalDeletedDecorationMarkerVariableActive : isTraditional ? (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalDeletedDecorationMarkerVariableNew : _traditional.traditionalDeletedDecorationMarkerVariable : _standard.deletedContentStyleNew;
+        return isTraditional && isActive ? _traditional.traditionalDeletedDecorationMarkerVariableActive : isTraditional ? _traditional.traditionalDeletedDecorationMarkerVariableNew : _standard.deletedContentStyleNew;
       }
     }
-    return isTraditional && isActive ? _traditional.traditionalDecorationMarkerVariableActive : isTraditional ? (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalDecorationMarkerVariableNew : _traditional.traditionalDecorationMarkerVariable : _standard.standardDecorationMarkerVariable;
+    return isTraditional && isActive ? _traditional.traditionalDecorationMarkerVariableActive : isTraditional ? _traditional.traditionalDecorationMarkerVariableNew : _standard.standardDecorationMarkerVariable;
   }
   if (nodeName === 'blockquote') {
     if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? _traditional.traditionalStyleQuoteNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleQuoteNodeNew : _traditional.traditionalStyleQuoteNode : _standard.editingStyleQuoteNode;
+        return isTraditional ? isActive ? _traditional.traditionalStyleQuoteNodeActive : _traditional.traditionalStyleQuoteNodeNew : _standard.editingStyleQuoteNode;
       } else {
         return isTraditional ? _traditional.deletedTraditionalStyleQuoteNode : _standard.deletedStyleQuoteNode;
       }
     }
-    return isTraditional ? isActive ? _traditional.traditionalStyleQuoteNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleQuoteNodeNew : _traditional.traditionalStyleQuoteNode : _standard.editingStyleQuoteNode;
+    return isTraditional ? isActive ? _traditional.traditionalStyleQuoteNodeActive : _traditional.traditionalStyleQuoteNodeNew : _standard.editingStyleQuoteNode;
   }
   if (nodeName === 'rule') {
     if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? _traditional.traditionalStyleRuleNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleRuleNodeNew : _traditional.traditionalStyleRuleNode : _standard.editingStyleRuleNode;
+        return isTraditional ? isActive ? _traditional.traditionalStyleRuleNodeActive : _traditional.traditionalStyleRuleNodeNew : _standard.editingStyleRuleNode;
       } else {
         return isTraditional ? (0, _traditional.getDeletedTraditionalInlineStyle)(false) : _standard.deletedContentStyleNew;
       }
     }
-    return isTraditional ? isActive ? _traditional.traditionalStyleRuleNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleRuleNodeNew : _traditional.traditionalStyleRuleNode : _standard.editingStyleRuleNode;
+    return isTraditional ? isActive ? _traditional.traditionalStyleRuleNodeActive : _traditional.traditionalStyleRuleNodeNew : _standard.editingStyleRuleNode;
   }
   if (nodeName === 'blockCard') {
     if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? _traditional.traditionalStyleCardBlockNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleCardBlockNodeNew : _traditional.traditionalStyleCardBlockNode : _standard.editingStyleCardBlockNode;
+        return isTraditional ? isActive ? _traditional.traditionalStyleCardBlockNodeActive : _traditional.traditionalStyleCardBlockNodeNew : _standard.editingStyleCardBlockNode;
       } else {
         return isTraditional ? (0, _traditional.getDeletedTraditionalInlineStyle)(false) : _standard.deletedContentStyleNew;
       }
     }
-    return isTraditional ? isActive ? _traditional.traditionalStyleCardBlockNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleCardBlockNodeNew : _traditional.traditionalStyleCardBlockNode : _standard.editingStyleCardBlockNode;
+    return isTraditional ? isActive ? _traditional.traditionalStyleCardBlockNodeActive : _traditional.traditionalStyleCardBlockNodeNew : _standard.editingStyleCardBlockNode;
   }
   if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     if (isInserted) {
-      return isTraditional ? isActive ? _traditional.traditionalStyleNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleNodeNew : _traditional.traditionalStyleNode : _standard.editingStyleNode;
+      return isTraditional ? isActive ? _traditional.traditionalStyleNodeActive : _traditional.traditionalStyleNodeNew : _standard.editingStyleNode;
     } else {
       return isTraditional ? (0, _traditional.getDeletedTraditionalInlineStyle)(false) : _standard.deletedContentStyleNew;
     }
   }
-  return isTraditional ? isActive ? _traditional.traditionalStyleNodeActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalStyleNodeNew : _traditional.traditionalStyleNode : _standard.editingStyleNode;
+  return isTraditional ? isActive ? _traditional.traditionalStyleNodeActive : _traditional.traditionalStyleNodeNew : _standard.editingStyleNode;
 };
 
 /**
@@ -151,18 +148,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     });
   }
   var className = getNodeClass(change.name);
-  if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
-    if (style || className) {
-      decorations.push(_view.Decoration.node(change.from, change.to, {
-        style: style,
-        'data-testid': 'show-diff-changed-decoration-node',
-        class: className
-      }, {
-        key: 'diff-block',
-        nodeName: change.name
-      }));
-    }
-  } else {
+  if (style || className) {
     decorations.push(_view.Decoration.node(change.from, change.to, {
       style: style,
       'data-testid': 'show-diff-changed-decoration-node',

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

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _standard = require("./colorSchemes/standard");
 var _traditional = require("./colorSchemes/traditional");
@@ -56,21 +55,6 @@ var getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
   return (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? _standard.deletedContentStyleNew : _standard.deletedContentStyle;
 };
 
-/**
- * Wraps content with deleted styling without opacity (for use when content is a direct child of dom)
- */
-var createDeletedStyleWrapperWithoutOpacity = function createDeletedStyleWrapperWithoutOpacity(colorScheme, isActive) {
-  var wrapper = document.createElement('span');
-  if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
-    wrapper.setAttribute('style',
-    // Merge into existing styles when cleaning up
-    getDeletedContentStyle(colorScheme, isActive) + _standard.deletedInlineContentBackground);
-  } else {
-    wrapper.setAttribute('style', getDeletedContentStyle(colorScheme, isActive));
-  }
-  return wrapper;
-};
-
 /**
  * CSS backgrounds don't work when applied to a wrapper around a paragraph, so
  * the wrapper needs to be injected inside the node around the child content
@@ -131,7 +115,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     _ref2$isInserted = _ref2.isInserted,
     isInserted = _ref2$isInserted === void 0 ? false : _ref2$isInserted;
   var slice = doc.slice(change.fromA, change.toA);
-  var shouldSkipDeletedEmptyParagraphDecoration = !isInserted && (slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.childCount) === 1 && (slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || (_slice$content2 = _slice$content2.firstChild) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.type.name) === 'paragraph' && (slice === null || slice === void 0 || (_slice$content3 = slice.content) === null || _slice$content3 === void 0 || (_slice$content3 = _slice$content3.firstChild) === null || _slice$content3 === void 0 ? void 0 : _slice$content3.content.size) === 0 && (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation');
+  var shouldSkipDeletedEmptyParagraphDecoration = !isInserted && (slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.childCount) === 1 && (slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || (_slice$content2 = _slice$content2.firstChild) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.type.name) === 'paragraph' && (slice === null || slice === void 0 || (_slice$content3 = slice.content) === null || _slice$content3 === void 0 || (_slice$content3 = _slice$content3.firstChild) === null || _slice$content3 === void 0 ? void 0 : _slice$content3.content.size) === 0;
   // Widget decoration used for deletions as the content is not in the document
   // and we want to display the deleted content with a style.
   var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, change.fromB, slice);
@@ -254,24 +238,18 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     } else {
       var fallbackNode = fallbackSerialization();
       if (fallbackNode) {
-        if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) || (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
-          if (fallbackNode instanceof HTMLElement) {
-            var injectedNode = injectInnerWrapper({
-              node: fallbackNode,
-              colorScheme: colorScheme,
-              isActive: isActive,
-              isInserted: isInserted
-            });
-            dom.append(injectedNode);
-          } else {
-            var _wrapper2 = createContentWrapper(colorScheme, isActive, isInserted);
-            _wrapper2.append(fallbackNode);
-            dom.append(_wrapper2);
-          }
+        if (fallbackNode instanceof HTMLElement) {
+          var injectedNode = injectInnerWrapper({
+            node: fallbackNode,
+            colorScheme: colorScheme,
+            isActive: isActive,
+            isInserted: isInserted
+          });
+          dom.append(injectedNode);
         } else {
-          var _wrapper3 = createDeletedStyleWrapperWithoutOpacity(colorScheme, isActive);
-          _wrapper3.append(fallbackNode);
-          dom.append(_wrapper3);
+          var _wrapper2 = createContentWrapper(colorScheme, isActive, isInserted);
+          _wrapper2.append(fallbackNode);
+          dom.append(_wrapper2);
         }
       }
     }

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.stepIsValidAttrChange = exports.getAttrChangeRanges = void 0;
 var _steps = require("@atlaskit/adf-schema/steps");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var filterUndefined = function filterUndefined(x) {
   return !!x;
 };
@@ -42,39 +41,38 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     var stepAttrs = getStepAttrs(step);
     var $pos = doc.resolve(step.pos);
     var nodeAtPos = doc.nodeAt(step.pos);
-    if ((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true)) {
-      // 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') {
-        return {
-          fromB: step.pos,
-          toB: step.pos + nodeAtPos.nodeSize,
-          isInline: true
-        };
-      }
 
-      // taskItem node: state attribute change — highlight the taskItem node
-      if (stepAttrs.some(function (v) {
-        return taskItemAttrs.includes(v);
-      }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
-        return {
-          fromB: step.pos,
-          toB: step.pos + nodeAtPos.nodeSize
-        };
-      }
+    // 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') {
+      return {
+        fromB: step.pos,
+        toB: step.pos + nodeAtPos.nodeSize,
+        isInline: true
+      };
+    }
 
-      // extension nodes: any attribute change except localId — highlight the node
-      if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(function (v) {
-        return !extensionExcludedAttrs.includes(v);
-      })) {
-        var isInline = nodeAtPos.type.name === 'inlineExtension';
-        return {
-          fromB: step.pos,
-          toB: step.pos + nodeAtPos.nodeSize,
-          isInline: isInline
-        };
-      }
+    // taskItem node: state attribute change — highlight the taskItem node
+    if (stepAttrs.some(function (v) {
+      return taskItemAttrs.includes(v);
+    }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
+      return {
+        fromB: step.pos,
+        toB: step.pos + nodeAtPos.nodeSize
+      };
+    }
+
+    // extension nodes: any attribute change except localId — highlight the node
+    if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(function (v) {
+      return !extensionExcludedAttrs.includes(v);
+    })) {
+      var isInline = nodeAtPos.type.name === 'inlineExtension';
+      return {
+        fromB: step.pos,
+        toB: step.pos + nodeAtPos.nodeSize,
+        isInline: isInline
+      };
     }
 
     // media node: id/collection/url attribute change — highlight the mediaSingle parent

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.wrapBlockNodeView = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _messages = require("@atlaskit/editor-common/messages");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _standard = require("../colorSchemes/standard");
 var _traditional = require("../colorSchemes/traditional");
@@ -87,10 +86,7 @@ var getChangedNodeStyle = function getChangedNodeStyle(nodeName, colorScheme) {
       return undefined;
     }
     if (isTraditional) {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
-        return isActive ? _traditional.traditionalStyleNodeActive : _traditional.traditionalStyleNodeNew;
-      }
-      return isActive ? _traditional.traditionalStyleNodeActive : _traditional.traditionalStyleNode;
+      return isActive ? _traditional.traditionalStyleNodeActive : _traditional.traditionalStyleNodeNew;
     }
     return _standard.editingStyleNode;
   }
@@ -103,13 +99,13 @@ var getChangedNodeStyle = function getChangedNodeStyle(nodeName, colorScheme) {
     case 'expand':
     case 'decisionList':
       if (isTraditional) {
-        return isActive ? _traditional.deletedTraditionalBlockOutlineActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.deletedTraditionalBlockOutlineNew : _traditional.deletedTraditionalBlockOutline;
+        return isActive ? _traditional.deletedTraditionalBlockOutlineActive : _traditional.deletedTraditionalBlockOutlineNew;
       }
       return isActive ? _standard.deletedBlockOutlineActive : _standard.deletedBlockOutline;
     case 'panel':
     case 'codeBlock':
       if (isTraditional) {
-        return isActive ? _traditional.deletedTraditionalBlockOutlineRoundedActive : (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.deletedTraditionalBlockOutlineRoundedNew : _traditional.deletedTraditionalBlockOutlineRounded;
+        return isActive ? _traditional.deletedTraditionalBlockOutlineRoundedActive : _traditional.deletedTraditionalBlockOutlineRoundedNew;
       }
       return isActive ? _standard.deletedBlockOutlineRoundedActive : _standard.deletedBlockOutlineRounded;
     default:
@@ -152,7 +148,7 @@ var maybeAddDeletedOutlineNewClass = function maybeAddDeletedOutlineNewClass(_re
   if (name !== 'mediaSingle' && name !== 'embedCard') {
     return;
   }
-  if (colorScheme === 'traditional' && !isActive && (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
+  if (colorScheme === 'traditional' && !isActive) {
     nodeView.classList.add('show-diff-deleted-outline-new');
   }
 };
@@ -176,7 +172,7 @@ var applyCellOverlayStyles = function applyCellOverlayStyles(_ref2) {
     isInserted = _ref2.isInserted;
   element.querySelectorAll('td, th').forEach(function (cell) {
     var overlay = document.createElement('span');
-    var overlayStyle = colorScheme === 'traditional' ? isInserted ? (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? _traditional.traditionalAddedCellOverlayStyleNew : _traditional.traditionalAddedCellOverlayStyle : _traditional.deletedTraditionalCellOverlayStyle : isInserted ? _standard.addedCellOverlayStyle : _standard.deletedCellOverlayStyle;
+    var overlayStyle = colorScheme === 'traditional' ? isInserted ? _traditional.traditionalAddedCellOverlayStyleNew : _traditional.deletedTraditionalCellOverlayStyle : isInserted ? _standard.addedCellOverlayStyle : _standard.deletedCellOverlayStyle;
     overlay.setAttribute('style', overlayStyle);
     cell.appendChild(overlay);
   });

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

@@ -11,7 +11,6 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _calculateDiffDecorations = require("./calculateDiff/calculateDiffDecorations");
 var _enforceCustomStepRegisters = require("./enforceCustomStepRegisters");
@@ -22,9 +21,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { (0, _defineProperty2.default)(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; }
 var showDiffPluginKey = exports.showDiffPluginKey = new _state2.PluginKey('showDiffPlugin');
 var createPlugin = exports.createPlugin = function createPlugin(config, getIntl, api) {
-  if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_equality_fallback')) {
-    (0, _enforceCustomStepRegisters.enforceCustomStepRegisters)();
-  }
+  (0, _enforceCustomStepRegisters.enforceCustomStepRegisters)();
   var nodeViewSerializer = new _NodeViewSerializer.NodeViewSerializer({});
   var setNodeViewSerializer = function setNodeViewSerializer(editorView) {
     nodeViewSerializer.init({
@@ -65,7 +62,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               nodeViewSerializer: nodeViewSerializer,
               colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
               intl: getIntl(),
-              activeIndexPos: (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined,
+              activeIndexPos: newPluginState.activeIndexPos,
               api: api
             }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
               isInverted: (_newPluginState = newPluginState) === null || _newPluginState === void 0 ? void 0 : _newPluginState.isInverted,
@@ -84,7 +81,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               diffType: 'inline',
               hideDeletedDiffs: false
             } : {});
-          } else if (((meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_NEXT' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_PREVIOUS') && (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
+          } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_NEXT' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_PREVIOUS') {
             // Update the active index in plugin state and recalculate decorations
             var _decorations = (0, _getScrollableDecorations.getScrollableDecorations)(currentPluginState.decorations, newState.doc);
             if (_decorations.length > 0) {
@@ -170,19 +167,17 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
           }
 
           // Check for any potential scroll side-effects
-          if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
-            var activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
-            previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
-            if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
-              var _cancelPendingScrollT2, _api$expand;
-              (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 || _cancelPendingScrollT2();
-              var scrollableDecorations = (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc);
-              var activeDecoration = scrollableDecorations[pluginState.activeIndex];
-              if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand = _api$expand.commands) !== null && _api$expand !== void 0 && _api$expand.toggleExpandRange && (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
-                api === null || api === void 0 || api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
-              }
-              cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToActiveDecoration)(view, scrollableDecorations, pluginState.activeIndex);
+          var activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
+          previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
+          if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
+            var _cancelPendingScrollT2, _api$expand;
+            (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 || _cancelPendingScrollT2();
+            var scrollableDecorations = (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc);
+            var activeDecoration = scrollableDecorations[pluginState.activeIndex];
+            if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand = _api$expand.commands) !== null && _api$expand !== void 0 && _api$expand.toggleExpandRange) {
+              api === null || api === void 0 || api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
             }
+            cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToActiveDecoration)(view, scrollableDecorations, pluginState.activeIndex);
           }
         },
         destroy: function destroy() {

package/dist/cjs/showDiffPlugin.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.showDiffPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _getScrollableDecorations = require("./pm-plugins/getScrollableDecorations");
 var _main = require("./pm-plugins/main");
 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; }
@@ -55,7 +54,6 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
       }];
     },
     getSharedState: function getSharedState(editorState) {
-      var _pluginState$decorati;
       if (!editorState) {
         return {
           isDisplayingChanges: false,
@@ -63,7 +61,7 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
         };
       }
       var pluginState = _main.showDiffPluginKey.getState(editorState);
-      var decorationCount = (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? (0, _getScrollableDecorations.getScrollableDecorations)(pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations, editorState.doc) : (pluginState === null || pluginState === void 0 || (_pluginState$decorati = pluginState.decorations) === null || _pluginState$decorati === void 0 ? void 0 : _pluginState$decorati.find()) || [];
+      var decorationCount = (0, _getScrollableDecorations.getScrollableDecorations)(pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations, editorState.doc);
       return {
         isDisplayingChanges: decorationCount.length > 0,
         activeIndex: pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex,

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

@@ -1,5 +1,4 @@
 import { Transform } from '@atlaskit/editor-prosemirror/transform';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
  * Returns a copy of the document with all marks removed from all text.
@@ -42,13 +41,10 @@ export function areDocsEqualByBlockStructureAndText(doc1, doc2) {
   if (doc1.textContent !== doc2.textContent) {
     return false;
   }
-  if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
-    // Strip marks before comparing so that mark-driven text fragmentation
-    // (e.g. annotation mark reordering producing different childCounts) does not
-    // cause false inequalities.
-    const stripped1 = stripMarks(doc1);
-    const stripped2 = stripMarks(doc2);
-    return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
-  }
-  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
+  // Strip marks before comparing so that mark-driven text fragmentation
+  // (e.g. annotation mark reordering producing different childCounts) does not
+  // cause false inequalities.
+  const stripped1 = stripMarks(doc1);
+  const stripped2 = stripMarks(doc2);
+  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
 }

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

@@ -4,7 +4,6 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { areDocsEqualByBlockStructureAndText } from '../areDocsEqualByBlockStructureAndText';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
@@ -110,25 +109,19 @@ const calculateDiffDecorationsInner = ({
   // Rather than using .eq() we use a custom function that only checks for structural
   // changes and ignores differences in attributes which don't affect decoration positions
   if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
-    const recoveredViaContentEquality = fg('platform_editor_show_diff_equality_fallback') ? areDocsEqualByBlockStructureAndText(steppedDoc, tr.doc) : undefined;
-    if (expValEquals('platform_editor_are_nodes_equal_ignore_mark_order', 'isEnabled', true)) {
-      var _api$analytics;
-      api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.fireAnalyticsEvent({
-        eventType: 'track',
-        action: 'nodesNotEqual',
-        actionSubject: 'showDiff',
-        attributes: {
-          docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
-          colorScheme,
-          recoveredViaContentEquality
-        }
-      });
-    }
-    if (fg('platform_editor_show_diff_equality_fallback')) {
-      if (!recoveredViaContentEquality) {
-        return DecorationSet.empty;
+    var _api$analytics;
+    const recoveredViaContentEquality = areDocsEqualByBlockStructureAndText(steppedDoc, tr.doc);
+    api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.fireAnalyticsEvent({
+      eventType: 'track',
+      action: 'nodesNotEqual',
+      actionSubject: 'showDiff',
+      attributes: {
+        docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
+        colorScheme,
+        recoveredViaContentEquality
       }
-    } else {
+    });
+    if (!recoveredViaContentEquality) {
       return DecorationSet.empty;
     }
   }
@@ -202,7 +195,7 @@ const calculateDiffDecorationsInner = ({
     }));
   });
   getAttrChangeRanges(tr.doc, attrSteps).forEach(change => {
-    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) && change.isInline) {
+    if (change.isInline) {
       // Inline nodes (e.g. date) need an inline decoration rather than a block decoration
       const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
       decorations.push(createInlineChangedDecoration({