@atlaskit/editor-plugin-show-diff 3.3.0 → 3.3.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 3.3.2
+
+### Patch Changes
+
+- [`5c35083992b75`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c35083992b75) -
+  [EDITOR-3498] Redo + view changes makes browser freeze, fixed bug.
+
+## 3.3.1
+
+### Patch Changes
+
+- [`be40850b186a8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/be40850b186a8) -
+  Rolled up editor AIFC beta gates into the parent streaming gate. Also decoupled the placholder
+  from the main AIFC FG by utilising the withEmptyParagraph plugin option, since this prop is only
+  set when AIFC is enabled. This means we don't need refs to this gate in the plugin because it's
+  already controlled by a prop.
+- Updated dependencies
+
 ## 3.3.0
 
 ### Minor Changes

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

@@ -83,8 +83,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   var tr = state.tr;
   var steppedDoc = originalDoc;
   var attrSteps = [];
-  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc);
   var simplifiedSteps = (0, _simplifyChanges.simplifySteps)(steps, originalDoc);
+  var stepMaps = [];
   var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
   try {
@@ -95,8 +95,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
         if ((0, _attributeDecorations.stepIsValidAttrChange)(step, steppedDoc, result.doc)) {
           attrSteps.push(step);
         }
+        stepMaps.push(step.getMap());
         steppedDoc = result.doc;
-        changeset = changeset.addSteps(steppedDoc, [step.getMap()], step);
       }
     }
 
@@ -110,6 +110,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   if (!(0, _document.areNodesEqualIgnoreAttrs)(steppedDoc, tr.doc)) {
     return _view.DecorationSet.empty;
   }
+  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);
   var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
   var optimizedChanges = optimizeChanges(changes);
   var decorations = [];

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

@@ -199,9 +199,6 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
 
   // For non-table content, use the existing span wrapper approach
   var dom = document.createElement('span');
-  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
@@ -240,13 +237,9 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
             // Fallback to serializing the individual child node
             var serializedChild = serializer.serializeNode(childNode);
             if (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);
-              }
+              var _wrapper = createWrapperWithStrikethrough();
+              _wrapper.append(serializedChild);
+              dom.append(_wrapper);
             }
           }
         });
@@ -302,11 +295,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')) {
+      } else {
         // Handle all block nodes with unified function
         (0, _deletedBlocksHandler.handleBlockNodeView)(dom, nodeView, targetNode, colourScheme, intl);
-      } else {
-        dom.append(nodeView);
       }
     } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(targetNode.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
@@ -314,13 +305,9 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
     } else {
       var fallbackNode = fallbackSerialization();
       if (fallbackNode) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
-          var _wrapper2 = (0, _deletedBlocksHandler.createDeletedStyleWrapperWithoutOpacity)(colourScheme);
-          _wrapper2.append(fallbackNode);
-          dom.append(_wrapper2);
-        } else {
-          dom.append(fallbackNode);
-        }
+        var _wrapper2 = (0, _deletedBlocksHandler.createDeletedStyleWrapperWithoutOpacity)(colourScheme);
+        _wrapper2.append(fallbackNode);
+        dom.append(_wrapper2);
       }
     }
   });

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

@@ -78,16 +78,16 @@ const calculateDiffDecorationsInner = ({
   } = state;
   let steppedDoc = originalDoc;
   const attrSteps = [];
-  let changeset = ChangeSet.create(originalDoc);
   const simplifiedSteps = simplifySteps(steps, originalDoc);
+  const stepMaps = [];
   for (const step of simplifiedSteps) {
     const result = step.apply(steppedDoc);
     if (result.failed === null && result.doc) {
       if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {
         attrSteps.push(step);
       }
+      stepMaps.push(step.getMap());
       steppedDoc = result.doc;
-      changeset = changeset.addSteps(steppedDoc, [step.getMap()], step);
     }
   }
 
@@ -96,6 +96,7 @@ const calculateDiffDecorationsInner = ({
   if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
     return DecorationSet.empty;
   }
+  const changeset = ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);
   const changes = simplifyChanges(changeset.changes, tr.doc);
   const optimizedChanges = optimizeChanges(changes);
   const decorations = [];

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

@@ -179,9 +179,6 @@ export const createDeletedContentDecoration = ({
 
   // For non-table content, use the existing span wrapper approach
   const dom = document.createElement('span');
-  if (!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
@@ -220,13 +217,9 @@ export const createDeletedContentDecoration = ({
             // Fallback to serializing the individual child node
             const serializedChild = serializer.serializeNode(childNode);
             if (serializedChild) {
-              if (fg('platform_editor_ai_aifc_patch_beta_2')) {
-                const wrapper = createWrapperWithStrikethrough();
-                wrapper.append(serializedChild);
-                dom.append(wrapper);
-              } else {
-                dom.append(serializedChild);
-              }
+              const wrapper = createWrapperWithStrikethrough();
+              wrapper.append(serializedChild);
+              dom.append(wrapper);
             }
           }
         });
@@ -278,11 +271,9 @@ export const createDeletedContentDecoration = ({
         const wrapper = createWrapperWithStrikethrough();
         wrapper.append(nodeView);
         dom.append(wrapper);
-      } else if (fg('platform_editor_ai_aifc_patch_beta_2')) {
+      } else {
         // Handle all block nodes with unified function
         handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl);
-      } else {
-        dom.append(nodeView);
       }
     } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(targetNode.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
@@ -290,13 +281,9 @@ export const createDeletedContentDecoration = ({
     } else {
       const fallbackNode = fallbackSerialization();
       if (fallbackNode) {
-        if (fg('platform_editor_ai_aifc_patch_beta_2')) {
-          const wrapper = createDeletedStyleWrapperWithoutOpacity(colourScheme);
-          wrapper.append(fallbackNode);
-          dom.append(wrapper);
-        } else {
-          dom.append(fallbackNode);
-        }
+        const wrapper = createDeletedStyleWrapperWithoutOpacity(colourScheme);
+        wrapper.append(fallbackNode);
+        dom.append(wrapper);
       }
     }
   });

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

@@ -77,8 +77,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   var tr = state.tr;
   var steppedDoc = originalDoc;
   var attrSteps = [];
-  var changeset = ChangeSet.create(originalDoc);
   var simplifiedSteps = simplifySteps(steps, originalDoc);
+  var stepMaps = [];
   var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
   try {
@@ -89,8 +89,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
         if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {
           attrSteps.push(step);
         }
+        stepMaps.push(step.getMap());
         steppedDoc = result.doc;
-        changeset = changeset.addSteps(steppedDoc, [step.getMap()], step);
       }
     }
 
@@ -104,6 +104,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
     return DecorationSet.empty;
   }
+  var changeset = ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);
   var changes = simplifyChanges(changeset.changes, tr.doc);
   var optimizedChanges = optimizeChanges(changes);
   var decorations = [];

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

@@ -193,9 +193,6 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
 
   // For non-table content, use the existing span wrapper approach
   var dom = document.createElement('span');
-  if (!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
@@ -234,13 +231,9 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
             // Fallback to serializing the individual child node
             var serializedChild = serializer.serializeNode(childNode);
             if (serializedChild) {
-              if (fg('platform_editor_ai_aifc_patch_beta_2')) {
-                var _wrapper = createWrapperWithStrikethrough();
-                _wrapper.append(serializedChild);
-                dom.append(_wrapper);
-              } else {
-                dom.append(serializedChild);
-              }
+              var _wrapper = createWrapperWithStrikethrough();
+              _wrapper.append(serializedChild);
+              dom.append(_wrapper);
             }
           }
         });
@@ -296,11 +289,9 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
         var wrapper = createWrapperWithStrikethrough();
         wrapper.append(nodeView);
         dom.append(wrapper);
-      } else if (fg('platform_editor_ai_aifc_patch_beta_2')) {
+      } else {
         // Handle all block nodes with unified function
         handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl);
-      } else {
-        dom.append(nodeView);
       }
     } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(targetNode.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
@@ -308,13 +299,9 @@ export var createDeletedContentDecoration = function createDeletedContentDecorat
     } else {
       var fallbackNode = fallbackSerialization();
       if (fallbackNode) {
-        if (fg('platform_editor_ai_aifc_patch_beta_2')) {
-          var _wrapper2 = createDeletedStyleWrapperWithoutOpacity(colourScheme);
-          _wrapper2.append(fallbackNode);
-          dom.append(_wrapper2);
-        } else {
-          dom.append(fallbackNode);
-        }
+        var _wrapper2 = createDeletedStyleWrapperWithoutOpacity(colourScheme);
+        _wrapper2.append(fallbackNode);
+        dom.append(_wrapper2);
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "3.3.0",
+	"version": "3.3.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"prosemirror-changeset": "^2.2.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.39.0",
+		"@atlaskit/editor-common": "^110.40.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {
@@ -79,9 +79,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_ai_aifc_patch_beta_2": {
-			"type": "boolean"
-		},
 		"platform_editor_ai_aifc_patch_ga": {
 			"type": "boolean"
 		},