@atlaskit/editor-plugin-show-diff 4.1.2 → 4.1.3

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

@@ -2,38 +2,11 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getStandardNodeStyle, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, editingStyle, editingStyleActive, deletedContentStyleUnbounded } from './colorSchemes/standard';
+import { getTraditionalNodeStyle, deletedTraditionalContentStyle, deletedTraditionalContentStyleUnbounded, traditionalInsertStyle, traditionalInsertStyleActive } from './colorSchemes/traditional';
 import { createDeletedStyleWrapperWithoutOpacity, handleBlockNodeView } from './deletedBlocksHandler';
 import { handleDeletedRows } from './deletedRowsHandler';
 import { findSafeInsertPos } from './findSafeInsertPos';
-var editingStyle = convertToInlineCss({
-  background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
-});
-var editingStyleActive = convertToInlineCss({
-  background: "var(--ds-background-accent-purple-subtler, #EED7FC)",
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-text-accent-purple, #803FA5)"
-});
-var traditionalInsertStyle = 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 = 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)"
-});
-
 /**
  * Inline decoration used for insertions as the content already exists in the document
  *
@@ -53,124 +26,6 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     'data-testid': 'show-diff-changed-decoration'
   }, {});
 };
-var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
-  switch (nodeName) {
-    case 'blockquote':
-      return colourScheme === 'traditional' ? traditionalStyleQuoteNode : editingStyleQuoteNode;
-    case 'mediaSingle':
-    case 'mediaGroup':
-    case 'table':
-    case 'tableRow':
-    case 'tableCell':
-    case 'tableHeader':
-      return undefined;
-    // Handle table separately to avoid border issues
-    case 'paragraph':
-    case 'heading':
-    case 'hardBreak':
-      return undefined;
-    // Paragraph and heading nodes do not need special styling
-    case 'decisionList':
-    case 'taskList':
-    case 'taskItem':
-    case 'bulletList':
-    case 'orderedList':
-      return undefined;
-    case 'extension':
-    case 'embedCard':
-    case 'listItem':
-      return convertToInlineCss({
-        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
-      });
-    case 'layoutSection':
-      return undefined;
-    // Layout nodes do not need special styling
-    case 'rule':
-      return colourScheme === 'traditional' ? traditionalStyleRuleNode : editingStyleRuleNode;
-    case 'blockCard':
-      return colourScheme === 'traditional' ? traditionalStyleCardBlockNode : editingStyleCardBlockNode;
-    default:
-      return colourScheme === 'traditional' ? traditionalStyleNode : editingStyleNode;
-  }
-};
-var editingStyleQuoteNode = convertToInlineCss({
-  borderLeft: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)")
-});
-var traditionalStyleQuoteNode = convertToInlineCss({
-  borderLeft: "2px solid ".concat("var(--ds-border-accent-green, #22A06B)")
-});
-var editingStyleRuleNode = convertToInlineCss({
-  backgroundColor: "var(--ds-border-accent-purple, #AF59E1)"
-});
-var traditionalStyleRuleNode = convertToInlineCss({
-  backgroundColor: "var(--ds-border-accent-green, #22A06B)"
-});
-var editingStyleNode = convertToInlineCss({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #AF59E1)"),
-  borderRadius: "var(--ds-radius-small, 4px)"
-});
-var traditionalStyleNode = convertToInlineCss({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
-  borderRadius: "var(--ds-radius-small, 4px)"
-});
-var editingStyleCardBlockNode = convertToInlineCss({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #AF59E1)"),
-  borderRadius: "var(--ds-radius-medium, 6px)"
-});
-var traditionalStyleCardBlockNode = convertToInlineCss({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
-  borderRadius: "var(--ds-radius-medium, 6px)"
-});
-var deletedContentStyle = convertToInlineCss({
-  color: "var(--ds-text-accent-gray, #505258)",
-  textDecoration: 'line-through',
-  position: 'relative',
-  opacity: 0.6
-});
-var deletedContentStyleActive = convertToInlineCss({
-  color: "var(--ds-text, #292A2E)",
-  textDecoration: 'line-through',
-  textDecorationColor: "var(--ds-text-accent-gray, #505258)",
-  position: 'relative',
-  opacity: 1
-});
-var deletedContentStyleNew = convertToInlineCss({
-  color: "var(--ds-text-accent-gray, #505258)",
-  textDecoration: 'line-through',
-  position: 'relative',
-  opacity: 0.8
-});
-var deletedContentStyleNewActive = convertToInlineCss({
-  color: "var(--ds-text, #292A2E)",
-  textDecoration: 'line-through',
-  textDecorationColor: "var(--ds-text-accent-gray, #505258)",
-  position: 'relative',
-  opacity: 1
-});
-var deletedContentStyleUnbounded = convertToInlineCss({
-  position: 'absolute',
-  top: '50%',
-  width: '100%',
-  display: 'inline-block',
-  borderTop: "1px solid ".concat("var(--ds-text-accent-gray, #505258)"),
-  pointerEvents: 'none',
-  zIndex: 1
-});
-var deletedTraditionalContentStyle = convertToInlineCss({
-  textDecorationColor: "var(--ds-border-accent-red, #E2483D)",
-  textDecoration: 'line-through',
-  position: 'relative',
-  opacity: 1
-});
-var deletedTraditionalContentStyleUnbounded = convertToInlineCss({
-  position: 'absolute',
-  top: '50%',
-  width: '100%',
-  display: 'inline-block',
-  borderTop: "1px solid ".concat("var(--ds-border-accent-red, #E2483D)"),
-  pointerEvents: 'none',
-  zIndex: 1
-});
 export var getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
 };
@@ -192,6 +47,9 @@ var getNodeClass = function getNodeClass(name) {
       return undefined;
   }
 };
+var getBlockNodeStyle = function getBlockNodeStyle(name, colourScheme) {
+  return colourScheme === 'traditional' ? getTraditionalNodeStyle(name) : getStandardNodeStyle(name);
+};
 
 /**
  * Inline decoration used for insertions as the content already exists in the document
@@ -201,11 +59,24 @@ var getNodeClass = function getNodeClass(name) {
  */
 export var createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
   return Decoration.node(change.from, change.to, {
-    style: getEditorStyleNode(change.name, colourScheme),
+    style: getBlockNodeStyle(change.name, colourScheme),
     'data-testid': 'show-diff-changed-decoration-node',
     class: getNodeClass(change.name)
   }, {});
 };
+var createContentWrapper = function createContentWrapper(colourScheme) {
+  var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var wrapper = document.createElement('span');
+  var baseStyle = convertToInlineCss({
+    position: 'relative',
+    width: 'fit-content'
+  });
+  wrapper.setAttribute('style', "".concat(baseStyle).concat(getDeletedContentStyle(colourScheme, isActive)));
+  var strikethrough = document.createElement('span');
+  strikethrough.setAttribute('style', getDeletedContentStyleUnbounded(colourScheme));
+  wrapper.append(strikethrough);
+  return wrapper;
+};
 export var createDeletedContentDecoration = function createDeletedContentDecoration(_ref) {
   var change = _ref.change,
     doc = _ref.doc,
@@ -251,20 +122,6 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
    * or sliced End depth is and match only the entire node.
    */
   slice.content.forEach(function (node) {
-    // Create a wrapper for each node with strikethrough
-    var createWrapperWithStrikethrough = function createWrapperWithStrikethrough() {
-      var wrapper = document.createElement('span');
-      var baseStyle = convertToInlineCss({
-        position: 'relative',
-        width: 'fit-content'
-      });
-      wrapper.setAttribute('style', "".concat(baseStyle).concat(getDeletedContentStyle(colourScheme, isActive)));
-      var strikethrough = document.createElement('span');
-      strikethrough.setAttribute('style', getDeletedContentStyleUnbounded(colourScheme));
-      wrapper.append(strikethrough);
-      return wrapper;
-    };
-
     // Helper function to handle multiple child nodes
     var handleMultipleChildNodes = function handleMultipleChildNodes(node) {
       if (node.content.childCount > 1 && node.type.inlineContent) {
@@ -272,16 +129,15 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
           var childNodeView = serializer.tryCreateNodeView(childNode);
           if (childNodeView) {
             var lineBreak = document.createElement('br');
-            targetNode = node;
             dom.append(lineBreak);
-            var wrapper = createWrapperWithStrikethrough();
+            var wrapper = createContentWrapper(colourScheme, isActive);
             wrapper.append(childNodeView);
             dom.append(wrapper);
           } else {
             // Fallback to serializing the individual child node
             var serializedChild = serializer.serializeNode(childNode);
             if (serializedChild) {
-              var _wrapper = createWrapperWithStrikethrough();
+              var _wrapper = createContentWrapper(colourScheme, isActive);
               _wrapper.append(serializedChild);
               dom.append(_wrapper);
             }
@@ -296,21 +152,15 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
     var isFirst = slice.content.firstChild === node;
     var isLast = slice.content.lastChild === node;
     var hasInlineContent = node.content.childCount > 0 && node.type.inlineContent === true;
-    var targetNode;
     var fallbackSerialization;
+    if (handleMultipleChildNodes(node)) {
+      return;
+    }
     if ((isFirst || isLast && slice.content.childCount > 2) && hasInlineContent) {
-      if (handleMultipleChildNodes(node)) {
-        return;
-      }
-      targetNode = node;
       fallbackSerialization = function fallbackSerialization() {
         return serializer.serializeFragment(node.content);
       };
     } else if (isLast && slice.content.childCount === 2) {
-      if (handleMultipleChildNodes(node)) {
-        return;
-      }
-      targetNode = node;
       fallbackSerialization = function fallbackSerialization() {
         if (node.type.name === 'text') {
           return document.createTextNode(node.text || '');
@@ -323,27 +173,23 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
         return serializer.serializeFragment(node.content);
       };
     } else {
-      if (handleMultipleChildNodes(node)) {
-        return;
-      }
-      targetNode = node;
       fallbackSerialization = function fallbackSerialization() {
         return serializer.serializeNode(node);
       };
     }
 
     // Try to create node view, fallback to serialization
-    var nodeView = serializer.tryCreateNodeView(targetNode);
+    var nodeView = serializer.tryCreateNodeView(node);
     if (nodeView) {
-      if (targetNode.isInline) {
-        var wrapper = createWrapperWithStrikethrough();
+      if (node.isInline) {
+        var wrapper = createContentWrapper(colourScheme, isActive);
         wrapper.append(nodeView);
         dom.append(wrapper);
       } else {
         // Handle all block nodes with unified function
-        handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl);
+        handleBlockNodeView(dom, nodeView, node, colourScheme, intl);
       }
-    } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(targetNode.type.name)) {
+    } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(node.type.name)) {
       // Skip the case where the node is a paragraph or table row that way it can still be rendered and delete the entire table
       return;
     } else {

package/dist/types/pm-plugins/colorSchemes/standard.d.ts

@@ -0,0 +1,8 @@
+export declare const editingStyle: string;
+export declare const editingStyleActive: string;
+export declare const deletedContentStyle: string;
+export declare const deletedContentStyleActive: string;
+export declare const deletedContentStyleNew: string;
+export declare const deletedContentStyleNewActive: string;
+export declare const deletedContentStyleUnbounded: string;
+export declare const getStandardNodeStyle: (nodeName: string) => string | undefined;

package/dist/types/pm-plugins/colorSchemes/traditional.d.ts

@@ -0,0 +1,5 @@
+export declare const traditionalInsertStyle: string;
+export declare const traditionalInsertStyleActive: string;
+export declare const deletedTraditionalContentStyle: string;
+export declare const deletedTraditionalContentStyleUnbounded: string;
+export declare const getTraditionalNodeStyle: (nodeName: string) => string | undefined;

package/dist/types-ts4.5/pm-plugins/colorSchemes/standard.d.ts

@@ -0,0 +1,8 @@
+export declare const editingStyle: string;
+export declare const editingStyleActive: string;
+export declare const deletedContentStyle: string;
+export declare const deletedContentStyleActive: string;
+export declare const deletedContentStyleNew: string;
+export declare const deletedContentStyleNewActive: string;
+export declare const deletedContentStyleUnbounded: string;
+export declare const getStandardNodeStyle: (nodeName: string) => string | undefined;

package/dist/types-ts4.5/pm-plugins/colorSchemes/traditional.d.ts

@@ -0,0 +1,5 @@
+export declare const traditionalInsertStyle: string;
+export declare const traditionalInsertStyleActive: string;
+export declare const deletedTraditionalContentStyle: string;
+export declare const deletedTraditionalContentStyleUnbounded: string;
+export declare const getTraditionalNodeStyle: (nodeName: string) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "4.1.2",
+	"version": "4.1.3",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,11 +28,11 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.0.0",
+		"@atlaskit/adf-schema": "^52.1.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^32.0.0",
+		"@atlaskit/tmp-editor-statsig": "^32.10.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -40,7 +40,7 @@
 		"prosemirror-changeset": "^2.3.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.20.0",
+		"@atlaskit/editor-common": "^111.24.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {