@atlaskit/editor-plugin-toolbar 27.0.16 → 27.0.17

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 27.0.17
+
+### Patch Changes
+
+- [`6bc3894066dc8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6bc3894066dc8) -
+  Clean up the `platform_editor_toolbar_multi_editor_fix` experiment. The selection toolbar now
+  always scopes mouseups to its own editor, so it closes correctly when multiple editors are open.
+- Updated dependencies
+
 ## 27.0.16
 
 ### Patch Changes

package/compass.yml

@@ -35,7 +35,7 @@ customFields:
     value: true
   - name: Reviewer Selection Mechanism
     type: text
-    value: random(2)
+    value: randomTZIgnored(2)
   - name: Required Reviewer Approvals
     type: number
     value: 1

package/dist/cjs/toolbarPlugin.js

@@ -17,10 +17,8 @@ var _createRegistry = require("@atlaskit/editor-toolbar-model/create-registry");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _selectionToolbarOpenExperience = require("./pm-plugins/experiences/selection-toolbar-open-experience");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _consts = require("./ui/consts");
 var _SelectionToolbar = require("./ui/SelectionToolbar");
 var _toolbarComponents = require("./ui/toolbar-components");
-var _toolbar = require("./ui/utils/toolbar");
 var _excluded = ["contextualFormattingModeOverride"];
 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; }
@@ -189,45 +187,27 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
               var unbind = (0, _bindEventListener.bind)(_view.root, {
                 type: 'mouseup',
                 listener: function listener(ev) {
-                  var _api$editorViewMode2;
+                  var _api$editorViewMode, _api$toolbar;
                   mouseState.isMouseDown = false;
                   var event = ev;
-                  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_toolbar_multi_editor_fix')) {
-                    var _api$editorViewMode, _api$toolbar;
-                    // Scope mouseups to this editor and its React-portaled toolbar.
-                    var isMouseUpInOwnedToolbar = refs.toolbarMouseUpEvent === event;
-                    var isMouseUpInEditor = event.composedPath().includes(_view.dom);
-                    refs.toolbarMouseUpEvent = undefined;
 
-                    // Prevent outside clicks from reopening a blurred editor's toolbar.
-                    var _editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
-                    var _isViewModeEnabled = (_editorViewModePlugin === null || _editorViewModePlugin === void 0 ? void 0 : _editorViewModePlugin.mode) === 'view';
-                    // Include focus in nested editable islands.
-                    var _hasEditorFocus = _view.hasFocus() || _view.dom.contains(_view.root.activeElement);
-                    var shouldShowToolbar = _isViewModeEnabled ? isMouseUpInEditor || isMouseUpInOwnedToolbar : _hasEditorFocus || isMouseUpInOwnedToolbar;
-                    var currentShouldShowToolbar = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || (_api$toolbar = _api$toolbar.sharedState.currentState()) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.shouldShowToolbar;
-                    if (currentShouldShowToolbar !== shouldShowToolbar) {
-                      _view.dispatch(_view.state.tr.setMeta(_pluginKey.editorToolbarPluginKey, {
-                        shouldShowToolbar: shouldShowToolbar
-                      }));
-                    }
-                    return;
-                  }
-                  var isInToolbar = (0, _toolbar.isEventInContainer)(event, _consts.DEFAULT_POPUP_SELECTORS.toolbarContainer);
-                  var isInPortal = (0, _toolbar.isEventInContainer)(event, _consts.DEFAULT_POPUP_SELECTORS.portal);
+                  // Scope mouseups to this editor and its React-portaled toolbar.
+                  var isMouseUpInOwnedToolbar = refs.toolbarMouseUpEvent === event;
+                  var isMouseUpInEditor = event.composedPath().includes(_view.dom);
+                  refs.toolbarMouseUpEvent = undefined;
 
-                  // We only want to set selectionStable to true if the editor has focus
-                  // to prevent the toolbar from showing when the editor is blurred
-                  // due to a click outside the editor.
-                  var editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.sharedState.currentState();
+                  // Prevent outside clicks from reopening a blurred editor's toolbar.
+                  var editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
                   var isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
-                  // Focus can sit inside a nested editable region ProseMirror does not own -
-                  // such as a reference synced block's island - where `view.hasFocus()` is
-                  // false but the user is still interacting with the editor.
+                  // Include focus in nested editable islands.
                   var hasEditorFocus = _view.hasFocus() || _view.dom.contains(_view.root.activeElement);
-                  _view.dispatch(_view.state.tr.setMeta(_pluginKey.editorToolbarPluginKey, {
-                    shouldShowToolbar: !isViewModeEnabled ? hasEditorFocus || isInToolbar || isInPortal : true
-                  }));
+                  var shouldShowToolbar = isViewModeEnabled ? isMouseUpInEditor || isMouseUpInOwnedToolbar : hasEditorFocus || isMouseUpInOwnedToolbar;
+                  var currentShouldShowToolbar = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || (_api$toolbar = _api$toolbar.sharedState.currentState()) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.shouldShowToolbar;
+                  if (currentShouldShowToolbar !== shouldShowToolbar) {
+                    _view.dispatch(_view.state.tr.setMeta(_pluginKey.editorToolbarPluginKey, {
+                      shouldShowToolbar: shouldShowToolbar
+                    }));
+                  }
                 }
               });
               var unbindEditorViewFocus = (0, _bindEventListener.bind)(_view.dom, {

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

@@ -26,7 +26,6 @@ var _toolbarButtonGroup = require("@atlaskit/editor-toolbar/toolbar-button-group
 var _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
 var _toolbarSection = require("@atlaskit/editor-toolbar/toolbar-section");
 var _uiContext = require("@atlaskit/editor-toolbar/ui-context");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _consts = require("../consts");
 var _keyboardConfig = require("./keyboard-config");
@@ -145,9 +144,9 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     onPositionCalculated: onPositionCalculated,
     mountTo: mountPoint,
     zIndex: _constants.akEditorFloatingDialogZIndex
-  }, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_toolbar_multi_editor_fix') ? /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     onMouseUpCapture: onToolbarMouseUp
-  }, toolbarContent) : toolbarContent);
+  }, toolbarContent));
 };
 var SelectionToolbarWithErrorBoundary = exports.SelectionToolbarWithErrorBoundary = function SelectionToolbarWithErrorBoundary(_ref3) {
   var _api$analytics2;

package/dist/cjs/ui/consts.js

@@ -3,9 +3,5 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SELECTION_TOOLBAR_LABEL = exports.DEFAULT_POPUP_SELECTORS = void 0;
-var SELECTION_TOOLBAR_LABEL = exports.SELECTION_TOOLBAR_LABEL = 'Selection toolbar';
-var DEFAULT_POPUP_SELECTORS = exports.DEFAULT_POPUP_SELECTORS = {
-  toolbarContainer: '[role="toolbar"]',
-  portal: '.atlaskit-portal'
-};
+exports.SELECTION_TOOLBAR_LABEL = void 0;
+var SELECTION_TOOLBAR_LABEL = exports.SELECTION_TOOLBAR_LABEL = 'Selection toolbar';

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

@@ -3,14 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isShortcutToFocusToolbar = exports.isEventInContainer = exports.getFocusableElements = void 0;
-var isEventInContainer = exports.isEventInContainer = function isEventInContainer(event, containerSelector) {
-  var target = event.target instanceof Element ? event.target : null;
-  if (!target) {
-    return false;
-  }
-  return !!target.closest(containerSelector);
-};
+exports.isShortcutToFocusToolbar = exports.getFocusableElements = void 0;
 var isShortcutToFocusToolbar = exports.isShortcutToFocusToolbar = function isShortcutToFocusToolbar(event) {
   return event.altKey && event.key === 'F10';
 };

package/dist/es2019/toolbarPlugin.js

@@ -7,10 +7,8 @@ import { createComponentRegistry } from '@atlaskit/editor-toolbar-model/create-r
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getSelectionToolbarOpenExperiencePlugin } from './pm-plugins/experiences/selection-toolbar-open-experience';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
-import { DEFAULT_POPUP_SELECTORS } from './ui/consts';
 import { SelectionToolbarWithErrorBoundary } from './ui/SelectionToolbar';
 import { getToolbarComponents } from './ui/toolbar-components';
-import { isEventInContainer } from './ui/utils/toolbar';
 function getSelectedNode(editorState) {
   const {
     selection
@@ -181,45 +179,27 @@ export const toolbarPlugin = ({
               const unbind = bind(view.root, {
                 type: 'mouseup',
                 listener: function (ev) {
-                  var _api$editorViewMode2;
+                  var _api$editorViewMode, _api$toolbar, _api$toolbar$sharedSt;
                   mouseState.isMouseDown = false;
                   const event = ev;
-                  if (isExperimentEnabled('platform_editor_toolbar_multi_editor_fix')) {
-                    var _api$editorViewMode, _api$toolbar, _api$toolbar$sharedSt;
-                    // Scope mouseups to this editor and its React-portaled toolbar.
-                    const isMouseUpInOwnedToolbar = refs.toolbarMouseUpEvent === event;
-                    const isMouseUpInEditor = event.composedPath().includes(view.dom);
-                    refs.toolbarMouseUpEvent = undefined;
 
-                    // Prevent outside clicks from reopening a blurred editor's toolbar.
-                    const editorViewModePlugin = api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
-                    const isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
-                    // Include focus in nested editable islands.
-                    const hasEditorFocus = view.hasFocus() || view.dom.contains(view.root.activeElement);
-                    const shouldShowToolbar = isViewModeEnabled ? isMouseUpInEditor || isMouseUpInOwnedToolbar : hasEditorFocus || isMouseUpInOwnedToolbar;
-                    const currentShouldShowToolbar = api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : (_api$toolbar$sharedSt = _api$toolbar.sharedState.currentState()) === null || _api$toolbar$sharedSt === void 0 ? void 0 : _api$toolbar$sharedSt.shouldShowToolbar;
-                    if (currentShouldShowToolbar !== shouldShowToolbar) {
-                      view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
-                        shouldShowToolbar
-                      }));
-                    }
-                    return;
-                  }
-                  const isInToolbar = isEventInContainer(event, DEFAULT_POPUP_SELECTORS.toolbarContainer);
-                  const isInPortal = isEventInContainer(event, DEFAULT_POPUP_SELECTORS.portal);
+                  // Scope mouseups to this editor and its React-portaled toolbar.
+                  const isMouseUpInOwnedToolbar = refs.toolbarMouseUpEvent === event;
+                  const isMouseUpInEditor = event.composedPath().includes(view.dom);
+                  refs.toolbarMouseUpEvent = undefined;
 
-                  // We only want to set selectionStable to true if the editor has focus
-                  // to prevent the toolbar from showing when the editor is blurred
-                  // due to a click outside the editor.
-                  const editorViewModePlugin = api === null || api === void 0 ? void 0 : (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.sharedState.currentState();
+                  // Prevent outside clicks from reopening a blurred editor's toolbar.
+                  const editorViewModePlugin = api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
                   const isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
-                  // Focus can sit inside a nested editable region ProseMirror does not own -
-                  // such as a reference synced block's island - where `view.hasFocus()` is
-                  // false but the user is still interacting with the editor.
+                  // Include focus in nested editable islands.
                   const hasEditorFocus = view.hasFocus() || view.dom.contains(view.root.activeElement);
-                  view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
-                    shouldShowToolbar: !isViewModeEnabled ? hasEditorFocus || isInToolbar || isInPortal : true
-                  }));
+                  const shouldShowToolbar = isViewModeEnabled ? isMouseUpInEditor || isMouseUpInOwnedToolbar : hasEditorFocus || isMouseUpInOwnedToolbar;
+                  const currentShouldShowToolbar = api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : (_api$toolbar$sharedSt = _api$toolbar.sharedState.currentState()) === null || _api$toolbar$sharedSt === void 0 ? void 0 : _api$toolbar$sharedSt.shouldShowToolbar;
+                  if (currentShouldShowToolbar !== shouldShowToolbar) {
+                    view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
+                      shouldShowToolbar
+                    }));
+                  }
                 }
               });
               const unbindEditorViewFocus = bind(view.dom, {

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

@@ -18,7 +18,6 @@ import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-grou
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 import { ToolbarSection } from '@atlaskit/editor-toolbar/toolbar-section';
 import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
 import { getKeyboardNavigationConfig } from './keyboard-config';
@@ -137,9 +136,9 @@ export const SelectionToolbar = ({
     onPositionCalculated: onPositionCalculated,
     mountTo: mountPoint,
     zIndex: akEditorFloatingDialogZIndex
-  }, isExperimentEnabled('platform_editor_toolbar_multi_editor_fix') ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     onMouseUpCapture: onToolbarMouseUp
-  }, toolbarContent) : toolbarContent);
+  }, toolbarContent));
 };
 export const SelectionToolbarWithErrorBoundary = ({
   api,

package/dist/es2019/ui/consts.js

@@ -1,5 +1 @@
-export const SELECTION_TOOLBAR_LABEL = 'Selection toolbar';
-export const DEFAULT_POPUP_SELECTORS = {
-  toolbarContainer: '[role="toolbar"]',
-  portal: '.atlaskit-portal'
-};
+export const SELECTION_TOOLBAR_LABEL = 'Selection toolbar';

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

@@ -1,10 +1,3 @@
-export const isEventInContainer = (event, containerSelector) => {
-  const target = event.target instanceof Element ? event.target : null;
-  if (!target) {
-    return false;
-  }
-  return !!target.closest(containerSelector);
-};
 export const isShortcutToFocusToolbar = event => {
   return event.altKey && event.key === 'F10';
 };

package/dist/esm/toolbarPlugin.js

@@ -13,10 +13,8 @@ import { createComponentRegistry } from '@atlaskit/editor-toolbar-model/create-r
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getSelectionToolbarOpenExperiencePlugin } from './pm-plugins/experiences/selection-toolbar-open-experience';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
-import { DEFAULT_POPUP_SELECTORS } from './ui/consts';
 import { SelectionToolbarWithErrorBoundary } from './ui/SelectionToolbar';
 import { getToolbarComponents } from './ui/toolbar-components';
-import { isEventInContainer } from './ui/utils/toolbar';
 function getSelectedNode(editorState) {
   var selection = editorState.selection;
   if (selection instanceof NodeSelection) {
@@ -182,45 +180,27 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
               var unbind = bind(_view.root, {
                 type: 'mouseup',
                 listener: function listener(ev) {
-                  var _api$editorViewMode2;
+                  var _api$editorViewMode, _api$toolbar;
                   mouseState.isMouseDown = false;
                   var event = ev;
-                  if (isExperimentEnabled('platform_editor_toolbar_multi_editor_fix')) {
-                    var _api$editorViewMode, _api$toolbar;
-                    // Scope mouseups to this editor and its React-portaled toolbar.
-                    var isMouseUpInOwnedToolbar = refs.toolbarMouseUpEvent === event;
-                    var isMouseUpInEditor = event.composedPath().includes(_view.dom);
-                    refs.toolbarMouseUpEvent = undefined;
 
-                    // Prevent outside clicks from reopening a blurred editor's toolbar.
-                    var _editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
-                    var _isViewModeEnabled = (_editorViewModePlugin === null || _editorViewModePlugin === void 0 ? void 0 : _editorViewModePlugin.mode) === 'view';
-                    // Include focus in nested editable islands.
-                    var _hasEditorFocus = _view.hasFocus() || _view.dom.contains(_view.root.activeElement);
-                    var shouldShowToolbar = _isViewModeEnabled ? isMouseUpInEditor || isMouseUpInOwnedToolbar : _hasEditorFocus || isMouseUpInOwnedToolbar;
-                    var currentShouldShowToolbar = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || (_api$toolbar = _api$toolbar.sharedState.currentState()) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.shouldShowToolbar;
-                    if (currentShouldShowToolbar !== shouldShowToolbar) {
-                      _view.dispatch(_view.state.tr.setMeta(editorToolbarPluginKey, {
-                        shouldShowToolbar: shouldShowToolbar
-                      }));
-                    }
-                    return;
-                  }
-                  var isInToolbar = isEventInContainer(event, DEFAULT_POPUP_SELECTORS.toolbarContainer);
-                  var isInPortal = isEventInContainer(event, DEFAULT_POPUP_SELECTORS.portal);
+                  // Scope mouseups to this editor and its React-portaled toolbar.
+                  var isMouseUpInOwnedToolbar = refs.toolbarMouseUpEvent === event;
+                  var isMouseUpInEditor = event.composedPath().includes(_view.dom);
+                  refs.toolbarMouseUpEvent = undefined;
 
-                  // We only want to set selectionStable to true if the editor has focus
-                  // to prevent the toolbar from showing when the editor is blurred
-                  // due to a click outside the editor.
-                  var editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.sharedState.currentState();
+                  // Prevent outside clicks from reopening a blurred editor's toolbar.
+                  var editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
                   var isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
-                  // Focus can sit inside a nested editable region ProseMirror does not own -
-                  // such as a reference synced block's island - where `view.hasFocus()` is
-                  // false but the user is still interacting with the editor.
+                  // Include focus in nested editable islands.
                   var hasEditorFocus = _view.hasFocus() || _view.dom.contains(_view.root.activeElement);
-                  _view.dispatch(_view.state.tr.setMeta(editorToolbarPluginKey, {
-                    shouldShowToolbar: !isViewModeEnabled ? hasEditorFocus || isInToolbar || isInPortal : true
-                  }));
+                  var shouldShowToolbar = isViewModeEnabled ? isMouseUpInEditor || isMouseUpInOwnedToolbar : hasEditorFocus || isMouseUpInOwnedToolbar;
+                  var currentShouldShowToolbar = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || (_api$toolbar = _api$toolbar.sharedState.currentState()) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.shouldShowToolbar;
+                  if (currentShouldShowToolbar !== shouldShowToolbar) {
+                    _view.dispatch(_view.state.tr.setMeta(editorToolbarPluginKey, {
+                      shouldShowToolbar: shouldShowToolbar
+                    }));
+                  }
                 }
               });
               var unbindEditorViewFocus = bind(_view.dom, {

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

@@ -18,7 +18,6 @@ import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-grou
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 import { ToolbarSection } from '@atlaskit/editor-toolbar/toolbar-section';
 import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
 import { getKeyboardNavigationConfig } from './keyboard-config';
@@ -136,9 +135,9 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     onPositionCalculated: onPositionCalculated,
     mountTo: mountPoint,
     zIndex: akEditorFloatingDialogZIndex
-  }, isExperimentEnabled('platform_editor_toolbar_multi_editor_fix') ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     onMouseUpCapture: onToolbarMouseUp
-  }, toolbarContent) : toolbarContent);
+  }, toolbarContent));
 };
 export var SelectionToolbarWithErrorBoundary = function SelectionToolbarWithErrorBoundary(_ref3) {
   var _api$analytics2;

package/dist/esm/ui/consts.js

@@ -1,5 +1 @@
-export var SELECTION_TOOLBAR_LABEL = 'Selection toolbar';
-export var DEFAULT_POPUP_SELECTORS = {
-  toolbarContainer: '[role="toolbar"]',
-  portal: '.atlaskit-portal'
-};
+export var SELECTION_TOOLBAR_LABEL = 'Selection toolbar';

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

@@ -1,10 +1,3 @@
-export var isEventInContainer = function isEventInContainer(event, containerSelector) {
-  var target = event.target instanceof Element ? event.target : null;
-  if (!target) {
-    return false;
-  }
-  return !!target.closest(containerSelector);
-};
 export var isShortcutToFocusToolbar = function isShortcutToFocusToolbar(event) {
   return event.altKey && event.key === 'F10';
 };

package/dist/types/ui/consts.d.ts

@@ -1,5 +1 @@
 export declare const SELECTION_TOOLBAR_LABEL = "Selection toolbar";
-export declare const DEFAULT_POPUP_SELECTORS: {
-    readonly toolbarContainer: '[role="toolbar"]';
-    readonly portal: '.atlaskit-portal';
-};

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

@@ -1,3 +1,2 @@
-export declare const isEventInContainer: (event: Event, containerSelector: string) => boolean;
 export declare const isShortcutToFocusToolbar: (event: KeyboardEvent) => boolean;
 export declare const getFocusableElements: (rootNode: HTMLElement | null) => Array<HTMLElement>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "27.0.16",
+	"version": "27.0.17",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,12 +37,12 @@
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.9.0",
+		"@atlaskit/editor-common": "^134.16.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
 	"devDependencies": {
-		"@atlaskit/editor-common": "^134.9.0",
+		"@atlaskit/editor-common": "^134.16.0",
 		"react": "^19.2.0",
 		"react-intl": "^7.0.0"
 	}