@atlaskit/editor-plugin-block-controls 4.1.7 → 4.1.9

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 4.1.9
+
+### Patch Changes
+
+- [#198359](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/198359)
+  [`077794c6e9512`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/077794c6e9512) -
+  Remove fg to ensure safari cursor is not hidden due to block controls
+
+## 4.1.8
+
+### Patch Changes
+
+- [#196697](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/196697)
+  [`18b5fbc52627b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/18b5fbc52627b) -
+  [ux] Adds block menu plugin for full-page preset and shows the menu when drag handle is clicked.
+- Updated dependencies
+
 ## 4.1.7
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -10,6 +10,7 @@ var _react = _interopRequireDefault(require("react"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _moveNode = require("./editor-commands/move-node");
 var _moveToLayout = require("./editor-commands/move-to-layout");
@@ -71,6 +72,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       },
       toggleBlockMenu: function toggleBlockMenu(options) {
         return function (_ref4) {
+          var _options$anchorName;
           var tr = _ref4.tr;
           var currMeta = tr.getMeta(_main.key);
           if (options !== null && options !== void 0 && options.closeMenu) {
@@ -79,6 +81,14 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
             }));
             return tr;
           }
+
+          // Do not open menu on layoutColumn and close opened menu when layoutColumn drag handle is clicked
+          if (options !== null && options !== void 0 && (_options$anchorName = options.anchorName) !== null && _options$anchorName !== void 0 && _options$anchorName.includes('layoutColumn')) {
+            tr.setMeta(_main.key, _objectSpread(_objectSpread({}, currMeta), {}, {
+              closeMenu: true
+            }));
+            return tr;
+          }
           tr.setMeta(_main.key, _objectSpread(_objectSpread({}, currMeta), {}, {
             toggleMenu: {
               anchorName: options === null || options === void 0 ? void 0 : options.anchorName
@@ -206,17 +216,23 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         popupsMountPoint = _ref8.popupsMountPoint,
         popupsBoundariesElement = _ref8.popupsBoundariesElement,
         popupsScrollableElement = _ref8.popupsScrollableElement;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_blockMenu.default, {
-        editorView: editorView,
-        mountPoint: popupsMountPoint,
-        boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        api: api
-      }) : /*#__PURE__*/_react.default.createElement(_dragHandleMenu.DragHandleMenu, {
-        api: api
-      }), /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, {
-        api: api
-      }));
+      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, {
+          api: api
+        }));
+      } else {
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_blockMenu.default, {
+          editorView: editorView,
+          mountPoint: popupsMountPoint,
+          boundariesElement: popupsBoundariesElement,
+          scrollableElement: popupsScrollableElement,
+          api: api
+        }) : /*#__PURE__*/_react.default.createElement(_dragHandleMenu.DragHandleMenu, {
+          api: api
+        }), /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, {
+          api: api
+        }));
+      }
     }
   };
 };

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleMouseOver = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(target) {
   if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
@@ -17,7 +18,9 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     isDragging = _ref.isDragging,
-    activeNode = _ref.activeNode;
+    activeNode = _ref.activeNode,
+    isMenuOpen = _ref.isMenuOpen,
+    originalAnchorName = _ref.menuTriggerBy;
 
   // Most mouseover events don't fire during drag but some can slip through
   // when the drag begins. This prevents those.
@@ -127,6 +130,12 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
         var _api$core2, _api$blockControls3;
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
+      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+        if (isMenuOpen && originalAnchorName) {
+          var _api$core3, _api$blockControls4;
+          api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu());
+        }
+      }
     }
   }
 };

package/dist/cjs/pm-plugins/main.js

@@ -20,6 +20,7 @@ var _element = require("@atlaskit/pragmatic-drag-and-drop-auto-scroll/element");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("../ui/consts");
 var _decorationsAnchor = require("./decorations-anchor");
@@ -504,7 +505,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     newActiveNode = isEmptyDoc || !(meta !== null && meta !== void 0 && meta.activeNode) && (0, _decorationsDragHandle.findHandleDec)(decorations, (_latestActiveNode11 = latestActiveNode) === null || _latestActiveNode11 === void 0 ? void 0 : _latestActiveNode11.pos, (_latestActiveNode12 = latestActiveNode) === null || _latestActiveNode12 === void 0 ? void 0 : _latestActiveNode12.pos).length === 0 ? null : latestActiveNode;
   }
   var isMenuOpenNew = isMenuOpen;
-  if (_consts.BLOCK_MENU_ENABLED && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if (_consts.BLOCK_MENU_ENABLED && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
     if (meta !== null && meta !== void 0 && meta.closeMenu) {
       isMenuOpenNew = false;
     } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
@@ -526,7 +527,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     activeDropTargetNode: currentActiveDropTargetNode,
     isDragging: (_meta$isDragging3 = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging3 !== void 0 ? _meta$isDragging3 : isDragging,
     isMenuOpen: isMenuOpenNew,
-    menuTriggerBy: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (meta === null || meta === void 0 || (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
+    menuTriggerBy: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? (meta === null || meta === void 0 || (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
     editorHeight: (_meta$editorHeight = meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== null && _meta$editorHeight !== void 0 ? _meta$editorHeight : editorHeight,
     editorWidthLeft: (_meta$editorWidthLeft = meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== null && _meta$editorWidthLeft !== void 0 ? _meta$editorWidthLeft : editorWidthLeft,
     editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : editorWidthRight,

package/dist/cjs/ui/drag-handle.js

@@ -291,7 +291,7 @@ var useDragHandlePluginState = (0, _hooks.sharedPluginStateHookMigratorFactory)(
   };
 });
 var DragHandle = exports.DragHandle = function DragHandle(_ref) {
-  var _api$core2, _api$blockControls3, _api$analytics2, _api$core4;
+  var _api$core2, _api$blockControls4, _api$analytics2, _api$core4;
   var view = _ref.view,
     api = _ref.api,
     formatMessage = _ref.formatMessage,
@@ -377,13 +377,21 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
             tr: tr
           });
           e.stopPropagation();
+        } else if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+          var _api$blockControls2;
+          api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
+            anchorName: anchorName
+          })({
+            tr: tr
+          });
+          e.stopPropagation();
         }
       } else if (isTopLevelNode && $anchor.depth <= _consts2.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_shift_click_select')) {
-        var _api$blockControls2;
+        var _api$blockControls3;
         var alignAnchorHeadToSel = (0, _selection.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
         var selectionWithExpandedHead = (0, _selection.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
-        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.setMultiSelectPositions()({
+        api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.setMultiSelectPositions()({
           tr: tr
         });
       }
@@ -403,7 +411,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 ? void 0 : api.blockControls.sharedState, api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
+  }, [isMultiSelect, api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 ? void 0 : api.blockControls.sharedState, api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
 
   // TODO: ED-26959 - This needs to be investigated further. Drag preview generation is not always working
   // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
@@ -477,8 +485,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
             var oldHandlePosCheck = handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to;
             var newHandlePosCheck = (0, _getSelection.isHandleCorrelatedToSelection)(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1') ? newHandlePosCheck : oldHandlePosCheck)) {
-              var _api$blockControls4;
-              api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.setMultiSelectPositions()({
+              var _api$blockControls5;
+              api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
                 tr: tr
               });
             } else if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -586,7 +594,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           return;
         }
         api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref7) {
-          var _api$blockControls$sh3, _api$blockControls5, _api$analytics3;
+          var _api$blockControls$sh3, _api$blockControls6, _api$analytics3;
           var tr = _ref7.tr;
           var nodeTypes, hasSelectedMultipleNodes;
           var resolvedMovingNode = tr.doc.resolve(start);
@@ -600,7 +608,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
           tr.setMeta('scrollIntoView', false);

package/dist/cjs/ui/global-styles.js

@@ -11,7 +11,6 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("@atlaskit/theme/constants");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -269,12 +268,6 @@ var headingWithIndentationInLayoutStyleFix = (0, _react.css)((0, _defineProperty
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
   marginTop: '0 !important'
 }));
-var withRelativePosStyleLegacy = (0, _react.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': (0, _defineProperty2.default)({}, "&& ".concat(dragHandlerAnchorSelector), {
-    position: 'relative'
-  })
-});
 var withRelativePosStyle = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "&& ".concat(dragHandlerAnchorSelector), {
@@ -316,6 +309,6 @@ var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWra
     disabled: !(0, _expValEquals.expValEquals)('platform_editor_block_controls_perf_optimization', 'isEnabled', true)
   });
   return (0, _react.jsx)(_react.Global, {
-    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, (0, _expValEquals.expValEquals)('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? extendHoverZoneReduced : undefined, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, (0, _platformFeatureFlags.fg)('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, (0, _expValEquals.expValEquals)('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? extendHoverZoneReduced : undefined, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, (0, _experiments.editorExperiment)('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
   });
 };

package/dist/es2019/blockControlsPlugin.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
@@ -61,6 +62,7 @@ export const blockControlsPlugin = ({
     toggleBlockMenu: options => ({
       tr
     }) => {
+      var _options$anchorName;
       const currMeta = tr.getMeta(key);
       if (options !== null && options !== void 0 && options.closeMenu) {
         tr.setMeta(key, {
@@ -69,6 +71,15 @@ export const blockControlsPlugin = ({
         });
         return tr;
       }
+
+      // Do not open menu on layoutColumn and close opened menu when layoutColumn drag handle is clicked
+      if (options !== null && options !== void 0 && (_options$anchorName = options.anchorName) !== null && _options$anchorName !== void 0 && _options$anchorName.includes('layoutColumn')) {
+        tr.setMeta(key, {
+          ...currMeta,
+          closeMenu: true
+        });
+        return tr;
+      }
       tr.setMeta(key, {
         ...currMeta,
         toggleMenu: {
@@ -198,16 +209,22 @@ export const blockControlsPlugin = ({
     popupsBoundariesElement,
     popupsScrollableElement
   }) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, editorExperiment('platform_editor_controls', 'variant1') ? /*#__PURE__*/React.createElement(BlockMenu, {
-      editorView: editorView,
-      mountPoint: popupsMountPoint,
-      boundariesElement: popupsBoundariesElement,
-      scrollableElement: popupsScrollableElement,
-      api: api
-    }) : /*#__PURE__*/React.createElement(DragHandleMenu, {
-      api: api
-    }), /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
-      api: api
-    }));
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
+        api: api
+      }));
+    } else {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, editorExperiment('platform_editor_controls', 'variant1') ? /*#__PURE__*/React.createElement(BlockMenu, {
+        editorView: editorView,
+        mountPoint: popupsMountPoint,
+        boundariesElement: popupsBoundariesElement,
+        scrollableElement: popupsScrollableElement,
+        api: api
+      }) : /*#__PURE__*/React.createElement(DragHandleMenu, {
+        api: api
+      }), /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
+        api: api
+      }));
+    }
   }
 });

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -1,4 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 const isEmptyNestedParagraphOrHeading = target => {
   if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
@@ -11,7 +12,9 @@ export const handleMouseOver = (view, event, api) => {
   var _api$blockControls, _target$classList;
   const {
     isDragging,
-    activeNode
+    activeNode,
+    isMenuOpen,
+    menuTriggerBy: originalAnchorName
   } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
 
   // Most mouseover events don't fire during drag but some can slip through
@@ -122,6 +125,12 @@ export const handleMouseOver = (view, event, api) => {
         var _api$core2, _api$blockControls3;
         api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
+      if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+        if (isMenuOpen && originalAnchorName) {
+          var _api$core3, _api$blockControls4;
+          api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu());
+        }
+      }
     }
   }
 };

package/dist/es2019/pm-plugins/main.js

@@ -12,6 +12,7 @@ import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-sc
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { BLOCK_MENU_ENABLED } from '../ui/consts';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
@@ -504,7 +505,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     newActiveNode = isEmptyDoc || !(meta !== null && meta !== void 0 && meta.activeNode) && findHandleDec(decorations, (_latestActiveNode11 = latestActiveNode) === null || _latestActiveNode11 === void 0 ? void 0 : _latestActiveNode11.pos, (_latestActiveNode12 = latestActiveNode) === null || _latestActiveNode12 === void 0 ? void 0 : _latestActiveNode12.pos).length === 0 ? null : latestActiveNode;
   }
   let isMenuOpenNew = isMenuOpen;
-  if (BLOCK_MENU_ENABLED && editorExperiment('platform_editor_controls', 'variant1')) {
+  if (BLOCK_MENU_ENABLED && editorExperiment('platform_editor_controls', 'variant1') || expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
     if (meta !== null && meta !== void 0 && meta.closeMenu) {
       isMenuOpenNew = false;
     } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
@@ -526,7 +527,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     activeDropTargetNode: currentActiveDropTargetNode,
     isDragging: (_meta$isDragging3 = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging3 !== void 0 ? _meta$isDragging3 : isDragging,
     isMenuOpen: isMenuOpenNew,
-    menuTriggerBy: editorExperiment('platform_editor_controls', 'variant1') ? (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
+    menuTriggerBy: editorExperiment('platform_editor_controls', 'variant1') || expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
     editorHeight: (_meta$editorHeight = meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== null && _meta$editorHeight !== void 0 ? _meta$editorHeight : editorHeight,
     editorWidthLeft: (_meta$editorWidthLeft = meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== null && _meta$editorWidthLeft !== void 0 ? _meta$editorWidthLeft : editorWidthLeft,
     editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : editorWidthRight,

package/dist/es2019/ui/drag-handle.js

@@ -298,7 +298,7 @@ export const DragHandle = ({
   isTopLevelNode = true,
   anchorRectCache
 }) => {
-  var _api$core2, _api$blockControls3, _api$analytics2, _api$core4;
+  var _api$core2, _api$blockControls4, _api$analytics2, _api$core4;
   const buttonRef = useRef(null);
   const [dragHandleSelected, setDragHandleSelected] = useState(false);
   const [dragHandleDisabled, setDragHandleDisabled] = useState(false);
@@ -359,13 +359,21 @@ export const DragHandle = ({
             tr
           });
           e.stopPropagation();
+        } else if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+          var _api$blockControls2;
+          api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
+            anchorName
+          })({
+            tr
+          });
+          e.stopPropagation();
         }
       } else if (isTopLevelNode && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-        var _api$blockControls2;
+        var _api$blockControls3;
         const alignAnchorHeadToSel = alignAnchorHeadInDirectionOfPos(tr.selection, startPos);
         const selectionWithExpandedHead = expandSelectionHeadToNodeAtPos(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
-        api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.setMultiSelectPositions()({
+        api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.setMultiSelectPositions()({
           tr
         });
       }
@@ -385,7 +393,7 @@ export const DragHandle = ({
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 ? void 0 : api.blockControls.sharedState, api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
+  }, [isMultiSelect, api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 ? void 0 : api.blockControls.sharedState, api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
 
   // TODO: ED-26959 - This needs to be investigated further. Drag preview generation is not always working
   // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
@@ -458,8 +466,8 @@ export const DragHandle = ({
             const oldHandlePosCheck = handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to;
             const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && (fg('platform_editor_elements_dnd_multi_select_patch_1') ? newHandlePosCheck : oldHandlePosCheck)) {
-              var _api$blockControls4;
-              api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.setMultiSelectPositions()({
+              var _api$blockControls5;
+              api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.setMultiSelectPositions()({
                 tr
               });
             } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -574,7 +582,7 @@ export const DragHandle = ({
         api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
           tr
         }) => {
-          var _api$blockControls$sh3, _api$blockControls5, _api$analytics3;
+          var _api$blockControls$sh3, _api$blockControls6, _api$analytics3;
           let nodeTypes, hasSelectedMultipleNodes;
           const resolvedMovingNode = tr.doc.resolve(start);
           const maybeNode = resolvedMovingNode.nodeAfter;
@@ -587,7 +595,7 @@ export const DragHandle = ({
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr
           });
           tr.setMeta('scrollIntoView', false);

package/dist/es2019/ui/global-styles.js

@@ -8,7 +8,6 @@ import { tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { akEditorBreakoutPadding, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { layers } from '@atlaskit/theme/constants';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -299,15 +298,6 @@ const headingWithIndentationInLayoutStyleFix = css({
     marginTop: '0 !important'
   }
 });
-const withRelativePosStyleLegacy = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
-    [`&& ${dragHandlerAnchorSelector}`]: {
-      position: 'relative'
-    }
-  }
-});
 const withRelativePosStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': {
@@ -355,6 +345,6 @@ export const GlobalStylesWrapper = ({
     disabled: !expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)
   });
   return jsx(Global, {
-    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? extendHoverZoneReduced : undefined, editorExperiment('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, fg('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? extendHoverZoneReduced : undefined, editorExperiment('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
   });
 };

package/dist/esm/blockControlsPlugin.js

@@ -5,6 +5,7 @@ import React from 'react';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
@@ -64,6 +65,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       },
       toggleBlockMenu: function toggleBlockMenu(options) {
         return function (_ref4) {
+          var _options$anchorName;
           var tr = _ref4.tr;
           var currMeta = tr.getMeta(key);
           if (options !== null && options !== void 0 && options.closeMenu) {
@@ -72,6 +74,14 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
             }));
             return tr;
           }
+
+          // Do not open menu on layoutColumn and close opened menu when layoutColumn drag handle is clicked
+          if (options !== null && options !== void 0 && (_options$anchorName = options.anchorName) !== null && _options$anchorName !== void 0 && _options$anchorName.includes('layoutColumn')) {
+            tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
+              closeMenu: true
+            }));
+            return tr;
+          }
           tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
             toggleMenu: {
               anchorName: options === null || options === void 0 ? void 0 : options.anchorName
@@ -199,17 +209,23 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         popupsMountPoint = _ref8.popupsMountPoint,
         popupsBoundariesElement = _ref8.popupsBoundariesElement,
         popupsScrollableElement = _ref8.popupsScrollableElement;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, editorExperiment('platform_editor_controls', 'variant1') ? /*#__PURE__*/React.createElement(BlockMenu, {
-        editorView: editorView,
-        mountPoint: popupsMountPoint,
-        boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        api: api
-      }) : /*#__PURE__*/React.createElement(DragHandleMenu, {
-        api: api
-      }), /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
-        api: api
-      }));
+      if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
+          api: api
+        }));
+      } else {
+        return /*#__PURE__*/React.createElement(React.Fragment, null, editorExperiment('platform_editor_controls', 'variant1') ? /*#__PURE__*/React.createElement(BlockMenu, {
+          editorView: editorView,
+          mountPoint: popupsMountPoint,
+          boundariesElement: popupsBoundariesElement,
+          scrollableElement: popupsScrollableElement,
+          api: api
+        }) : /*#__PURE__*/React.createElement(DragHandleMenu, {
+          api: api
+        }), /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
+          api: api
+        }));
+      }
     }
   };
 };

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -1,4 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(target) {
   if (target instanceof HTMLHeadingElement || target instanceof HTMLParagraphElement) {
@@ -11,7 +12,9 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     isDragging = _ref.isDragging,
-    activeNode = _ref.activeNode;
+    activeNode = _ref.activeNode,
+    isMenuOpen = _ref.isMenuOpen,
+    originalAnchorName = _ref.menuTriggerBy;
 
   // Most mouseover events don't fire during drag but some can slip through
   // when the drag begins. This prevents those.
@@ -121,6 +124,12 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
         var _api$core2, _api$blockControls3;
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
+      if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+        if (isMenuOpen && originalAnchorName) {
+          var _api$core3, _api$blockControls4;
+          api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu());
+        }
+      }
     }
   }
 };

package/dist/esm/pm-plugins/main.js

@@ -15,6 +15,7 @@ import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-sc
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { BLOCK_MENU_ENABLED } from '../ui/consts';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
@@ -497,7 +498,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     newActiveNode = isEmptyDoc || !(meta !== null && meta !== void 0 && meta.activeNode) && findHandleDec(decorations, (_latestActiveNode11 = latestActiveNode) === null || _latestActiveNode11 === void 0 ? void 0 : _latestActiveNode11.pos, (_latestActiveNode12 = latestActiveNode) === null || _latestActiveNode12 === void 0 ? void 0 : _latestActiveNode12.pos).length === 0 ? null : latestActiveNode;
   }
   var isMenuOpenNew = isMenuOpen;
-  if (BLOCK_MENU_ENABLED && editorExperiment('platform_editor_controls', 'variant1')) {
+  if (BLOCK_MENU_ENABLED && editorExperiment('platform_editor_controls', 'variant1') || expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
     if (meta !== null && meta !== void 0 && meta.closeMenu) {
       isMenuOpenNew = false;
     } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
@@ -519,7 +520,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     activeDropTargetNode: currentActiveDropTargetNode,
     isDragging: (_meta$isDragging3 = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging3 !== void 0 ? _meta$isDragging3 : isDragging,
     isMenuOpen: isMenuOpenNew,
-    menuTriggerBy: editorExperiment('platform_editor_controls', 'variant1') ? (meta === null || meta === void 0 || (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
+    menuTriggerBy: editorExperiment('platform_editor_controls', 'variant1') || expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? (meta === null || meta === void 0 || (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
     editorHeight: (_meta$editorHeight = meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== null && _meta$editorHeight !== void 0 ? _meta$editorHeight : editorHeight,
     editorWidthLeft: (_meta$editorWidthLeft = meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== null && _meta$editorWidthLeft !== void 0 ? _meta$editorWidthLeft : editorWidthLeft,
     editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : editorWidthRight,

package/dist/esm/ui/drag-handle.js

@@ -288,7 +288,7 @@ var useDragHandlePluginState = sharedPluginStateHookMigratorFactory(function (ap
   };
 });
 export var DragHandle = function DragHandle(_ref) {
-  var _api$core2, _api$blockControls3, _api$analytics2, _api$core4;
+  var _api$core2, _api$blockControls4, _api$analytics2, _api$core4;
   var view = _ref.view,
     api = _ref.api,
     formatMessage = _ref.formatMessage,
@@ -374,13 +374,21 @@ export var DragHandle = function DragHandle(_ref) {
             tr: tr
           });
           e.stopPropagation();
+        } else if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+          var _api$blockControls2;
+          api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
+            anchorName: anchorName
+          })({
+            tr: tr
+          });
+          e.stopPropagation();
         }
       } else if (isTopLevelNode && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-        var _api$blockControls2;
+        var _api$blockControls3;
         var alignAnchorHeadToSel = alignAnchorHeadInDirectionOfPos(tr.selection, startPos);
         var selectionWithExpandedHead = expandSelectionHeadToNodeAtPos(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
-        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.setMultiSelectPositions()({
+        api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.setMultiSelectPositions()({
           tr: tr
         });
       }
@@ -400,7 +408,7 @@ export var DragHandle = function DragHandle(_ref) {
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 ? void 0 : api.blockControls.sharedState, api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
+  }, [isMultiSelect, api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions, api === null || api === void 0 ? void 0 : api.blockControls.sharedState, api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
 
   // TODO: ED-26959 - This needs to be investigated further. Drag preview generation is not always working
   // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
@@ -474,8 +482,8 @@ export var DragHandle = function DragHandle(_ref) {
             var oldHandlePosCheck = handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to;
             var newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && (fg('platform_editor_elements_dnd_multi_select_patch_1') ? newHandlePosCheck : oldHandlePosCheck)) {
-              var _api$blockControls4;
-              api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.setMultiSelectPositions()({
+              var _api$blockControls5;
+              api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
                 tr: tr
               });
             } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -583,7 +591,7 @@ export var DragHandle = function DragHandle(_ref) {
           return;
         }
         api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref7) {
-          var _api$blockControls$sh3, _api$blockControls5, _api$analytics3;
+          var _api$blockControls$sh3, _api$blockControls6, _api$analytics3;
           var tr = _ref7.tr;
           var nodeTypes, hasSelectedMultipleNodes;
           var resolvedMovingNode = tr.doc.resolve(start);
@@ -597,7 +605,7 @@ export var DragHandle = function DragHandle(_ref) {
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
           tr.setMeta('scrollIntoView', false);

package/dist/esm/ui/global-styles.js

@@ -9,7 +9,6 @@ import { tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { akEditorBreakoutPadding, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { layers } from '@atlaskit/theme/constants';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -262,12 +261,6 @@ var headingWithIndentationInLayoutStyleFix = css(_defineProperty({}, "".concat(d
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
   marginTop: '0 !important'
 }));
-var withRelativePosStyleLegacy = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': _defineProperty({}, "&& ".concat(dragHandlerAnchorSelector), {
-    position: 'relative'
-  })
-});
 var withRelativePosStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': _defineProperty(_defineProperty({}, "&& ".concat(dragHandlerAnchorSelector), {
@@ -309,6 +302,6 @@ export var GlobalStylesWrapper = function GlobalStylesWrapper(_ref) {
     disabled: !expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)
   });
   return jsx(Global, {
-    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? extendHoverZoneReduced : undefined, editorExperiment('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, fg('platform_editor_fix_safari_cursor_hidden_empty') ? withRelativePosStyle : withRelativePosStyleLegacy, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), isDragging && extendedDragZone, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? extendHoverZoneReduced : undefined, editorExperiment('platform_editor_controls', 'variant1') ? undefined : withInlineNodeStyle, editorExperiment('platform_editor_block_control_optimise_render', true) ? quickInsertStyles : undefined, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, withAnchorNameZindexStyle]
   });
 };

package/dist/types/editor-commands/move-node.d.ts

@@ -2,5 +2,5 @@ import { type IntlShape } from 'react-intl-next';
 import type { Command, EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin, MoveNodeMethod } from '../blockControlsPluginType';
 import { DIRECTION } from '../pm-plugins/utils/consts';
-export declare const moveNodeViaShortcut: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION, formatMessage?: IntlShape['formatMessage']) => Command;
-export declare const moveNode: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
+export declare const moveNodeViaShortcut: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION, formatMessage?: IntlShape["formatMessage"]) => Command;
+export declare const moveNode: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape["formatMessage"]) => EditorCommand;

package/dist/types/pm-plugins/decorations-drop-target-active.d.ts

@@ -7,7 +7,7 @@ import { type Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { ActiveDropTargetNode, ActiveNode, BlockControlsPlugin } from '../blockControlsPluginType';
 import type { AnchorRectCache } from './utils/anchor-utils';
 export declare const canMoveNodeOrSliceToPos: (state: EditorState, node: PMNode, parent: PMNode, index: number, $toPos: ResolvedPos, activeNode?: ActiveNode) => boolean | null;
-export declare const getActiveDropTargetDecorations: (activeDropTargetNode: ActiveDropTargetNode, state: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, existingDecs: Decoration[], formatMessage: IntlShape['formatMessage'], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache) => {
+export declare const getActiveDropTargetDecorations: (activeDropTargetNode: ActiveDropTargetNode, state: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, existingDecs: Decoration[], formatMessage: IntlShape["formatMessage"], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache) => {
     decsToAdd: Decoration[];
     decsToRemove: Decoration[];
 };

package/dist/types/pm-plugins/decorations-drop-target.d.ts

@@ -15,6 +15,6 @@ import { type AnchorRectCache } from './utils/anchor-utils';
  * @returns
  */
 export declare const findDropTargetDecs: (decorations: DecorationSet, from?: number, to?: number) => Decoration[];
-export declare const createDropTargetDecoration: (pos: number, props: Omit<DropTargetProps, 'getPos'>, nodeViewPortalProviderAPI: PortalProviderAPI, side?: number, anchorRectCache?: AnchorRectCache, isSameLayout?: boolean) => Decoration;
-export declare const createLayoutDropTargetDecoration: (pos: number, props: Omit<DropTargetLayoutProps, 'getPos'>, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => Decoration;
-export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache, from?: number, to?: number) => Decoration[];
+export declare const createDropTargetDecoration: (pos: number, props: Omit<DropTargetProps, "getPos">, nodeViewPortalProviderAPI: PortalProviderAPI, side?: number, anchorRectCache?: AnchorRectCache, isSameLayout?: boolean) => Decoration;
+export declare const createLayoutDropTargetDecoration: (pos: number, props: Omit<DropTargetLayoutProps, "getPos">, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => Decoration;
+export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape["formatMessage"], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache, from?: number, to?: number) => Decoration[];

package/dist/types/pm-plugins/main.d.ts

@@ -12,7 +12,7 @@ export interface FlagType {
     isMultiSelectEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
-export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
+export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape["formatMessage"], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
     activeNode: any;
     activeDropTargetNode: ActiveDropTargetNode | undefined;

package/dist/types/pm-plugins/utils/active-anchor-tracker.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node/events" />
-/// <reference types="typings/events" />
 import { EventEmitter } from 'events';
 export declare class ActiveAnchorTracker {
     emitter: EventEmitter | null;

package/dist/types/pm-plugins/utils/inline-drop-target.d.ts

@@ -1,3 +1,7 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type ActiveNode } from '../../blockControlsPluginType';
-export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, isSameLayout?: boolean, activeNode?: ActiveNode) => boolean;
+export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, 
+/**
+ * Is the active node in the same layout as the target node
+ */
+isSameLayout?: boolean, activeNode?: ActiveNode) => boolean;

package/dist/types/ui/block-menu-items.d.ts

@@ -6,10 +6,10 @@ import type { IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
-export declare const getBlockMenuItems: (formatMessage: IntlShape['formatMessage']) => {
+export declare const getBlockMenuItems: (formatMessage: IntlShape["formatMessage"]) => {
     items: MenuItem[];
 }[];
 export declare const menuItemsCallback: {
-    moveUp: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
-    moveDown: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
+    moveUp: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape["formatMessage"]) => import("@atlaskit/editor-common/types").Command;
+    moveDown: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape["formatMessage"]) => import("@atlaskit/editor-common/types").Command;
 };

package/dist/types/ui/drop-target-layout.d.ts

@@ -11,5 +11,5 @@ export type DropTargetLayoutProps = {
     formatMessage?: IntlShape['formatMessage'];
 };
 export declare const DropTargetLayout: (props: DropTargetLayoutProps & {
-    anchorRectCache?: AnchorRectCache | undefined;
+    anchorRectCache?: AnchorRectCache;
 }) => jsx.JSX.Element | null;

package/dist/types/ui/drop-target.d.ts

@@ -17,6 +17,6 @@ export type DropTargetProps = {
     formatMessage?: IntlShape['formatMessage'];
 };
 export declare const DropTarget: (props: DropTargetProps & {
-    anchorRectCache?: AnchorRectCache | undefined;
-    isSameLayout?: boolean | undefined;
+    anchorRectCache?: AnchorRectCache;
+    isSameLayout?: boolean;
 }) => jsx.JSX.Element;

package/dist/types/ui/inline-drop-target.d.ts

@@ -2,6 +2,6 @@ import { jsx } from '@emotion/react';
 import { type AnchorRectCache } from '../pm-plugins/utils/anchor-utils';
 import { type DropTargetProps } from './drop-target';
 export declare const InlineDropTarget: ({ api, nextNode, position, anchorRectCache, getPos, }: DropTargetProps & {
-    anchorRectCache?: AnchorRectCache | undefined;
-    position: 'left' | 'right';
+    anchorRectCache?: AnchorRectCache;
+    position: "left" | "right";
 }) => jsx.JSX.Element;

package/dist/types-ts4.5/editor-commands/move-node.d.ts

@@ -2,5 +2,5 @@ import { type IntlShape } from 'react-intl-next';
 import type { Command, EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin, MoveNodeMethod } from '../blockControlsPluginType';
 import { DIRECTION } from '../pm-plugins/utils/consts';
-export declare const moveNodeViaShortcut: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION, formatMessage?: IntlShape['formatMessage']) => Command;
-export declare const moveNode: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
+export declare const moveNodeViaShortcut: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION, formatMessage?: IntlShape["formatMessage"]) => Command;
+export declare const moveNode: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape["formatMessage"]) => EditorCommand;

package/dist/types-ts4.5/pm-plugins/decorations-drop-target-active.d.ts

@@ -7,7 +7,7 @@ import { type Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { ActiveDropTargetNode, ActiveNode, BlockControlsPlugin } from '../blockControlsPluginType';
 import type { AnchorRectCache } from './utils/anchor-utils';
 export declare const canMoveNodeOrSliceToPos: (state: EditorState, node: PMNode, parent: PMNode, index: number, $toPos: ResolvedPos, activeNode?: ActiveNode) => boolean | null;
-export declare const getActiveDropTargetDecorations: (activeDropTargetNode: ActiveDropTargetNode, state: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, existingDecs: Decoration[], formatMessage: IntlShape['formatMessage'], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache) => {
+export declare const getActiveDropTargetDecorations: (activeDropTargetNode: ActiveDropTargetNode, state: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, existingDecs: Decoration[], formatMessage: IntlShape["formatMessage"], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache) => {
     decsToAdd: Decoration[];
     decsToRemove: Decoration[];
 };

package/dist/types-ts4.5/pm-plugins/decorations-drop-target.d.ts

@@ -15,6 +15,6 @@ import { type AnchorRectCache } from './utils/anchor-utils';
  * @returns
  */
 export declare const findDropTargetDecs: (decorations: DecorationSet, from?: number, to?: number) => Decoration[];
-export declare const createDropTargetDecoration: (pos: number, props: Omit<DropTargetProps, 'getPos'>, nodeViewPortalProviderAPI: PortalProviderAPI, side?: number, anchorRectCache?: AnchorRectCache, isSameLayout?: boolean) => Decoration;
-export declare const createLayoutDropTargetDecoration: (pos: number, props: Omit<DropTargetLayoutProps, 'getPos'>, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => Decoration;
-export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache, from?: number, to?: number) => Decoration[];
+export declare const createDropTargetDecoration: (pos: number, props: Omit<DropTargetProps, "getPos">, nodeViewPortalProviderAPI: PortalProviderAPI, side?: number, anchorRectCache?: AnchorRectCache, isSameLayout?: boolean) => Decoration;
+export declare const createLayoutDropTargetDecoration: (pos: number, props: Omit<DropTargetLayoutProps, "getPos">, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => Decoration;
+export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape["formatMessage"], nodeViewPortalProviderAPI: PortalProviderAPI, activeNode?: ActiveNode, anchorRectCache?: AnchorRectCache, from?: number, to?: number) => Decoration[];

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -12,7 +12,7 @@ export interface FlagType {
     isMultiSelectEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
-export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
+export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape["formatMessage"], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
     activeNode: any;
     activeDropTargetNode: ActiveDropTargetNode | undefined;

package/dist/types-ts4.5/pm-plugins/utils/active-anchor-tracker.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node/events" />
-/// <reference types="typings/events" />
 import { EventEmitter } from 'events';
 export declare class ActiveAnchorTracker {
     emitter: EventEmitter | null;

package/dist/types-ts4.5/pm-plugins/utils/inline-drop-target.d.ts

@@ -1,3 +1,7 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type ActiveNode } from '../../blockControlsPluginType';
-export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, isSameLayout?: boolean, activeNode?: ActiveNode) => boolean;
+export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, 
+/**
+ * Is the active node in the same layout as the target node
+ */
+isSameLayout?: boolean, activeNode?: ActiveNode) => boolean;

package/dist/types-ts4.5/ui/block-menu-items.d.ts

@@ -6,10 +6,10 @@ import type { IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
-export declare const getBlockMenuItems: (formatMessage: IntlShape['formatMessage']) => {
+export declare const getBlockMenuItems: (formatMessage: IntlShape["formatMessage"]) => {
     items: MenuItem[];
 }[];
 export declare const menuItemsCallback: {
-    moveUp: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
-    moveDown: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
+    moveUp: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape["formatMessage"]) => import("@atlaskit/editor-common/types").Command;
+    moveDown: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape["formatMessage"]) => import("@atlaskit/editor-common/types").Command;
 };

package/dist/types-ts4.5/ui/drop-target-layout.d.ts

@@ -11,5 +11,5 @@ export type DropTargetLayoutProps = {
     formatMessage?: IntlShape['formatMessage'];
 };
 export declare const DropTargetLayout: (props: DropTargetLayoutProps & {
-    anchorRectCache?: AnchorRectCache | undefined;
+    anchorRectCache?: AnchorRectCache;
 }) => jsx.JSX.Element | null;

package/dist/types-ts4.5/ui/drop-target.d.ts

@@ -17,6 +17,6 @@ export type DropTargetProps = {
     formatMessage?: IntlShape['formatMessage'];
 };
 export declare const DropTarget: (props: DropTargetProps & {
-    anchorRectCache?: AnchorRectCache | undefined;
-    isSameLayout?: boolean | undefined;
+    anchorRectCache?: AnchorRectCache;
+    isSameLayout?: boolean;
 }) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/inline-drop-target.d.ts

@@ -2,6 +2,6 @@ import { jsx } from '@emotion/react';
 import { type AnchorRectCache } from '../pm-plugins/utils/anchor-utils';
 import { type DropTargetProps } from './drop-target';
 export declare const InlineDropTarget: ({ api, nextNode, position, anchorRectCache, getPos, }: DropTargetProps & {
-    anchorRectCache?: AnchorRectCache | undefined;
-    position: 'left' | 'right';
+    anchorRectCache?: AnchorRectCache;
+    position: "left" | "right";
 }) => jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "4.1.7",
+	"version": "4.1.9",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,9 +44,9 @@
 		"@atlaskit/editor-plugin-user-intent": "^1.1.0",
 		"@atlaskit/editor-plugin-width": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-shared-styles": "^3.5.0",
+		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^27.9.0",
+		"@atlaskit/icon": "^27.11.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.11.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.22.0",
+		"@atlaskit/tmp-editor-statsig": "^9.26.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.16.0",
+		"@atlaskit/editor-common": "^107.20.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -149,9 +149,6 @@
 		"platform_editor_elements_dnd_multi_select_patch_3": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_safari_cursor_hidden_empty": {
-			"type": "boolean"
-		},
 		"platform_editor_drag_and_drop_perf_analytics": {
 			"type": "boolean"
 		},