@atlaskit/editor-common 88.8.2 → 88.8.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 88.8.3
+
+### Patch Changes
+
+- [#136760](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136760)
+  [`39e4b9c90b284`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/39e4b9c90b284) -
+  LazyNodeView update method to compare decorations
+
 ## 88.8.2
 
 ### Patch Changes

package/dist/cjs/lazy-node-view/index.js

@@ -70,7 +70,7 @@ var testOnlyIgnoreLazyNodeViewSet = new WeakSet();
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 function testOnlyIgnoreLazyNodeView(view) {
   testOnlyIgnoreLazyNodeViewSet.add(view);
@@ -137,7 +137,7 @@ var withLazyLoading = exports.withLazyLoading = function withLazyLoading(_ref) {
       if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
         return resolvedNodeView(node, view, getPos, decorations);
       }
-      return new _nodeView.LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
+      return new _nodeView.LazyNodeView(node, view, getPos, decorations);
     }
     var loaderPromise = loader().then(function (nodeViewFuncModule) {
       var _resolvedNodesPerEdit;
@@ -187,7 +187,7 @@ var withLazyLoading = exports.withLazyLoading = function withLazyLoading(_ref) {
       //   },
       // });
     }
-    return new _nodeView.LazyNodeView(node, view, getPos, loaderPromise);
+    return new _nodeView.LazyNodeView(node, view, getPos, decorations);
   };
   return createLazyNodeView;
 };

package/dist/cjs/lazy-node-view/node-view.js

@@ -15,23 +15,40 @@ var getEditorLineWidth = (0, _memoize.default)(function (view) {
   return (_view$dom = view.dom) === null || _view$dom === void 0 ? void 0 : _view$dom.clientWidth;
 });
 
+// Copied from ProseMirror NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L1095-L1099
+function sameOuterDeco(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (var i = 0; i < a.length; i++) {
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type) {
+      return false;
+    }
+
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type.eq(b[i].type)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
-  function LazyNodeView(_node, view, _getPos, nodeViewLoader) {
+  function LazyNodeView(_node, view, _getPos, _outerDeco) {
     var _this = this,
       _node$type;
     (0, _classCallCheck2.default)(this, LazyNodeView);
-    (0, _defineProperty2.default)(this, "update", function (node) {
+    (0, _defineProperty2.default)(this, "update", function (node, outerDeco) {
       var prevNode = _this.node;
       _this.node = node;
-
-      // Forcing NodeView to be re-created
-      // so that ProseMirror can replace LazyNodeView with the real one.
-      if (_this.isNodeViewLoaded) {
+      if (!sameOuterDeco(outerDeco, _this.outerDeco)) {
         return false;
       }
 
@@ -40,7 +57,7 @@ var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
       return !_this.node.sameMarkup(prevNode);
     });
     this.node = _node;
-    this.isNodeViewLoaded = false;
+    this.outerDeco = _outerDeco;
     if (typeof ((_node$type = _node.type) === null || _node$type === void 0 || (_node$type = _node$type.spec) === null || _node$type === void 0 ? void 0 : _node$type.toDOM) !== 'function') {
       this.dom = document.createElement('div');
       return;
@@ -63,9 +80,6 @@ var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
-    nodeViewLoader.then(function () {
-      _this.isNodeViewLoaded = true;
-    });
   }
   (0, _createClass2.default)(LazyNodeView, [{
     key: "ignoreMutation",

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "88.8.2";
+var packageVersion = "88.8.3";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -25,7 +25,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "88.8.2";
+var packageVersion = "88.8.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/lazy-node-view/index.js

@@ -54,7 +54,7 @@ const testOnlyIgnoreLazyNodeViewSet = new WeakSet();
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export function testOnlyIgnoreLazyNodeView(view) {
   testOnlyIgnoreLazyNodeViewSet.add(view);
@@ -122,7 +122,7 @@ export const withLazyLoading = ({
       if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
         return resolvedNodeView(node, view, getPos, decorations);
       }
-      return new LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
+      return new LazyNodeView(node, view, getPos, decorations);
     }
     const loaderPromise = loader().then(nodeViewFuncModule => {
       var _resolvedNodesPerEdit;
@@ -169,7 +169,7 @@ export const withLazyLoading = ({
       //   },
       // });
     }
-    return new LazyNodeView(node, view, getPos, loaderPromise);
+    return new LazyNodeView(node, view, getPos, decorations);
   };
   return createLazyNodeView;
 };

package/dist/es2019/lazy-node-view/node-view.js

@@ -6,21 +6,38 @@ const getEditorLineWidth = memoize(view => {
   return (_view$dom = view.dom) === null || _view$dom === void 0 ? void 0 : _view$dom.clientWidth;
 });
 
+// Copied from ProseMirror NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L1095-L1099
+function sameOuterDeco(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (let i = 0; i < a.length; i++) {
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type) {
+      return false;
+    }
+
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type.eq(b[i].type)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 export class LazyNodeView {
-  constructor(_node, view, _getPos, nodeViewLoader) {
+  constructor(_node, view, _getPos, _outerDeco) {
     var _node$type, _node$type$spec;
-    _defineProperty(this, "update", node => {
+    _defineProperty(this, "update", (node, outerDeco) => {
       const prevNode = this.node;
       this.node = node;
-
-      // Forcing NodeView to be re-created
-      // so that ProseMirror can replace LazyNodeView with the real one.
-      if (this.isNodeViewLoaded) {
+      if (!sameOuterDeco(outerDeco, this.outerDeco)) {
         return false;
       }
 
@@ -29,7 +46,7 @@ export class LazyNodeView {
       return !this.node.sameMarkup(prevNode);
     });
     this.node = _node;
-    this.isNodeViewLoaded = false;
+    this.outerDeco = _outerDeco;
     if (typeof ((_node$type = _node.type) === null || _node$type === void 0 ? void 0 : (_node$type$spec = _node$type.spec) === null || _node$type$spec === void 0 ? void 0 : _node$type$spec.toDOM) !== 'function') {
       this.dom = document.createElement('div');
       return;
@@ -52,9 +69,6 @@ export class LazyNodeView {
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
-    nodeViewLoader.then(() => {
-      this.isNodeViewLoaded = true;
-    });
   }
   ignoreMutation() {
     if (this.node.type.isTextblock) {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "88.8.2";
+const packageVersion = "88.8.3";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "88.8.2";
+const packageVersion = "88.8.3";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/lazy-node-view/index.js

@@ -55,7 +55,7 @@ var testOnlyIgnoreLazyNodeViewSet = new WeakSet();
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export function testOnlyIgnoreLazyNodeView(view) {
   testOnlyIgnoreLazyNodeViewSet.add(view);
@@ -122,7 +122,7 @@ export var withLazyLoading = function withLazyLoading(_ref) {
       if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
         return resolvedNodeView(node, view, getPos, decorations);
       }
-      return new LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
+      return new LazyNodeView(node, view, getPos, decorations);
     }
     var loaderPromise = loader().then(function (nodeViewFuncModule) {
       var _resolvedNodesPerEdit;
@@ -172,7 +172,7 @@ export var withLazyLoading = function withLazyLoading(_ref) {
       //   },
       // });
     }
-    return new LazyNodeView(node, view, getPos, loaderPromise);
+    return new LazyNodeView(node, view, getPos, decorations);
   };
   return createLazyNodeView;
 };

package/dist/esm/lazy-node-view/node-view.js

@@ -8,23 +8,40 @@ var getEditorLineWidth = memoize(function (view) {
   return (_view$dom = view.dom) === null || _view$dom === void 0 ? void 0 : _view$dom.clientWidth;
 });
 
+// Copied from ProseMirror NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L1095-L1099
+function sameOuterDeco(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  for (var i = 0; i < a.length; i++) {
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type) {
+      return false;
+    }
+
+    // @ts-expect-error type actually exist on decoration at runtime
+    if (!a[i].type.eq(b[i].type)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 export var LazyNodeView = /*#__PURE__*/function () {
-  function LazyNodeView(_node, view, _getPos, nodeViewLoader) {
+  function LazyNodeView(_node, view, _getPos, _outerDeco) {
     var _this = this,
       _node$type;
     _classCallCheck(this, LazyNodeView);
-    _defineProperty(this, "update", function (node) {
+    _defineProperty(this, "update", function (node, outerDeco) {
       var prevNode = _this.node;
       _this.node = node;
-
-      // Forcing NodeView to be re-created
-      // so that ProseMirror can replace LazyNodeView with the real one.
-      if (_this.isNodeViewLoaded) {
+      if (!sameOuterDeco(outerDeco, _this.outerDeco)) {
         return false;
       }
 
@@ -33,7 +50,7 @@ export var LazyNodeView = /*#__PURE__*/function () {
       return !_this.node.sameMarkup(prevNode);
     });
     this.node = _node;
-    this.isNodeViewLoaded = false;
+    this.outerDeco = _outerDeco;
     if (typeof ((_node$type = _node.type) === null || _node$type === void 0 || (_node$type = _node$type.spec) === null || _node$type === void 0 ? void 0 : _node$type.toDOM) !== 'function') {
       this.dom = document.createElement('div');
       return;
@@ -56,9 +73,6 @@ export var LazyNodeView = /*#__PURE__*/function () {
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
-    nodeViewLoader.then(function () {
-      _this.isNodeViewLoaded = true;
-    });
   }
   _createClass(LazyNodeView, [{
     key: "ignoreMutation",

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "88.8.2";
+var packageVersion = "88.8.3";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -22,7 +22,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "88.8.2";
+var packageVersion = "88.8.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/lazy-node-view/index.d.ts

@@ -35,7 +35,7 @@ export type LazyLoadingProps<NodeViewOptions> = {
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export declare function testOnlyIgnoreLazyNodeView(view: EditorView): void;
 /**

package/dist/types/lazy-node-view/node-view.d.ts

@@ -1,5 +1,5 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
+import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -9,8 +9,8 @@ export declare class LazyNodeView implements NodeView {
     dom: Node;
     contentDOM?: HTMLElement;
     private node;
-    private isNodeViewLoaded;
-    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, nodeViewLoader: Promise<unknown>);
-    update: (node: PMNode) => boolean;
+    private outerDeco;
+    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, outerDeco: readonly Decoration[]);
+    update: (node: PMNode, outerDeco: readonly Decoration[]) => boolean;
     ignoreMutation(): boolean;
 }

package/dist/types-ts4.5/lazy-node-view/index.d.ts

@@ -35,7 +35,7 @@ export type LazyLoadingProps<NodeViewOptions> = {
  *
  * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
  *
- * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ * @deprecated DO NOT USE THIS OUTSIDE TESTS.
  */
 export declare function testOnlyIgnoreLazyNodeView(view: EditorView): void;
 /**

package/dist/types-ts4.5/lazy-node-view/node-view.d.ts

@@ -1,5 +1,5 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
+import type { Decoration, EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -9,8 +9,8 @@ export declare class LazyNodeView implements NodeView {
     dom: Node;
     contentDOM?: HTMLElement;
     private node;
-    private isNodeViewLoaded;
-    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, nodeViewLoader: Promise<unknown>);
-    update: (node: PMNode) => boolean;
+    private outerDeco;
+    constructor(node: PMNode, view: EditorView, _getPos: () => number | undefined, outerDeco: readonly Decoration[]);
+    update: (node: PMNode, outerDeco: readonly Decoration[]) => boolean;
     ignoreMutation(): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "88.8.2",
+	"version": "88.8.3",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"