@atlaskit/editor-common 88.6.2 → 88.8.0

package/dist/es2019/icons/shared/DynamicStrokeIconDecoration.js

@@ -0,0 +1,40 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { css, jsx } from '@emotion/react';
+import { Box, xcss } from '@atlaskit/primitives';
+const barStyles = css({
+  position: 'absolute',
+  left: 0,
+  right: 0,
+  top: "var(--ds-space-250, 20px)",
+  margin: 'auto',
+  width: "var(--ds-space-200, 16px)",
+  height: '3px'
+});
+const textColorIconWrapper = xcss({
+  position: 'relative'
+});
+const getBackground = (selectedColor, disabled) => {
+  if (selectedColor) {
+    return selectedColor;
+  }
+  return disabled ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon, #44546F)";
+};
+export const DynamicStrokeIconDecoration = ({
+  selectedColor,
+  disabled,
+  icon
+}) => {
+  return jsx(Box, {
+    xcss: textColorIconWrapper
+  }, icon, jsx("div", {
+    "data-testid": "toolbar-icon-dynamic-stroke",
+    style: {
+      background: getBackground(selectedColor, disabled)
+    },
+    css: barStyles
+  }));
+};

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.8.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/styles/index.js

@@ -27,7 +27,7 @@ export { resizerStyles, resizerHandleClassName, resizerHandleTrackClassName, res
 export { gridStyles, GRID_GUTTER } from './shared/grid';
 export { smartCardStyles, FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, DATASOURCE_INNER_CONTAINER_CLASSNAME } from './shared/smartCard';
 export { embedCardStyles, embedSpacingStyles } from './shared/embedCard';
-export { buttonGroupStyle, separatorStyles, wrapperStyle, triggerWrapperStyles } from './shared/plugins';
+export { buttonGroupStyle, separatorStyles, wrapperStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding } from './shared/plugins';
 export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
 export { expandIconWrapperStyle, expandClassNames, expandIconContainerStyle } from './shared/expand';
 export { sharedExpandStyles } from '../ui/Expand/sharedStyles';

package/dist/es2019/styles/shared/lists.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { bulletListSelector, orderedListSelector } from '@atlaskit/adf-schema';
-import browser from '../../utils/browser';
+import { browser } from '../../utils/browser';
 export const listItemCounterPadding = 24;
 var CSS_VAR_NAMES = /*#__PURE__*/function (CSS_VAR_NAMES) {
   CSS_VAR_NAMES["ITEM_COUNTER_PADDING"] = "--ed--list--item-counter--padding";

package/dist/es2019/styles/shared/plugins.js

@@ -42,4 +42,10 @@ export const wrapperStyle = css({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const triggerWrapperStyles = css({
   display: 'flex'
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const triggerWrapperStylesWithPadding = css({
+  display: 'flex',
+  paddingRight: "var(--ds-space-025, 2px)"
 });

package/dist/es2019/styles/shared/table.js

@@ -3,7 +3,7 @@ import { css } from '@emotion/react';
 import { tableCellContentDomSelector, tableCellSelector, tableHeaderSelector, tablePrefixSelector } from '@atlaskit/adf-schema';
 import { akEditorBreakoutPadding, akEditorFullWidthLayoutWidth, akEditorSelectedNodeClassName, akEditorTableBorder, akEditorTableNumberColumnWidth, akEditorTableToolbar, akEditorWideLayoutWidth, overflowShadow } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
-import browser from '../../utils/browser';
+import { browser } from '../../utils/browser';
 import { CodeBlockSharedCssClassName } from './code-block';
 import { tableCellBackgroundStyleOverride } from './tableCell';
 export const tableMarginTop = 24;

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

package/dist/es2019/utils/analytics.js

@@ -1,4 +1,4 @@
-import { EDITOR_APPEARANCE_CONTEXT } from '@atlaskit/analytics-namespaced-context';
+import { EDITOR_APPEARANCE_CONTEXT } from '@atlaskit/analytics-namespaced-context/FabricEditorAnalyticsContext';
 export const getAnalyticsAppearance = appearance => {
   switch (appearance) {
     case 'full-page':
@@ -29,5 +29,4 @@ export let SEVERITY = /*#__PURE__*/function (SEVERITY) {
   SEVERITY["BLOCKING"] = "blocking";
   return SEVERITY;
 }({});
-export { UNSUPPORTED_CONTENT_LEVEL_SEVERITY, getUnsupportedContentLevelData, UNSUPPORTED_CONTENT_LEVEL_SEVERITY_THRESHOLD_DEFAULTS } from './unsupportedContent/get-unsupported-content-level-data';
 export const analyticsEventKey = 'EDITOR_ANALYTICS_EVENT';

package/dist/es2019/utils/browser.js

@@ -36,4 +36,4 @@ if (typeof navigator !== 'undefined') {
   result.supportsIntersectionObserver = typeof window !== 'undefined' && 'IntersectionObserver' in window && 'IntersectionObserverEntry' in window && 'intersectionRatio' in window.IntersectionObserverEntry.prototype;
   result.supportsResizeObserver = typeof window !== 'undefined' && 'ResizeObserver' in window && 'ResizeObserverEntry' in window;
 }
-export default result;
+export { result as browser };

package/dist/es2019/utils/index.js

@@ -4,18 +4,56 @@ import { isEmptyParagraph } from './editor-core-utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
 export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames } from './annotation';
 export { getExtensionLozengeData } from './macro';
-export { default as browser } from './browser';
+export {
+/**
+ * @private
+ * @deprecated
+ *
+ * Please use `@atlaskit/editor-common/browser` entry-point instead.
+ */
+browser } from './browser';
 export { default as ErrorReporter } from './error-reporter';
 export { isPastDate, timestampToIsoFormat, timestampToString, timestampToTaskContext, timestampToUTCDate, todayTimestampInUTC } from './date';
 export { isElementInTableCell, isTextSelection, isLastItemMediaGroup, setNodeSelection, setTextSelection, setAllSelection, setCellSelection, nonNullable, stepAddsOneOf, stepHasSlice, extractSliceFromStep, isValidPosition, isEmptyParagraph, isInLayoutColumn, removeBlockMarks, filterChildrenBetween } from './editor-core-utils';
 export { withImageLoader } from './imageLoader';
 export { absoluteBreakoutWidth, calcBreakoutWidth, calcWideWidth, breakoutConsts, calculateBreakoutStyles, calcBreakoutWidthPx, getNextBreakoutMode, getTitle } from './breakout';
-export { findChangedNodesFromTransaction, validNode, validateNodes, isType, isParagraph, isText, isLinkMark, SelectedState, isNodeSelectedOrInRange, isSupportedInParent, isMediaNode, isNodeBeforeMediaNode } from './nodes';
+export {
+/**
+ * @private
+ * @deprecated
+ *
+ * This is only used in editor-core and shouldn't be used anywhere else.
+ * If you do need it please reach out to #cc-editor-lego
+ */
+findChangedNodesFromTransaction,
+/**
+ * @private
+ * @deprecated
+ *
+ * This is only used in editor-core and shouldn't be used anywhere else.
+ * If you do need it please reach out to #cc-editor-lego
+ */
+validNode,
+/**
+ * @private
+ * @deprecated
+ *
+ * This is only used in editor-core and shouldn't be used anywhere else.
+ * If you do need it please reach out to #cc-editor-lego
+ */
+validateNodes, isType, isParagraph, isText, isLinkMark, SelectedState, isNodeSelectedOrInRange, isSupportedInParent, isMediaNode, isNodeBeforeMediaNode } from './nodes';
 export { pluginFactory } from './plugin-state-factory';
 export { getFragmentBackingArray, mapFragment, mapSlice, flatmap, mapChildren } from './slice';
 export { walkUpTreeUntil, unwrap, removeNestedEmptyEls, containsClassName, closest, closestElement, parsePx, mapElem, maphElem } from './dom';
 export { default as ADFTraversor } from './traversor';
-export { analyticsEventKey, getAnalyticsAppearance, getAnalyticsEditorAppearance, getAnalyticsEventSeverity, SEVERITY, getUnsupportedContentLevelData, UNSUPPORTED_CONTENT_LEVEL_SEVERITY, UNSUPPORTED_CONTENT_LEVEL_SEVERITY_THRESHOLD_DEFAULTS } from './analytics';
+/**
+ * @private
+ * @deprecated
+ *
+ * Use entry-point `@atlaskit/editor-common/utils/analytics` instead
+ */
+export { analyticsEventKey, getAnalyticsAppearance, getAnalyticsEditorAppearance, getAnalyticsEventSeverity, SEVERITY } from './analytics';
+export { getUnsupportedContentLevelData, UNSUPPORTED_CONTENT_LEVEL_SEVERITY, UNSUPPORTED_CONTENT_LEVEL_SEVERITY_THRESHOLD_DEFAULTS } from './unsupportedContent/get-unsupported-content-level-data';
 export { findAndTrackUnsupportedContentNodes } from './track-unsupported-content';
 export { getDistortedDurationMonitor, measureRender } from './performance/measure-render';
 export { startMeasure, stopMeasure, clearMeasure } from './performance/measure';
@@ -39,6 +77,12 @@ export { RenderCountProfiler, PROFILER_KEY } from './profiler/render-count';
 export { validateADFEntity, validationErrorHandler } from './validate-using-spec';
 export { getShallowPropsDifference, getPropsDifference } from './compare-props';
 export { useComponentRenderTracking } from './performance/hooks/use-component-render-tracking';
+/**
+ * @private
+ * @deprecated
+ *
+ * Private API do not use
+ */
 export { isOutdatedBrowser } from './outdated-browsers';
 export { autoJoinTr } from './prosemirror/autojoin';
 export { isReferencedSource, removeConnectedNodes, getChildrenInfo, getNodeName } from './referentiality';

package/dist/es2019/utils/unsupportedContent/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/icons/index.js

@@ -6,6 +6,7 @@ export { PanelSuccessIcon } from './shared/PanelSuccessIcon';
 export { PanelNoteIcon } from './shared/PanelNoteIcon';
 export { BorderIcon } from './shared/BorderIcon';
 export { SteppedRainbowIconDecoration } from './shared/SteppedRainbowIconDecoration';
+export { DynamicStrokeIconDecoration } from './shared/DynamicStrokeIconDecoration';
 export var IconTable = Loadable({
   loader: function loader() {
     return import( /* webpackChunkName: "@atlaskit-internal_editor-icon-table" */'../icons/shared/table').then(function (module) {

package/dist/esm/icons/shared/DynamicStrokeIconDecoration.js

@@ -0,0 +1,39 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { css, jsx } from '@emotion/react';
+import { Box, xcss } from '@atlaskit/primitives';
+var barStyles = css({
+  position: 'absolute',
+  left: 0,
+  right: 0,
+  top: "var(--ds-space-250, 20px)",
+  margin: 'auto',
+  width: "var(--ds-space-200, 16px)",
+  height: '3px'
+});
+var textColorIconWrapper = xcss({
+  position: 'relative'
+});
+var getBackground = function getBackground(selectedColor, disabled) {
+  if (selectedColor) {
+    return selectedColor;
+  }
+  return disabled ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon, #44546F)";
+};
+export var DynamicStrokeIconDecoration = function DynamicStrokeIconDecoration(_ref) {
+  var selectedColor = _ref.selectedColor,
+    disabled = _ref.disabled,
+    icon = _ref.icon;
+  return jsx(Box, {
+    xcss: textColorIconWrapper
+  }, icon, jsx("div", {
+    "data-testid": "toolbar-icon-dynamic-stroke",
+    style: {
+      background: getBackground(selectedColor, disabled)
+    },
+    css: barStyles
+  }));
+};

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;
 };

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

@@ -1,5 +1,6 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import memoize from 'lodash/memoize';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 var getEditorLineWidth = memoize(function (view) {
@@ -13,18 +14,34 @@ var getEditorLineWidth = memoize(function (view) {
  * A NodeView that serves as a placeholder until the actual NodeView is loaded.
  */
 export var LazyNodeView = /*#__PURE__*/function () {
-  function LazyNodeView(node, view, getPos) {
-    var _node$type;
+  function LazyNodeView(_node, view, _getPos, nodeViewLoader) {
+    var _this = this,
+      _node$type;
     _classCallCheck(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') {
+    _defineProperty(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 = DOMSerializer.renderSpec(document, node.type.spec.toDOM(node,
+    var 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));
@@ -33,16 +50,19 @@ export var 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;
+    });
   }
   _createClass(LazyNodeView, [{
     key: "ignoreMutation",
-    value: function ignoreMutation(mutation) {
+    value: function ignoreMutation() {
       if (this.node.type.isTextblock) {
         return false;
       }