@atlaskit/editor-common 125.2.1 → 125.3.0

package/dist/cjs/toolbar-flag-check.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.areToolbarFlagsEnabled = void 0;
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var areToolbarFlagsEnabled = exports.areToolbarFlagsEnabled = function areToolbarFlagsEnabled(isNewToolbarEnabled) {
-  return Boolean((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') || isNewToolbarEnabled);
+  return Boolean((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') || isNewToolbarEnabled);
 };

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

@@ -24,7 +24,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 = "125.2.0";
+var packageVersion = "125.2.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/ui/Mention/mention-with-profilecard.js

@@ -8,7 +8,6 @@ exports.default = MentionWithProfileCard;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
-var _reactLooselyLazy = require("react-loosely-lazy");
 var _resourcedMention = _interopRequireDefault(require("@atlaskit/mention/resourced-mention"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -16,42 +15,24 @@ var _anchor = require("@atlaskit/primitives/anchor");
 var _profileCardTrigger = _interopRequireDefault(require("@atlaskit/profilecard/profile-card-trigger"));
 var _navigateToTeamsApp2 = require("@atlaskit/teams-app-config/utils/teams-app-navigation/navigate-to-teams-app");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); } // oxlint-disable-next-line @atlassian/no-restricted-imports
-// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); } // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- TODO: migrate to @atlaskit/primitives/compiled
 // Lazy-loaded so the agent profile card chunk (and its `@atlaskit/rovo-agent-components`
 // dependency) stays off the critical path — it is only fetched when an agent mention
 // (`userType === 'APP'`) actually renders, never for person mentions.
-var loadAgentProfileCardTrigger = function loadAgentProfileCardTrigger() {
-  return Promise.resolve().then(function () {
-    return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_profilecard/agent-profile-card-trigger" */
-    '@atlaskit/profilecard/agent-profile-card-trigger'));
-  }).then(function (mod) {
-    return mod.AgentProfileCardTrigger;
-  });
-};
-var AgentProfileCardTriggerLazy = (0, _reactLooselyLazy.lazy)(function () {
-  return Promise.resolve().then(function () {
-    return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_profilecard/agent-profile-card-trigger" */
-    '@atlaskit/profilecard/agent-profile-card-trigger'));
-  }).then(function (mod) {
-    return mod.AgentProfileCardTrigger;
-  });
-});
-AgentProfileCardTriggerLazy.displayName = 'lazy(AgentProfileCardTrigger)';
-var AgentProfileCardTriggerLoadable = (0, _reactLoadable.default)({
-  loader: loadAgentProfileCardTrigger,
+// Uses react-loadable to match editor-common's code-splitting factory (see src/icons/index.ts).
+var AgentProfileCardTrigger = (0, _reactLoadable.default)({
+  loader: function loader() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_profilecard/agent-profile-card-trigger" */
+      '@atlaskit/profilecard/agent-profile-card-trigger'));
+    }).then(function (mod) {
+      return mod.AgentProfileCardTrigger;
+    });
+  },
   loading: function loading() {
     return null;
   }
 });
-var AgentProfileCardTrigger = function AgentProfileCardTrigger(props) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_loosely_lazy_migration') ? /*#__PURE__*/_react.default.createElement(_reactLooselyLazy.LazySuspense, {
-    fallback: null
-  }, /*#__PURE__*/_react.default.createElement(AgentProfileCardTriggerLazy, props)) :
-  /*#__PURE__*/
-  // eslint-disable-next-line react/jsx-props-no-spreading
-  _react.default.createElement(AgentProfileCardTriggerLoadable, props);
-};
 
 // Ignored via go/ees005
 // eslint-disable-next-line require-unicode-regexp

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

@@ -17,6 +17,7 @@ var _bindEventListener = require("bind-event-listener");
 var _focusTrap = _interopRequireDefault(require("focus-trap"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _utils = require("./utils");
 var _validatePosition = require("./validatePosition");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -36,10 +37,45 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
     _this = _callSuper(this, Popup, [].concat(args));
     (0, _defineProperty2.default)(_this, "rafIds", new Set());
     (0, _defineProperty2.default)(_this, "state", {
+      targetVisible: true,
       validPosition: true
     });
     (0, _defineProperty2.default)(_this, "popupRef", /*#__PURE__*/_react.default.createRef());
     (0, _defineProperty2.default)(_this, "placement", ['', '']);
+    (0, _defineProperty2.default)(_this, "setTargetVisibility", function (targetVisible) {
+      if (targetVisible !== _this.state.targetVisible) {
+        if (!targetVisible) {
+          var _this$focusTrap;
+          // Let consumers preserve focus before the popup becomes hidden.
+          _this.reportTargetVisibility(targetVisible);
+          (_this$focusTrap = _this.focusTrap) === null || _this$focusTrap === void 0 || _this$focusTrap.pause();
+          _this.setState({
+            targetVisible: targetVisible
+          });
+          return;
+        }
+
+        // Reveal the popup before consumers restore focus to its contents.
+        _this.setState({
+          targetVisible: targetVisible
+        }, function () {
+          if (_this.props.focusTrap) {
+            var _this$focusTrap2;
+            (_this$focusTrap2 = _this.focusTrap) === null || _this$focusTrap2 === void 0 || _this$focusTrap2.unpause();
+          }
+          _this.reportTargetVisibility(targetVisible);
+        });
+        return;
+      }
+      _this.reportTargetVisibility(targetVisible);
+    });
+    (0, _defineProperty2.default)(_this, "reportTargetVisibility", function (targetVisible) {
+      if (targetVisible !== _this.reportedTargetVisibility) {
+        var _this$props$onTargetV, _this$props;
+        _this.reportedTargetVisibility = targetVisible;
+        (_this$props$onTargetV = (_this$props = _this.props).onTargetVisibilityChanged) === null || _this$props$onTargetV === void 0 || _this$props$onTargetV.call(_this$props, targetVisible);
+      }
+    });
     (0, _defineProperty2.default)(_this, "handleRef", function (popup) {
       if (!popup) {
         return;
@@ -162,6 +198,41 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
         });
       }
     }
+  }, {
+    key: "initTargetVisibilityObserver",
+    value: function initTargetVisibilityObserver() {
+      var _this$targetVisibilit,
+        _observedTarget$owner,
+        _this3 = this;
+      var _this$props2 = this.props,
+        hideWhenTargetOutOfView = _this$props2.hideWhenTargetOutOfView,
+        target = _this$props2.target,
+        visibilityTarget = _this$props2.visibilityTarget;
+      var observedTarget = visibilityTarget !== null && visibilityTarget !== void 0 ? visibilityTarget : target;
+      (_this$targetVisibilit = this.targetVisibilityObserver) === null || _this$targetVisibilit === void 0 || _this$targetVisibilit.disconnect();
+      this.targetVisibilityObserver = undefined;
+      if (!hideWhenTargetOutOfView || !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_popup_target_visibility')) {
+        if (!this.state.targetVisible) {
+          this.setTargetVisibility(true);
+        }
+        return;
+      }
+      this.reportedTargetVisibility = undefined;
+      var IntersectionObserverConstructor = observedTarget === null || observedTarget === void 0 || (_observedTarget$owner = observedTarget.ownerDocument.defaultView) === null || _observedTarget$owner === void 0 ? void 0 : _observedTarget$owner.IntersectionObserver;
+      if (!IntersectionObserverConstructor || !observedTarget) {
+        this.setTargetVisibility(true);
+        return;
+      }
+      this.targetVisibilityObserver = new IntersectionObserverConstructor(function (entries) {
+        var _entry$isIntersecting;
+        var entry = entries[entries.length - 1];
+        _this3.setTargetVisibility((_entry$isIntersecting = entry === null || entry === void 0 ? void 0 : entry.isIntersecting) !== null && _entry$isIntersecting !== void 0 ? _entry$isIntersecting : true);
+      }, {
+        root: null
+      });
+      this.targetVisibilityObserver.observe(observedTarget);
+      this.setTargetVisibility(true);
+    }
   }, {
     key: "cannotSetPopup",
     value: function cannotSetPopup(popup, target, overflowScrollParent) {
@@ -229,9 +300,9 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
      * Deactivates the focus trap if it exists
      */
     function destroyFocusTrap() {
-      var _this$focusTrap;
+      var _this$focusTrap3;
       this.initFocusTrap.cancel();
-      (_this$focusTrap = this.focusTrap) === null || _this$focusTrap === void 0 || _this$focusTrap.deactivate();
+      (_this$focusTrap3 = this.focusTrap) === null || _this$focusTrap3 === void 0 || _this$focusTrap3.deactivate();
     }
 
     /**
@@ -243,8 +314,8 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
       if (prevProps.focusTrap !== this.props.focusTrap) {
         // If currently set to disable, then pause the trap if it exists
         if (!this.props.focusTrap) {
-          var _this$focusTrap2;
-          return (_this$focusTrap2 = this.focusTrap) === null || _this$focusTrap2 === void 0 ? void 0 : _this$focusTrap2.pause();
+          var _this$focusTrap4;
+          return (_this$focusTrap4 = this.focusTrap) === null || _this$focusTrap4 === void 0 ? void 0 : _this$focusTrap4.pause();
         }
 
         // If set to enabled and trap already exists, unpause
@@ -265,10 +336,10 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
     key: "initScrollElement",
     value: function initScrollElement() {
       var _this$unbindScroll;
-      var _this$props = this.props,
-        stick = _this$props.stick,
-        target = _this$props.target,
-        scrollableElement = _this$props.scrollableElement;
+      var _this$props3 = this.props,
+        stick = _this$props3.stick,
+        target = _this$props3.target,
+        scrollableElement = _this$props3.scrollableElement;
       (_this$unbindScroll = this.unbindScroll) === null || _this$unbindScroll === void 0 || _this$unbindScroll.call(this);
       if (this.scrollElement && this.resizeObserver) {
         this.resizeObserver.unobserve(this.scrollElement);
@@ -294,6 +365,11 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
       if (prevProps.scrollableElement !== this.props.scrollableElement) {
         this.initScrollElement();
       }
+      // Reconfigure while enabled, or once after disabling to clean up the existing observer.
+      // A different target must be observed again.
+      if ((prevProps.hideWhenTargetOutOfView || this.props.hideWhenTargetOutOfView) && (prevProps.hideWhenTargetOutOfView !== this.props.hideWhenTargetOutOfView || prevProps.target !== this.props.target || prevProps.visibilityTarget !== this.props.visibilityTarget)) {
+        this.initTargetVisibilityObserver();
+      }
       if (this.props !== prevProps) {
         this.scheduledUpdatePosition(prevProps);
       }
@@ -305,14 +381,18 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       window.addEventListener('resize', this.onResize);
       this.initScrollElement();
+      if (this.props.hideWhenTargetOutOfView) {
+        this.initTargetVisibilityObserver();
+      }
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      var _this$unbindScroll2, _this$resizeObserver3;
+      var _this$targetVisibilit2, _this$unbindScroll2, _this$resizeObserver3;
       // Ignored via go/ees005
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       window.removeEventListener('resize', this.onResize);
+      (_this$targetVisibilit2 = this.targetVisibilityObserver) === null || _this$targetVisibilit2 === void 0 || _this$targetVisibilit2.disconnect();
       (_this$unbindScroll2 = this.unbindScroll) === null || _this$unbindScroll2 === void 0 || _this$unbindScroll2.call(this);
       if (this.scrollElement) {
         // Ignored via go/ees005
@@ -331,8 +411,10 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
     key: "renderPopup",
     value: function renderPopup() {
       var _this$props$ariaLabel,
-        _this3 = this;
-      var position = this.state.position;
+        _this4 = this;
+      var _this$state = this.state,
+        position = _this$state.position,
+        targetVisible = _this$state.targetVisible;
       var shouldRenderPopup = this.props.shouldRenderPopup;
       if (shouldRenderPopup && !shouldRenderPopup(position || {})) {
         return null;
@@ -349,18 +431,20 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
         // use role = dialog as default role, as dialog role itself is not a parent role that requires specific children to function as some other ARIA roles(menu) do
         // if set default role to menu, tons of integration tests will fail as many of our popup usages do not have children that satisfy menu role requirements
         if (ariaLabel) {
-          return _this3.props.role || 'dialog';
+          return _this4.props.role || 'dialog';
         }
         return undefined;
       };
       return /*#__PURE__*/_react.default.createElement("div", {
         ref: this.handleRef,
-        style: _objectSpread(_objectSpread({
+        style: _objectSpread(_objectSpread(_objectSpread({
           // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
           position: 'absolute',
           // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
           zIndex: this.props.zIndex || _editorSharedStyles.akEditorFloatingPanelZIndex
-        }, position), this.props.style),
+        }, position), this.props.style), this.props.hideWhenTargetOutOfView && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_popup_target_visibility') && !targetVisible && {
+          visibility: 'hidden'
+        }),
         role: getRole(),
         "aria-label": ariaLabel,
         "data-testid": "popup-wrapper"
@@ -372,9 +456,9 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props2 = this.props,
-        target = _this$props2.target,
-        mountTo = _this$props2.mountTo;
+      var _this$props4 = this.props,
+        target = _this$props4.target,
+        mountTo = _this$props4.mountTo;
       var validPosition = this.state.validPosition;
       if (!target || !validPosition) {
         return null;

package/dist/es2019/element-browser/components/ElementBrowserLoader.js

@@ -7,11 +7,6 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import Loadable from 'react-loadable';
-// oxlint-disable-next-line @atlassian/no-restricted-imports
-import { lazy, LazySuspense } from 'react-loosely-lazy';
-
-// oxlint-disable-next-line @atlassian/no-restricted-imports
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import Spinner from '@atlaskit/spinner/spinner';
 const spinnerContainer = css({
   display: 'flex',
@@ -20,11 +15,8 @@ const spinnerContainer = css({
   height: '100%',
   width: '100%'
 });
-const loadElementBrowser = () => import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(module => module.default);
-const ElementBrowserLazy = lazy(() => import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(module => module.default));
-ElementBrowserLazy.displayName = 'lazy(ElementBrowser)';
-const ElementBrowserLoadable = Loadable({
-  loader: loadElementBrowser,
+const ElementBrowserLoader = Loadable({
+  loader: () => import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(module => module.default),
   loading: () => jsx("div", {
     css: spinnerContainer
   }, jsx(Spinner, {
@@ -32,10 +24,4 @@ const ElementBrowserLoadable = Loadable({
     interactionName: "element-browser-spinner"
   }))
 });
-const ElementBrowserLoader = props => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? jsx(LazySuspense, {
-  fallback: null
-}, jsx(ElementBrowserLazy, props)) :
-// eslint-disable-next-line react/jsx-props-no-spreading
-jsx(ElementBrowserLoadable, props);
-ElementBrowserLoader.preload = () => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? ElementBrowserLazy.preload() : ElementBrowserLoadable.preload();
 export default ElementBrowserLoader;

package/dist/es2019/extensions/extension-handlers.js

@@ -1,11 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { useIntl } from 'react-intl';
 import Loadable from 'react-loadable';
-// oxlint-disable-next-line @atlassian/no-restricted-imports
-import { lazy, LazySuspense } from 'react-loosely-lazy';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getExtensionKeyAndNodeKey, resolveImport } from './manifest-helpers';
 import { messages } from './messages';
 import { resolveImportSync } from './resolveImportSync';
@@ -64,38 +59,6 @@ function isUnknownConfluenceMacroWithBody(extensionNode) {
   var _extensionNode$parame, _extensionNode$parame2, _extensionNode$parame3;
   return extensionNode !== null && extensionNode.type === 'extension' && extensionNode.extensionType === 'com.atlassian.confluence.macro.core' && !!((_extensionNode$parame = extensionNode.parameters) !== null && _extensionNode$parame !== void 0 && (_extensionNode$parame2 = _extensionNode$parame.macroParams) !== null && _extensionNode$parame2 !== void 0 && (_extensionNode$parame3 = _extensionNode$parame2.__bodyContent) !== null && _extensionNode$parame3 !== void 0 && _extensionNode$parame3.value);
 }
-// eslint-disable-next-line @repo/internal/react/no-class-components -- error boundaries require a class component
-class ExtensionRendererErrorBoundary extends React.Component {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "state", {});
-  }
-  static getDerivedStateFromError(error) {
-    return {
-      error
-    };
-  }
-  componentDidCatch(error) {
-    // eslint-disable-next-line no-console
-    console.error('Error rendering extension', error);
-  }
-  render() {
-    return this.state.error ? renderExtensionLoadingError(this.state.error, this.props.fallbackProps) : this.props.children;
-  }
-}
-const noop = () => {};
-function renderExtensionLoadingError(error, props) {
-  // Needed because the old react-loadable (older code-splitting library) error handling behaviour might be relied on by extensions.
-  // https://unpkg.com/react-loadable@5.2.2/lib/index.js
-  return /*#__PURE__*/React.createElement(ExtensionLoading, _extends({
-    isLoading: false,
-    pastDelay: true,
-    timedOut: false,
-    error: error,
-    retry: noop
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props));
-}
 function ExtensionLoading(props) {
   const intl = useIntl();
   const extensionNode = props.node;
@@ -118,45 +81,27 @@ function ExtensionLoading(props) {
 
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 export function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
-  const loadNodeRenderer = () => {
-    var _renderSync, _ref;
-    const maybePromise = getExtensionModuleNodeMaybePreloaded(extensionProvider, extensionType, extensionKey);
-    if (maybePromise instanceof Promise) {
-      return maybePromise.then(node => resolveImport(node.render()));
-    }
-    const preloaded = maybePromise === null || maybePromise === void 0 ? void 0 : (_renderSync = (_ref = maybePromise).renderSync) === null || _renderSync === void 0 ? void 0 : _renderSync.call(_ref);
-    // Only product implemented preloading will return sync result
-    // However the out-of-box won't handle this. Confluence uses a custom implementation
-    return preloaded ?
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    resolveImportSync(preloaded) : resolveImport(maybePromise.render());
-  };
-  const LazyNodeRenderer = lazy(() => loadNodeRenderer());
-  LazyNodeRenderer.displayName = 'lazy(NodeRenderer)';
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const LoadableNodeRenderer = Loadable({
-    loader: loadNodeRenderer,
+  return Loadable({
+    loader: () => {
+      const maybePromise = getExtensionModuleNodeMaybePreloaded(extensionProvider, extensionType, extensionKey);
+      if (maybePromise instanceof Promise) {
+        return maybePromise.then(node => resolveImport(node.render()));
+      } else {
+        var _renderSync, _ref;
+        const preloaded = maybePromise === null || maybePromise === void 0 ? void 0 : (_renderSync = (_ref = maybePromise).renderSync) === null || _renderSync === void 0 ? void 0 : _renderSync.call(_ref);
+        // Only product implemented preloading will return sync result
+        // However the out-of-box won't handle this. Confluence uses a custom implementation
+        return preloaded ?
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        resolveImportSync(preloaded) : resolveImport(maybePromise.render());
+      }
+    },
     // react-loadable passes all props from <NodeRenderer> to the loading component at runtime,
     // but its TypeScript types only expect LoadingComponentProps. We cast here because
     // ExtensionLoading accepts additional props (node, showUnknownMacroPlaceholder) that
     // react-loadable will pass through but doesn't know about in its type definitions.
     loading: ExtensionLoading
   });
-  const NodeRenderer = props => {
-    var _props$loadingFallbac;
-    if (!isExperimentEnabled('platform_editor_loosely_lazy_migration')) {
-      // eslint-disable-next-line react/jsx-props-no-spreading
-      return /*#__PURE__*/React.createElement(LoadableNodeRenderer, props);
-    }
-    return /*#__PURE__*/React.createElement(ExtensionRendererErrorBoundary, {
-      fallbackProps: props
-    }, /*#__PURE__*/React.createElement(LazySuspense, {
-      fallback: (_props$loadingFallbac = props.loadingFallback) !== null && _props$loadingFallbac !== void 0 ? _props$loadingFallbac : null
-    }, /*#__PURE__*/React.createElement(LazyNodeRenderer, props)));
-  };
-  NodeRenderer.preload = () => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? LazyNodeRenderer.preload() : LoadableNodeRenderer.preload();
-  return NodeRenderer;
 }
 // eslint-disable-next-line @atlaskit/editor/no-re-export
 export { getExtensionManifest } from './getExtensionManifest';

package/dist/es2019/floating-toolbar/DropdownMenuExtensionItems.js

@@ -1,8 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
 import Loadable from 'react-loadable';
-// oxlint-disable-next-line @atlassian/no-restricted-imports
-import { lazy, LazySuspense } from 'react-loosely-lazy';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getContextualToolbarItemsFromModule } from '../extensions';
 import { nodeToJSON } from '../utils';
 import { DropdownMenuItem } from './DropdownMenuItem';
@@ -65,21 +62,10 @@ const DropdownMenuExtensionItem = ({
   // Use ref to keep icon component stable across renders
   const iconRef = useRef(null);
   if (!iconRef.current && item.icon) {
-    const loadIcon = () => resolveExtensionIcon(item.icon);
-    const IconLazy = lazy(() => resolveExtensionIcon(item.icon));
-    IconLazy.displayName = 'lazy(ExtensionIcon)';
-    const IconLoadable = Loadable({
-      loader: loadIcon,
+    iconRef.current = Loadable({
+      loader: () => resolveExtensionIcon(item.icon),
       loading: noop
     });
-    const Icon = props => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? /*#__PURE__*/React.createElement(LazySuspense, {
-      fallback: null
-    }, /*#__PURE__*/React.createElement(IconLazy, props)) :
-    /*#__PURE__*/
-    // eslint-disable-next-line react/jsx-props-no-spreading -- pass icon props to the legacy component
-    React.createElement(IconLoadable, props);
-    Icon.preload = () => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? IconLazy.preload() : IconLoadable.preload();
-    iconRef.current = Icon;
   }
   const dropdownItem = convertExtensionToDropdownMenuItem({
     item,

package/dist/es2019/icons/index.js

@@ -1,11 +1,7 @@
 // Disable no-re-export rule for entry point files
 /* eslint-disable @atlaskit/editor/no-re-export */
 
-import React from 'react';
 import Loadable from 'react-loadable';
-// oxlint-disable-next-line @atlassian/no-restricted-imports
-import { lazy, LazySuspense } from 'react-loosely-lazy';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export { PanelInfoIcon } from './shared/PanelInfoIcon';
 export { PanelWarningIcon } from './shared/PanelWarningIcon';
 export { PanelErrorIcon } from './shared/PanelErrorIcon';
@@ -14,17 +10,7 @@ export { PanelNoteIcon } from './shared/PanelNoteIcon';
 export { BorderIcon } from './shared/BorderIcon';
 export { SteppedRainbowIconDecoration, rainbow, disabledRainbow } from './shared/SteppedRainbowIconDecoration';
 export { DynamicStrokeIconDecoration } from './shared/DynamicStrokeIconDecoration';
-const loadIconTable = () => import( /* webpackChunkName: "@atlaskit-internal_editor-icon-table" */'../icons/shared/table').then(module => module.default);
-const IconTableLazy = lazy(() => import( /* webpackChunkName: "@atlaskit-internal_editor-icon-table" */'../icons/shared/table').then(module => module.default));
-IconTableLazy.displayName = 'lazy(IconTable)';
-const IconTableLoadable = Loadable({
-  loader: loadIconTable,
+export const IconTable = Loadable({
+  loader: () => import( /* webpackChunkName: "@atlaskit-internal_editor-icon-table" */'../icons/shared/table').then(module => module.default),
   loading: () => null
-});
-export const IconTable = props => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? /*#__PURE__*/React.createElement(LazySuspense, {
-  fallback: null
-}, /*#__PURE__*/React.createElement(IconTableLazy, props)) :
-/*#__PURE__*/
-// eslint-disable-next-line react/jsx-props-no-spreading -- pass icon props to the legacy component
-React.createElement(IconTableLoadable, props);
-IconTable.preload = () => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? IconTableLazy.preload() : IconTableLoadable.preload();
+});

package/dist/es2019/monitoring/error.js

@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 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 = "125.2.0";
+const packageVersion = "125.2.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007