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

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

@@ -8,7 +8,6 @@ exports.createNodeChangedDecorationWidget = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _isExtendedEnabled = require("../isExtendedEnabled");
 var _emptyTextBlocks = require("../utils/emptyTextBlocks");
 var _isEmptyParagraphSlice = require("../utils/isEmptyParagraphSlice");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
@@ -41,8 +40,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     nodeViewSerializer = _ref.nodeViewSerializer,
     colorScheme = _ref.colorScheme,
     isInserted = _ref.isInserted,
-    leftAnchorId = _ref.leftAnchorId,
-    diffType = _ref.diffType;
+    leftAnchorId = _ref.leftAnchorId;
   // Collect the inner content position of each cell in the new document within
   // the change range. Whole-cell replacement preserves cell count/order, so the
   // nth new-doc cell corresponds to the nth cell in the slice.
@@ -70,7 +68,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     // so every block inside the cell is rendered.
     cellNode.content.forEach(function (blockNode) {
       var nodeView = nodeViewSerializer.tryCreateNodeView(blockNode);
-      var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, false, isInserted, diffType);
+      var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, false, isInserted);
       if (nodeView) {
         wrapper.append(nodeView);
       } else {
@@ -94,16 +92,14 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
 
     // Skip findSafeInsertPos: it walks forward to a schema-valid cell-insert point
     // and pushes the widget into the next cell. `targetPos` is the correct spot.
-    decorations.push(_view.Decoration.widget(targetPos, dom, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
+    decorations.push(_view.Decoration.widget(targetPos, dom, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: crypto.randomUUID(),
       leftAnchorId: leftAnchorId,
       isInserted: isInserted,
-      diffType: diffType
-    }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
       side: -1
-    })))));
+    }))));
   });
   return decorations;
 };
@@ -131,7 +127,6 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
     _ref2$placeBelow = _ref2.placeBelow,
     placeBelow = _ref2$placeBelow === void 0 ? false : _ref2$placeBelow,
-    diffType = _ref2.diffType,
     _ref2$hideAddedDiffsU = _ref2.hideAddedDiffsUnderline,
     hideAddedDiffsUnderline = _ref2$hideAddedDiffsU === void 0 ? false : _ref2$hideAddedDiffsU,
     reveal = _ref2.reveal,
@@ -163,7 +158,6 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     return [(0, _createDeletedLineBreakWidget.createDeletedLineBreakDecoration)({
       colorScheme: colorScheme,
       count: deletedBlankLineCount,
-      diffType: diffType,
       isActive: isActive,
       pos: safeInsertPos,
       reveal: reveal,
@@ -188,8 +182,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
       isInserted: isInserted,
-      leftAnchorId: leftAnchorId,
-      diffType: diffType
+      leftAnchorId: leftAnchorId
     });
   }
   if (tableDiffMode.kind === 'none') {
@@ -206,7 +199,6 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       isActive: isActive,
       isInserted: isInserted,
       leftAnchorId: leftAnchorId,
-      diffType: diffType,
       intl: intl,
       // Needed for the row's own indicator anchor; this path returns before the
       // `anchor-name` assignment further down.
@@ -233,8 +225,8 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   var isVisuallyFirstInParent = !placeBelow && $safeInsertPos.parentOffset === 0;
   var isTopLevelInsert = $safeInsertPos.depth === 0;
   var hasPreviousBlock = ((_$safeInsertPos$nodeB = $safeInsertPos.nodeBefore) === null || _$safeInsertPos$nodeB === void 0 ? void 0 : _$safeInsertPos$nodeB.isBlock) === true;
-  var isFirstDocHeadingReplacement = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !placeBelow && change.fromB === 0 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'heading' && ((_newDoc$firstChild = newDoc.firstChild) === null || _newDoc$firstChild === void 0 ? void 0 : _newDoc$firstChild.type.name) === 'heading';
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isTopLevelInsert && hasPreviousBlock && !isFirstDocHeadingReplacement) {
+  var isFirstDocHeadingReplacement = !placeBelow && change.fromB === 0 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'heading' && ((_newDoc$firstChild = newDoc.firstChild) === null || _newDoc$firstChild === void 0 ? void 0 : _newDoc$firstChild.type.name) === 'heading';
+  if (isTopLevelInsert && hasPreviousBlock && !isFirstDocHeadingReplacement) {
     // Editor CSS removes the top margin from a block when it is its parent's first child.
     // Keep the serialized block as a subsequent child so each block type retains its own margin.
     dom.append(dom.ownerDocument.createElement('div'));
@@ -250,27 +242,23 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   // incorrectly applies because isNestedNode resolves to false (getPos returns 0).
   // Observe DOM mutations and override the transform on .rich-media-item elements
   // after React mounts to prevent the image from shifting outside its parent container.
-  var constrainMediaObserver;
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    constrainMediaObserver = new MutationObserver(function () {
-      var richMediaItems = dom.querySelectorAll('.rich-media-item');
-      richMediaItems.forEach(function (el) {
-        if (el instanceof HTMLElement) {
-          el.style.transform = 'none';
-          el.style.marginLeft = '0';
-          el.style.maxWidth = '100%';
-        }
-      });
-      if (richMediaItems.length > 0) {
-        var _constrainMediaObserv;
-        (_constrainMediaObserv = constrainMediaObserver) === null || _constrainMediaObserv === void 0 || _constrainMediaObserv.disconnect();
+  var constrainMediaObserver = new MutationObserver(function () {
+    var richMediaItems = dom.querySelectorAll('.rich-media-item');
+    richMediaItems.forEach(function (el) {
+      if (el instanceof HTMLElement) {
+        el.style.transform = 'none';
+        el.style.marginLeft = '0';
+        el.style.maxWidth = '100%';
       }
     });
-    constrainMediaObserver.observe(dom, {
-      childList: true,
-      subtree: true
-    });
-  }
+    if (richMediaItems.length > 0) {
+      constrainMediaObserver.disconnect();
+    }
+  });
+  constrainMediaObserver.observe(dom, {
+    childList: true,
+    subtree: true
+  });
   // Derived from the deleted range so it survives a recalculation — see the same reasoning in
   // `createInlineChangedDecoration`.
   var diffId = showContributorTags ? "widget-".concat(change.fromA, "-").concat(change.toA) : crypto.randomUUID();
@@ -323,14 +311,14 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
           if (childNodeView) {
             var lineBreak = document.createElement('br');
             dom.append(lineBreak);
-            var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, diffType);
+            var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted);
             wrapper.append(childNodeView);
             dom.append(wrapper);
           } else {
             // Fallback to serializing the individual child node
             var serializedChild = serializer.serializeNode(childNode);
             if (serializedChild) {
-              var _wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, diffType);
+              var _wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted);
               _wrapper.append(serializedChild);
               dom.append(_wrapper);
             }
@@ -377,7 +365,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     var nodeView = serializer.tryCreateNodeView(node);
     if (nodeView) {
       if (node.isInline) {
-        var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, diffType, reveal);
+        var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, reveal);
         wrapper.append(nodeView);
         dom.append(wrapper);
       } else {
@@ -390,7 +378,6 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
           intl: intl,
           isActive: isActive,
           isInserted: isInserted,
-          diffType: diffType,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           highlightInlineLeafNodes: shouldPreserveCompleteMultiInlineBlock
         });
@@ -407,12 +394,11 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
             colorScheme: colorScheme,
             isActive: isActive,
             isInserted: isInserted,
-            diffType: diffType,
             reveal: reveal
           });
           dom.append(injectedNode);
         } else {
-          var _wrapper2 = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, diffType, reveal);
+          var _wrapper2 = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, reveal);
           _wrapper2.append(fallbackNode);
           dom.append(_wrapper2);
         }
@@ -481,7 +467,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
 
   // Needed even when the indicator bar is off, because a contributor tag also anchors against the
   // widget.
-  if ((showIndicators || showContributorTags) && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (showIndicators || showContributorTags) {
     dom.style.setProperty('anchor-name', "--".concat((0, _decorationKeys.buildAnchorDecorationKey)({
       diffId: diffId
     })));
@@ -538,7 +524,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       }
     }
   }
-  if (showIndicators && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (showIndicators) {
     var leftAnchor = (0, _createAnchorDecorationWidgets.createLeftAnchorWidget)({
       doc: newDoc,
       from: safeInsertPos,
@@ -555,7 +541,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
+  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
     attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
@@ -563,20 +549,17 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     leftAnchorId: leftAnchorId,
     isActive: isActive,
     isInserted: isInserted,
-    diffType: diffType
-  }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), {}, {
+  })), {}, {
     // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
     // adjacent text in the NEW document. `dom` already carries the original marks, so a
     // formatting change would render the deleted side wrapped in the very mark the edit
     // introduced — unbolded text shown struck through but still bold.
     marks: [],
     destroy: function destroy() {
-      var _constrainMediaObserv2;
-      (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 || _constrainMediaObserv2.disconnect();
+      constrainMediaObserver.disconnect();
       (0, _createContributorTagWidget.unmountContributorTag)(tagMount);
       tagMount = undefined;
     }
@@ -597,7 +580,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   // Away from the parent's start the node below keeps its own margin, and it is the block *inside*
   // the widget that loses one — handled by `absorbFirstChildMarginReset` above, not here.
   var nodeAfterWidget = $safeInsertPos.nodeAfter;
-  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_2') && (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isVisuallyFirstInParent && nodeAfterWidget) {
+  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_2') && isVisuallyFirstInParent && nodeAfterWidget) {
     var shapedSpacer = (0, _createNodeShapedMarginSpacer.createNodeShapedMarginSpacer)({
       node: nodeAfterWidget,
       serializer: serializer,
@@ -621,7 +604,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       }));
     }
   }
-  if (!(0, _fg.fg)('platform_editor_ai_show_diff_patch_2') && isDiffWidgetAtStartOfDoc && isSingleBlock && isPureDeletion && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (!(0, _fg.fg)('platform_editor_ai_show_diff_patch_2') && isDiffWidgetAtStartOfDoc && isSingleBlock && isPureDeletion) {
     var followingNode = $safeInsertPos.nodeAfter;
     var headingLevel = (followingNode === null || followingNode === void 0 ? void 0 : followingNode.type.name) === 'heading' ? followingNode.attrs.level : undefined;
     if (isHeadingLevel(headingLevel)) {
@@ -644,8 +627,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
         colorScheme: colorScheme,
         decorationType: 'widget',
         diffId: crypto.randomUUID(),
-        isInserted: isInserted,
-        diffType: diffType
+        isInserted: isInserted
       }))));
     }
   }

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

@@ -9,7 +9,6 @@ exports.buildAnchorDecorationSpec = buildAnchorDecorationSpec;
 exports.scrollMarginTopValue = exports.scrollMarginTopStyle = exports.isDiffDecorationSpec = exports.isDiffDecoration = exports.isAnchorDecorationSpec = exports.extractDiffDescriptors = exports.buildDiffDecorationSpec = exports.buildDiffDecorationKey = exports.buildContributorTagDecorationSpec = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _isExtendedEnabled = require("../isExtendedEnabled");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (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; }
 /**
@@ -63,19 +62,14 @@ var buildAnchorDecorationKey = exports.buildAnchorDecorationKey = function build
 };
 
 /**
- * Builds a diff decoration key. The extended experience includes the `diffId`
- * in the key so independently rendered decorations for the same type remain
- * distinguishable.
+ * Builds a diff decoration key. The key includes the `diffId` so independently
+ * rendered decorations for the same type remain distinguishable.
  */
 var buildDiffDecorationKey = exports.buildDiffDecorationKey = function buildDiffDecorationKey(_ref2) {
   var decorationKeyPrefix = _ref2.decorationKeyPrefix,
     isActive = _ref2.isActive,
-    diffId = _ref2.diffId,
-    diffType = _ref2.diffType;
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    return "".concat(decorationKeyPrefix, "-").concat(diffId, "-").concat(isActive ? 'active' : 'inactive');
-  }
-  return isActive !== undefined ? "".concat(decorationKeyPrefix, "-").concat(isActive ? 'active' : 'inactive') : decorationKeyPrefix;
+    diffId = _ref2.diffId;
+  return "".concat(decorationKeyPrefix, "-").concat(diffId, "-").concat(isActive ? 'active' : 'inactive');
 };
 var buildDiffDecorationSpec = exports.buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
   var attributionKey = _ref3.attributionKey,
@@ -86,8 +80,7 @@ var buildDiffDecorationSpec = exports.buildDiffDecorationSpec = function buildDi
     isInserted = _ref3.isInserted,
     leftAnchorId = _ref3.leftAnchorId,
     nodeName = _ref3.nodeName,
-    side = _ref3.side,
-    diffType = _ref3.diffType;
+    side = _ref3.side;
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     decorationFamily: DecorationFamily.diff,
     decorationType: decorationType,
@@ -95,8 +88,7 @@ var buildDiffDecorationSpec = exports.buildDiffDecorationSpec = function buildDi
     key: buildDiffDecorationKey({
       decorationKeyPrefix: DiffDecorationKey[decorationType],
       diffId: diffId,
-      isActive: isActive,
-      diffType: diffType
+      isActive: isActive
     })
   }, attributionKey ? {
     attributionKey: attributionKey

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.createDeletedLineBreakWidget = exports.createDeletedLineBreakDecoration = exports.RETURN_GLYPH = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _decorationKeys = require("../decorationKeys");
 var _wrapBlockNodeView = require("./wrapBlockNodeView");
 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; }
@@ -37,7 +36,6 @@ var createDeletedLineBreakWidget = exports.createDeletedLineBreakWidget = functi
   var colorScheme = _ref.colorScheme,
     _ref$count = _ref.count,
     count = _ref$count === void 0 ? 1 : _ref$count,
-    diffType = _ref.diffType,
     _ref$isActive = _ref.isActive,
     isActive = _ref$isActive === void 0 ? false : _ref$isActive,
     reveal = _ref.reveal;
@@ -55,7 +53,7 @@ var createDeletedLineBreakWidget = exports.createDeletedLineBreakWidget = functi
       // deleted-content wrapper is styled as an inline run.
       dom.append(dom.ownerDocument.createElement('br'));
     }
-    var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, false, diffType, reveal);
+    var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, false, reveal);
     wrapper.append(dom.ownerDocument.createTextNode(RETURN_GLYPH));
     dom.append(wrapper);
   }
@@ -75,7 +73,6 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
   var attributionKey = _ref2.attributionKey,
     colorScheme = _ref2.colorScheme,
     count = _ref2.count,
-    diffType = _ref2.diffType,
     _ref2$isActive = _ref2.isActive,
     isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
     pos = _ref2.pos,
@@ -84,7 +81,6 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
   return _view.Decoration.widget(pos, createDeletedLineBreakWidget({
     colorScheme: colorScheme,
     count: count,
-    diffType: diffType,
     isActive: isActive,
     reveal: reveal
   }), _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)(_objectSpread({
@@ -95,9 +91,8 @@ var createDeletedLineBreakDecoration = exports.createDeletedLineBreakDecoration
     isActive: isActive,
     // The glyph always stands in for removed content, whichever side of the changeset the
     // change itself landed on.
-    isInserted: false,
-    diffType: diffType
-  }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && side !== undefined && {
+    isInserted: false
+  }, side !== undefined && {
     side: side
   }))), {}, {
     // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the