@atlaskit/editor-plugin-show-diff 3.1.4 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 3.2.0
+
+### Minor Changes
+
+- [`68caaf98e8f89`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/68caaf98e8f89) -
+  [ux] [EDITOR-1628] Added "Removed" Lozenge and gray border decorations to deleted block nodes in
+  show diff view
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.1.5
+
+### Patch Changes
+
+- [`7c8492867be97`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7c8492867be97) -
+  [ux] Add support for media attribute changes in the diff
+
 ## 3.1.4
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-cc/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-jira/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-post-office/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../../platform/feature-flags/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-products/tsconfig.json"
 		},

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

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAttrChangeRanges = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _steps = require("@atlaskit/adf-schema/steps");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var filterUndefined = function filterUndefined(x) {
+  return !!x;
+};
+
+// Currently allow attributes that indicats a change in media image
+var allowedAttrs = ['id', 'collection', 'url'];
+var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRanges(doc, steps) {
+  return steps.map(function (step) {
+    if (step instanceof _transform.AttrStep && allowedAttrs.includes(step.attr) || step instanceof _steps.SetAttrsStep && (0, _toConsumableArray2.default)(Object.keys(step.attrs)).some(function (v) {
+      return allowedAttrs.includes(v);
+    })) {
+      var $pos = doc.resolve(step.pos);
+      if ($pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+        var startPos = $pos.pos + $pos.parentOffset;
+        return {
+          fromB: startPos,
+          toB: startPos + $pos.parent.nodeSize - 1
+        };
+      }
+    }
+    return undefined;
+  }).filter(filterUndefined);
+};

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

@@ -15,6 +15,7 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _attributeDecorations = require("./attributeDecorations");
 var _decorations = require("./decorations");
 var _markDecorations = require("./markDecorations");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -94,7 +95,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   var state = _ref.state,
     pluginState = _ref.pluginState,
     nodeViewSerializer = _ref.nodeViewSerializer,
-    colourScheme = _ref.colourScheme;
+    colourScheme = _ref.colourScheme,
+    intl = _ref.intl;
   var originalDoc = pluginState.originalDoc,
     rawSteps = pluginState.steps;
   var steps = simplifySteps(rawSteps);
@@ -141,7 +143,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
         doc: originalDoc,
         nodeViewSerializer: nodeViewSerializer,
         colourScheme: colourScheme,
-        newDoc: tr.doc
+        newDoc: tr.doc,
+        intl: intl
       });
       if (decoration) {
         decorations.push(decoration);
@@ -151,6 +154,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   (0, _markDecorations.getMarkChangeRanges)(steps).forEach(function (change) {
     decorations.push((0, _decorations.createInlineChangedDecoration)(change, colourScheme));
   });
+  (0, _attributeDecorations.getAttrChangeRanges)(tr.doc, rawSteps).forEach(function (change) {
+    decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(tr.doc, change.fromB, change.toB, colourScheme)));
+  });
   return _view.DecorationSet.empty.add(tr.doc, decorations);
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
@@ -161,12 +167,14 @@ function (_ref2, _ref3) {
     _ref4$ = _ref4[0],
     pluginState = _ref4$.pluginState,
     state = _ref4$.state,
-    colourScheme = _ref4$.colourScheme;
+    colourScheme = _ref4$.colourScheme,
+    intl = _ref4$.intl;
   var _ref5 = (0, _slicedToArray2.default)(_ref3, 1),
     _ref5$ = _ref5[0],
     lastPluginState = _ref5$.pluginState,
     lastState = _ref5$.state,
-    lastColourScheme = _ref5$.colourScheme;
+    lastColourScheme = _ref5$.colourScheme,
+    lastIntl = _ref5$.intl;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
-  return (_ref6 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colourScheme === lastColourScheme) !== null && _ref6 !== void 0 ? _ref6 : false;
+  return (_ref6 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colourScheme === lastColourScheme && intl.locale === lastIntl.locale) !== null && _ref6 !== void 0 ? _ref6 : false;
 });

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

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createInlineChangedDecoration = exports.createDeletedContentDecoration = exports.createBlockChangedDecoration = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var _messages = require("@atlaskit/editor-common/messages");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _findSafeInsertPos = require("./findSafeInsertPos");
 var editingStyle = (0, _lazyNodeView.convertToInlineCss)({
   background: "var(--ds-background-accent-purple-subtlest, #F3F0FF)",
@@ -76,6 +78,59 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
       return colourScheme === 'traditional' ? traditionalStyleNode : editingStyleNode;
   }
 };
+var getDeletedStyleNode = function getDeletedStyleNode(nodeName) {
+  switch (nodeName) {
+    case 'blockquote':
+      return deletedStyleQuoteNode;
+    case 'expand':
+    case 'decisionList':
+      return deletedBlockOutline;
+    case 'panel':
+    case 'codeBlock':
+      return deletedBlockOutlineRounded;
+    default:
+      return undefined;
+  }
+};
+var shouldShowRemovedLozenge = function shouldShowRemovedLozenge(nodeName) {
+  switch (nodeName) {
+    case 'expand':
+    case 'codeBlock':
+    case 'mediaSingle':
+    case 'panel':
+    case 'decisionList':
+      return true;
+    default:
+      return false;
+  }
+};
+var shouldFitContentWidth = function shouldFitContentWidth(nodeName) {
+  switch (nodeName) {
+    case 'mediaSingle':
+    case 'embedCard':
+    case 'blockCard':
+      return true;
+    default:
+      return false;
+  }
+};
+var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeClass(nodeName) {
+  switch (nodeName) {
+    case 'mediaSingle':
+    case 'embedCard':
+      return true;
+    default:
+      return false;
+  }
+};
+
+/**
+ * Checks if a node should apply deleted styles directly without wrapper
+ * to preserve natural block-level margins
+ */
+var shouldApplyDeletedStylesDirectly = function shouldApplyDeletedStylesDirectly(nodeName) {
+  return nodeName === 'blockquote' || nodeName === 'heading';
+};
 var editingStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
   borderLeft: "2px solid ".concat("var(--ds-border-accent-purple, #8270DB)")
 });
@@ -104,6 +159,18 @@ var traditionalStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
   boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
   borderRadius: "var(--ds-radius-medium, 6px)"
 });
+var deletedStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
+  borderLeft: "2px solid ".concat("var(--ds-border-accent-gray, #758195)")
+});
+var deletedBlockOutline = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #758195)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var deletedBlockOutlineRounded = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #758195)"),
+  borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)")
+});
+
 /**
  * Inline decoration used for insertions as the content already exists in the document
  *
@@ -146,18 +213,149 @@ var deletedTraditionalContentStyleUnbounded = (0, _lazyNodeView.convertToInlineC
   pointerEvents: 'none',
   zIndex: 1
 });
+var lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
+  display: 'inline-flex',
+  boxSizing: 'border-box',
+  position: 'static',
+  blockSize: 'min-content',
+  borderRadius: "var(--ds-radius-small, 4px)",
+  overflow: 'hidden',
+  paddingInlineStart: "var(--ds-space-050, 4px)",
+  paddingInlineEnd: "var(--ds-space-050, 4px)",
+  backgroundColor: "var(--ds-background-accent-gray-subtler, #DCDFE4)",
+  font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-bold, 700)",
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap',
+  color: "var(--ds-text-warning-inverse, #172B4D)"
+});
 var getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
 };
 var getDeletedContentStyle = function getDeletedContentStyle(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyle : deletedContentStyle;
 };
+
+/**
+ * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
+ */
+var createRemovedLozenge = function createRemovedLozenge(intl, nodeName) {
+  var container = document.createElement('span');
+  var borderTopRightRadius;
+  var borderTopLeftRadius;
+  if (['expand', 'decisionList'].includes(nodeName || '')) {
+    borderTopRightRadius = "var(--ds-radius-small, 4px)";
+  } else if (['panel', 'codeBlock'].includes(nodeName || '')) {
+    borderTopRightRadius = "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)");
+  } else if (nodeName === 'mediaSingle') {
+    borderTopLeftRadius = "var(--ds-radius-small, 4px)";
+  }
+  var containerStyle = (0, _lazyNodeView.convertToInlineCss)({
+    position: 'absolute',
+    top: nodeName === 'mediaSingle' ? "var(--ds-space-300, 24px)" : "var(--ds-space-0, 0px)",
+    right: nodeName === 'mediaSingle' ? undefined : "var(--ds-space-0, 0px)",
+    left: nodeName === 'mediaSingle' ? "var(--ds-space-0, 0px)" : undefined,
+    zIndex: 2,
+    pointerEvents: 'none',
+    display: 'flex',
+    overflow: 'hidden',
+    borderTopRightRadius: borderTopRightRadius,
+    borderTopLeftRadius: borderTopLeftRadius
+  });
+  container.setAttribute('style', containerStyle);
+  container.setAttribute('data-testid', 'show-diff-removed-lozenge');
+
+  // Create vanilla HTML lozenge element with Atlaskit Lozenge styling (visual refresh)
+  var lozengeElement = document.createElement('span');
+  lozengeElement.setAttribute('style', lozengeStyle);
+  lozengeElement.textContent = intl.formatMessage(_messages.trackChangesMessages.removed).toUpperCase();
+  container.appendChild(lozengeElement);
+  return container;
+};
+
+/**
+ * Wraps a block node in a container with relative positioning to support absolute positioned lozenge
+ */
+var createBlockNodeWrapper = function createBlockNodeWrapper(nodeName) {
+  var wrapper = document.createElement('div');
+  var fitContent = shouldFitContentWidth(nodeName);
+  var baseStyle = (0, _lazyNodeView.convertToInlineCss)({
+    position: 'relative',
+    display: fitContent ? 'inline-block' : 'block',
+    width: fitContent ? 'fit-content' : undefined,
+    height: fitContent ? 'fit-content' : undefined,
+    opacity: 1
+  });
+  wrapper.setAttribute('style', baseStyle);
+  return wrapper;
+};
+
+/**
+ * Wraps content with deleted styling without opacity (for use when content is a direct child of dom)
+ */
+var createDeletedStyleWrapperWithoutOpacity = function createDeletedStyleWrapperWithoutOpacity(colourScheme) {
+  var wrapper = document.createElement('span');
+  wrapper.setAttribute('style', getDeletedContentStyle(colourScheme));
+  return wrapper;
+};
+
+/**
+ * Applies deleted styles directly to an HTML element by merging with existing styles
+ */
+var applyDeletedStylesToElement = function applyDeletedStylesToElement(element, targetNode, colourScheme) {
+  var currentStyle = element.getAttribute('style') || '';
+  var deletedContentStyle = getDeletedContentStyle(colourScheme);
+  var nodeSpecificStyle = getDeletedStyleNode(targetNode.type.name) || '';
+  element.setAttribute('style', "".concat(currentStyle).concat(deletedContentStyle).concat(nodeSpecificStyle));
+};
+
+/**
+ * Appends a block node with wrapper, lozenge, and appropriate styling
+ */
+var appendBlockNodeWithWrapper = function appendBlockNodeWithWrapper(dom, nodeView, targetNode, colourScheme, intl) {
+  var blockWrapper = createBlockNodeWrapper(targetNode.type.name);
+  if (shouldShowRemovedLozenge(targetNode.type.name)) {
+    var lozenge = createRemovedLozenge(intl, targetNode.type.name);
+    blockWrapper.append(lozenge);
+  }
+
+  // Wrap the nodeView in a content wrapper that has the opacity style AND the box-shadow
+  // This keeps the lozenge at full opacity while the content AND border are faded
+  var contentWrapper = document.createElement('div');
+  var nodeStyle = getDeletedStyleNode(targetNode.type.name);
+  contentWrapper.setAttribute('style', "".concat(getDeletedContentStyle(colourScheme)).concat(nodeStyle || ''));
+  contentWrapper.append(nodeView);
+  blockWrapper.append(contentWrapper);
+  if (nodeView instanceof HTMLElement) {
+    if (shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
+      nodeView.classList.add('show-diff-deleted-node');
+    }
+  }
+  dom.append(blockWrapper);
+};
+
+/**
+ * Handles all block node rendering with appropriate deleted styling.
+ * For blockquote and heading nodes, applies styles directly to preserve natural margins.
+ * For other block nodes, uses wrapper approach with optional lozenge.
+ */
+var handleBlockNodeView = function handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl) {
+  if (shouldApplyDeletedStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
+    // Apply deleted styles directly to preserve natural block-level margins
+    applyDeletedStylesToElement(nodeView, targetNode, colourScheme);
+    dom.append(nodeView);
+  } else {
+    // Use wrapper approach for other block nodes
+    appendBlockNodeWithWrapper(dom, nodeView, targetNode, colourScheme, intl);
+  }
+};
 var createDeletedContentDecoration = exports.createDeletedContentDecoration = function createDeletedContentDecoration(_ref) {
   var change = _ref.change,
     doc = _ref.doc,
     nodeViewSerializer = _ref.nodeViewSerializer,
     colourScheme = _ref.colourScheme,
-    newDoc = _ref.newDoc;
+    newDoc = _ref.newDoc,
+    intl = _ref.intl;
   var slice = doc.slice(change.fromA, change.toA);
   if (slice.content.content.length === 0) {
     return;
@@ -174,7 +372,9 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
 
   // For non-table content, use the existing span wrapper approach
   var dom = document.createElement('span');
-  dom.setAttribute('style', getDeletedContentStyle(colourScheme));
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
+    dom.setAttribute('style', getDeletedContentStyle(colourScheme));
+  }
 
   /*
    * The thinking is we separate out the fragment we got from doc.slice
@@ -186,8 +386,11 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
     // Create a wrapper for each node with strikethrough
     var createWrapperWithStrikethrough = function createWrapperWithStrikethrough() {
       var wrapper = document.createElement('span');
-      wrapper.style.position = 'relative';
-      wrapper.style.width = 'fit-content';
+      var baseStyle = (0, _lazyNodeView.convertToInlineCss)({
+        position: 'relative',
+        width: 'fit-content'
+      });
+      wrapper.setAttribute('style', "".concat(baseStyle).concat(getDeletedContentStyle(colourScheme)));
       var strikethrough = document.createElement('span');
       strikethrough.setAttribute('style', getDeletedContentStyleUnbounded(colourScheme));
       wrapper.append(strikethrough);
@@ -210,7 +413,13 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
             // Fallback to serializing the individual child node
             var serializedChild = serializer.serializeNode(childNode);
             if (serializedChild) {
-              dom.append(serializedChild);
+              if ((0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
+                var _wrapper = createWrapperWithStrikethrough();
+                _wrapper.append(serializedChild);
+                dom.append(_wrapper);
+              } else {
+                dom.append(serializedChild);
+              }
             }
           }
         });
@@ -266,6 +475,9 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
         var wrapper = createWrapperWithStrikethrough();
         wrapper.append(nodeView);
         dom.append(wrapper);
+      } else if ((0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
+        // Handle all block nodes with unified function
+        handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl);
       } else {
         dom.append(nodeView);
       }
@@ -275,7 +487,13 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
     } else {
       var fallbackNode = fallbackSerialization();
       if (fallbackNode) {
-        dom.append(fallbackNode);
+        if ((0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
+          var _wrapper2 = createDeletedStyleWrapperWithoutOpacity(colourScheme);
+          _wrapper2.append(fallbackNode);
+          dom.append(_wrapper2);
+        } else {
+          dom.append(fallbackNode);
+        }
       }
     }
   });
@@ -284,5 +502,5 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
   // 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);
-  return _view.Decoration.widget(safeInsertPos, dom, {});
+  return _view.Decoration.widget(safeInsertPos, dom);
 };

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

@@ -8,15 +8,15 @@ exports.showDiffPluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _state = require("@atlaskit/editor-prosemirror/state");
+var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _calculateDiffDecorations = require("./calculateDiffDecorations");
 var _NodeViewSerializer = require("./NodeViewSerializer");
 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; }
-var showDiffPluginKey = exports.showDiffPluginKey = new _state.PluginKey('showDiffPlugin');
-var createPlugin = exports.createPlugin = function createPlugin(config) {
+var showDiffPluginKey = exports.showDiffPluginKey = new _state2.PluginKey('showDiffPlugin');
+var createPlugin = exports.createPlugin = function createPlugin(config, getIntl) {
   var nodeViewSerializer = new _NodeViewSerializer.NodeViewSerializer({});
   var setNodeViewSerializer = function setNodeViewSerializer(editorView) {
     nodeViewSerializer.init({
@@ -26,7 +26,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config) {
   return new _safePlugin.SafePlugin({
     key: showDiffPluginKey,
     state: {
-      init: function init(_, state) {
+      init: function init(_, _state) {
         // We do initial setup after we setup the editor view
         return {
           steps: [],
@@ -49,7 +49,8 @@ var createPlugin = exports.createPlugin = function createPlugin(config) {
               state: newState,
               pluginState: newPluginState,
               nodeViewSerializer: nodeViewSerializer,
-              colourScheme: config === null || config === void 0 ? void 0 : config.colourScheme
+              colourScheme: config === null || config === void 0 ? void 0 : config.colourScheme,
+              intl: getIntl()
             });
             // Update the decorations
             newPluginState.decorations = decorations;

package/dist/cjs/showDiffPlugin.js

@@ -10,7 +10,7 @@ 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; }
 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 showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
-  var api = _ref.api,
+  var _api = _ref.api,
     config = _ref.config;
   return {
     name: 'showDiff',
@@ -34,8 +34,9 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'showDiffPlugin',
-        plugin: function plugin() {
-          return (0, _main.createPlugin)(config);
+        plugin: function plugin(_ref4) {
+          var getIntl = _ref4.getIntl;
+          return (0, _main.createPlugin)(config, getIntl);
         }
       }];
     },

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

@@ -0,0 +1,21 @@
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
+const filterUndefined = x => !!x;
+
+// Currently allow attributes that indicats a change in media image
+const allowedAttrs = ['id', 'collection', 'url'];
+export const getAttrChangeRanges = (doc, steps) => {
+  return steps.map(step => {
+    if (step instanceof AttrStep && allowedAttrs.includes(step.attr) || step instanceof SetAttrsStep && [...Object.keys(step.attrs)].some(v => allowedAttrs.includes(v))) {
+      const $pos = doc.resolve(step.pos);
+      if ($pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+        const startPos = $pos.pos + $pos.parentOffset;
+        return {
+          fromB: startPos,
+          toB: startPos + $pos.parent.nodeSize - 1
+        };
+      }
+    }
+    return undefined;
+  }).filter(filterUndefined);
+};

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

@@ -6,6 +6,7 @@ import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { getAttrChangeRanges } from './attributeDecorations';
 import { createInlineChangedDecoration, createDeletedContentDecoration, createBlockChangedDecoration } from './decorations';
 import { getMarkChangeRanges } from './markDecorations';
 const calculateNodesForBlockDecoration = (doc, from, to, colourScheme) => {
@@ -82,7 +83,8 @@ const calculateDiffDecorationsInner = ({
   state,
   pluginState,
   nodeViewSerializer,
-  colourScheme
+  colourScheme,
+  intl
 }) => {
   const {
     originalDoc,
@@ -125,7 +127,8 @@ const calculateDiffDecorationsInner = ({
         doc: originalDoc,
         nodeViewSerializer,
         colourScheme,
-        newDoc: tr.doc
+        newDoc: tr.doc,
+        intl
       });
       if (decoration) {
         decorations.push(decoration);
@@ -135,6 +138,9 @@ const calculateDiffDecorationsInner = ({
   getMarkChangeRanges(steps).forEach(change => {
     decorations.push(createInlineChangedDecoration(change, colourScheme));
   });
+  getAttrChangeRanges(tr.doc, rawSteps).forEach(change => {
+    decorations.push(...calculateNodesForBlockDecoration(tr.doc, change.fromB, change.toB, colourScheme));
+  });
   return DecorationSet.empty.add(tr.doc, decorations);
 };
 export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
@@ -142,13 +148,15 @@ export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner
 ([{
   pluginState,
   state,
-  colourScheme
+  colourScheme,
+  intl
 }], [{
   pluginState: lastPluginState,
   state: lastState,
-  colourScheme: lastColourScheme
+  colourScheme: lastColourScheme,
+  intl: lastIntl
 }]) => {
   var _ref;
   const originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
-  return (_ref = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colourScheme === lastColourScheme) !== null && _ref !== void 0 ? _ref : false;
+  return (_ref = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colourScheme === lastColourScheme && intl.locale === lastIntl.locale) !== null && _ref !== void 0 ? _ref : false;
 });