@atlaskit/editor-plugin-show-diff 5.0.4 → 5.0.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 5.0.6
+
+### Patch Changes
+
+- [`2e27b70a136ed`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e27b70a136ed) -
+  EDITOR-5632: Further refactors to block / row handling - mainly renaming + param change to object
+  param to make it more extensible for future work.
+- Updated dependencies
+
+## 5.0.5
+
+### Patch Changes
+
+- [`8865b5e8a708a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8865b5e8a708a) -
+  EDITOR-5632: Refactor diff plugin to make functions more generic.
+- Updated dependencies
+
 ## 5.0.4
 
 ### Patch Changes

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

@@ -13,25 +13,34 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _attributeDecorations = require("./attributeDecorations");
-var _decorations = require("./decorations");
-var _markDecorations = require("./markDecorations");
+var _createBlockChangedDecoration = require("./decorations/createBlockChangedDecoration");
+var _createInlineChangedDecoration = require("./decorations/createInlineChangedDecoration");
+var _createNodeChangedDecorationWidget = require("./decorations/createNodeChangedDecorationWidget");
+var _getAttrChangeRanges = require("./decorations/utils/getAttrChangeRanges");
+var _getMarkChangeRanges = require("./decorations/utils/getMarkChangeRanges");
 var _simplifyChanges = require("./simplifyChanges");
 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; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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; } // eslint-disable-next-line @atlassian/tangerine/import/entry-points
-var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(doc, from, to, colorScheme) {
+var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref) {
+  var doc = _ref.doc,
+    from = _ref.from,
+    to = _ref.to,
+    colorScheme = _ref.colorScheme;
   var decorations = [];
   // Iterate over the document nodes within the range
   doc.nodesBetween(from, to, function (node, pos) {
     if (node.isBlock) {
-      var decoration = (0, _decorations.createBlockChangedDecoration)({
-        from: pos,
-        to: pos + node.nodeSize,
-        name: node.type.name
-      }, colorScheme);
+      var decoration = (0, _createBlockChangedDecoration.createBlockChangedDecoration)({
+        change: {
+          from: pos,
+          to: pos + node.nodeSize,
+          name: node.type.name
+        },
+        colorScheme: colorScheme
+      });
       if (decoration) {
         decorations.push(decoration);
       }
@@ -72,13 +81,13 @@ function optimizeChanges(changes) {
   optimized.push(current);
   return optimized;
 }
-var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref) {
-  var state = _ref.state,
-    pluginState = _ref.pluginState,
-    nodeViewSerializer = _ref.nodeViewSerializer,
-    colorScheme = _ref.colorScheme,
-    intl = _ref.intl,
-    activeIndexPos = _ref.activeIndexPos;
+var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref2) {
+  var state = _ref2.state,
+    pluginState = _ref2.pluginState,
+    nodeViewSerializer = _ref2.nodeViewSerializer,
+    colorScheme = _ref2.colorScheme,
+    intl = _ref2.intl,
+    activeIndexPos = _ref2.activeIndexPos;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps;
   if (!originalDoc || !pluginState.isDisplayingChanges) {
@@ -96,7 +105,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
       var step = _step.value;
       var result = step.apply(steppedDoc);
       if (result.failed === null && result.doc) {
-        if ((0, _attributeDecorations.stepIsValidAttrChange)(step, steppedDoc, result.doc)) {
+        if ((0, _getAttrChangeRanges.stepIsValidAttrChange)(step, steppedDoc, result.doc)) {
           attrSteps.push(step);
         }
         stepMaps.push(step.getMap());
@@ -121,12 +130,21 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   optimizedChanges.forEach(function (change) {
     var isActive = activeIndexPos && change.fromB >= activeIndexPos.from && change.toB <= activeIndexPos.to;
     if (change.inserted.length > 0) {
-      decorations.push((0, _decorations.createInlineChangedDecoration)(change, colorScheme, isActive));
-      decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(tr.doc, change.fromB, change.toB, colorScheme)));
+      decorations.push((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
+        change: change,
+        colorScheme: colorScheme,
+        isActive: isActive
+      }));
+      decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration({
+        doc: tr.doc,
+        from: change.fromB,
+        to: change.toB,
+        colorScheme: colorScheme
+      })));
     }
     if (change.deleted.length > 0) {
       var _isActive = activeIndexPos && change.fromB >= activeIndexPos.from && change.toB <= activeIndexPos.to;
-      var decoration = (0, _decorations.createDeletedContentDecoration)({
+      var decoration = (0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)({
         change: change,
         doc: originalDoc,
         nodeViewSerializer: nodeViewSerializer,
@@ -140,33 +158,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
       }
     }
   });
-  (0, _markDecorations.getMarkChangeRanges)(steps).forEach(function (change) {
+  (0, _getMarkChangeRanges.getMarkChangeRanges)(steps).forEach(function (change) {
     var isActive = activeIndexPos && change.fromB >= activeIndexPos.from && change.toB <= activeIndexPos.to;
-    decorations.push((0, _decorations.createInlineChangedDecoration)(change, colorScheme, isActive));
+    decorations.push((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
+      change: change,
+      colorScheme: colorScheme,
+      isActive: isActive
+    }));
   });
-  (0, _attributeDecorations.getAttrChangeRanges)(tr.doc, attrSteps).forEach(function (change) {
-    decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(tr.doc, change.fromB, change.toB, colorScheme)));
+  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrSteps).forEach(function (change) {
+    decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration({
+      doc: tr.doc,
+      from: change.fromB,
+      to: change.toB,
+      colorScheme: colorScheme
+    })));
   });
   return _view.DecorationSet.empty.add(tr.doc, decorations);
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref2, _ref3) {
-  var _ref6;
-  var _ref4 = (0, _slicedToArray2.default)(_ref2, 1),
-    _ref4$ = _ref4[0],
-    pluginState = _ref4$.pluginState,
-    state = _ref4$.state,
-    colorScheme = _ref4$.colorScheme,
-    intl = _ref4$.intl,
-    activeIndexPos = _ref4$.activeIndexPos;
+function (_ref3, _ref4) {
+  var _ref7;
   var _ref5 = (0, _slicedToArray2.default)(_ref3, 1),
     _ref5$ = _ref5[0],
-    lastPluginState = _ref5$.pluginState,
-    lastState = _ref5$.state,
-    lastColorScheme = _ref5$.colorScheme,
-    lastIntl = _ref5$.intl,
-    lastActiveIndexPos = _ref5$.activeIndexPos;
+    pluginState = _ref5$.pluginState,
+    state = _ref5$.state,
+    colorScheme = _ref5$.colorScheme,
+    intl = _ref5$.intl,
+    activeIndexPos = _ref5$.activeIndexPos;
+  var _ref6 = (0, _slicedToArray2.default)(_ref4, 1),
+    _ref6$ = _ref6[0],
+    lastPluginState = _ref6$.pluginState,
+    lastState = _ref6$.state,
+    lastColorScheme = _ref6$.colorScheme,
+    lastIntl = _ref6$.intl,
+    lastActiveIndexPos = _ref6$.activeIndexPos;
   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) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos)) !== null && _ref6 !== void 0 ? _ref6 : false;
+  return (_ref7 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos)) !== null && _ref7 !== void 0 ? _ref7 : false;
 });

package/dist/cjs/pm-plugins/{colorSchemes → decorations/colorSchemes}/standard.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getStandardNodeStyle = exports.editingStyleActive = exports.editingStyle = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNewActive = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = void 0;
+exports.standardDecorationMarkerVariable = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleCardBlockNode = exports.editingStyleActive = exports.editingStyle = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNewActive = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedBlockOutlineRounded = exports.deletedBlockOutline = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var editingStyle = exports.editingStyle = (0, _lazyNodeView.convertToInlineCss)({
   background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
@@ -54,43 +54,45 @@ var deletedContentStyleUnbounded = exports.deletedContentStyleUnbounded = (0, _l
   pointerEvents: 'none',
   zIndex: 1
 });
-var editingStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
+var deletedStyleQuoteNode = exports.deletedStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
+  borderLeft: "2px solid ".concat("var(--ds-border-accent-gray, #7D818A)")
+});
+var deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNodeWithLozenge = (0, _lazyNodeView.convertToInlineCss)({
+  marginTop: "var(--ds-space-150, 12px)",
+  paddingTop: "var(--ds-space-025, 2px)",
+  paddingBottom: "var(--ds-space-025, 2px)",
+  paddingLeft: "var(--ds-space-025, 2px)",
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var deletedBlockOutline = exports.deletedBlockOutline = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var deletedBlockOutlineRounded = exports.deletedBlockOutlineRounded = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
+  borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)")
+});
+var deletedRowStyle = exports.deletedRowStyle = (0, _lazyNodeView.convertToInlineCss)({
+  color: "var(--ds-text-accent-gray, #505258)",
+  textDecoration: 'line-through',
+  opacity: 0.6,
+  display: 'table-row'
+});
+var editingStyleQuoteNode = exports.editingStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
   borderLeft: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)")
 });
-var editingStyleRuleNode = (0, _lazyNodeView.convertToInlineCss)({
+var editingStyleRuleNode = exports.editingStyleRuleNode = (0, _lazyNodeView.convertToInlineCss)({
   backgroundColor: "var(--ds-border-accent-purple, #AF59E1)"
 });
-var editingStyleNode = (0, _lazyNodeView.convertToInlineCss)({
+var editingStyleNode = exports.editingStyleNode = (0, _lazyNodeView.convertToInlineCss)({
   boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   borderRadius: "var(--ds-radius-small, 4px)"
 });
-var editingStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
+var editingStyleCardBlockNode = exports.editingStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
   boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   borderRadius: "var(--ds-radius-medium, 6px)"
 });
-var standardDecorationMarkerVariableName = (0, _lazyNodeView.convertToInlineCss)({
+var standardDecorationMarkerVariable = exports.standardDecorationMarkerVariable = (0, _lazyNodeView.convertToInlineCss)({
   '--diff-decoration-marker-color': "var(--ds-border-accent-purple, #AF59E1)"
-});
-var getStandardNodeStyle = exports.getStandardNodeStyle = function getStandardNodeStyle(nodeName) {
-  if (['mediaSingle', 'mediaGroup', 'table',
-  // Handle table separately to avoid border issues
-  'tableRow', 'tableCell', 'tableHeader', 'paragraph',
-  // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
-    // Layout nodes do not need special styling
-    return undefined;
-  }
-  if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
-    return standardDecorationMarkerVariableName;
-  }
-  if (nodeName === 'blockquote') {
-    return editingStyleQuoteNode;
-  }
-  if (nodeName === 'rule') {
-    return editingStyleRuleNode;
-  }
-  if (nodeName === 'blockCard') {
-    return editingStyleCardBlockNode;
-  }
-  return editingStyleNode;
-};
+});

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

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.traditionalStyleRuleNode = exports.traditionalStyleQuoteNode = exports.traditionalStyleNode = exports.traditionalStyleCardBlockNode = exports.traditionalInsertStyleActive = exports.traditionalInsertStyle = exports.traditionalDecorationMarkerVariable = exports.deletedTraditionalStyleQuoteNode = exports.deletedTraditionalRowStyle = exports.deletedTraditionalContentStyleUnbounded = exports.deletedTraditionalContentStyle = exports.deletedTraditionalBlockOutlineRounded = exports.deletedTraditionalBlockOutline = void 0;
+var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var traditionalInsertStyle = exports.traditionalInsertStyle = (0, _lazyNodeView.convertToInlineCss)({
+  background: "var(--ds-background-accent-green-subtlest, #DCFFF1)",
+  textDecoration: 'underline',
+  textDecorationStyle: 'solid',
+  textDecorationThickness: "var(--ds-space-025, 2px)",
+  textDecorationColor: "var(--ds-border-accent-green, #22A06B)"
+});
+var traditionalInsertStyleActive = exports.traditionalInsertStyleActive = (0, _lazyNodeView.convertToInlineCss)({
+  background: "var(--ds-background-accent-green-subtler, #BAF3DB)",
+  textDecoration: 'underline',
+  textDecorationStyle: 'solid',
+  textDecorationThickness: "var(--ds-space-025, 2px)",
+  textDecorationColor: "var(--ds-text-accent-green, #216E4E)"
+});
+var deletedTraditionalContentStyle = exports.deletedTraditionalContentStyle = (0, _lazyNodeView.convertToInlineCss)({
+  textDecorationColor: "var(--ds-border-accent-red, #E2483D)",
+  textDecoration: 'line-through',
+  position: 'relative',
+  opacity: 1
+});
+var deletedTraditionalContentStyleUnbounded = exports.deletedTraditionalContentStyleUnbounded = (0, _lazyNodeView.convertToInlineCss)({
+  position: 'absolute',
+  top: '50%',
+  width: '100%',
+  display: 'inline-block',
+  borderTop: "1px solid ".concat("var(--ds-border-accent-red, #E2483D)"),
+  pointerEvents: 'none',
+  zIndex: 1
+});
+var deletedTraditionalStyleQuoteNode = exports.deletedTraditionalStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
+  marginTop: "var(--ds-space-150, 12px)",
+  paddingTop: "var(--ds-space-025, 2px)",
+  paddingBottom: "var(--ds-space-025, 2px)",
+  paddingLeft: "var(--ds-space-025, 2px)",
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-red, #E2483D)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var deletedTraditionalBlockOutline = exports.deletedTraditionalBlockOutline = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-red, #E2483D)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var deletedTraditionalBlockOutlineRounded = exports.deletedTraditionalBlockOutlineRounded = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-red, #E2483D)"),
+  borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)")
+});
+var deletedTraditionalRowStyle = exports.deletedTraditionalRowStyle = (0, _lazyNodeView.convertToInlineCss)({
+  textDecorationColor: "var(--ds-border-accent-red, #E2483D)",
+  textDecoration: 'line-through',
+  opacity: 0.6,
+  display: 'table-row'
+});
+var traditionalStyleQuoteNode = exports.traditionalStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
+  borderLeft: "2px solid ".concat("var(--ds-border-accent-green, #22A06B)")
+});
+var traditionalStyleRuleNode = exports.traditionalStyleRuleNode = (0, _lazyNodeView.convertToInlineCss)({
+  backgroundColor: "var(--ds-border-accent-green, #22A06B)"
+});
+var traditionalStyleNode = exports.traditionalStyleNode = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var traditionalStyleCardBlockNode = exports.traditionalStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
+  borderRadius: "var(--ds-radius-medium, 6px)"
+});
+var traditionalDecorationMarkerVariable = exports.traditionalDecorationMarkerVariable = (0, _lazyNodeView.convertToInlineCss)({
+  '--diff-decoration-marker-color': "var(--ds-border-accent-green, #22A06B)"
+});

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

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createBlockChangedDecoration = void 0;
+var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _standard = require("./colorSchemes/standard");
+var _traditional = require("./colorSchemes/traditional");
+var getNodeClass = function getNodeClass(name) {
+  switch (name) {
+    case 'extension':
+      return 'show-diff-changed-decoration-node';
+    default:
+      return undefined;
+  }
+};
+var getBlockNodeStyle = function getBlockNodeStyle(nodeName, colorScheme) {
+  var isTraditional = colorScheme === 'traditional';
+  if (['mediaSingle', 'mediaGroup', 'table',
+  // Handle table separately to avoid border issues
+  'tableRow', 'tableCell', 'tableHeader', 'paragraph',
+  // Paragraph and heading nodes do not need special styling
+  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
+    // Layout nodes do not need special styling
+    return undefined;
+  }
+  if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
+    return isTraditional ? _traditional.traditionalDecorationMarkerVariable : _standard.standardDecorationMarkerVariable;
+  }
+  if (nodeName === 'blockquote') {
+    return isTraditional ? _traditional.traditionalStyleQuoteNode : _standard.editingStyleQuoteNode;
+  }
+  if (nodeName === 'rule') {
+    return isTraditional ? _traditional.traditionalStyleRuleNode : _standard.editingStyleRuleNode;
+  }
+  if (nodeName === 'blockCard') {
+    return isTraditional ? _traditional.traditionalStyleCardBlockNode : _standard.editingStyleCardBlockNode;
+  }
+  return isTraditional ? _traditional.traditionalStyleNode : _standard.editingStyleNode;
+};
+
+/**
+ * Inline decoration used for insertions as the content already exists in the document
+ *
+ * @param change Changeset "change" containing information about the change content + range
+ * @returns Prosemirror inline decoration
+ */
+var createBlockChangedDecoration = exports.createBlockChangedDecoration = function createBlockChangedDecoration(_ref) {
+  var change = _ref.change,
+    colorScheme = _ref.colorScheme;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
+    var style = getBlockNodeStyle(change.name, colorScheme);
+    var className = getNodeClass(change.name);
+    if (style || className) {
+      return _view.Decoration.node(change.from, change.to, {
+        style: style,
+        'data-testid': 'show-diff-changed-decoration-node',
+        class: className
+      }, {
+        key: 'diff-block'
+      });
+    }
+    return undefined;
+  } else {
+    return _view.Decoration.node(change.from, change.to, {
+      style: getBlockNodeStyle(change.name, colorScheme),
+      'data-testid': 'show-diff-changed-decoration-node',
+      class: getNodeClass(change.name)
+    }, {
+      key: 'diff-block'
+    });
+  }
+};

package/dist/cjs/pm-plugins/{deletedRowsHandler.js → decorations/createChangedRowDecorationWidgets.js}

@@ -4,34 +4,23 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleDeletedRows = exports.createDeletedRowsDecorations = void 0;
+exports.createChangedRowDecorationWidgets = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
-var _findSafeInsertPos = require("./findSafeInsertPos");
+var _standard = require("./colorSchemes/standard");
+var _traditional = require("./colorSchemes/traditional");
+var _findSafeInsertPos = require("./utils/findSafeInsertPos");
 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; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var deletedRowStyle = (0, _lazyNodeView.convertToInlineCss)({
-  color: "var(--ds-text-accent-gray, #505258)",
-  textDecoration: 'line-through',
-  opacity: 0.6,
-  display: 'table-row'
-});
-var deletedTraditionalRowStyle = (0, _lazyNodeView.convertToInlineCss)({
-  textDecorationColor: "var(--ds-border-accent-red, #E2483D)",
-  textDecoration: 'line-through',
-  opacity: 0.6,
-  display: 'table-row'
-});
 /**
  * Extracts information about deleted table rows from a change
  */
-var extractDeletedRows = function extractDeletedRows(change, originalDoc, newDoc) {
-  var deletedRows = [];
+var extractChangedRows = function extractChangedRows(change, originalDoc, newDoc) {
+  var changedRows = [];
 
   // Find the table in the original document
   var $fromPos = originalDoc.resolve(change.fromA);
@@ -39,7 +28,7 @@ var extractDeletedRows = function extractDeletedRows(change, originalDoc, newDoc
     return node.type.name === 'table';
   });
   if (!tableOld) {
-    return deletedRows;
+    return changedRows;
   }
   var oldTableMap = _tableMap.TableMap.get(tableOld.node);
 
@@ -49,18 +38,18 @@ var extractDeletedRows = function extractDeletedRows(change, originalDoc, newDoc
     return node.type.name === 'table';
   });
   if (!tableNew) {
-    return deletedRows;
+    return changedRows;
   }
   var newTableMap = _tableMap.TableMap.get(tableNew.node);
 
-  // If no rows were deleted, return empty
+  // If no rows were changed, return empty
   if (oldTableMap.height <= newTableMap.height ||
   // For now ignore if there are column deletions as well
   oldTableMap.width !== newTableMap.width) {
-    return deletedRows;
+    return changedRows;
   }
 
-  // Find which rows were deleted by analyzing the change range
+  // Find which rows were changed by analyzing the change range
   var changeStartInTable = change.fromA - tableOld.pos - 1;
   var changeEndInTable = change.toA - tableOld.pos - 1;
   var currentOffset = 0;
@@ -75,7 +64,7 @@ var extractDeletedRows = function extractDeletedRows(change, originalDoc, newDoc
       var startOfRow = newTableMap.mapByRow.slice().reverse().find(function (row) {
         return row[0] + tableNew.pos < change.fromB && change.fromB < row[row.length - 1] + tableNew.pos;
       });
-      deletedRows.push({
+      changedRows.push({
         rowIndex: rowIndex,
         rowNode: rowNode,
         fromA: tableOld.pos + 1 + rowStart,
@@ -90,9 +79,9 @@ var extractDeletedRows = function extractDeletedRows(change, originalDoc, newDoc
   });
 
   // Filter changes that never truly got deleted
-  return deletedRows.filter(function (deletedRow) {
+  return changedRows.filter(function (changedRow) {
     return !tableNew.node.children.some(function (newRow) {
-      return (0, _document.areNodesEqualIgnoreAttrs)(newRow, deletedRow.rowNode);
+      return (0, _document.areNodesEqualIgnoreAttrs)(newRow, changedRow.rowNode);
     });
   });
 };
@@ -126,9 +115,9 @@ var isEmptyRow = function isEmptyRow(rowNode) {
 /**
  * Creates a DOM representation of a deleted table row
  */
-var createDeletedRowDOM = function createDeletedRowDOM(rowNode, nodeViewSerializer, colorScheme) {
+var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializer, colorScheme) {
   var tr = document.createElement('tr');
-  tr.setAttribute('style', colorScheme === 'traditional' ? deletedTraditionalRowStyle : deletedRowStyle);
+  tr.setAttribute('style', colorScheme === 'traditional' ? _traditional.deletedTraditionalRowStyle : _standard.deletedRowStyle);
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
   // Serialize each cell in the row
@@ -150,19 +139,19 @@ var createDeletedRowDOM = function createDeletedRowDOM(rowNode, nodeViewSerializ
 };
 
 /**
- * Expands a diff to include whole deleted rows when table rows are affected
+ * Expands a diff to include whole changed rows when table rows are affected
  */
-var expandDiffForDeletedRows = function expandDiffForDeletedRows(changes, originalDoc, newDoc) {
-  var deletedRowInfo = [];
+var expandDiffForChangedRows = function expandDiffForChangedRows(changes, originalDoc, newDoc) {
+  var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var change = _step.value;
       // Check if this change affects table content
-      var deletedRows = extractDeletedRows(change, originalDoc, newDoc);
-      if (deletedRows.length > 0) {
-        deletedRowInfo.push.apply(deletedRowInfo, (0, _toConsumableArray2.default)(deletedRows));
+      var changedRows = extractChangedRows(change, originalDoc, newDoc);
+      if (changedRows.length > 0) {
+        rowInfo.push.apply(rowInfo, (0, _toConsumableArray2.default)(changedRows));
       }
     }
   } catch (err) {
@@ -170,45 +159,29 @@ var expandDiffForDeletedRows = function expandDiffForDeletedRows(changes, origin
   } finally {
     _iterator.f();
   }
-  return deletedRowInfo;
+  return rowInfo;
 };
 
 /**
- * Creates decorations for deleted table rows
+ * Main function to handle deleted rows - computes diff and creates decorations
  */
-var createDeletedRowsDecorations = exports.createDeletedRowsDecorations = function createDeletedRowsDecorations(_ref) {
-  var deletedRows = _ref.deletedRows,
+var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref) {
+  var changes = _ref.changes,
     originalDoc = _ref.originalDoc,
     newDoc = _ref.newDoc,
     nodeViewSerializer = _ref.nodeViewSerializer,
     colorScheme = _ref.colorScheme;
-  return deletedRows.map(function (deletedRow) {
-    var rowDOM = createDeletedRowDOM(deletedRow.rowNode, nodeViewSerializer, colorScheme);
+  // First, expand the changes to include complete deleted rows
+  var changedRows = expandDiffForChangedRows(changes.filter(function (change) {
+    return change.deleted.length > 0;
+  }), originalDoc, newDoc);
+  return changedRows.map(function (changedRow) {
+    var rowDOM = createChangedRowDOM(changedRow.rowNode, nodeViewSerializer, colorScheme);
 
     // Find safe insertion position for the deleted row
-    var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, deletedRow.fromB - 1,
+    var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
-    originalDoc.slice(deletedRow.fromA, deletedRow.toA));
+    originalDoc.slice(changedRow.fromA, changedRow.toA));
     return _view.Decoration.widget(safeInsertPos, rowDOM, {});
   });
-};
-
-/**
- * Main function to handle deleted rows - computes diff and creates decorations
- */
-var handleDeletedRows = exports.handleDeletedRows = function handleDeletedRows(changes, originalDoc, newDoc, nodeViewSerializer, colorScheme) {
-  // First, expand the changes to include complete deleted rows
-  var deletedRows = expandDiffForDeletedRows(changes.filter(function (change) {
-    return change.deleted.length > 0;
-  }), originalDoc, newDoc);
-  var allDecorations = createDeletedRowsDecorations({
-    deletedRows: deletedRows,
-    originalDoc: originalDoc,
-    newDoc: newDoc,
-    nodeViewSerializer: nodeViewSerializer,
-    colorScheme: colorScheme
-  });
-  return {
-    decorations: allDecorations
-  };
 };

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

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createInlineChangedDecoration = void 0;
+var _view = require("@atlaskit/editor-prosemirror/view");
+var _standard = require("./colorSchemes/standard");
+var _traditional = require("./colorSchemes/traditional");
+/**
+ * Inline decoration used for insertions as the content already exists in the document
+ *
+ * @param change Changeset "change" containing information about the change content + range
+ * @returns Prosemirror inline decoration
+ */
+var createInlineChangedDecoration = exports.createInlineChangedDecoration = function createInlineChangedDecoration(_ref) {
+  var change = _ref.change,
+    colorScheme = _ref.colorScheme,
+    _ref$isActive = _ref.isActive,
+    isActive = _ref$isActive === void 0 ? false : _ref$isActive;
+  var style;
+  if (colorScheme === 'traditional') {
+    style = isActive ? _traditional.traditionalInsertStyleActive : _traditional.traditionalInsertStyle;
+  } else {
+    style = isActive ? _standard.editingStyleActive : _standard.editingStyle;
+  }
+  return _view.Decoration.inline(change.fromB, change.toB, {
+    style: style,
+    'data-testid': 'show-diff-changed-decoration'
+  }, {
+    key: 'diff-inline'
+  });
+};