@atlaskit/editor-plugin-show-diff 10.2.0 → 10.4.0

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

@@ -127,6 +127,7 @@ const calculateDiffDecorationsInner = ({
   isInverted = false,
   diffType = 'inline',
   hideDeletedDiffs = false,
+  hideAddedDiffsUnderline: hideAddedDiffsUnderlineParam = false,
   showIndicators = false,
   smartThresholds,
   deletedDiffPlacement = 'top'
@@ -142,6 +143,10 @@ const calculateDiffDecorationsInner = ({
       diffDescriptors: []
     };
   }
+
+  // Resolve the option against its gate once here, so every downstream inline/block builder
+  // receives the same value. When the gate is off the option is a no-op.
+  const hideAddedDiffsUnderline = hideAddedDiffsUnderlineParam && fg('platform_editor_ai_smart_diff');
   const {
     tr
   } = state;
@@ -237,7 +242,8 @@ const calculateDiffDecorationsInner = ({
             ...(isExtendedEnabled(diffType) && {
               isInserted,
               shouldHideDeleted,
-              showIndicators
+              showIndicators,
+              hideAddedDiffsUnderline
             })
           }));
         }
@@ -251,7 +257,8 @@ const calculateDiffDecorationsInner = ({
           ...(isExtendedEnabled(diffType) && {
             isInserted,
             shouldHideDeleted,
-            showIndicators
+            showIndicators,
+            hideAddedDiffsUnderline
           })
         }));
       }
@@ -284,6 +291,7 @@ const calculateDiffDecorationsInner = ({
           ...(isExtendedEnabled(diffType) && {
             isInserted: !isInserted,
             diffType,
+            hideAddedDiffsUnderline,
             // For `smart` node- and paragraph-level changes, optionally render the
             // deleted content below the new content (gray + strikethrough) instead
             // of above it. Controlled by `deletedDiffPlacement` (default `'top'`).
@@ -422,6 +430,7 @@ export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner
   isInverted,
   diffType,
   hideDeletedDiffs,
+  hideAddedDiffsUnderline,
   showIndicators,
   smartThresholds,
   deletedDiffPlacement
@@ -434,6 +443,7 @@ export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner
   isInverted: lastIsInverted,
   diffType: lastDiffType,
   hideDeletedDiffs: lastHideDeletedDiffs,
+  hideAddedDiffsUnderline: lastHideAddedDiffsUnderline,
   showIndicators: lastShowIndicators,
   smartThresholds: lastSmartThresholds,
   deletedDiffPlacement: lastDeletedDiffPlacement
@@ -442,7 +452,7 @@ export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner
   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) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement) !== null && _ref !== void 0 ? _ref : false;
+    return (_ref = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement) !== null && _ref !== void 0 ? _ref : false;
   }
   return (_ref2 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref2 !== void 0 ? _ref2 : false;
 });

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

@@ -0,0 +1,94 @@
+/**
+ * Generic, editor-state-free diff-change computation.
+ *
+ * Turns an `originalDoc` + forward `steps` into the classified `Change[]` for the
+ * requested `diffType`, plus the reconstructed new document — the same classifier
+ * the diff overlay uses (`calculateDiffDecorations` → `getChanges`), exposed as a
+ * reusable utility (e.g. to derive reviewable segments without rendering
+ * decorations). It runs the requested `diffType` DIRECTLY and does NOT apply the
+ * overlay's `platform_editor_ai_smart_diff` gate, so a `smart` result here can
+ * differ from what the overlay draws when that gate is off (the overlay falls back
+ * to inline); callers that need overlay parity must account for that gate.
+ *
+ * Pure: no `EditorState`, no transactions, no React. The new document is
+ * reconstructed by applying the (simplified) steps to `originalDoc`.
+ */
+import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { diffBySteps } from './diffBySteps';
+import { groupChangesByBlock } from './groupChangesByBlock';
+import { optimizeChanges } from './optimizeChanges';
+import { simplifySteps } from './simplifySteps';
+import { classifySmartChanges } from './smart/classifySmartChanges';
+/**
+ * Apply the (simplified) steps to `originalDoc` to reconstruct the new doc, and
+ * compute the classified `Change[]` for the requested `diffType`. Mirrors the
+ * body of `calculateDiffDecorations` → `getChanges` so callers stay in lock-step
+ * with the rendered diff. Returns an empty change list (and `originalDoc` as the
+ * new doc) when there are no steps.
+ */
+export const computeDiffChanges = ({
+  originalDoc,
+  steps,
+  diffType = 'smart',
+  locale = 'en',
+  smartThresholds
+}) => {
+  if (!steps || steps.length === 0) {
+    return {
+      changes: [],
+      newDoc: originalDoc
+    };
+  }
+  const simplifiedSteps = simplifySteps(steps, originalDoc);
+  let steppedDoc = originalDoc;
+  const stepMaps = [];
+  try {
+    for (const step of simplifiedSteps) {
+      const result = step.apply(steppedDoc);
+      if (result.failed === null && result.doc) {
+        stepMaps.push(step.getMap());
+        steppedDoc = result.doc;
+      }
+    }
+  } catch {
+    // A step's positions fell outside the current doc — `ReplaceStep.apply`
+    // throws a RangeError (rather than returning a failed result) when a
+    // position exceeds the doc size. This can happen for pathological or
+    // inconsistent step sequences. Bail with no changes rather than letting the
+    // error propagate to the caller (which, for the PSR, would crash the
+    // toolbar); the consumer then falls back to its non-diff segmenting path.
+    return {
+      changes: [],
+      newDoc: originalDoc
+    };
+  }
+  const changeset = ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, steppedDoc);
+  if (diffType === 'smart') {
+    return {
+      changes: classifySmartChanges({
+        changes: simplifyChanges(changeset.changes, steppedDoc),
+        originalDoc,
+        newDoc: steppedDoc,
+        locale,
+        thresholds: smartThresholds
+      }),
+      newDoc: steppedDoc
+    };
+  }
+  if (diffType === 'block') {
+    return {
+      changes: groupChangesByBlock(changeset.changes, originalDoc, steppedDoc),
+      newDoc: steppedDoc
+    };
+  }
+  if (diffType === 'step') {
+    return {
+      changes: diffBySteps(originalDoc, simplifiedSteps),
+      newDoc: steppedDoc
+    };
+  }
+  return {
+    changes: optimizeChanges(simplifyChanges(changeset.changes, steppedDoc)),
+    newDoc: steppedDoc
+  };
+};

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

@@ -38,6 +38,24 @@ export const editingStyleActiveExtended = convertToInlineCss({
   borderBottom: `2px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
   padding: `1px 0 2px`
 });
+
+/**
+ * Underline-free variants of the extended inserted-content styles. Used when the `showDiff`
+ * command is called with `hideAddedDiffsUnderline: true` to remove ONLY the dark-purple
+ * `borderBottom` underline from added/updated content while keeping the purple background
+ * highlight and padding. See the `editing*Extended` constants above for the full versions.
+ */
+export const editingStyleExtendedNoUnderline = convertToInlineCss({
+  background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
+  padding: `1px 0 2px`
+});
+export const editingStyleActiveExtendedNoUnderline = convertToInlineCss({
+  background: "var(--ds-background-accent-purple-subtler-pressed, #D8A0F7)",
+  padding: `1px 0 2px`
+});
+export const editingContentStyleInBlockExtendedNoUnderline = convertToInlineCss({
+  padding: `1px 0 2px`
+});
 export const deletedContentStyle = convertToInlineCss({
   color: "var(--ds-text-accent-gray, #505258)",
   textDecoration: 'line-through',

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

@@ -1,7 +1,7 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExtendedEnabled } from '../isExtendedEnabled';
-import { editingStyle, editingStyleExtended, editingStyleActive, editingStyleActiveExtended, deletedContentStyle, deletedContentStyleActive, deletedInlineContentStyleExtended } from './colorSchemes/standard';
+import { editingStyle, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActive, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, deletedContentStyle, deletedContentStyleActive, deletedInlineContentStyleExtended } from './colorSchemes/standard';
 import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle } from './colorSchemes/traditional';
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { buildDiffDecorationSpec } from './decorationKeys';
@@ -23,7 +23,8 @@ export const createInlineChangedDecoration = ({
   shouldHideDeleted = false,
   showIndicators = false,
   doc,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   const diffId = crypto.randomUUID();
   if (shouldHideDeleted) {
@@ -41,7 +42,7 @@ export const createInlineChangedDecoration = ({
       if (colorScheme === 'traditional') {
         style = isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
       } else {
-        style = isActive ? editingStyleActiveExtended : editingStyleExtended;
+        style = isActive ? hideAddedDiffsUnderline ? editingStyleActiveExtendedNoUnderline : editingStyleActiveExtended : hideAddedDiffsUnderline ? editingStyleExtendedNoUnderline : editingStyleExtended;
       }
     } else {
       if (colorScheme === 'traditional') {

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

@@ -25,7 +25,8 @@ export const createNodeChangedDecorationWidget = ({
   // before it. Used for `smart` node-level changes so the deleted node appears beneath
   // its replacement (gray + strikethrough).
   placeBelow = false,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   var _slice$content, _slice$content2, _slice$content2$first, _slice$content3, _slice$content3$first, _slice$content$firstC;
   const slice = doc.slice(change.fromA, change.toA);
@@ -164,7 +165,8 @@ export const createNodeChangedDecorationWidget = ({
           intl,
           isActive,
           isInserted,
-          diffType
+          diffType,
+          hideAddedDiffsUnderline
         });
       }
     } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(node.type.name)) {

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

@@ -3,7 +3,7 @@ import { trackChangesMessages } from '@atlaskit/editor-common/messages';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
-import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingStyleExtended, editingStyleActiveExtended, editingStyleNode, addedCellOverlayStyle, deletedCellOverlayStyle } from '../colorSchemes/standard';
+import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, addedCellOverlayStyle, deletedCellOverlayStyle } from '../colorSchemes/standard';
 import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle } from '../colorSchemes/traditional';
 const lozengeStyle = convertToInlineCss({
   display: 'inline-flex',
@@ -53,12 +53,12 @@ const lozengeStyleActiveTraditional = convertToInlineCss({
   whiteSpace: 'nowrap',
   color: "var(--ds-text-warning-inverse, #292A2E)"
 });
-const getChangedContentStyle = (colorScheme, isActive = false, isInserted = false, diffType) => {
+const getChangedContentStyle = (colorScheme, isActive = false, isInserted = false, diffType, hideAddedDiffsUnderline = false) => {
   if (isExtendedEnabled(diffType) && isInserted) {
     if (colorScheme === 'traditional') {
       return isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
     }
-    return isActive ? editingStyleActiveExtended : editingStyleExtended;
+    return isActive ? hideAddedDiffsUnderline ? editingStyleActiveExtendedNoUnderline : editingStyleActiveExtended : hideAddedDiffsUnderline ? editingStyleExtendedNoUnderline : editingStyleExtended;
   }
   if (colorScheme === 'traditional') {
     return getDeletedTraditionalInlineStyle(isActive);
@@ -68,11 +68,11 @@ const getChangedContentStyle = (colorScheme, isActive = false, isInserted = fals
   }
   return expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? deletedContentStyleNew : deletedContentStyle;
 };
-const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive = false, diffType) => {
+const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive = false, diffType, hideAddedDiffsUnderline = false) => {
   const isTraditional = colorScheme === 'traditional';
   if (isExtendedEnabled(diffType) && isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
-      return editingContentStyleInBlockExtended;
+      return hideAddedDiffsUnderline ? editingContentStyleInBlockExtendedNoUnderline : editingContentStyleInBlockExtended;
     }
     if (isTextLikeBlockNode(nodeName)) {
       return undefined;
@@ -219,12 +219,13 @@ const applyStylesToElement = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   const currentStyle = element.getAttribute('style') || '';
-  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, diffType);
+  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType) || '';
+  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
   element.setAttribute('style', `${currentStyle}${contentStyle}${nodeSpecificStyle}`);
 };
 const applyMultiContainerLikeStyles = ({
@@ -233,11 +234,12 @@ const applyMultiContainerLikeStyles = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   const currentStyle = element.getAttribute('style') || '';
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType) || '';
+  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
   if (targetNode.type.name === 'decisionList') {
     element.querySelectorAll('li').forEach(listItem => {
       const currentListItemStyle = listItem.getAttribute('style') || '';
@@ -262,14 +264,15 @@ const applyTextLikeBlockNodeStyles = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   const currentStyle = element.getAttribute('style') || '';
-  const nodeSpecificStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive, diffType) || '';
+  const nodeSpecificStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
   if (nodeSpecificStyle) {
     element.setAttribute('style', `${currentStyle}${nodeSpecificStyle}`);
   }
-  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, diffType);
+  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
   const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
   const textNodesToWrap = [];
   let currentNode = walker.nextNode();
@@ -296,17 +299,18 @@ const createBlockNodeContentWrapper = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   const contentWrapper = document.createElement('div');
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  const nodeStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType);
+  const nodeStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline);
 
   // When the extended experiment is enabled and the content is inserted,
   // block widget nodes that already have dedicated node-level styling (e.g. boxShadow outline)
   // should not also get the inline content style (borderBottom underline) on their container.
   const shouldSkipContentStyle = isExtendedEnabled(diffType) && isInserted && nodeStyle !== undefined;
-  const contentStyle = shouldSkipContentStyle ? '' : getChangedContentStyle(colorScheme, isActive, isInserted, diffType);
+  const contentStyle = shouldSkipContentStyle ? '' : getChangedContentStyle(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
   contentWrapper.setAttribute('style', `${contentStyle}${nodeStyle || ''}`);
   contentWrapper.append(nodeView);
   return contentWrapper;
@@ -419,7 +423,8 @@ const wrapBlockNode = ({
   intl,
   isActive = false,
   isInserted = false,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   const blockWrapper = createBlockNodeWrapper();
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
@@ -453,7 +458,8 @@ const wrapBlockNode = ({
     colorScheme,
     isActive,
     isInserted,
-    diffType
+    diffType,
+    hideAddedDiffsUnderline
   });
   blockWrapper.append(contentWrapper);
   if (nodeView instanceof HTMLElement && shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
@@ -485,7 +491,8 @@ export const wrapBlockNodeView = ({
   intl,
   isActive = false,
   isInserted = false,
-  diffType
+  diffType,
+  hideAddedDiffsUnderline = false
 }) => {
   if (isExtendedEnabled(diffType)) {
     if (nodeView instanceof HTMLElement) {
@@ -496,7 +503,8 @@ export const wrapBlockNodeView = ({
           colorScheme,
           isActive,
           isInserted,
-          diffType
+          diffType,
+          hideAddedDiffsUnderline
         });
         dom.append(nodeView);
         return;
@@ -508,7 +516,8 @@ export const wrapBlockNodeView = ({
           colorScheme,
           isActive,
           isInserted,
-          diffType
+          diffType,
+          hideAddedDiffsUnderline
         });
         dom.append(nodeView);
         return;
@@ -531,7 +540,8 @@ export const wrapBlockNodeView = ({
       intl,
       isActive,
       isInserted,
-      diffType
+      diffType,
+      hideAddedDiffsUnderline
     });
     return;
   } else {
@@ -566,14 +576,14 @@ const getDeletedContentStyleUnbounded = (colorScheme, isActive = false) => {
   }
   return colorScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
 };
-const getInsertedContentStyle = (colorScheme, isActive = false) => {
+const getInsertedContentStyle = (colorScheme, isActive = false, hideAddedDiffsUnderline = false) => {
   if (colorScheme === 'traditional') {
     return isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
   }
   if (isActive) {
-    return editingStyleActiveExtended;
+    return hideAddedDiffsUnderline ? editingStyleActiveExtendedNoUnderline : editingStyleActiveExtended;
   }
-  return editingStyleExtended;
+  return hideAddedDiffsUnderline ? editingStyleExtendedNoUnderline : editingStyleExtended;
 };
 const getDeletedContentStyle = (colorScheme, isActive = false, diffType) => {
   if (colorScheme === 'traditional') {

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

@@ -32,6 +32,7 @@ export const createPlugin = (config, getIntl, api) => {
             isInverted: false,
             diffType: 'inline',
             hideDeletedDiffs: false,
+            hideAddedDiffsUnderline: false,
             showIndicators: false,
             diffDescriptors: []
           } : {})
@@ -42,7 +43,7 @@ export const createPlugin = (config, getIntl, api) => {
         let newPluginState = currentPluginState;
         if (meta) {
           if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SHOW_DIFF') {
-            var _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8;
+            var _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8, _newPluginState9;
             // Update the plugin state with the new metadata
             newPluginState = {
               ...currentPluginState,
@@ -66,14 +67,15 @@ export const createPlugin = (config, getIntl, api) => {
                 isInverted: (_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.isInverted,
                 diffType: (_newPluginState3 = newPluginState) === null || _newPluginState3 === void 0 ? void 0 : _newPluginState3.diffType,
                 hideDeletedDiffs: (_newPluginState4 = newPluginState) === null || _newPluginState4 === void 0 ? void 0 : _newPluginState4.hideDeletedDiffs,
-                showIndicators: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.showIndicators,
-                smartThresholds: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.smartThresholds,
-                deletedDiffPlacement: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.deletedDiffPlacement
+                hideAddedDiffsUnderline: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.hideAddedDiffsUnderline,
+                showIndicators: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.showIndicators,
+                smartThresholds: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.smartThresholds,
+                deletedDiffPlacement: (_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.deletedDiffPlacement
               } : {})
             });
             // Update the decorations and their ids
             newPluginState.decorations = decorations;
-            if (isExtendedEnabled((_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.diffType)) {
+            if (isExtendedEnabled((_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.diffType)) {
               newPluginState.diffDescriptors = diffDescriptors;
             }
           } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'HIDE_DIFF') {
@@ -91,13 +93,14 @@ export const createPlugin = (config, getIntl, api) => {
                 isInverted: false,
                 diffType: 'inline',
                 hideDeletedDiffs: false,
+                hideAddedDiffsUnderline: false,
                 diffDescriptors: []
               } : {})
             };
           } 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') {
-            var _newPluginState9;
+            var _newPluginState0;
             // Update the active index in plugin state and recalculate decorations
-            const decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.diffType);
+            const decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState0 = newPluginState) === null || _newPluginState0 === void 0 ? void 0 : _newPluginState0.diffType);
             if (decorations.length > 0) {
               var _currentPluginState$a;
               // Initialize to -1 if undefined so that the first "next" scroll takes us to index 0 (first change).
@@ -139,6 +142,7 @@ export const createPlugin = (config, getIntl, api) => {
                   isInverted: newPluginState.isInverted,
                   diffType: newPluginState.diffType,
                   hideDeletedDiffs: newPluginState.hideDeletedDiffs,
+                  hideAddedDiffsUnderline: newPluginState.hideAddedDiffsUnderline,
                   showIndicators: newPluginState.showIndicators,
                   smartThresholds: newPluginState.smartThresholds,
                   deletedDiffPlacement: newPluginState.deletedDiffPlacement

package/dist/esm/entry-points/calculate-diff.js

@@ -0,0 +1,2 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+export { computeDiffChanges } from '../pm-plugins/calculateDiff/computeDiffChanges';

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

@@ -139,6 +139,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     diffType = _ref3$diffType === void 0 ? 'inline' : _ref3$diffType,
     _ref3$hideDeletedDiff = _ref3.hideDeletedDiffs,
     hideDeletedDiffs = _ref3$hideDeletedDiff === void 0 ? false : _ref3$hideDeletedDiff,
+    _ref3$hideAddedDiffsU = _ref3.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderlineParam = _ref3$hideAddedDiffsU === void 0 ? false : _ref3$hideAddedDiffsU,
     _ref3$showIndicators = _ref3.showIndicators,
     showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators,
     smartThresholds = _ref3.smartThresholds,
@@ -153,6 +155,10 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
       diffDescriptors: []
     };
   }
+
+  // Resolve the option against its gate once here, so every downstream inline/block builder
+  // receives the same value. When the gate is off the option is a no-op.
+  var hideAddedDiffsUnderline = hideAddedDiffsUnderlineParam && fg('platform_editor_ai_smart_diff');
   var tr = state.tr;
   var steppedDoc = originalDoc;
   var attrSteps = [];
@@ -261,7 +267,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
             }, isExtendedEnabled(diffType) && {
               isInserted: isInserted,
               shouldHideDeleted: shouldHideDeleted,
-              showIndicators: showIndicators
+              showIndicators: showIndicators,
+              hideAddedDiffsUnderline: hideAddedDiffsUnderline
             }))));
           }
         } catch (err) {
@@ -279,7 +286,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
         }, isExtendedEnabled(diffType) && {
           isInserted: isInserted,
           shouldHideDeleted: shouldHideDeleted,
-          showIndicators: showIndicators
+          showIndicators: showIndicators,
+          hideAddedDiffsUnderline: hideAddedDiffsUnderline
         }))));
       }
       decorations.push.apply(decorations, _toConsumableArray(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({
@@ -311,6 +319,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
         }, isExtendedEnabled(diffType) && {
           isInserted: !isInserted,
           diffType: diffType,
+          hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           // For `smart` node- and paragraph-level changes, optionally render the
           // deleted content below the new content (gray + strikethrough) instead
           // of above it. Controlled by `deletedDiffPlacement` (default `'top'`).
@@ -455,6 +464,7 @@ function (_ref5, _ref6) {
     isInverted = _ref7$.isInverted,
     diffType = _ref7$.diffType,
     hideDeletedDiffs = _ref7$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref7$.hideAddedDiffsUnderline,
     showIndicators = _ref7$.showIndicators,
     smartThresholds = _ref7$.smartThresholds,
     deletedDiffPlacement = _ref7$.deletedDiffPlacement;
@@ -468,13 +478,14 @@ function (_ref5, _ref6) {
     lastIsInverted = _ref8$.isInverted,
     lastDiffType = _ref8$.diffType,
     lastHideDeletedDiffs = _ref8$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
     lastShowIndicators = _ref8$.showIndicators,
     lastSmartThresholds = _ref8$.smartThresholds,
     lastDeletedDiffPlacement = _ref8$.deletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
     var _ref9;
-    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
+    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
   }
   return (_ref0 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref0 !== void 0 ? _ref0 : false;
 });