@atlaskit/editor-common 114.6.2 → 114.8.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @atlaskit/editor-common
 
+## 114.8.0
+
+### Minor Changes
+
+- [`019540f8c0a67`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/019540f8c0a67) -
+  Fix editor popup scroll parent detection for chromeless editor in modals.
+
+  When the `platform_editor_fix_scrolling_popup_position` experiment is enabled, the Popup component
+  now prefers an explicitly provided `scrollableElement` prop over the auto-detected DOM ancestor.
+  This fixes popup positioning (code block language selector, table options, selection toolbar) in
+  chromeless editors embedded within modals, where the scroll container uses `overflow: auto` and
+  cannot be found by the existing `findOverflowScrollParent` utility.
+
+  The pre-computed scroll parent is also threaded through to `calculateVerticalStickTop` and
+  `calculateVerticalStickBottom` to avoid redundant DOM traversal and ensure position calculations
+  use the same element as the scroll event listener.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 114.7.0
+
+### Minor Changes
+
+- [`f25ff7f70d948`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f25ff7f70d948) -
+  FFCLEANUP-91667 Remove shipped limited-mode experiment from Statsig config; use fixed document
+  thresholds in editor-common for limited-mode detection.
+- [`85699a44bd1f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/85699a44bd1f8) -
+  Add Confluence short-link URL expansion for native embeds. When a Confluence short link
+  (`/wiki/x/<token>`) is pasted, it is resolved to its canonical page URL via the Object Resolver
+  Service before matching against registered experience manifests, gated behind
+  `platform-native-embeds-short-link-expansion`.
+  - `NativeEmbedFacade`: new `expandShortLink`, `getExperienceIdFromUrlAsync`, and `setCardClient`
+    methods; `createExperienceForUrl` now expands short links before manifest matching.
+  - `editor-plugin-card`: exposes `resolveShortLinkUrl` action; `replaceQueuedUrlWithCard` supports
+    async `EmbedCardNodeTransformer` return values.
+  - `editor-plugin-native-embeds`: wires `cardClient` from config and passes `api` to
+    `cardToNativeEmbedNode` for async short-link resolution.
+  - `editor-common`: `EmbedCardNodeTransformer` type updated to allow `Promise` return;
+    `CardPluginActions` extended with `resolveShortLinkUrl`.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 114.6.2
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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" != _typeof(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); }
 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 = "114.6.1";
+var packageVersion = "114.7.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/node-anchor/limited-mode-document-thresholds.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = exports.LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = exports.LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = void 0;
+/** Fixed document thresholds for limited (performance) mode (previously Statsig-driven). */
+var LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = exports.LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = 5000;
+var LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = exports.LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = 30000;
+
+/** When true, any legacy-content macro triggers limited mode regardless of size/count. */
+var LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = exports.LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = true;

package/dist/cjs/node-anchor/node-anchor-provider.js

@@ -8,28 +8,9 @@ exports.getNodeIdProvider = exports.NodeAnchorProvider = 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 _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _utils = require("../utils");
 var _dynamicBitArray = require("./dynamic-bit-array");
-/**
- * Gets a numeric experiment param, returning undefined if the value is not a valid number.
- * This guards against test overrides returning booleans or strings for numeric params.
- */
-var getNumericExperimentParam = function getNumericExperimentParam(paramName, fallbackValue) {
-  var rawValue = (0, _expVal.expVal)('cc_editor_limited_mode_expanded', paramName, fallbackValue);
-  if (typeof rawValue === 'number') {
-    return rawValue;
-  }
-
-  // Handle string values from test overrides
-  if (typeof rawValue === 'string') {
-    var parsed = parseInt(rawValue, 10);
-    if (!isNaN(parsed)) {
-      return parsed;
-    }
-  }
-  return undefined;
-};
+var _limitedModeDocumentThresholds = require("./limited-mode-document-thresholds");
 var NodeAnchorProvider = exports.NodeAnchorProvider = /*#__PURE__*/function () {
   function NodeAnchorProvider() {
     var limitedMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -111,87 +92,55 @@ var NodeAnchorProvider = exports.NodeAnchorProvider = /*#__PURE__*/function () {
   }]);
 }();
 var nodeIdProviderMap = new WeakMap();
-var LIMITED_MODE_NODE_SIZE_THRESHOLD = 40000;
-
-/**
- * Calculates custom document size including LCM ADF lengths (for non-expanded path).
- * This function can be removed when cc_editor_limited_mode_expanded is cleaned up.
- */
-var getCustomDocSize = function getCustomDocSize(doc) {
-  var lcmAdfLength = 0;
-  doc.descendants(function (node) {
-    var _node$attrs;
-    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey) === 'legacy-content') {
-      var _node$attrs$parameter, _node$attrs2;
-      lcmAdfLength += (_node$attrs$parameter = (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.parameters) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.adf) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.length) !== null && _node$attrs$parameter !== void 0 ? _node$attrs$parameter : 0;
-    }
-  });
-  return doc.nodeSize + lcmAdfLength;
-};
 
 /**
  * Determines whether limited mode should be enabled.
  * This logic mirrors the limited mode plugin implementation, but lives here to avoid a circular dependency.
  * If it changes, update the matching logic in `editor-plugin-limited-mode/src/pm-plugins/main.ts`.
  *
- * Under the expanded gate, limited mode is activated when ANY of the following conditions are met:
- * 1. Document size exceeds `docSizeThreshold` (if defined) - checked first as O(1)
- * 2. Node count exceeds `nodeCountThreshold` (if defined)
- * 3. Document contains a legacy-content macro (LCM) (if `includeLcmInThreshold` is true)
+ * Limited mode is activated when ANY of the following conditions are met:
+ * 1. Document size exceeds `LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD` — checked first as O(1)
+ * 2. Node count exceeds `LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD`
+ * 3. Document contains a legacy-content macro (LCM)
  *
  * Performance optimisations:
  * - Doc size is checked first (O(1)) - if it exceeds threshold, we skip traversal entirely.
- * - If `includeLcmInThreshold` is enabled and we find an LCM, we exit traversal early.
- * - If neither node count nor LCM conditions are configured, we skip traversal entirely.
+ * - If we find an LCM during traversal, we exit early since limited mode will be enabled.
  */
 var isLimitedModeEnabled = function isLimitedModeEnabled(editorView) {
   var doc = editorView.state.doc;
-  if ((0, _expVal.expVal)('cc_editor_limited_mode_expanded', 'isEnabled', false)) {
-    var nodeCountThreshold = getNumericExperimentParam('nodeCountThreshold', 5000);
-    var docSizeThreshold = getNumericExperimentParam('docSizeThreshold', 30000);
-    var includeLcmInThreshold = Boolean((0, _expVal.expVal)('cc_editor_limited_mode_expanded', 'includeLcmInThreshold', false));
+  var nodeCountThreshold = _limitedModeDocumentThresholds.LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD;
+  var docSizeThreshold = _limitedModeDocumentThresholds.LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD;
 
-    // Early exit: doc size exceeds threshold - O(1), no traversal needed
-    if (docSizeThreshold !== undefined && doc.nodeSize > docSizeThreshold) {
-      return true;
-    }
+  // Early exit: doc size exceeds threshold - O(1), no traversal needed
+  if (doc.nodeSize > docSizeThreshold) {
+    return true;
+  }
+
+  // Single traversal for node count and LCM detection
+  var nodeCount = 0;
+  var hasLcm = false;
+  doc.descendants(function (node) {
+    var _node$attrs;
+    nodeCount += 1;
+    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey) === 'legacy-content') {
+      hasLcm = true;
 
-    // Early exit: no traversal needed if neither condition is configured
-    var needNodeCount = nodeCountThreshold !== undefined;
-    if (!needNodeCount && !includeLcmInThreshold) {
+      // Early exit: LCM found — limited mode will be enabled
       return false;
     }
+  });
 
-    // Single traversal for node count and/or LCM detection
-    var nodeCount = 0;
-    var hasLcm = false;
-    doc.descendants(function (node) {
-      var _node$attrs3;
-      nodeCount += 1;
-      if (((_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.extensionKey) === 'legacy-content') {
-        hasLcm = true;
-
-        // Early exit: LCM found and condition is enabled - no need to continue counting
-        if (includeLcmInThreshold) {
-          return false;
-        }
-      }
-    });
-
-    // LCM condition takes precedence (if we early exited traversal, this is why)
-    if (includeLcmInThreshold && hasLcm) {
-      return true;
-    }
+  // LCM condition takes precedence (if we early exited traversal, this is why)
+  if (hasLcm) {
+    return true;
+  }
 
-    // Check node count threshold
-    if (needNodeCount && nodeCount > nodeCountThreshold) {
-      return true;
-    }
-    return false;
-  } else {
-    var customDocSize = getCustomDocSize(doc);
-    return customDocSize > LIMITED_MODE_NODE_SIZE_THRESHOLD;
+  // Check node count threshold
+  if (nodeCount > nodeCountThreshold) {
+    return true;
   }
+  return false;
 };
 
 // Get the NodeIdProvider for a specific EditorView instance.

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

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

@@ -17,6 +17,7 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _reactDom = require("react-dom");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils = require("./utils");
 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; }
@@ -119,7 +120,8 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
         allowOutOfBounds: allowOutOfBounds,
         rect: rect,
         boundariesElement: boundariesElement || document.body,
-        minPopupMargin: minPopupMargin
+        minPopupMargin: minPopupMargin,
+        scrollableElement: stick && (0, _expValEquals.expValEquals)('platform_editor_fix_scrolling_popup_position', 'isEnabled', true) ? this.scrollElement : undefined
       });
       position = onPositionCalculated ? onPositionCalculated(position) : position;
       if (typeof position.top !== 'undefined' && absoluteOffset !== null && absoluteOffset !== void 0 && absoluteOffset.top) {
@@ -268,12 +270,17 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
 
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      this.scrollParentElement = (0, _utils.findOverflowScrollParent)(this.props.target);
-      if (this.scrollParentElement && this.resizeObserver) {
-        this.resizeObserver.observe(this.scrollParentElement);
+      var target = this.props.target;
+
+      // Resolve the effective scroll parent: prefer the explicitly provided scrollableElement
+      // prop over the auto-detected ancestor. Allows product consumers to provide the correct
+      // scroll container (e.g. a modal body) when auto-detection can't find it.
+      var scrollParentElement = (0, _expValEquals.expValEquals)('platform_editor_fix_scrolling_popup_position', 'isEnabled', true) ? this.props.scrollableElement || (0, _utils.findOverflowScrollParent)(target) : (0, _utils.findOverflowScrollParent)(target);
+      if (scrollParentElement && this.resizeObserver) {
+        this.resizeObserver.observe(scrollParentElement);
       }
       if (stick) {
-        this.scrollElement = this.scrollParentElement;
+        this.scrollElement = scrollParentElement;
       } else {
         this.scrollElement = this.props.scrollableElement;
       }

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

@@ -145,8 +145,9 @@ var calculateVerticalStickBottom = function calculateVerticalStickBottom(_ref2)
     popup = _ref2.popup,
     offset = _ref2.offset,
     position = _ref2.position,
-    boundariesElement = _ref2.boundariesElement;
-  var scrollParent = findOverflowScrollParent(target) || boundariesElement;
+    boundariesElement = _ref2.boundariesElement,
+    scrollableElement = _ref2.scrollableElement;
+  var scrollParent = scrollableElement || findOverflowScrollParent(target) || boundariesElement;
   var newPos = _objectSpread({}, position);
   if (scrollParent) {
     var topOffsetTop = targetTop - scrollParent.getBoundingClientRect().top;
@@ -169,8 +170,9 @@ var calculateVerticalStickTop = function calculateVerticalStickTop(_ref3) {
     offset = _ref3.offset,
     position = _ref3.position,
     placement = _ref3.placement,
-    boundariesElement = _ref3.boundariesElement;
-  var scrollParent = findOverflowScrollParent(target) || boundariesElement;
+    boundariesElement = _ref3.boundariesElement,
+    scrollableElement = _ref3.scrollableElement;
+  var scrollParent = scrollableElement || findOverflowScrollParent(target) || boundariesElement;
   var newPos = _objectSpread({}, position);
   if (scrollParent) {
     var _scrollParent$getBoun = scrollParent.getBoundingClientRect(),
@@ -233,7 +235,8 @@ function calculatePosition(_ref5) {
     allowOutOfBounds = _ref5$allowOutOfBound === void 0 ? false : _ref5$allowOutOfBound,
     rect = _ref5.rect,
     boundariesElement = _ref5.boundariesElement,
-    minPopupMargin = _ref5.minPopupMargin;
+    minPopupMargin = _ref5.minPopupMargin,
+    scrollableElement = _ref5.scrollableElement;
   var position = {};
   if (!target || !popup || !popup.offsetParent || !isHTMLElementNode(popup.offsetParent)) {
     return position;
@@ -292,7 +295,8 @@ function calculatePosition(_ref5) {
       offset: offset,
       position: position,
       placement: verticalPlacement,
-      boundariesElement: boundariesElement
+      boundariesElement: boundariesElement,
+      scrollableElement: scrollableElement
     });
   }
   if (verticalPlacement !== 'top' && verticalPlacement !== 'start' && stick) {
@@ -303,7 +307,8 @@ function calculatePosition(_ref5) {
       popup: popup,
       offset: offset,
       position: position,
-      boundariesElement: boundariesElement
+      boundariesElement: boundariesElement,
+      scrollableElement: scrollableElement
     });
   }
   var horizontalPosition = calculateHorizontalPlacement({

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 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 = "114.6.1";
+const packageVersion = "114.7.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/node-anchor/limited-mode-document-thresholds.js

@@ -0,0 +1,6 @@
+/** Fixed document thresholds for limited (performance) mode (previously Statsig-driven). */
+export const LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = 5000;
+export const LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = 30000;
+
+/** When true, any legacy-content macro triggers limited mode regardless of size/count. */
+export const LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = true;

package/dist/es2019/node-anchor/node-anchor-provider.js

@@ -1,27 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { isEmptyDocument } from '../utils';
 import { DynamicBitArray } from './dynamic-bit-array';
-
-/**
- * Gets a numeric experiment param, returning undefined if the value is not a valid number.
- * This guards against test overrides returning booleans or strings for numeric params.
- */
-const getNumericExperimentParam = (paramName, fallbackValue) => {
-  const rawValue = expVal('cc_editor_limited_mode_expanded', paramName, fallbackValue);
-  if (typeof rawValue === 'number') {
-    return rawValue;
-  }
-
-  // Handle string values from test overrides
-  if (typeof rawValue === 'string') {
-    const parsed = parseInt(rawValue, 10);
-    if (!isNaN(parsed)) {
-      return parsed;
-    }
-  }
-  return undefined;
-};
+import { LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD, LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD } from './limited-mode-document-thresholds';
 export class NodeAnchorProvider {
   constructor(limitedMode = false, emptyDoc = false) {
     _defineProperty(this, "cache", new WeakMap());
@@ -85,87 +65,55 @@ export class NodeAnchorProvider {
   }
 }
 const nodeIdProviderMap = new WeakMap();
-const LIMITED_MODE_NODE_SIZE_THRESHOLD = 40000;
-
-/**
- * Calculates custom document size including LCM ADF lengths (for non-expanded path).
- * This function can be removed when cc_editor_limited_mode_expanded is cleaned up.
- */
-const getCustomDocSize = doc => {
-  let lcmAdfLength = 0;
-  doc.descendants(node => {
-    var _node$attrs;
-    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey) === 'legacy-content') {
-      var _node$attrs$parameter, _node$attrs2, _node$attrs2$paramete, _node$attrs2$paramete2;
-      lcmAdfLength += (_node$attrs$parameter = (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$paramete = _node$attrs2.parameters) === null || _node$attrs2$paramete === void 0 ? void 0 : (_node$attrs2$paramete2 = _node$attrs2$paramete.adf) === null || _node$attrs2$paramete2 === void 0 ? void 0 : _node$attrs2$paramete2.length) !== null && _node$attrs$parameter !== void 0 ? _node$attrs$parameter : 0;
-    }
-  });
-  return doc.nodeSize + lcmAdfLength;
-};
 
 /**
  * Determines whether limited mode should be enabled.
  * This logic mirrors the limited mode plugin implementation, but lives here to avoid a circular dependency.
  * If it changes, update the matching logic in `editor-plugin-limited-mode/src/pm-plugins/main.ts`.
  *
- * Under the expanded gate, limited mode is activated when ANY of the following conditions are met:
- * 1. Document size exceeds `docSizeThreshold` (if defined) - checked first as O(1)
- * 2. Node count exceeds `nodeCountThreshold` (if defined)
- * 3. Document contains a legacy-content macro (LCM) (if `includeLcmInThreshold` is true)
+ * Limited mode is activated when ANY of the following conditions are met:
+ * 1. Document size exceeds `LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD` — checked first as O(1)
+ * 2. Node count exceeds `LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD`
+ * 3. Document contains a legacy-content macro (LCM)
  *
  * Performance optimisations:
  * - Doc size is checked first (O(1)) - if it exceeds threshold, we skip traversal entirely.
- * - If `includeLcmInThreshold` is enabled and we find an LCM, we exit traversal early.
- * - If neither node count nor LCM conditions are configured, we skip traversal entirely.
+ * - If we find an LCM during traversal, we exit early since limited mode will be enabled.
  */
 const isLimitedModeEnabled = editorView => {
   const doc = editorView.state.doc;
-  if (expVal('cc_editor_limited_mode_expanded', 'isEnabled', false)) {
-    const nodeCountThreshold = getNumericExperimentParam('nodeCountThreshold', 5000);
-    const docSizeThreshold = getNumericExperimentParam('docSizeThreshold', 30000);
-    const includeLcmInThreshold = Boolean(expVal('cc_editor_limited_mode_expanded', 'includeLcmInThreshold', false));
+  const nodeCountThreshold = LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD;
+  const docSizeThreshold = LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD;
 
-    // Early exit: doc size exceeds threshold - O(1), no traversal needed
-    if (docSizeThreshold !== undefined && doc.nodeSize > docSizeThreshold) {
-      return true;
-    }
+  // Early exit: doc size exceeds threshold - O(1), no traversal needed
+  if (doc.nodeSize > docSizeThreshold) {
+    return true;
+  }
+
+  // Single traversal for node count and LCM detection
+  let nodeCount = 0;
+  let hasLcm = false;
+  doc.descendants(node => {
+    var _node$attrs;
+    nodeCount += 1;
+    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey) === 'legacy-content') {
+      hasLcm = true;
 
-    // Early exit: no traversal needed if neither condition is configured
-    const needNodeCount = nodeCountThreshold !== undefined;
-    if (!needNodeCount && !includeLcmInThreshold) {
+      // Early exit: LCM found — limited mode will be enabled
       return false;
     }
+  });
 
-    // Single traversal for node count and/or LCM detection
-    let nodeCount = 0;
-    let hasLcm = false;
-    doc.descendants(node => {
-      var _node$attrs3;
-      nodeCount += 1;
-      if (((_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.extensionKey) === 'legacy-content') {
-        hasLcm = true;
-
-        // Early exit: LCM found and condition is enabled - no need to continue counting
-        if (includeLcmInThreshold) {
-          return false;
-        }
-      }
-    });
-
-    // LCM condition takes precedence (if we early exited traversal, this is why)
-    if (includeLcmInThreshold && hasLcm) {
-      return true;
-    }
+  // LCM condition takes precedence (if we early exited traversal, this is why)
+  if (hasLcm) {
+    return true;
+  }
 
-    // Check node count threshold
-    if (needNodeCount && nodeCount > nodeCountThreshold) {
-      return true;
-    }
-    return false;
-  } else {
-    const customDocSize = getCustomDocSize(doc);
-    return customDocSize > LIMITED_MODE_NODE_SIZE_THRESHOLD;
+  // Check node count threshold
+  if (nodeCount > nodeCountThreshold) {
+    return true;
   }
+  return false;
 };
 
 // Get the NodeIdProvider for a specific EditorView instance.

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

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "114.6.1";
+const packageVersion = "114.7.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

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

@@ -5,6 +5,7 @@ import rafSchedule from 'raf-schd';
 import { createPortal, flushSync } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { calculatePlacement, calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 // Ignored via go/ees005
@@ -96,7 +97,8 @@ export default class Popup extends React.Component {
       allowOutOfBounds,
       rect,
       boundariesElement: boundariesElement || document.body,
-      minPopupMargin
+      minPopupMargin,
+      scrollableElement: stick && expValEquals('platform_editor_fix_scrolling_popup_position', 'isEnabled', true) ? this.scrollElement : undefined
     });
     position = onPositionCalculated ? onPositionCalculated(position) : position;
     if (typeof position.top !== 'undefined' && absoluteOffset !== null && absoluteOffset !== void 0 && absoluteOffset.top) {
@@ -234,12 +236,17 @@ export default class Popup extends React.Component {
 
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    this.scrollParentElement = findOverflowScrollParent(this.props.target);
-    if (this.scrollParentElement && this.resizeObserver) {
-      this.resizeObserver.observe(this.scrollParentElement);
+    const target = this.props.target;
+
+    // Resolve the effective scroll parent: prefer the explicitly provided scrollableElement
+    // prop over the auto-detected ancestor. Allows product consumers to provide the correct
+    // scroll container (e.g. a modal body) when auto-detection can't find it.
+    const scrollParentElement = expValEquals('platform_editor_fix_scrolling_popup_position', 'isEnabled', true) ? this.props.scrollableElement || findOverflowScrollParent(target) : findOverflowScrollParent(target);
+    if (scrollParentElement && this.resizeObserver) {
+      this.resizeObserver.observe(scrollParentElement);
     }
     if (stick) {
-      this.scrollElement = this.scrollParentElement;
+      this.scrollElement = scrollParentElement;
     } else {
       this.scrollElement = this.props.scrollableElement;
     }

package/dist/es2019/ui/Popup/utils.js

@@ -131,9 +131,10 @@ const calculateVerticalStickBottom = ({
   popup,
   offset,
   position,
-  boundariesElement
+  boundariesElement,
+  scrollableElement
 }) => {
-  const scrollParent = findOverflowScrollParent(target) || boundariesElement;
+  const scrollParent = scrollableElement || findOverflowScrollParent(target) || boundariesElement;
   const newPos = {
     ...position
   };
@@ -158,9 +159,10 @@ const calculateVerticalStickTop = ({
   offset,
   position,
   placement,
-  boundariesElement
+  boundariesElement,
+  scrollableElement
 }) => {
-  const scrollParent = findOverflowScrollParent(target) || boundariesElement;
+  const scrollParent = scrollableElement || findOverflowScrollParent(target) || boundariesElement;
   const newPos = {
     ...position
   };
@@ -226,7 +228,8 @@ export function calculatePosition({
   allowOutOfBounds = false,
   rect,
   boundariesElement,
-  minPopupMargin
+  minPopupMargin,
+  scrollableElement
 }) {
   let position = {};
   if (!target || !popup || !popup.offsetParent || !isHTMLElementNode(popup.offsetParent)) {
@@ -289,7 +292,8 @@ export function calculatePosition({
       offset,
       position,
       placement: verticalPlacement,
-      boundariesElement
+      boundariesElement,
+      scrollableElement
     });
   }
   if (verticalPlacement !== 'top' && verticalPlacement !== 'start' && stick) {
@@ -300,7 +304,8 @@ export function calculatePosition({
       popup,
       offset,
       position,
-      boundariesElement
+      boundariesElement,
+      scrollableElement
     });
   }
   const horizontalPosition = calculateHorizontalPlacement({

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 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 = "114.6.1";
+var packageVersion = "114.7.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/node-anchor/limited-mode-document-thresholds.js

@@ -0,0 +1,6 @@
+/** Fixed document thresholds for limited (performance) mode (previously Statsig-driven). */
+export var LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = 5000;
+export var LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = 30000;
+
+/** When true, any legacy-content macro triggers limited mode regardless of size/count. */
+export var LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = true;

package/dist/esm/node-anchor/node-anchor-provider.js

@@ -1,29 +1,9 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { isEmptyDocument } from '../utils';
 import { DynamicBitArray } from './dynamic-bit-array';
-
-/**
- * Gets a numeric experiment param, returning undefined if the value is not a valid number.
- * This guards against test overrides returning booleans or strings for numeric params.
- */
-var getNumericExperimentParam = function getNumericExperimentParam(paramName, fallbackValue) {
-  var rawValue = expVal('cc_editor_limited_mode_expanded', paramName, fallbackValue);
-  if (typeof rawValue === 'number') {
-    return rawValue;
-  }
-
-  // Handle string values from test overrides
-  if (typeof rawValue === 'string') {
-    var parsed = parseInt(rawValue, 10);
-    if (!isNaN(parsed)) {
-      return parsed;
-    }
-  }
-  return undefined;
-};
+import { LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD, LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD } from './limited-mode-document-thresholds';
 export var NodeAnchorProvider = /*#__PURE__*/function () {
   function NodeAnchorProvider() {
     var limitedMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -105,87 +85,55 @@ export var NodeAnchorProvider = /*#__PURE__*/function () {
   }]);
 }();
 var nodeIdProviderMap = new WeakMap();
-var LIMITED_MODE_NODE_SIZE_THRESHOLD = 40000;
-
-/**
- * Calculates custom document size including LCM ADF lengths (for non-expanded path).
- * This function can be removed when cc_editor_limited_mode_expanded is cleaned up.
- */
-var getCustomDocSize = function getCustomDocSize(doc) {
-  var lcmAdfLength = 0;
-  doc.descendants(function (node) {
-    var _node$attrs;
-    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey) === 'legacy-content') {
-      var _node$attrs$parameter, _node$attrs2;
-      lcmAdfLength += (_node$attrs$parameter = (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.parameters) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.adf) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.length) !== null && _node$attrs$parameter !== void 0 ? _node$attrs$parameter : 0;
-    }
-  });
-  return doc.nodeSize + lcmAdfLength;
-};
 
 /**
  * Determines whether limited mode should be enabled.
  * This logic mirrors the limited mode plugin implementation, but lives here to avoid a circular dependency.
  * If it changes, update the matching logic in `editor-plugin-limited-mode/src/pm-plugins/main.ts`.
  *
- * Under the expanded gate, limited mode is activated when ANY of the following conditions are met:
- * 1. Document size exceeds `docSizeThreshold` (if defined) - checked first as O(1)
- * 2. Node count exceeds `nodeCountThreshold` (if defined)
- * 3. Document contains a legacy-content macro (LCM) (if `includeLcmInThreshold` is true)
+ * Limited mode is activated when ANY of the following conditions are met:
+ * 1. Document size exceeds `LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD` — checked first as O(1)
+ * 2. Node count exceeds `LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD`
+ * 3. Document contains a legacy-content macro (LCM)
  *
  * Performance optimisations:
  * - Doc size is checked first (O(1)) - if it exceeds threshold, we skip traversal entirely.
- * - If `includeLcmInThreshold` is enabled and we find an LCM, we exit traversal early.
- * - If neither node count nor LCM conditions are configured, we skip traversal entirely.
+ * - If we find an LCM during traversal, we exit early since limited mode will be enabled.
  */
 var isLimitedModeEnabled = function isLimitedModeEnabled(editorView) {
   var doc = editorView.state.doc;
-  if (expVal('cc_editor_limited_mode_expanded', 'isEnabled', false)) {
-    var nodeCountThreshold = getNumericExperimentParam('nodeCountThreshold', 5000);
-    var docSizeThreshold = getNumericExperimentParam('docSizeThreshold', 30000);
-    var includeLcmInThreshold = Boolean(expVal('cc_editor_limited_mode_expanded', 'includeLcmInThreshold', false));
+  var nodeCountThreshold = LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD;
+  var docSizeThreshold = LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD;
 
-    // Early exit: doc size exceeds threshold - O(1), no traversal needed
-    if (docSizeThreshold !== undefined && doc.nodeSize > docSizeThreshold) {
-      return true;
-    }
+  // Early exit: doc size exceeds threshold - O(1), no traversal needed
+  if (doc.nodeSize > docSizeThreshold) {
+    return true;
+  }
+
+  // Single traversal for node count and LCM detection
+  var nodeCount = 0;
+  var hasLcm = false;
+  doc.descendants(function (node) {
+    var _node$attrs;
+    nodeCount += 1;
+    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey) === 'legacy-content') {
+      hasLcm = true;
 
-    // Early exit: no traversal needed if neither condition is configured
-    var needNodeCount = nodeCountThreshold !== undefined;
-    if (!needNodeCount && !includeLcmInThreshold) {
+      // Early exit: LCM found — limited mode will be enabled
       return false;
     }
+  });
 
-    // Single traversal for node count and/or LCM detection
-    var nodeCount = 0;
-    var hasLcm = false;
-    doc.descendants(function (node) {
-      var _node$attrs3;
-      nodeCount += 1;
-      if (((_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.extensionKey) === 'legacy-content') {
-        hasLcm = true;
-
-        // Early exit: LCM found and condition is enabled - no need to continue counting
-        if (includeLcmInThreshold) {
-          return false;
-        }
-      }
-    });
-
-    // LCM condition takes precedence (if we early exited traversal, this is why)
-    if (includeLcmInThreshold && hasLcm) {
-      return true;
-    }
+  // LCM condition takes precedence (if we early exited traversal, this is why)
+  if (hasLcm) {
+    return true;
+  }
 
-    // Check node count threshold
-    if (needNodeCount && nodeCount > nodeCountThreshold) {
-      return true;
-    }
-    return false;
-  } else {
-    var customDocSize = getCustomDocSize(doc);
-    return customDocSize > LIMITED_MODE_NODE_SIZE_THRESHOLD;
+  // Check node count threshold
+  if (nodeCount > nodeCountThreshold) {
+    return true;
   }
+  return false;
 };
 
 // Get the NodeIdProvider for a specific EditorView instance.

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

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "114.6.1";
+var packageVersion = "114.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

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

@@ -14,6 +14,7 @@ import rafSchedule from 'raf-schd';
 import { createPortal, flushSync } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { calculatePlacement, calculatePosition as _calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 // Ignored via go/ees005
@@ -112,7 +113,8 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         allowOutOfBounds: allowOutOfBounds,
         rect: rect,
         boundariesElement: boundariesElement || document.body,
-        minPopupMargin: minPopupMargin
+        minPopupMargin: minPopupMargin,
+        scrollableElement: stick && expValEquals('platform_editor_fix_scrolling_popup_position', 'isEnabled', true) ? this.scrollElement : undefined
       });
       position = onPositionCalculated ? onPositionCalculated(position) : position;
       if (typeof position.top !== 'undefined' && absoluteOffset !== null && absoluteOffset !== void 0 && absoluteOffset.top) {
@@ -261,12 +263,17 @@ var Popup = /*#__PURE__*/function (_React$Component) {
 
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      this.scrollParentElement = findOverflowScrollParent(this.props.target);
-      if (this.scrollParentElement && this.resizeObserver) {
-        this.resizeObserver.observe(this.scrollParentElement);
+      var target = this.props.target;
+
+      // Resolve the effective scroll parent: prefer the explicitly provided scrollableElement
+      // prop over the auto-detected ancestor. Allows product consumers to provide the correct
+      // scroll container (e.g. a modal body) when auto-detection can't find it.
+      var scrollParentElement = expValEquals('platform_editor_fix_scrolling_popup_position', 'isEnabled', true) ? this.props.scrollableElement || findOverflowScrollParent(target) : findOverflowScrollParent(target);
+      if (scrollParentElement && this.resizeObserver) {
+        this.resizeObserver.observe(scrollParentElement);
       }
       if (stick) {
-        this.scrollElement = this.scrollParentElement;
+        this.scrollElement = scrollParentElement;
       } else {
         this.scrollElement = this.props.scrollableElement;
       }

package/dist/esm/ui/Popup/utils.js

@@ -131,8 +131,9 @@ var calculateVerticalStickBottom = function calculateVerticalStickBottom(_ref2)
     popup = _ref2.popup,
     offset = _ref2.offset,
     position = _ref2.position,
-    boundariesElement = _ref2.boundariesElement;
-  var scrollParent = findOverflowScrollParent(target) || boundariesElement;
+    boundariesElement = _ref2.boundariesElement,
+    scrollableElement = _ref2.scrollableElement;
+  var scrollParent = scrollableElement || findOverflowScrollParent(target) || boundariesElement;
   var newPos = _objectSpread({}, position);
   if (scrollParent) {
     var topOffsetTop = targetTop - scrollParent.getBoundingClientRect().top;
@@ -155,8 +156,9 @@ var calculateVerticalStickTop = function calculateVerticalStickTop(_ref3) {
     offset = _ref3.offset,
     position = _ref3.position,
     placement = _ref3.placement,
-    boundariesElement = _ref3.boundariesElement;
-  var scrollParent = findOverflowScrollParent(target) || boundariesElement;
+    boundariesElement = _ref3.boundariesElement,
+    scrollableElement = _ref3.scrollableElement;
+  var scrollParent = scrollableElement || findOverflowScrollParent(target) || boundariesElement;
   var newPos = _objectSpread({}, position);
   if (scrollParent) {
     var _scrollParent$getBoun = scrollParent.getBoundingClientRect(),
@@ -219,7 +221,8 @@ export function calculatePosition(_ref5) {
     allowOutOfBounds = _ref5$allowOutOfBound === void 0 ? false : _ref5$allowOutOfBound,
     rect = _ref5.rect,
     boundariesElement = _ref5.boundariesElement,
-    minPopupMargin = _ref5.minPopupMargin;
+    minPopupMargin = _ref5.minPopupMargin,
+    scrollableElement = _ref5.scrollableElement;
   var position = {};
   if (!target || !popup || !popup.offsetParent || !isHTMLElementNode(popup.offsetParent)) {
     return position;
@@ -278,7 +281,8 @@ export function calculatePosition(_ref5) {
       offset: offset,
       position: position,
       placement: verticalPlacement,
-      boundariesElement: boundariesElement
+      boundariesElement: boundariesElement,
+      scrollableElement: scrollableElement
     });
   }
   if (verticalPlacement !== 'top' && verticalPlacement !== 'start' && stick) {
@@ -289,7 +293,8 @@ export function calculatePosition(_ref5) {
       popup: popup,
       offset: offset,
       position: position,
-      boundariesElement: boundariesElement
+      boundariesElement: boundariesElement,
+      scrollableElement: scrollableElement
     });
   }
   var horizontalPosition = calculateHorizontalPlacement({

package/dist/types/card/types.d.ts

@@ -43,8 +43,13 @@ export type EmbedCardTransformAttrs = {
  * an alternative ProseMirror Node (e.g. a native embed extension node).
  *
  * Returns undefined if the URL is not supported or transformation is not possible.
+ *
+ * May return a Promise when the transformation requires async work, such as
+ * resolving a Confluence short-link URL via the Object Resolver Service before
+ * matching against a registered experience manifest. Callers that support async
+ * transformation should check for a Promise return value and await it.
  */
-export type EmbedCardNodeTransformer = (schema: Schema, attrs: EmbedCardTransformAttrs) => Node | undefined;
+export type EmbedCardNodeTransformer = (schema: Schema, attrs: EmbedCardTransformAttrs) => Node | undefined | Promise<Node | undefined>;
 /**
  * Options for creating a transform command that replaces a selected card node
  * with an alternative node representation.
@@ -69,6 +74,15 @@ export interface EmbedCardTransformers {
     embedCardNodeTransformer: EmbedCardNodeTransformer;
 }
 export type CardPluginActions = {
+    /**
+     * Resolves a URL via the Object Resolver Service and returns the canonical
+     * expanded URL. Useful for expanding Confluence short-link URLs
+     * (`/wiki/x/<token>`) before matching against experience manifests.
+     *
+     * Returns `undefined` if the URL cannot be resolved or ORS returns no
+     * usable URL in its response data.
+     */
+    resolveShortLinkUrl: (url: string) => Promise<string | undefined>;
     getEndingToolbarItems: GetEndingToolbarItems;
     getStartingToolbarItems: GetStartingToolbarItems;
     hideLinkToolbar: HideLinkToolbarAction;

package/dist/types/node-anchor/limited-mode-document-thresholds.d.ts

@@ -0,0 +1,5 @@
+/** Fixed document thresholds for limited (performance) mode (previously Statsig-driven). */
+export declare const LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = 5000;
+export declare const LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = 30000;
+/** When true, any legacy-content macro triggers limited mode regardless of size/count. */
+export declare const LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = true;

package/dist/types/ui/Popup/index.d.ts

@@ -38,7 +38,6 @@ export interface State {
 }
 export default class Popup extends React.Component<Props, State> {
     scrollElement: undefined | false | HTMLElement;
-    scrollParentElement: undefined | false | HTMLElement;
     rafIds: Set<number>;
     static defaultProps: {
         allowOutOfBound: boolean;

package/dist/types/ui/Popup/utils.d.ts

@@ -14,6 +14,7 @@ export interface CalculatePositionParams {
     rect?: DOMRect;
     stick?: boolean;
     target?: HTMLElement;
+    scrollableElement?: HTMLElement | false;
 }
 export declare function isBody(elem: HTMLElement | Element): boolean;
 export declare function isTextNode(elem: HTMLElement | Element): boolean;
@@ -30,7 +31,7 @@ export declare function calculatePlacement(target: HTMLElement, boundariesElemen
  * Calculates relative coordinates for placing popup along with the target.
  * Uses placement from calculatePlacement.
  */
-export declare function calculatePosition({ placement, target, popup, offset, stick, allowOutOfBounds, rect, boundariesElement, minPopupMargin, }: CalculatePositionParams): Position;
+export declare function calculatePosition({ placement, target, popup, offset, stick, allowOutOfBounds, rect, boundariesElement, minPopupMargin, scrollableElement, }: CalculatePositionParams): Position;
 export declare function validatePosition(popup: HTMLElement): boolean;
 /**
  * Traverse DOM Tree upwards looking for popup parents with "overflow: scroll".

package/dist/types-ts4.5/card/types.d.ts

@@ -43,8 +43,13 @@ export type EmbedCardTransformAttrs = {
  * an alternative ProseMirror Node (e.g. a native embed extension node).
  *
  * Returns undefined if the URL is not supported or transformation is not possible.
+ *
+ * May return a Promise when the transformation requires async work, such as
+ * resolving a Confluence short-link URL via the Object Resolver Service before
+ * matching against a registered experience manifest. Callers that support async
+ * transformation should check for a Promise return value and await it.
  */
-export type EmbedCardNodeTransformer = (schema: Schema, attrs: EmbedCardTransformAttrs) => Node | undefined;
+export type EmbedCardNodeTransformer = (schema: Schema, attrs: EmbedCardTransformAttrs) => Node | undefined | Promise<Node | undefined>;
 /**
  * Options for creating a transform command that replaces a selected card node
  * with an alternative node representation.
@@ -69,6 +74,15 @@ export interface EmbedCardTransformers {
     embedCardNodeTransformer: EmbedCardNodeTransformer;
 }
 export type CardPluginActions = {
+    /**
+     * Resolves a URL via the Object Resolver Service and returns the canonical
+     * expanded URL. Useful for expanding Confluence short-link URLs
+     * (`/wiki/x/<token>`) before matching against experience manifests.
+     *
+     * Returns `undefined` if the URL cannot be resolved or ORS returns no
+     * usable URL in its response data.
+     */
+    resolveShortLinkUrl: (url: string) => Promise<string | undefined>;
     getEndingToolbarItems: GetEndingToolbarItems;
     getStartingToolbarItems: GetStartingToolbarItems;
     hideLinkToolbar: HideLinkToolbarAction;

package/dist/types-ts4.5/node-anchor/limited-mode-document-thresholds.d.ts

@@ -0,0 +1,5 @@
+/** Fixed document thresholds for limited (performance) mode (previously Statsig-driven). */
+export declare const LIMITED_MODE_DEFAULT_NODE_COUNT_THRESHOLD = 5000;
+export declare const LIMITED_MODE_DEFAULT_DOC_SIZE_THRESHOLD = 30000;
+/** When true, any legacy-content macro triggers limited mode regardless of size/count. */
+export declare const LIMITED_MODE_INCLUDE_LEGACY_CONTENT_IN_THRESHOLD = true;

package/dist/types-ts4.5/ui/Popup/index.d.ts

@@ -41,7 +41,6 @@ export interface State {
 }
 export default class Popup extends React.Component<Props, State> {
     scrollElement: undefined | false | HTMLElement;
-    scrollParentElement: undefined | false | HTMLElement;
     rafIds: Set<number>;
     static defaultProps: {
         allowOutOfBound: boolean;

package/dist/types-ts4.5/ui/Popup/utils.d.ts

@@ -17,6 +17,7 @@ export interface CalculatePositionParams {
     rect?: DOMRect;
     stick?: boolean;
     target?: HTMLElement;
+    scrollableElement?: HTMLElement | false;
 }
 export declare function isBody(elem: HTMLElement | Element): boolean;
 export declare function isTextNode(elem: HTMLElement | Element): boolean;
@@ -36,7 +37,7 @@ export declare function calculatePlacement(target: HTMLElement, boundariesElemen
  * Calculates relative coordinates for placing popup along with the target.
  * Uses placement from calculatePlacement.
  */
-export declare function calculatePosition({ placement, target, popup, offset, stick, allowOutOfBounds, rect, boundariesElement, minPopupMargin, }: CalculatePositionParams): Position;
+export declare function calculatePosition({ placement, target, popup, offset, stick, allowOutOfBounds, rect, boundariesElement, minPopupMargin, scrollableElement, }: CalculatePositionParams): Position;
 export declare function validatePosition(popup: HTMLElement): boolean;
 /**
  * Traverse DOM Tree upwards looking for popup parents with "overflow: scroll".

package/limited-mode-document-thresholds/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@atlaskit/editor-common/limited-mode-document-thresholds",
+  "main": "../dist/cjs/node-anchor/limited-mode-document-thresholds.js",
+  "module": "../dist/esm/node-anchor/limited-mode-document-thresholds.js",
+  "module:es2019": "../dist/es2019/node-anchor/limited-mode-document-thresholds.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../dist/types/node-anchor/limited-mode-document-thresholds.d.ts",
+  "typesVersions": {
+    ">=4.5 <5.9": {
+      "*": [
+        "../dist/types-ts4.5/node-anchor/limited-mode-document-thresholds.d.ts"
+      ]
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "114.6.2",
+	"version": "114.8.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -57,8 +57,8 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^1.0.0",
 		"@atlaskit/editor-toolbar-model": "^0.4.0",
-		"@atlaskit/emoji": "^70.1.0",
-		"@atlaskit/icon": "^34.2.0",
+		"@atlaskit/emoji": "^70.2.0",
+		"@atlaskit/icon": "^34.3.0",
 		"@atlaskit/icon-object": "^7.5.0",
 		"@atlaskit/link": "^3.4.0",
 		"@atlaskit/link-datasource": "^5.2.0",
@@ -86,9 +86,9 @@
 		"@atlaskit/spinner": "^19.1.0",
 		"@atlaskit/task-decision": "^20.0.0",
 		"@atlaskit/textfield": "^8.3.0",
-		"@atlaskit/tmp-editor-statsig": "^65.0.0",
+		"@atlaskit/tmp-editor-statsig": "^66.1.0",
 		"@atlaskit/tokens": "^13.0.0",
-		"@atlaskit/tooltip": "^21.1.0",
+		"@atlaskit/tooltip": "^21.2.0",
 		"@atlaskit/width-detector": "^5.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",