@atlaskit/editor-plugin-show-diff 19.0.2 → 19.0.4

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

@@ -20,8 +20,8 @@ import { createDeletedLineBreakDecoration } from '../decorations/utils/createDel
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
 import { createRemovedLozenge } from '../decorations/utils/wrapBlockNodeView';
+import { getDefaultDiffType } from '../getDefaultDiffType';
 import { getScrollableDecorations } from '../getScrollableDecorations';
-import { getDefaultDiffType, isExtendedEnabled } from '../isExtendedEnabled';
 import { emptyTextBlockContentPositions } from '../utils/emptyTextBlocks';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
@@ -44,28 +44,24 @@ const getChanges = ({
   intl,
   smartThresholds
 }) => {
-  if (isExtendedEnabled(diffType)) {
-    // The `smart` diff type is gated behind `platform_editor_ai_smart_diff`. When the gate is
-    // off, `smart` falls through to the default (`inline`) path below so behaviour degrades
-    // gracefully (see docs/smart-diff-design.md §3).
-    if (diffType === 'smart' && fg('platform_editor_ai_smart_diff')) {
-      const changes = simplifyChanges(changeset.changes, tr.doc);
-      return classifySmartChanges({
-        changes,
-        originalDoc,
-        newDoc: tr.doc,
-        locale: intl.locale,
-        thresholds: smartThresholds
-      });
-    }
-    if (diffType === 'step') {
-      return diffBySteps(originalDoc, steps);
-    }
-    if (diffType === 'block') {
-      return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
-    }
+  // The `smart` diff type is gated behind `platform_editor_ai_smart_diff`. When the gate is
+  // off, `smart` falls through to the default (`inline`) path below so behaviour degrades
+  // gracefully (see docs/smart-diff-design.md §3).
+  if (diffType === 'smart' && fg('platform_editor_ai_smart_diff')) {
     const changes = simplifyChanges(changeset.changes, tr.doc);
-    return optimizeChanges(changes);
+    return classifySmartChanges({
+      changes,
+      originalDoc,
+      newDoc: tr.doc,
+      locale: intl.locale,
+      thresholds: smartThresholds
+    });
+  }
+  if (diffType === 'step') {
+    return diffBySteps(originalDoc, steps);
+  }
+  if (diffType === 'block') {
+    return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
   }
   const changes = simplifyChanges(changeset.changes, tr.doc);
   return optimizeChanges(changes);
@@ -82,13 +78,11 @@ const getAttributedChanges = ({
   // the step attribution and promotes ranges to sentence/paragraph/node granularity, so a promoted
   // range covers several actors' steps and the latest-writer rule credits all of it to one of them.
   // The attributed changeset keeps step granularity instead.
-  if (isExtendedEnabled(diffType)) {
-    if (diffType === 'step') {
-      return attributedChanges;
-    }
-    if (diffType === 'block') {
-      return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
-    }
+  if (diffType === 'step') {
+    return attributedChanges;
+  }
+  if (diffType === 'block') {
+    return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
   }
   return simplifyChangesWithAttribution(attributedChanges, tr.doc);
 };
@@ -176,7 +170,6 @@ const calculateNodesForBlockDecoration = ({
   shouldHideDeleted = false,
   showContributorTags = false,
   showIndicators = false,
-  diffType,
   coarseTableCellsOnly = false,
   tagMountContext,
   nodeRanges
@@ -210,7 +203,6 @@ const calculateNodesForBlockDecoration = ({
         showContributorTags,
         showIndicators,
         doc,
-        diffType,
         tagMountContext
       }));
     }
@@ -232,7 +224,7 @@ const calculateNodesForBlockDecoration = ({
         return;
       }
     }
-    if (node.isBlock && (!isExtendedEnabled(diffType) || (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to)) {
+    if (node.isBlock && (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to) {
       const nodeEnd = pos + node.nodeSize;
       const isActive = isRangeActive(activeIndexPos, pos, nodeEnd);
       decorations.push(...createBlockChangedDecoration({
@@ -250,7 +242,6 @@ const calculateNodesForBlockDecoration = ({
         showContributorTags,
         showIndicators,
         doc,
-        diffType,
         tagMountContext
       }));
     }
@@ -300,10 +291,9 @@ export const isDeletedContentPlacedBelow = ({
  */
 const shouldHideDeletedSide = ({
   change,
-  diffType,
   hideDeletedDiffs,
   isInverted
-}) => isExtendedEnabled(diffType) && !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || fg('platform_editor_diff_hide_pure_deletions') && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true);
+}) => !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || fg('platform_editor_diff_hide_pure_deletions') && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true);
 const calculateDiffDecorationsInner = ({
   state,
   pluginState,
@@ -445,7 +435,7 @@ const calculateDiffDecorationsInner = ({
       ...attribution,
       stepIndex
     })));
-    attributedChanges = isExtendedEnabled(diffType) && diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : [...changeset.changes];
+    attributedChanges = diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : [...changeset.changes];
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
     const uncollapsedChanges = getAttributedChanges({
@@ -480,15 +470,13 @@ const calculateDiffDecorationsInner = ({
   /**
    * If showIndicators is on, we create an anchor widget here to mark the doc margin.
    */
-  if (showIndicators && isExtendedEnabled(diffType)) {
+  if (showIndicators) {
     decorations.push(createDocMarginAnchorWidget());
   }
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   const isInserted = !isInverted;
-  if (isExtendedEnabled(diffType)) {
-    changes = groupDeletedColumnChanges(changes, originalDoc, tr.doc, new Mapping(stepMaps), isInverted);
-  }
+  changes = groupDeletedColumnChanges(changes, originalDoc, tr.doc, new Mapping(stepMaps), isInverted);
   // A whole-table change owns every mark and attribute range inside its bounds, so those ranges
   // do not also get their own decoration.
   const tableChanges = changes.filter(change => change.deletedColumns !== undefined);
@@ -547,7 +535,7 @@ const calculateDiffDecorationsInner = ({
     });
     if (change.inserted.length > 0) {
       // On an inverted diff the inserted side is visually the deleted side.
-      const shouldHideDeleted = isExtendedEnabled(diffType) ? isInverted && hideDeletedDiffs : false;
+      const shouldHideDeleted = isInverted && hideDeletedDiffs;
 
       // A removed blank line — an empty paragraph or heading — has nothing to mark up. On an
       // inverted diff, the shape AI suggested edits renders, the block is still in the displayed
@@ -566,7 +554,6 @@ const calculateDiffDecorationsInner = ({
           decorations.push(createDeletedLineBreakDecoration({
             attributionKey,
             colorScheme: changeColorScheme,
-            diffType,
             isActive,
             pos,
             reveal,
@@ -596,7 +583,6 @@ const calculateDiffDecorationsInner = ({
       // boundary to keep the indicator bar continuous with the deleted content.
       const willRenderDeletedWidget = change.deleted.length > 0 && !isMarkOnly && !shouldHideDeletedSide({
         change,
-        diffType,
         hideDeletedDiffs,
         isInverted
       });
@@ -619,18 +605,15 @@ const calculateDiffDecorationsInner = ({
             doc: tr.doc,
             colorScheme: changeColorScheme,
             isActive,
-            diffType,
-            ...(isExtendedEnabled(diffType) && {
-              isInserted,
-              shouldHideDeleted,
-              showContributorTags,
-              showIndicators,
-              hideAddedDiffsUnderline,
-              hasDeletedWidget: willRenderDeletedWidget,
-              isDeletedWidgetBelow,
-              reveal,
-              tagMountContext
-            })
+            isInserted,
+            shouldHideDeleted,
+            showContributorTags,
+            showIndicators,
+            hideAddedDiffsUnderline,
+            hasDeletedWidget: willRenderDeletedWidget,
+            isDeletedWidgetBelow,
+            reveal,
+            tagMountContext
           }));
         }
       } else {
@@ -641,18 +624,15 @@ const calculateDiffDecorationsInner = ({
           doc: tr.doc,
           colorScheme: changeColorScheme,
           isActive,
-          diffType,
-          ...(isExtendedEnabled(diffType) && {
-            isInserted,
-            shouldHideDeleted,
-            showContributorTags,
-            showIndicators,
-            hideAddedDiffsUnderline,
-            hasDeletedWidget: willRenderDeletedWidget,
-            isDeletedWidgetBelow,
-            reveal,
-            tagMountContext
-          })
+          isInserted,
+          shouldHideDeleted,
+          showContributorTags,
+          showIndicators,
+          hideAddedDiffsUnderline,
+          hasDeletedWidget: willRenderDeletedWidget,
+          isDeletedWidgetBelow,
+          reveal,
+          tagMountContext
         }));
       }
       decorations.push(...calculateNodesForBlockDecoration({
@@ -663,16 +643,13 @@ const calculateDiffDecorationsInner = ({
         // A split piece's own range no longer covers the container it opened (EDITOR-8932).
         nodeRanges: change.blockNodeRangesB,
         colorScheme: changeColorScheme,
-        ...(isExtendedEnabled(diffType) && {
-          isInserted,
-          shouldHideDeleted,
-          showContributorTags,
-          showIndicators,
-          tagMountContext
-        }),
+        isInserted,
+        shouldHideDeleted,
+        showContributorTags,
+        showIndicators,
+        tagMountContext,
         activeIndexPos,
         intl,
-        diffType,
         coarseTableCellsOnly: useCoarseTableDecoration,
         leftAnchorId
       }));
@@ -680,7 +657,6 @@ const calculateDiffDecorationsInner = ({
     if (change.deleted.length > 0 && !isMarkOnly && !hasNoDeletedContent) {
       const shouldHideDeleted = shouldHideDeletedSide({
         change,
-        diffType,
         hideDeletedDiffs,
         isInverted
       });
@@ -689,9 +665,7 @@ const calculateDiffDecorationsInner = ({
           deletedColumns,
           // The deleted side has no inline decoration, so the widget carries the actor.
           attributionKey,
-          // Extended pipeline only, matching the inline path: the non-extended styles have no
-          // background for the wipe to act on.
-          reveal: isExtendedEnabled(diffType) ? reveal : undefined,
+          reveal,
           change,
           doc: originalDoc,
           nodeViewSerializer,
@@ -702,12 +676,9 @@ const calculateDiffDecorationsInner = ({
           leftAnchorId,
           showContributorTags,
           tagMountContext,
-          ...(isExtendedEnabled(diffType) && {
-            isInserted: !isInserted,
-            diffType,
-            hideAddedDiffsUnderline,
-            placeBelow: isDeletedWidgetBelow
-          }),
+          isInserted: !isInserted,
+          hideAddedDiffsUnderline,
+          placeBelow: isDeletedWidgetBelow,
           showIndicators
         }));
       }
@@ -736,7 +707,6 @@ const calculateDiffDecorationsInner = ({
       change,
       colorScheme: changeColorScheme,
       doc: tr.doc,
-      diffType,
       isActive,
       isInserted: true,
       reveal,
@@ -770,8 +740,7 @@ const calculateDiffDecorationsInner = ({
         tagMountContext,
         // Suppress the border-bottom underline for atomic inline nodeviews —
         // it doesn't render on custom nodeview DOM elements and is unnecessary noise.
-        hideAddedDiffsUnderline: true,
-        diffType
+        hideAddedDiffsUnderline: true
       }));
       // 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.
@@ -831,11 +800,8 @@ const calculateDiffDecorationsInner = ({
           intl,
           activeIndexPos,
           isInserted: false,
-          ...(isExtendedEnabled(diffType) && {
-            diffType,
-            hideAddedDiffsUnderline,
-            placeBelow
-          }),
+          hideAddedDiffsUnderline,
+          placeBelow,
           showIndicators,
           showContributorTags,
           tagMountContext
@@ -848,7 +814,7 @@ const calculateDiffDecorationsInner = ({
     contributorTags: showContributorTags ? extractContributorTags(decorationSet, contributors, activeIndexPos,
     // The stops the step buttons walk, so a stop cannot hold a second tag for one
     // contributor that navigation can never reach.
-    getScrollableDecorations(decorationSet, tr.doc, diffType)) : [],
+    getScrollableDecorations(decorationSet, tr.doc)) : [],
     decorations: decorationSet,
     diffDescriptors: extractDiffDescriptors(decorationSet)
   };
@@ -887,16 +853,12 @@ export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner
   inlineDeletedDiffPlacement: lastInlineDeletedDiffPlacement,
   reveal: lastReveal
 }]) => {
-  var _ref2;
+  var _ref;
   const originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
-  if (isExtendedEnabled(diffType)) {
-    var _ref;
-    return (_ref = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
-    // Contributors can arrive after the first calculation; without this, tags never appear.
-    isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
-    // Turning the reveal on or off changes the emitted styles, so a cached result from the
-    // other setting would leave the diff painted in the wrong resting state.
-    isEqual(reveal, lastReveal)) !== null && _ref !== void 0 ? _ref : false;
-  }
-  return (_ref2 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref2 !== void 0 ? _ref2 : false;
+  return (_ref = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+  // Contributors can arrive after the first calculation; without this, tags never appear.
+  isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
+  // Turning the reveal on or off changes the emitted styles, so a cached result from the
+  // other setting would leave the diff painted in the wrong resting state.
+  isEqual(reveal, lastReveal)) !== null && _ref !== void 0 ? _ref : false;
 });

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

@@ -829,7 +829,7 @@ export function buildDeletedCellOverlayRoundedStyle(colors) {
 // --- Inline content style dispatch ---
 
 /**
- * Inserted inline content under the extended diff experience. `insertedInlineTreatment` picks
+ * Inserted inline content. `insertedInlineTreatment` picks
  * `text-decoration` vs a `border-bottom` rule; only the latter honours `hideAddedDiffsUnderline`.
  */
 export function buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline) {

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

@@ -1,31 +1,5 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getStandardDeletedTextDecorationStyle } from './getStandardDeletedTextDecorationStyle';
-
-// delete on platform_editor_diff_plugin_extended cleanup
-export const editingStyle = convertToInlineCss({
-  background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
-});
-
-// delete on platform_editor_diff_plugin_extended cleanup
-export const editingContentStyleInBlock = convertToInlineCss({
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
-});
-
-// delete on platform_editor_diff_plugin_extended cleanup
-export const editingStyleActive = convertToInlineCss({
-  background: "var(--ds-background-accent-purple-subtler-pressed, #D8A0F7)",
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-text-accent-purple, #803FA5)"
-});
 export const editingStyleExtended = convertToInlineCss({
   background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
   borderBottom: `2px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,

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

@@ -3,7 +3,6 @@ import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { isTaggableBlockNode } from '../utils/taggableBlockNodes';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
@@ -35,12 +34,11 @@ const isInsideTable = (doc, pos) => findParentNodeClosestToPos(doc.resolve(pos),
  * position, so `nodeAt` returns exactly the node being decorated.
  */
 const canTagBlock = ({
-  diffType,
   doc,
   from
 }) => {
   var _doc$nodeAt;
-  if (doc === undefined || !isExtendedEnabled(diffType)) {
+  if (doc === undefined) {
     return false;
   }
   const nodeType = (_doc$nodeAt = doc.nodeAt(from)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type;
@@ -97,20 +95,16 @@ const getBlockNodeStyleNext = ({
   nodeName,
   colorScheme,
   isInserted = true,
-  isActive = false,
-  diffType
+  isActive = false
 }) => {
   if (UNSTYLED_NODES.includes(nodeName)) {
     return undefined;
   }
   if (CELL_NODES.includes(nodeName)) {
-    // When the gate is off, cells get no styling — as with UNSTYLED_NODES above.
-    return isExtendedEnabled(diffType) ? cellPositionStyle : undefined;
+    return cellPositionStyle;
   }
   const colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
-
-  // Deleted nodes only differ under the extended experience; otherwise all are insertions.
-  if (!isInserted && isExtendedEnabled(diffType)) {
+  if (!isInserted) {
     return buildDeletedBlockNodeStyle(colors, getDeletedBlockNodeCategory(nodeName), isActive);
   }
   return buildInsertedBlockNodeStyle(colors, getInsertedBlockNodeShape(nodeName), isActive);
@@ -173,7 +167,6 @@ export const createBlockChangedDecoration = ({
   showContributorTags = false,
   showIndicators = false,
   doc,
-  diffType,
   tagMountContext
 }) => {
   const decorations = [];
@@ -181,7 +174,6 @@ export const createBlockChangedDecoration = ({
   // `createInlineChangedDecoration`. Changes are disjoint, so no two of them decorate one node.
   const diffId = showContributorTags ? `block-${change.from}-${change.to}` : crypto.randomUUID();
   const shouldTagBlock = showContributorTags && canTagBlock({
-    diffType,
     doc,
     from: change.from
   });
@@ -200,11 +192,10 @@ export const createBlockChangedDecoration = ({
       leftAnchorId,
       isActive,
       isInserted,
-      nodeName: change.name,
-      diffType
+      nodeName: change.name
     }))];
   }
-  if (isExtendedEnabled(diffType) && CELL_NODES.includes(change.name)) {
+  if (CELL_NODES.includes(change.name)) {
     const cellOverlay = document.createElement('div');
     const colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
     const isRoundedTable = isExperimentEnabled('platform_editor_table_diff_rounded_corners');
@@ -228,15 +219,13 @@ export const createBlockChangedDecoration = ({
       key: 'cell-overlay-decoration'
     }));
   }
-  // isInserted is only read under the extended experience, so pass it unconditionally. `change.name`
-  // verbatim: base-name resolution stays in `canTagBlock`, which needs tags on, so a schema
-  // variant's legacy style is untouched — see `resolveBaseNodeName`.
+  // `change.name` verbatim: base-name resolution stays in `canTagBlock`, which needs tags on, so a
+  // schema variant's legacy style is untouched — see `resolveBaseNodeName`.
   const nodeStyle = getBlockNodeStyle({
     nodeName: change.name,
     colorScheme,
     isInserted,
-    isActive,
-    diffType
+    isActive
   });
   const style = tagAnchorName ? [nodeStyle, convertToInlineCss({
     anchorName: `--${tagAnchorName}`
@@ -259,8 +248,7 @@ export const createBlockChangedDecoration = ({
       leftAnchorId,
       isActive,
       isInserted,
-      nodeName: change.name,
-      diffType
+      nodeName: change.name
     })));
   }
   if (decorations.length === 0) {
@@ -268,7 +256,7 @@ export const createBlockChangedDecoration = ({
     // there is nothing for a tag to hang off even when the node type would otherwise be taggable.
     return decorations;
   }
-  if (showIndicators && doc && isExtendedEnabled(diffType)) {
+  if (showIndicators && doc) {
     decorations.push(...createBlockIndicatorAnchorWidgets({
       doc,
       from: change.from,

package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.styles.legacy.js

@@ -9,7 +9,6 @@
  * cleanup, together with `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
  */
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { standardDecorationMarkerVariable, deletedDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode, getStandardDeletedContentStyleNew, deletedStyleQuoteNode, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from './colorSchemes/standard';
 import { traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayRoundedStyle, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from './colorSchemes/traditional';
 
@@ -28,8 +27,7 @@ export const getBlockNodeStyleLegacy = ({
   nodeName,
   colorScheme,
   isInserted = true,
-  isActive = false,
-  diffType
+  isActive = false
 }) => {
   const isTraditional = colorScheme === 'traditional';
   if (['mediaSingle', 'mediaGroup', 'table',
@@ -42,77 +40,47 @@ export const getBlockNodeStyleLegacy = ({
   }
   // Media nodes inside mediaSingle should not get position:relative
   // as it shifts the image outside its parent container (e.g. panel)
-  if (nodeName === 'media') {
-    if (!isInserted && isExtendedEnabled(diffType)) {
+  if (nodeName === 'media' || nodeName === 'panel') {
+    if (!isInserted) {
       return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedDecorationMarkerVariable;
     }
     return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
   }
   if (['tableCell', 'tableHeader'].includes(nodeName)) {
-    if (isExtendedEnabled(diffType)) {
-      // This is used for positioning the cell overlay widget decorations
-      return convertToInlineCss({
-        position: 'relative'
-      });
-    }
-    // When gate is off, it should return undefined as above
-    return undefined;
-  }
-  if (nodeName === 'panel') {
-    if (!isInserted && isExtendedEnabled(diffType)) {
-      return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedDecorationMarkerVariable;
-    }
-    return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
+    // This is used for positioning the cell overlay widget decorations
+    return convertToInlineCss({
+      position: 'relative'
+    });
   }
   if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
-      } else {
-        if (nodeName === 'listItem') {
-          return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : deletedDecorationMarkerVariable;
-        }
-        return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : getStandardDeletedContentStyleNew();
-      }
+    if (isInserted) {
+      return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
     }
-    return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
+    if (nodeName === 'listItem') {
+      return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : deletedDecorationMarkerVariable;
+    }
+    return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : getStandardDeletedContentStyleNew();
   }
   if (nodeName === 'blockquote') {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
-      } else {
-        return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNode;
-      }
+    if (isInserted) {
+      return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
     }
-    return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
+    return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNode;
   }
   if (nodeName === 'rule') {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
-      } else {
-        return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
-      }
+    if (isInserted) {
+      return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
     }
-    return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
+    return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
   }
   if (nodeName === 'blockCard') {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
-      } else {
-        return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
-      }
-    }
-    return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
-  }
-  if (isExtendedEnabled(diffType)) {
     if (isInserted) {
-      return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
-    } else {
-      return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
+      return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
     }
+    return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
+  }
+  if (isInserted) {
+    return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
   }
-  return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
+  return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
 };