@atlaskit/editor-common 111.16.6 → 111.17.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-common
 
+## 111.17.1
+
+### Patch Changes
+
+- [`0e487e05b9e61`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0e487e05b9e61) -
+  additional analytics attributes
+- Updated dependencies
+
+## 111.17.0
+
+### Minor Changes
+
+- [`46a2d3f1807fb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/46a2d3f1807fb) -
+  Remove feature gate for block menu drag handle offset
+- [`dfe1c3b4007f4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dfe1c3b4007f4) -
+  [ux] Adding the ability to provide a Lozenge to Quick Insert Menu Items.
+
+### Patch Changes
+
+- [`48b6616a3fefc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/48b6616a3fefc) -
+  Add new logic to detect scrollable containers when calculating position for selection toolbar.
+  This fixes issues when used inside modals and other surfaces.
+- [`8d553b883996b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8d553b883996b) -
+  Add block menu transform experience tracking
+- Updated dependencies
+
 ## 111.16.6
 
 ### Patch Changes

package/dist/cjs/analytics/types/enums.js

@@ -409,6 +409,7 @@ var ACTION_SUBJECT_ID = exports.ACTION_SUBJECT_ID = /*#__PURE__*/function (ACTIO
   ACTION_SUBJECT_ID["DELETE_BLOCK"] = "deleteBlock";
   ACTION_SUBJECT_ID["MOVE_UP_BLOCK"] = "moveUpBlock";
   ACTION_SUBJECT_ID["MOVE_DOWN_BLOCK"] = "moveDownBlock";
+  ACTION_SUBJECT_ID["TRANSFORM_BLOCK"] = "transformBlock";
   ACTION_SUBJECT_ID["FORMAT_MENU"] = "formatMenu";
   ACTION_SUBJECT_ID["CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU"] = "createInlineCommentFromHighlightActionsMenu";
   ACTION_SUBJECT_ID["DATE"] = "date";

package/dist/cjs/extensions/module-helpers.js

@@ -38,7 +38,7 @@ function buildMenuItem(manifest, extensionModule) {
   if (!node) {
     throw new Error("Couldn't find any action for ".concat(title, " (").concat(key, ")"));
   }
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({
     key: key,
     title: title,
     extensionType: manifest.type,
@@ -51,6 +51,8 @@ function buildMenuItem(manifest, extensionModule) {
     documentationUrl: manifest.documentationUrl
   }, ((0, _platformFeatureFlags.fg)('cc_fd_wb_create_priority_in_slash_menu_enabled') || (0, _platformFeatureFlags.fg)('rovo_chat_enable_skills_ui_m1')) && {
     priority: extensionModule.priority
+  }), extensionModule.lozenge != null && {
+    lozenge: extensionModule.lozenge
   }), {}, {
     icon: extensionModule.icon || manifest.icons['48'],
     node: node

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 = "111.16.5";
+var packageVersion = "111.17.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

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

@@ -14,7 +14,6 @@ exports.isTextNode = isTextNode;
 exports.validatePosition = validatePosition;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function isBody(elem) {
@@ -263,8 +262,8 @@ function calculatePosition(_ref5) {
 
   // Calculate scrollbar dimensions to adjust positions
   // clientWidth/Height excludes scrollbars, offsetWidth/Height includes them
-  var scrollbarWidth = (0, _platformFeatureFlags.fg)('platform_editor_popup_calc_pos_scrollbar') ? popupOffsetParent.offsetWidth - popupOffsetParent.clientWidth : 0;
-  var scrollbarHeight = (0, _platformFeatureFlags.fg)('platform_editor_popup_calc_pos_scrollbar') ? popupOffsetParent.offsetHeight - popupOffsetParent.clientHeight : 0;
+  var scrollbarWidth = popupOffsetParent.offsetWidth - popupOffsetParent.clientWidth;
+  var scrollbarHeight = popupOffsetParent.offsetHeight - popupOffsetParent.clientHeight;
   var _target$getBoundingCl3 = target.getBoundingClientRect(),
     targetTop = _target$getBoundingCl3.top,
     targetLeft = _target$getBoundingCl3.left,

package/dist/cjs/utils/calculate-toolbar-position.js

@@ -86,7 +86,54 @@ var calculateToolbarPositionAboveSelection = exports.calculateToolbarPositionAbo
   };
 };
 var findContainingElement = function findContainingElement(editorView) {
-  // First, try to find .fabric-editor-popup-scroll-parent
+  if ((0, _expValEquals.expValEquals)('platform_editor_sel_toolbar_scroll_pos_fix_exp', 'isEnabled', true)) {
+    // Traverse DOM Tree upwards looking for scroll parents with "overflow: scroll"
+    // or fixed/absolute positioned containers.
+    var parent = editorView.dom;
+
+    // Ignored via go/ees005
+    // eslint-disable-next-line no-cond-assign
+    while (parent = parent.parentElement) {
+      var style = window.getComputedStyle(parent);
+
+      // Check for explicit scroll parent class
+      if (parent.classList.contains('fabric-editor-popup-scroll-parent')) {
+        return {
+          container: parent,
+          isFixed: false
+        };
+      }
+
+      // Check for overflow scroll containers
+      if (style.overflow === 'scroll' || style.overflowX === 'scroll' || style.overflowY === 'scroll' || style.overflow === 'auto' || style.overflowX === 'auto' || style.overflowY === 'auto') {
+        return {
+          container: parent,
+          isFixed: false
+        };
+      }
+
+      // Check for fixed or absolute positioned containers (modal wrappers, sidebars)
+      if (style.position === 'fixed' || style.position === 'absolute') {
+        return {
+          container: parent,
+          isFixed: style.position === 'fixed'
+        };
+      }
+
+      // Stop at body
+      if (parent === document.body) {
+        break;
+      }
+    }
+
+    // Fall back to document.body if no suitable container found
+    return {
+      container: document.body,
+      isFixed: false
+    };
+  }
+
+  // Original logic
   var scrollParent = editorView.dom.closest('.fabric-editor-popup-scroll-parent');
   if (scrollParent) {
     return {
@@ -94,7 +141,6 @@ var findContainingElement = function findContainingElement(editorView) {
       isFixed: false
     };
   } else {
-    // If no scroll parent, look for a fixed positioned parent
     var fixedParent = editorView.dom.parentElement;
     while (fixedParent && fixedParent !== document.body) {
       var computedStyle = window.getComputedStyle(fixedParent);
@@ -240,9 +286,10 @@ var calculateToolbarPositionTrackHeadNew = exports.calculateToolbarPositionTrack
     var _editorView$state$sel3 = editorView.state.selection,
       head = _editorView$state$sel3.head,
       anchor = _editorView$state$sel3.anchor;
+    var top;
+    var left;
     var topCoords = editorView.coordsAtPos(Math.min(head, anchor));
     var bottomCoords = editorView.coordsAtPos(Math.max(head, anchor) - Math.min(range.endOffset, 1));
-    var top;
     // If not the same line AND we are selecting downwards, display toolbar below.
     if (head > anchor && topCoords.top !== bottomCoords.top) {
       // We are taking the previous pos to the maxium, so avoid end of line positions
@@ -251,7 +298,7 @@ var calculateToolbarPositionTrackHeadNew = exports.calculateToolbarPositionTrack
     } else {
       top = (topCoords.top || 0) - toolbarRect.height * 1.5;
     }
-    var left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
+    left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
 
     // Place toolbar below selection if not sufficient space above
     if (top < containerBounds.top) {

package/dist/es2019/analytics/types/enums.js

@@ -403,6 +403,7 @@ export let ACTION_SUBJECT_ID = /*#__PURE__*/function (ACTION_SUBJECT_ID) {
   ACTION_SUBJECT_ID["DELETE_BLOCK"] = "deleteBlock";
   ACTION_SUBJECT_ID["MOVE_UP_BLOCK"] = "moveUpBlock";
   ACTION_SUBJECT_ID["MOVE_DOWN_BLOCK"] = "moveDownBlock";
+  ACTION_SUBJECT_ID["TRANSFORM_BLOCK"] = "transformBlock";
   ACTION_SUBJECT_ID["FORMAT_MENU"] = "formatMenu";
   ACTION_SUBJECT_ID["CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU"] = "createInlineCommentFromHighlightActionsMenu";
   ACTION_SUBJECT_ID["DATE"] = "date";

package/dist/es2019/extensions/module-helpers.js

@@ -28,6 +28,9 @@ export function buildMenuItem(manifest, extensionModule) {
     ...((fg('cc_fd_wb_create_priority_in_slash_menu_enabled') || fg('rovo_chat_enable_skills_ui_m1')) && {
       priority: extensionModule.priority
     }),
+    ...(extensionModule.lozenge != null && {
+      lozenge: extensionModule.lozenge
+    }),
     icon: extensionModule.icon || manifest.icons['48'],
     node
   };

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 = "111.16.5";
+const packageVersion = "111.17.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "111.16.5";
+const packageVersion = "111.17.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

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

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 export function isBody(elem) {
   return elem === document.body;
 }
@@ -257,8 +256,8 @@ export function calculatePosition({
 
   // Calculate scrollbar dimensions to adjust positions
   // clientWidth/Height excludes scrollbars, offsetWidth/Height includes them
-  const scrollbarWidth = fg('platform_editor_popup_calc_pos_scrollbar') ? popupOffsetParent.offsetWidth - popupOffsetParent.clientWidth : 0;
-  const scrollbarHeight = fg('platform_editor_popup_calc_pos_scrollbar') ? popupOffsetParent.offsetHeight - popupOffsetParent.clientHeight : 0;
+  const scrollbarWidth = popupOffsetParent.offsetWidth - popupOffsetParent.clientWidth;
+  const scrollbarHeight = popupOffsetParent.offsetHeight - popupOffsetParent.clientHeight;
   const {
     top: targetTop,
     left: targetLeft,

package/dist/es2019/utils/calculate-toolbar-position.js

@@ -80,7 +80,54 @@ export const calculateToolbarPositionAboveSelection = toolbarTitle => (editorVie
   };
 };
 const findContainingElement = editorView => {
-  // First, try to find .fabric-editor-popup-scroll-parent
+  if (expValEquals('platform_editor_sel_toolbar_scroll_pos_fix_exp', 'isEnabled', true)) {
+    // Traverse DOM Tree upwards looking for scroll parents with "overflow: scroll"
+    // or fixed/absolute positioned containers.
+    let parent = editorView.dom;
+
+    // Ignored via go/ees005
+    // eslint-disable-next-line no-cond-assign
+    while (parent = parent.parentElement) {
+      const style = window.getComputedStyle(parent);
+
+      // Check for explicit scroll parent class
+      if (parent.classList.contains('fabric-editor-popup-scroll-parent')) {
+        return {
+          container: parent,
+          isFixed: false
+        };
+      }
+
+      // Check for overflow scroll containers
+      if (style.overflow === 'scroll' || style.overflowX === 'scroll' || style.overflowY === 'scroll' || style.overflow === 'auto' || style.overflowX === 'auto' || style.overflowY === 'auto') {
+        return {
+          container: parent,
+          isFixed: false
+        };
+      }
+
+      // Check for fixed or absolute positioned containers (modal wrappers, sidebars)
+      if (style.position === 'fixed' || style.position === 'absolute') {
+        return {
+          container: parent,
+          isFixed: style.position === 'fixed'
+        };
+      }
+
+      // Stop at body
+      if (parent === document.body) {
+        break;
+      }
+    }
+
+    // Fall back to document.body if no suitable container found
+    return {
+      container: document.body,
+      isFixed: false
+    };
+  }
+
+  // Original logic
   const scrollParent = editorView.dom.closest('.fabric-editor-popup-scroll-parent');
   if (scrollParent) {
     return {
@@ -88,7 +135,6 @@ const findContainingElement = editorView => {
       isFixed: false
     };
   } else {
-    // If no scroll parent, look for a fixed positioned parent
     let fixedParent = editorView.dom.parentElement;
     while (fixedParent && fixedParent !== document.body) {
       const computedStyle = window.getComputedStyle(fixedParent);
@@ -236,9 +282,10 @@ export const calculateToolbarPositionTrackHeadNew = toolbarTitle => {
       head,
       anchor
     } = editorView.state.selection;
+    let top;
+    let left;
     const topCoords = editorView.coordsAtPos(Math.min(head, anchor));
     const bottomCoords = editorView.coordsAtPos(Math.max(head, anchor) - Math.min(range.endOffset, 1));
-    let top;
     // If not the same line AND we are selecting downwards, display toolbar below.
     if (head > anchor && topCoords.top !== bottomCoords.top) {
       // We are taking the previous pos to the maxium, so avoid end of line positions
@@ -247,7 +294,7 @@ export const calculateToolbarPositionTrackHeadNew = toolbarTitle => {
     } else {
       top = (topCoords.top || 0) - toolbarRect.height * 1.5;
     }
-    let left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
+    left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
 
     // Place toolbar below selection if not sufficient space above
     if (top < containerBounds.top) {

package/dist/esm/analytics/types/enums.js

@@ -403,6 +403,7 @@ export var ACTION_SUBJECT_ID = /*#__PURE__*/function (ACTION_SUBJECT_ID) {
   ACTION_SUBJECT_ID["DELETE_BLOCK"] = "deleteBlock";
   ACTION_SUBJECT_ID["MOVE_UP_BLOCK"] = "moveUpBlock";
   ACTION_SUBJECT_ID["MOVE_DOWN_BLOCK"] = "moveDownBlock";
+  ACTION_SUBJECT_ID["TRANSFORM_BLOCK"] = "transformBlock";
   ACTION_SUBJECT_ID["FORMAT_MENU"] = "formatMenu";
   ACTION_SUBJECT_ID["CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU"] = "createInlineCommentFromHighlightActionsMenu";
   ACTION_SUBJECT_ID["DATE"] = "date";

package/dist/esm/extensions/module-helpers.js

@@ -26,7 +26,7 @@ export function buildMenuItem(manifest, extensionModule) {
   if (!node) {
     throw new Error("Couldn't find any action for ".concat(title, " (").concat(key, ")"));
   }
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({
     key: key,
     title: title,
     extensionType: manifest.type,
@@ -39,6 +39,8 @@ export function buildMenuItem(manifest, extensionModule) {
     documentationUrl: manifest.documentationUrl
   }, (fg('cc_fd_wb_create_priority_in_slash_menu_enabled') || fg('rovo_chat_enable_skills_ui_m1')) && {
     priority: extensionModule.priority
+  }), extensionModule.lozenge != null && {
+    lozenge: extensionModule.lozenge
   }), {}, {
     icon: extensionModule.icon || manifest.icons['48'],
     node: node

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 = "111.16.5";
+var packageVersion = "111.17.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "111.16.5";
+var packageVersion = "111.17.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

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

@@ -2,7 +2,6 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { fg } from '@atlaskit/platform-feature-flags';
 export function isBody(elem) {
   return elem === document.body;
 }
@@ -249,8 +248,8 @@ export function calculatePosition(_ref5) {
 
   // Calculate scrollbar dimensions to adjust positions
   // clientWidth/Height excludes scrollbars, offsetWidth/Height includes them
-  var scrollbarWidth = fg('platform_editor_popup_calc_pos_scrollbar') ? popupOffsetParent.offsetWidth - popupOffsetParent.clientWidth : 0;
-  var scrollbarHeight = fg('platform_editor_popup_calc_pos_scrollbar') ? popupOffsetParent.offsetHeight - popupOffsetParent.clientHeight : 0;
+  var scrollbarWidth = popupOffsetParent.offsetWidth - popupOffsetParent.clientWidth;
+  var scrollbarHeight = popupOffsetParent.offsetHeight - popupOffsetParent.clientHeight;
   var _target$getBoundingCl3 = target.getBoundingClientRect(),
     targetTop = _target$getBoundingCl3.top,
     targetLeft = _target$getBoundingCl3.left,

package/dist/esm/utils/calculate-toolbar-position.js

@@ -80,7 +80,54 @@ export var calculateToolbarPositionAboveSelection = function calculateToolbarPos
   };
 };
 var findContainingElement = function findContainingElement(editorView) {
-  // First, try to find .fabric-editor-popup-scroll-parent
+  if (expValEquals('platform_editor_sel_toolbar_scroll_pos_fix_exp', 'isEnabled', true)) {
+    // Traverse DOM Tree upwards looking for scroll parents with "overflow: scroll"
+    // or fixed/absolute positioned containers.
+    var parent = editorView.dom;
+
+    // Ignored via go/ees005
+    // eslint-disable-next-line no-cond-assign
+    while (parent = parent.parentElement) {
+      var style = window.getComputedStyle(parent);
+
+      // Check for explicit scroll parent class
+      if (parent.classList.contains('fabric-editor-popup-scroll-parent')) {
+        return {
+          container: parent,
+          isFixed: false
+        };
+      }
+
+      // Check for overflow scroll containers
+      if (style.overflow === 'scroll' || style.overflowX === 'scroll' || style.overflowY === 'scroll' || style.overflow === 'auto' || style.overflowX === 'auto' || style.overflowY === 'auto') {
+        return {
+          container: parent,
+          isFixed: false
+        };
+      }
+
+      // Check for fixed or absolute positioned containers (modal wrappers, sidebars)
+      if (style.position === 'fixed' || style.position === 'absolute') {
+        return {
+          container: parent,
+          isFixed: style.position === 'fixed'
+        };
+      }
+
+      // Stop at body
+      if (parent === document.body) {
+        break;
+      }
+    }
+
+    // Fall back to document.body if no suitable container found
+    return {
+      container: document.body,
+      isFixed: false
+    };
+  }
+
+  // Original logic
   var scrollParent = editorView.dom.closest('.fabric-editor-popup-scroll-parent');
   if (scrollParent) {
     return {
@@ -88,7 +135,6 @@ var findContainingElement = function findContainingElement(editorView) {
       isFixed: false
     };
   } else {
-    // If no scroll parent, look for a fixed positioned parent
     var fixedParent = editorView.dom.parentElement;
     while (fixedParent && fixedParent !== document.body) {
       var computedStyle = window.getComputedStyle(fixedParent);
@@ -234,9 +280,10 @@ export var calculateToolbarPositionTrackHeadNew = function calculateToolbarPosit
     var _editorView$state$sel3 = editorView.state.selection,
       head = _editorView$state$sel3.head,
       anchor = _editorView$state$sel3.anchor;
+    var top;
+    var left;
     var topCoords = editorView.coordsAtPos(Math.min(head, anchor));
     var bottomCoords = editorView.coordsAtPos(Math.max(head, anchor) - Math.min(range.endOffset, 1));
-    var top;
     // If not the same line AND we are selecting downwards, display toolbar below.
     if (head > anchor && topCoords.top !== bottomCoords.top) {
       // We are taking the previous pos to the maxium, so avoid end of line positions
@@ -245,7 +292,7 @@ export var calculateToolbarPositionTrackHeadNew = function calculateToolbarPosit
     } else {
       top = (topCoords.top || 0) - toolbarRect.height * 1.5;
     }
-    var left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
+    left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
 
     // Place toolbar below selection if not sufficient space above
     if (top < containerBounds.top) {

package/dist/types/analytics/types/enums.d.ts

@@ -395,6 +395,7 @@ export declare enum ACTION_SUBJECT_ID {
     DELETE_BLOCK = "deleteBlock",
     MOVE_UP_BLOCK = "moveUpBlock",
     MOVE_DOWN_BLOCK = "moveDownBlock",
+    TRANSFORM_BLOCK = "transformBlock",
     FORMAT_MENU = "formatMenu",
     CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU = "createInlineCommentFromHighlightActionsMenu",
     DATE = "date",

package/dist/types/analytics/types/mention-events.d.ts

@@ -18,6 +18,7 @@ type MentionTypeaheadInviteItemViewedPayload = UIAEP<ACTION.RENDERED, ACTION_SUB
     sessionId: string;
     source: string;
     userRole?: string;
+    isInlineInviteMentionsEnabled?: boolean;
 }, undefined>;
 type MentionTypeaheadInviteItemClickedPayload = UIAEP<ACTION.CLICKED | ACTION.PRESSED, ACTION_SUBJECT.INVITE_ITEM, undefined, {
     childObjectId?: string;
@@ -32,6 +33,7 @@ type MentionTypeaheadInviteItemClickedPayload = UIAEP<ACTION.CLICKED | ACTION.PR
     spaceInQuery?: boolean;
     upKeyCount: number;
     userRole?: string;
+    isInlineInviteMentionsEnabled?: boolean;
 }, undefined>;
 type MentionTypeaheadInsertedPayload = UIAEP<ACTION.CLICKED | ACTION.PRESSED, ACTION_SUBJECT.MENTION_TYPEAHEAD, undefined, {
     accessLevel: string;

package/dist/types/extensions/types/extension-manifest.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentType } from 'react';
+import type { ComponentType, ReactNode } from 'react';
 import type { ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ExtensionAPI, ExtensionParams, MultiBodiedExtensionActions, UpdateExtension } from './extension-handler';
 import type { ExtensionIconModule, MaybeESModule } from './extension-manifest-common';
@@ -33,6 +33,7 @@ export type ExtensionModule<T extends Parameters = Parameters> = {
     icon?: () => ExtensionIconModule;
     key: string;
     keywords?: string[];
+    lozenge?: ReactNode;
     parameters?: T;
     priority?: number;
     title?: string;

package/dist/types/extensions/types/utils.d.ts

@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 import type { ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ExtensionKey, ExtensionModuleActionHandler, ExtensionType, Icon } from './extension-manifest';
 export type MenuItem = {
@@ -10,10 +11,11 @@ export type MenuItem = {
     icon: Icon;
     key: string;
     keywords: string[];
+    lozenge?: ReactNode;
     node: ADFEntity | ExtensionModuleActionHandler;
+    priority?: number;
     summary?: string;
     title: string;
-    priority?: number;
 };
 export type MenuItemMap = {
     [key: string]: MenuItem;

package/dist/types-ts4.5/analytics/types/enums.d.ts

@@ -395,6 +395,7 @@ export declare enum ACTION_SUBJECT_ID {
     DELETE_BLOCK = "deleteBlock",
     MOVE_UP_BLOCK = "moveUpBlock",
     MOVE_DOWN_BLOCK = "moveDownBlock",
+    TRANSFORM_BLOCK = "transformBlock",
     FORMAT_MENU = "formatMenu",
     CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU = "createInlineCommentFromHighlightActionsMenu",
     DATE = "date",

package/dist/types-ts4.5/analytics/types/mention-events.d.ts

@@ -18,6 +18,7 @@ type MentionTypeaheadInviteItemViewedPayload = UIAEP<ACTION.RENDERED, ACTION_SUB
     sessionId: string;
     source: string;
     userRole?: string;
+    isInlineInviteMentionsEnabled?: boolean;
 }, undefined>;
 type MentionTypeaheadInviteItemClickedPayload = UIAEP<ACTION.CLICKED | ACTION.PRESSED, ACTION_SUBJECT.INVITE_ITEM, undefined, {
     childObjectId?: string;
@@ -32,6 +33,7 @@ type MentionTypeaheadInviteItemClickedPayload = UIAEP<ACTION.CLICKED | ACTION.PR
     spaceInQuery?: boolean;
     upKeyCount: number;
     userRole?: string;
+    isInlineInviteMentionsEnabled?: boolean;
 }, undefined>;
 type MentionTypeaheadInsertedPayload = UIAEP<ACTION.CLICKED | ACTION.PRESSED, ACTION_SUBJECT.MENTION_TYPEAHEAD, undefined, {
     accessLevel: string;

package/dist/types-ts4.5/extensions/types/extension-manifest.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentType } from 'react';
+import type { ComponentType, ReactNode } from 'react';
 import type { ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ExtensionAPI, ExtensionParams, MultiBodiedExtensionActions, UpdateExtension } from './extension-handler';
 import type { ExtensionIconModule, MaybeESModule } from './extension-manifest-common';
@@ -33,6 +33,7 @@ export type ExtensionModule<T extends Parameters = Parameters> = {
     icon?: () => ExtensionIconModule;
     key: string;
     keywords?: string[];
+    lozenge?: ReactNode;
     parameters?: T;
     priority?: number;
     title?: string;

package/dist/types-ts4.5/extensions/types/utils.d.ts

@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 import type { ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ExtensionKey, ExtensionModuleActionHandler, ExtensionType, Icon } from './extension-manifest';
 export type MenuItem = {
@@ -10,10 +11,11 @@ export type MenuItem = {
     icon: Icon;
     key: string;
     keywords: string[];
+    lozenge?: ReactNode;
     node: ADFEntity | ExtensionModuleActionHandler;
+    priority?: number;
     summary?: string;
     title: string;
-    priority?: number;
 };
 export type MenuItemMap = {
     [key: string]: MenuItem;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "111.16.6",
+	"version": "111.17.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -72,7 +72,7 @@
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/profilecard": "^24.37.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/react-ufo": "^5.2.0",
+		"@atlaskit/react-ufo": "^5.3.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@atlaskit/smart-card": "^43.25.0",
 		"@atlaskit/smart-user-picker": "^9.0.0",
@@ -81,7 +81,7 @@
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^29.0.0",
+		"@atlaskit/tmp-editor-statsig": "^29.1.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -186,9 +186,6 @@
 		"platform_editor_link_popup_position_fix_aifc": {
 			"type": "boolean"
 		},
-		"platform_editor_popup_calc_pos_scrollbar": {
-			"type": "boolean"
-		},
 		"platform_editor_inline_node_virt_threshold_override": {
 			"type": "boolean"
 		},