@atlaskit/editor-common 88.6.2 → 88.7.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-common
 
+## 88.7.0
+
+### Minor Changes
+
+- [#136261](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136261)
+  [`7e900c6a2ae84`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7e900c6a2ae84) -
+  Lazy node view loading without setProps
+
+### Patch Changes
+
+- [#136261](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136261)
+  [`7e900c6a2ae84`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7e900c6a2ae84) -
+  Replace LazyNodeView without view.setProps
+
 ## 88.6.2
 
 ### Patch Changes

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,10 +10,20 @@ Object.defineProperty(exports, "convertToInlineCss", {
     return _cssHelper.convertToInlineCss;
   }
 });
+exports.lazyNodeViewDecorationPluginKey = void 0;
+exports.testOnlyIgnoreLazyNodeView = testOnlyIgnoreLazyNodeView;
 exports.withLazyLoading = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _nodeView = require("./node-view");
-var _replaceNodeViews = require("./replace-node-views");
 var _cssHelper = require("./css-helper");
+/**
+ * 📢 Public Plugin Key
+ *
+ * Communication channel between LazyNodeView loader and LazyNodeViewDecorationPlugin.
+ */
+var lazyNodeViewDecorationPluginKey = exports.lazyNodeViewDecorationPluginKey = new _state.PluginKey('lazyNodeViewDecoration');
+
 /**
  * 📢 Public Type
  *
@@ -25,6 +36,12 @@ var _cssHelper = require("./css-helper");
  * @see {withLazyLoading}
  */
 
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Caches loaded node view factory functions
+ */
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -32,6 +49,33 @@ var _cssHelper = require("./css-helper");
  */
 var requestedNodesPerEditorView = new WeakMap();
 
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Caches loaded node view factory functions for each editor view
+ */
+var resolvedNodesPerEditorView = new WeakMap();
+
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Stores editorView -> raf to debounce NodeView updates.
+ */
+var debounceToEditorViewMap = new WeakMap();
+var testOnlyIgnoreLazyNodeViewSet = new WeakSet();
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Used in tests to prevent lazy node view being replaced by a real node view.
+ *
+ * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
+ *
+ * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ */
+function testOnlyIgnoreLazyNodeView(view) {
+  testOnlyIgnoreLazyNodeViewSet.add(view);
+}
+
 /**
  * 📢 Public: Any EditorPlugin can use this function
  *
@@ -75,28 +119,62 @@ var requestedNodesPerEditorView = new WeakMap();
 var withLazyLoading = exports.withLazyLoading = function withLazyLoading(_ref) {
   var nodeName = _ref.nodeName,
     loader = _ref.loader,
-    getNodeViewOptions = _ref.getNodeViewOptions,
-    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+    getNodeViewOptions = _ref.getNodeViewOptions;
   var createLazyNodeView = function createLazyNodeView(node, view, getPos, decorations) {
     var _node$type;
     var requestedNodes = requestedNodesPerEditorView.get(view);
     if (!requestedNodes) {
-      requestedNodes = new Set(), requestedNodesPerEditorView.set(view, requestedNodes);
+      requestedNodes = new Map();
+      requestedNodesPerEditorView.set(view, requestedNodes);
+    }
+    var resolvedNodeViews = resolvedNodesPerEditorView.get(view);
+    if (!resolvedNodeViews) {
+      resolvedNodesPerEditorView.set(view, new Map());
     }
     var wasAlreadyRequested = requestedNodes.has(nodeName);
     if (wasAlreadyRequested) {
-      return new _nodeView.LazyNodeView(node, view, getPos);
+      var resolvedNodeView = resolvedNodeViews === null || resolvedNodeViews === void 0 ? void 0 : resolvedNodeViews.get(nodeName);
+      if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
+        return resolvedNodeView(node, view, getPos, decorations);
+      }
+      return new _nodeView.LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
     }
-    requestedNodes.add(nodeName);
-    loader().then(function (nodeViewFuncModule) {
+    var loaderPromise = loader().then(function (nodeViewFuncModule) {
+      var _resolvedNodesPerEdit;
       var nodeViewFunc = function nodeViewFunc(node, view, getPos, decorations) {
         return nodeViewFuncModule(node, view, getPos, decorations, getNodeViewOptions);
       };
-      (0, _replaceNodeViews.queueReplaceNodeViews)(view, {
-        nodeName: nodeName,
-        nodeViewFunc: nodeViewFunc
+      (_resolvedNodesPerEdit = resolvedNodesPerEditorView.get(view)) === null || _resolvedNodesPerEdit === void 0 || _resolvedNodesPerEdit.set(nodeName, nodeViewFunc);
+
+      /**
+       * Triggering lazyNodeViewDecoration plugin to apply decorations
+       * to nodes with newly loaded NodeViews.
+       */
+      var _ref2 = debounceToEditorViewMap.get(view) || [null, new Set()],
+        _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+        raf = _ref3[0],
+        nodeTypes = _ref3[1];
+      if (raf) {
+        cancelAnimationFrame(raf);
+      }
+      nodeTypes.add(node.type.name);
+      var nextRaf = requestAnimationFrame(function () {
+        debounceToEditorViewMap.set(view, [null, new Set()]);
+        var tr = view.state.tr;
+        tr.setMeta(lazyNodeViewDecorationPluginKey, {
+          type: 'add',
+          nodeTypes: nodeTypes
+        });
+        view.dispatch(tr);
       });
+      debounceToEditorViewMap.set(view, [nextRaf, nodeTypes]);
+      /**
+       * END triggering LazyNodeViewDecoration plugin
+       */
+
+      return nodeViewFunc;
     });
+    requestedNodes.set(nodeName, loaderPromise);
     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') {
       // TODO: Analytics ED-23982
       // dispatchAnalyticsEvent({
@@ -109,7 +187,7 @@ var withLazyLoading = exports.withLazyLoading = function withLazyLoading(_ref) {
       //   },
       // });
     }
-    return new _nodeView.LazyNodeView(node, view, getPos);
+    return new _nodeView.LazyNodeView(node, view, getPos, loaderPromise);
   };
   return createLazyNodeView;
 };

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.LazyNodeView = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _memoize = _interopRequireDefault(require("lodash/memoize"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var getEditorLineWidth = (0, _memoize.default)(function (view) {
@@ -20,18 +21,34 @@ var getEditorLineWidth = (0, _memoize.default)(function (view) {
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
-  function LazyNodeView(node, view, getPos) {
-    var _node$type;
+  function LazyNodeView(_node, view, _getPos, nodeViewLoader) {
+    var _this = this,
+      _node$type;
     (0, _classCallCheck2.default)(this, LazyNodeView);
-    this.node = node;
-    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') {
+    (0, _defineProperty2.default)(this, "update", function (node) {
+      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) {
+        return false;
+      }
+
+      // Copying some of the default NodeView update behaviour
+      // https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L803
+      return !_this.node.sameMarkup(prevNode);
+    });
+    this.node = _node;
+    this.isNodeViewLoaded = false;
+    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;
     }
     var toDOMConfiguration = {
       editorLineWidth: getEditorLineWidth(view)
     };
-    var fallback = _model.DOMSerializer.renderSpec(document, node.type.spec.toDOM(node,
+    var fallback = _model.DOMSerializer.renderSpec(document, _node.type.spec.toDOM(_node,
     // We are injecting a second parameter to be used by the toDOM lazy node view implementations
     // @ts-expect-error
     toDOMConfiguration));
@@ -40,16 +57,19 @@ var LazyNodeView = exports.LazyNodeView = /*#__PURE__*/function () {
     if (this.dom instanceof HTMLElement) {
       // This attribute is mostly used for debugging purposed
       // It will help us to found out when the node was replaced
-      this.dom.setAttribute('data-lazy-node-view', node.type.name);
+      this.dom.setAttribute('data-lazy-node-view', _node.type.name);
       // This is used on Libra tests
       // We are using this to make sure all lazy noded were replaced
       // 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",
-    value: function ignoreMutation(mutation) {
+    value: function ignoreMutation() {
       if (this.node.type.isTextblock) {
         return false;
       }

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.6.2";
+var packageVersion = "88.7.0";
 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.6.2";
+var packageVersion = "88.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -1,6 +1,12 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { LazyNodeView } from './node-view';
-import { queueReplaceNodeViews } from './replace-node-views';
 export { convertToInlineCss } from './css-helper';
+/**
+ * 📢 Public Plugin Key
+ *
+ * Communication channel between LazyNodeView loader and LazyNodeViewDecorationPlugin.
+ */
+export const lazyNodeViewDecorationPluginKey = new PluginKey('lazyNodeViewDecoration');
 
 /**
  * 📢 Public Type
@@ -14,6 +20,12 @@ export { convertToInlineCss } from './css-helper';
  * @see {withLazyLoading}
  */
 
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Caches loaded node view factory functions
+ */
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -21,6 +33,33 @@ export { convertToInlineCss } from './css-helper';
  */
 const requestedNodesPerEditorView = new WeakMap();
 
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Caches loaded node view factory functions for each editor view
+ */
+const resolvedNodesPerEditorView = new WeakMap();
+
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Stores editorView -> raf to debounce NodeView updates.
+ */
+const debounceToEditorViewMap = new WeakMap();
+const testOnlyIgnoreLazyNodeViewSet = new WeakSet();
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Used in tests to prevent lazy node view being replaced by a real node view.
+ *
+ * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
+ *
+ * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ */
+export function testOnlyIgnoreLazyNodeView(view) {
+  testOnlyIgnoreLazyNodeViewSet.add(view);
+}
+
 /**
  * 📢 Public: Any EditorPlugin can use this function
  *
@@ -64,29 +103,60 @@ const requestedNodesPerEditorView = new WeakMap();
 export const withLazyLoading = ({
   nodeName,
   loader,
-  getNodeViewOptions,
-  dispatchAnalyticsEvent
+  getNodeViewOptions
 }) => {
   const createLazyNodeView = (node, view, getPos, decorations) => {
     var _node$type, _node$type$spec;
     let requestedNodes = requestedNodesPerEditorView.get(view);
     if (!requestedNodes) {
-      requestedNodes = new Set(), requestedNodesPerEditorView.set(view, requestedNodes);
+      requestedNodes = new Map();
+      requestedNodesPerEditorView.set(view, requestedNodes);
+    }
+    const resolvedNodeViews = resolvedNodesPerEditorView.get(view);
+    if (!resolvedNodeViews) {
+      resolvedNodesPerEditorView.set(view, new Map());
     }
     const wasAlreadyRequested = requestedNodes.has(nodeName);
     if (wasAlreadyRequested) {
-      return new LazyNodeView(node, view, getPos);
+      const resolvedNodeView = resolvedNodeViews === null || resolvedNodeViews === void 0 ? void 0 : resolvedNodeViews.get(nodeName);
+      if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
+        return resolvedNodeView(node, view, getPos, decorations);
+      }
+      return new LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
     }
-    requestedNodes.add(nodeName);
-    loader().then(nodeViewFuncModule => {
+    const loaderPromise = loader().then(nodeViewFuncModule => {
+      var _resolvedNodesPerEdit;
       const nodeViewFunc = (node, view, getPos, decorations) => {
         return nodeViewFuncModule(node, view, getPos, decorations, getNodeViewOptions);
       };
-      queueReplaceNodeViews(view, {
-        nodeName,
-        nodeViewFunc
+      (_resolvedNodesPerEdit = resolvedNodesPerEditorView.get(view)) === null || _resolvedNodesPerEdit === void 0 ? void 0 : _resolvedNodesPerEdit.set(nodeName, nodeViewFunc);
+
+      /**
+       * Triggering lazyNodeViewDecoration plugin to apply decorations
+       * to nodes with newly loaded NodeViews.
+       */
+      const [raf, nodeTypes] = debounceToEditorViewMap.get(view) || [null, new Set()];
+      if (raf) {
+        cancelAnimationFrame(raf);
+      }
+      nodeTypes.add(node.type.name);
+      const nextRaf = requestAnimationFrame(() => {
+        debounceToEditorViewMap.set(view, [null, new Set()]);
+        const tr = view.state.tr;
+        tr.setMeta(lazyNodeViewDecorationPluginKey, {
+          type: 'add',
+          nodeTypes
+        });
+        view.dispatch(tr);
       });
+      debounceToEditorViewMap.set(view, [nextRaf, nodeTypes]);
+      /**
+       * END triggering LazyNodeViewDecoration plugin
+       */
+
+      return nodeViewFunc;
     });
+    requestedNodes.set(nodeName, loaderPromise);
     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') {
       // TODO: Analytics ED-23982
       // dispatchAnalyticsEvent({
@@ -99,7 +169,7 @@ export const withLazyLoading = ({
       //   },
       // });
     }
-    return new LazyNodeView(node, view, getPos);
+    return new LazyNodeView(node, view, getPos, loaderPromise);
   };
   return createLazyNodeView;
 };

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

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import memoize from 'lodash/memoize';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 const getEditorLineWidth = memoize(view => {
@@ -11,17 +12,32 @@ const getEditorLineWidth = memoize(view => {
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 export class LazyNodeView {
-  constructor(node, view, getPos) {
+  constructor(_node, view, _getPos, nodeViewLoader) {
     var _node$type, _node$type$spec;
-    this.node = node;
-    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') {
+    _defineProperty(this, "update", node => {
+      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) {
+        return false;
+      }
+
+      // Copying some of the default NodeView update behaviour
+      // https://github.com/ProseMirror/prosemirror-view/blob/cfa73eb969777f63bcb39972594fd4a9110f5a93/src/viewdesc.ts#L803
+      return !this.node.sameMarkup(prevNode);
+    });
+    this.node = _node;
+    this.isNodeViewLoaded = false;
+    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;
     }
     const toDOMConfiguration = {
       editorLineWidth: getEditorLineWidth(view)
     };
-    const fallback = DOMSerializer.renderSpec(document, node.type.spec.toDOM(node,
+    const fallback = DOMSerializer.renderSpec(document, _node.type.spec.toDOM(_node,
     // We are injecting a second parameter to be used by the toDOM lazy node view implementations
     // @ts-expect-error
     toDOMConfiguration));
@@ -30,14 +46,17 @@ export class LazyNodeView {
     if (this.dom instanceof HTMLElement) {
       // This attribute is mostly used for debugging purposed
       // It will help us to found out when the node was replaced
-      this.dom.setAttribute('data-lazy-node-view', node.type.name);
+      this.dom.setAttribute('data-lazy-node-view', _node.type.name);
       // This is used on Libra tests
       // We are using this to make sure all lazy noded were replaced
       // before the test started
       this.dom.setAttribute('data-lazy-node-view-fallback', 'true');
     }
+    nodeViewLoader.then(() => {
+      this.isNodeViewLoaded = true;
+    });
   }
-  ignoreMutation(mutation) {
+  ignoreMutation() {
     if (this.node.type.isTextblock) {
       return false;
     }

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.6.2";
+const packageVersion = "88.7.0";
 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.6.2";
+const packageVersion = "88.7.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -1,6 +1,13 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { LazyNodeView } from './node-view';
-import { queueReplaceNodeViews } from './replace-node-views';
 export { convertToInlineCss } from './css-helper';
+/**
+ * 📢 Public Plugin Key
+ *
+ * Communication channel between LazyNodeView loader and LazyNodeViewDecorationPlugin.
+ */
+export var lazyNodeViewDecorationPluginKey = new PluginKey('lazyNodeViewDecoration');
 
 /**
  * 📢 Public Type
@@ -14,6 +21,12 @@ export { convertToInlineCss } from './css-helper';
  * @see {withLazyLoading}
  */
 
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Caches loaded node view factory functions
+ */
+
 /**
  * 🧱 Internal: Editor FE Platform
  *
@@ -21,6 +34,33 @@ export { convertToInlineCss } from './css-helper';
  */
 var requestedNodesPerEditorView = new WeakMap();
 
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Caches loaded node view factory functions for each editor view
+ */
+var resolvedNodesPerEditorView = new WeakMap();
+
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Stores editorView -> raf to debounce NodeView updates.
+ */
+var debounceToEditorViewMap = new WeakMap();
+var testOnlyIgnoreLazyNodeViewSet = new WeakSet();
+/**
+ * 🧱 Internal: Editor FE Platform
+ *
+ * Used in tests to prevent lazy node view being replaced by a real node view.
+ *
+ * This needs to be replaced with proper implementation once LazyNodeView is converted to a plugin.
+ *
+ * @deprecated DO NOT USE THIS OUSIDE TESTS.
+ */
+export function testOnlyIgnoreLazyNodeView(view) {
+  testOnlyIgnoreLazyNodeViewSet.add(view);
+}
+
 /**
  * 📢 Public: Any EditorPlugin can use this function
  *
@@ -64,28 +104,62 @@ var requestedNodesPerEditorView = new WeakMap();
 export var withLazyLoading = function withLazyLoading(_ref) {
   var nodeName = _ref.nodeName,
     loader = _ref.loader,
-    getNodeViewOptions = _ref.getNodeViewOptions,
-    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+    getNodeViewOptions = _ref.getNodeViewOptions;
   var createLazyNodeView = function createLazyNodeView(node, view, getPos, decorations) {
     var _node$type;
     var requestedNodes = requestedNodesPerEditorView.get(view);
     if (!requestedNodes) {
-      requestedNodes = new Set(), requestedNodesPerEditorView.set(view, requestedNodes);
+      requestedNodes = new Map();
+      requestedNodesPerEditorView.set(view, requestedNodes);
+    }
+    var resolvedNodeViews = resolvedNodesPerEditorView.get(view);
+    if (!resolvedNodeViews) {
+      resolvedNodesPerEditorView.set(view, new Map());
     }
     var wasAlreadyRequested = requestedNodes.has(nodeName);
     if (wasAlreadyRequested) {
-      return new LazyNodeView(node, view, getPos);
+      var resolvedNodeView = resolvedNodeViews === null || resolvedNodeViews === void 0 ? void 0 : resolvedNodeViews.get(nodeName);
+      if (resolvedNodeView && !testOnlyIgnoreLazyNodeViewSet.has(view)) {
+        return resolvedNodeView(node, view, getPos, decorations);
+      }
+      return new LazyNodeView(node, view, getPos, requestedNodes.get(nodeName));
     }
-    requestedNodes.add(nodeName);
-    loader().then(function (nodeViewFuncModule) {
+    var loaderPromise = loader().then(function (nodeViewFuncModule) {
+      var _resolvedNodesPerEdit;
       var nodeViewFunc = function nodeViewFunc(node, view, getPos, decorations) {
         return nodeViewFuncModule(node, view, getPos, decorations, getNodeViewOptions);
       };
-      queueReplaceNodeViews(view, {
-        nodeName: nodeName,
-        nodeViewFunc: nodeViewFunc
+      (_resolvedNodesPerEdit = resolvedNodesPerEditorView.get(view)) === null || _resolvedNodesPerEdit === void 0 || _resolvedNodesPerEdit.set(nodeName, nodeViewFunc);
+
+      /**
+       * Triggering lazyNodeViewDecoration plugin to apply decorations
+       * to nodes with newly loaded NodeViews.
+       */
+      var _ref2 = debounceToEditorViewMap.get(view) || [null, new Set()],
+        _ref3 = _slicedToArray(_ref2, 2),
+        raf = _ref3[0],
+        nodeTypes = _ref3[1];
+      if (raf) {
+        cancelAnimationFrame(raf);
+      }
+      nodeTypes.add(node.type.name);
+      var nextRaf = requestAnimationFrame(function () {
+        debounceToEditorViewMap.set(view, [null, new Set()]);
+        var tr = view.state.tr;
+        tr.setMeta(lazyNodeViewDecorationPluginKey, {
+          type: 'add',
+          nodeTypes: nodeTypes
+        });
+        view.dispatch(tr);
       });
+      debounceToEditorViewMap.set(view, [nextRaf, nodeTypes]);
+      /**
+       * END triggering LazyNodeViewDecoration plugin
+       */
+
+      return nodeViewFunc;
     });
+    requestedNodes.set(nodeName, loaderPromise);
     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') {
       // TODO: Analytics ED-23982
       // dispatchAnalyticsEvent({
@@ -98,7 +172,7 @@ export var withLazyLoading = function withLazyLoading(_ref) {
       //   },
       // });
     }
-    return new LazyNodeView(node, view, getPos);
+    return new LazyNodeView(node, view, getPos, loaderPromise);
   };
   return createLazyNodeView;
 };