@atlaskit/editor-plugin-show-diff 2.1.2 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 3.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.3
+
+### Patch Changes
+
+- [`b8555904ec1cc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b8555904ec1cc) -
+  Add new util for comparing nodes ignoring attributes.
+- Updated dependencies
+
 ## 2.1.2
 
 ### Patch Changes

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

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.areNodesEqual = areNodesEqual;
 exports.calculateDiffDecorations = void 0;
 var _prosemirrorChangeset = require("prosemirror-changeset");
+var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _decorations = require("./decorations");
 var _markDecorations = require("./markDecorations");
@@ -43,7 +43,7 @@ var calculateDiffDecorations = exports.calculateDiffDecorations = function calcu
   } finally {
     _iterator.f();
   }
-  if (!areNodesEqual(steppedDoc, tr.doc)) {
+  if (!(0, _document.areNodesEqualIgnoreAttrs)(steppedDoc, tr.doc)) {
     return _view.DecorationSet.empty;
   }
   var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
@@ -68,35 +68,4 @@ var calculateDiffDecorations = exports.calculateDiffDecorations = function calcu
     decorations.push((0, _decorations.createInlineChangedDecoration)(change, colourScheme));
   });
   return _view.DecorationSet.empty.add(tr.doc, decorations);
-};
-
-/**
- * Compares two ProseMirror documents for equality, ignoring attributes
- * which don't affect the document structure.
- *
- * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
- *
- * @param doc1 PMNode
- * @param doc2 PMNode
- * @returns boolean
- */
-function areNodesEqual(node1, node2) {
-  if (node1.isText) {
-    return node1.eq(node2);
-  }
-  return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
-}
-function areFragmentsEqual(frag1, frag2) {
-  if (frag1.content.length !== frag2.content.length) {
-    return false;
-  }
-  var childrenEqual = true;
-  frag1.content.forEach(function (child, i) {
-    var otherChild = frag2.child(i);
-    if (child === otherChild || otherChild && areNodesEqual(child, otherChild)) {
-      return;
-    }
-    childrenEqual = false;
-  });
-  return childrenEqual;
-}
+};

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

@@ -1,5 +1,6 @@
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { createInlineChangedDecoration, createDeletedContentDecoration } from './decorations';
 import { getMarkChangeRanges } from './markDecorations';
@@ -30,7 +31,7 @@ export const calculateDiffDecorations = ({
   }
   // Rather than using .eq() we use a custom function that only checks for structural
   // changes and ignores differences in attributes which don't affect decoration positions
-  if (!areNodesEqual(steppedDoc, tr.doc)) {
+  if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
     return DecorationSet.empty;
   }
   const changes = simplifyChanges(changeset.changes, tr.doc);
@@ -55,35 +56,4 @@ export const calculateDiffDecorations = ({
     decorations.push(createInlineChangedDecoration(change, colourScheme));
   });
   return DecorationSet.empty.add(tr.doc, decorations);
-};
-
-/**
- * Compares two ProseMirror documents for equality, ignoring attributes
- * which don't affect the document structure.
- *
- * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
- *
- * @param doc1 PMNode
- * @param doc2 PMNode
- * @returns boolean
- */
-export function areNodesEqual(node1, node2) {
-  if (node1.isText) {
-    return node1.eq(node2);
-  }
-  return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
-}
-function areFragmentsEqual(frag1, frag2) {
-  if (frag1.content.length !== frag2.content.length) {
-    return false;
-  }
-  let childrenEqual = true;
-  frag1.content.forEach((child, i) => {
-    const otherChild = frag2.child(i);
-    if (child === otherChild || otherChild && areNodesEqual(child, otherChild)) {
-      return;
-    }
-    childrenEqual = false;
-  });
-  return childrenEqual;
-}
+};

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

@@ -3,6 +3,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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; }
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { createInlineChangedDecoration, createDeletedContentDecoration } from './decorations';
 import { getMarkChangeRanges } from './markDecorations';
@@ -37,7 +38,7 @@ export var calculateDiffDecorations = function calculateDiffDecorations(_ref) {
   } finally {
     _iterator.f();
   }
-  if (!areNodesEqual(steppedDoc, tr.doc)) {
+  if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
     return DecorationSet.empty;
   }
   var changes = simplifyChanges(changeset.changes, tr.doc);
@@ -62,35 +63,4 @@ export var calculateDiffDecorations = function calculateDiffDecorations(_ref) {
     decorations.push(createInlineChangedDecoration(change, colourScheme));
   });
   return DecorationSet.empty.add(tr.doc, decorations);
-};
-
-/**
- * Compares two ProseMirror documents for equality, ignoring attributes
- * which don't affect the document structure.
- *
- * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
- *
- * @param doc1 PMNode
- * @param doc2 PMNode
- * @returns boolean
- */
-export function areNodesEqual(node1, node2) {
-  if (node1.isText) {
-    return node1.eq(node2);
-  }
-  return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
-}
-function areFragmentsEqual(frag1, frag2) {
-  if (frag1.content.length !== frag2.content.length) {
-    return false;
-  }
-  var childrenEqual = true;
-  frag1.content.forEach(function (child, i) {
-    var otherChild = frag2.child(i);
-    if (child === otherChild || otherChild && areNodesEqual(child, otherChild)) {
-      return;
-    }
-    childrenEqual = false;
-  });
-  return childrenEqual;
-}
+};

package/dist/types/pm-plugins/calculateDiffDecorations.d.ts

@@ -1,4 +1,3 @@
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ShowDiffPluginState } from './main';
@@ -9,14 +8,3 @@ export declare const calculateDiffDecorations: ({ state, pluginState, nodeViewSe
     pluginState: Omit<ShowDiffPluginState, "decorations">;
     state: EditorState;
 }) => DecorationSet;
-/**
- * Compares two ProseMirror documents for equality, ignoring attributes
- * which don't affect the document structure.
- *
- * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
- *
- * @param doc1 PMNode
- * @param doc2 PMNode
- * @returns boolean
- */
-export declare function areNodesEqual(node1: PMNode, node2: PMNode): boolean;

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

@@ -1,4 +1,3 @@
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ShowDiffPluginState } from './main';
@@ -9,14 +8,3 @@ export declare const calculateDiffDecorations: ({ state, pluginState, nodeViewSe
     pluginState: Omit<ShowDiffPluginState, "decorations">;
     state: EditorState;
 }) => DecorationSet;
-/**
- * Compares two ProseMirror documents for equality, ignoring attributes
- * which don't affect the document structure.
- *
- * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
- *
- * @param doc1 PMNode
- * @param doc2 PMNode
- * @returns boolean
- */
-export declare function areNodesEqual(node1: PMNode, node2: PMNode): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "2.1.2",
+	"version": "3.0.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"prosemirror-changeset": "^2.2.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.8.0",
+		"@atlaskit/editor-common": "^110.0.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {