@atlaskit/editor-plugin-block-controls 7.10.2 → 7.11.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.11.0
+
+### Minor Changes
+
+- [`1d4a6d5ffb239`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d4a6d5ffb239) -
+  Remove old block menu implementation in block controls
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 7.10.2
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -24,8 +24,6 @@ var _editorCommands = require("./pm-plugins/selection-preservation/editor-comman
 var _pluginKey = require("./pm-plugins/selection-preservation/plugin-key");
 var _pmPlugin2 = require("./pm-plugins/selection-preservation/pm-plugin");
 var _getSelection = require("./pm-plugins/utils/getSelection");
-var _blockMenu = _interopRequireDefault(require("./ui/block-menu"));
-var _dragHandleMenu = require("./ui/drag-handle-menu");
 var _globalStyles = require("./ui/global-styles");
 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; }
@@ -80,8 +78,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
               rootPos: rootPos,
               rootAnchorName: rootAnchorName,
               rootNodeType: rootNodeType
-            },
-            closeMenu: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? true : undefined
+            }
           }));
           return tr;
         };
@@ -286,28 +283,10 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       }
       return sharedState;
     },
-    contentComponent: function contentComponent(_ref8) {
-      var editorView = _ref8.editorView,
-        popupsMountPoint = _ref8.popupsMountPoint,
-        popupsBoundariesElement = _ref8.popupsBoundariesElement,
-        popupsScrollableElement = _ref8.popupsScrollableElement;
-      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
-        }));
-      }
+    contentComponent: function contentComponent() {
+      return /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, {
+        api: api
+      });
     }
   };
 };

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

@@ -24,7 +24,6 @@ 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 _domAttrName = require("../ui/utils/dom-attr-name");
 var _decorationsAnchor = require("./decorations-anchor");
 var _decorationsDragHandle = require("./decorations-drag-handle");
@@ -533,7 +532,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 && flags.toolbarFlagsEnabled || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+  if ((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) {

package/dist/cjs/ui/consts.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.topPositionAdjustment = exports.spacingBetweenNodesForPreview = exports.spaceLookupMap = exports.rootElementGap = exports.nodeMargins = exports.getNestedNodeLeftPaddingMargin = exports.dropTargetMarginMap = exports.dragHandleGap = exports.STICKY_CONTROLS_TOP_MARGIN = exports.QUICK_INSERT_WIDTH = exports.QUICK_INSERT_LEFT_OFFSET = exports.QUICK_INSERT_HEIGHT = exports.QUICK_INSERT_DIMENSIONS = exports.DRAG_HANDLE_ZINDEX = exports.DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = exports.DRAG_HANDLE_NARROW_GAP = exports.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP = exports.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH = exports.DRAG_HANDLE_MAX_GAP = exports.DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = exports.DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_H6_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H5_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H4_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H3_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H2_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H1_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DEFAULT_GAP = exports.DRAG_HANDLE_BORDER_RADIUS = exports.DEFAULT_COLUMN_DISTRIBUTIONS = exports.BLOCK_MENU_WIDTH = exports.BLOCK_MENU_ENABLED = void 0;
+exports.topPositionAdjustment = exports.spacingBetweenNodesForPreview = exports.spaceLookupMap = exports.rootElementGap = exports.nodeMargins = exports.getNestedNodeLeftPaddingMargin = exports.dropTargetMarginMap = exports.dragHandleGap = exports.STICKY_CONTROLS_TOP_MARGIN = exports.QUICK_INSERT_WIDTH = exports.QUICK_INSERT_LEFT_OFFSET = exports.QUICK_INSERT_HEIGHT = exports.QUICK_INSERT_DIMENSIONS = exports.DRAG_HANDLE_ZINDEX = exports.DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = exports.DRAG_HANDLE_NARROW_GAP = exports.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP = exports.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH = exports.DRAG_HANDLE_MAX_GAP = exports.DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = exports.DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_H6_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H5_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H4_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H3_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H2_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H1_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DEFAULT_GAP = exports.DRAG_HANDLE_BORDER_RADIUS = exports.DEFAULT_COLUMN_DISTRIBUTIONS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -353,9 +353,4 @@ var DEFAULT_COLUMN_DISTRIBUTIONS = exports.DEFAULT_COLUMN_DISTRIBUTIONS = {
   3: 33.33,
   4: 25,
   5: 20
-};
-var BLOCK_MENU_WIDTH = exports.BLOCK_MENU_WIDTH = 220;
-
-// 	Temporarily disable BLOCK MENU feature until Q4 FY25.
-//  For more details, refer to ticket ED-26972 https://product-fabric.atlassian.net/browse/ED-26972
-var BLOCK_MENU_ENABLED = exports.BLOCK_MENU_ENABLED = false;
+};

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

@@ -17,7 +17,7 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
-var _selection2 = require("@atlaskit/editor-common/selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -39,7 +39,7 @@ var _pluginKey = require("../pm-plugins/selection-preservation/plugin-key");
 var _analytics2 = require("../pm-plugins/utils/analytics");
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _getSelection = require("../pm-plugins/utils/getSelection");
-var _selection3 = require("../pm-plugins/utils/selection");
+var _selection2 = require("../pm-plugins/utils/selection");
 var _consts2 = require("./consts");
 var _dragPreview = require("./drag-preview");
 var _anchorName = require("./utils/anchor-name");
@@ -476,53 +476,13 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       var mSelect = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       var $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
       if (!isMultiSelect || tr.selection.empty || !e.shiftKey) {
-        if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-          var node = tr.doc.nodeAt(startPos);
-          var nodeSize = node ? node.nodeSize : 1;
-          // It this will be required in other places, where selectNode is used, we should
-          // move it inside of the newGetSelection in the selectNode
-          if (nodeType === 'blockquote' && (0, _getSelection.isNodeWithCodeBlock)(tr, startPos, nodeSize)) {
-            var _selection = new _state.NodeSelection(tr.doc.resolve(startPos));
-            tr.setSelection(_selection);
-          } else {
-            tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
-          }
-        } else {
-          tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
-        }
-        var rootPos = (0, _experiments.editorExperiment)('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
-        var triggerByNode = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_synced_block', 'isEnabled', true) ? {
-          nodeType: nodeType,
-          pos: startPos,
-          rootPos: rootPos
-        } : undefined;
-        if (_consts2.BLOCK_MENU_ENABLED && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-          var _api$blockControls3;
-          api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.toggleBlockMenu({
-            anchorName: anchorName,
-            triggerByNode: triggerByNode,
-            openedViaKeyboard: false
-          })({
-            tr: tr
-          });
-          e.stopPropagation();
-        } else if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-          var _api$blockControls4;
-          api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.toggleBlockMenu({
-            anchorName: anchorName,
-            triggerByNode: triggerByNode,
-            openedViaKeyboard: false
-          })({
-            tr: tr
-          });
-          e.stopPropagation();
-        }
+        tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
       } 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$blockControls5;
-        var alignAnchorHeadToSel = (0, _selection3.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
-        var selectionWithExpandedHead = (0, _selection3.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
+        var _api$blockControls3;
+        var alignAnchorHeadToSel = (0, _selection2.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
+        var selectionWithExpandedHead = (0, _selection2.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
-        api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
+        api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.setMultiSelectPositions()({
           tr: tr
         });
       }
@@ -542,7 +502,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
+  }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType]);
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -584,7 +544,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       e.stopPropagation();
       var startPos = getPos();
       api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref6) {
-        var _api$blockControls6, _api$userIntent;
+        var _api$blockControls4, _api$userIntent;
         var tr = _ref6.tr;
         if (startPos === undefined) {
           return tr;
@@ -599,7 +559,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
           pos: startPos,
           rootPos: rootPos
         } : undefined;
-        api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.toggleBlockMenu({
+        api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.toggleBlockMenu({
           anchorName: anchorName,
           triggerByNode: triggerByNode,
           openedViaKeyboard: true
@@ -615,10 +575,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       e.preventDefault();
       e.stopPropagation();
       api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
-        var _api$blockControls7;
+        var _api$blockControls5;
         var tr = _ref7.tr;
-        (0, _selection2.deleteSelectedRange)(tr);
-        api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.toggleBlockMenu({
+        (0, _selection.deleteSelectedRange)(tr);
+        api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.toggleBlockMenu({
           closeMenu: true
         })({
           tr: tr
@@ -659,8 +619,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
             }
             var newHandlePosCheck = (0, _getSelection.isHandleCorrelatedToSelection)(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls8;
-              api === null || api === void 0 || (_api$blockControls8 = api.blockControls) === null || _api$blockControls8 === void 0 || _api$blockControls8.commands.setMultiSelectPositions()({
+              var _api$blockControls6;
+              api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setMultiSelectPositions()({
                 tr: tr
               });
             } else if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -768,7 +728,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
           return;
         }
         api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref1) {
-          var _api$blockControls$sh3, _api$blockControls9, _api$analytics3;
+          var _api$blockControls$sh3, _api$blockControls7, _api$analytics3;
           var tr = _ref1.tr;
           var nodeTypes, hasSelectedMultipleNodes;
           var resolvedMovingNode = tr.doc.resolve(start);
@@ -782,7 +742,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 || (_api$blockControls9 = api.blockControls) === null || _api$blockControls9 === void 0 || _api$blockControls9.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
           tr.setMeta('scrollIntoView', false);

package/dist/es2019/blockControlsPlugin.js

@@ -16,8 +16,6 @@ import { startPreservingSelection, stopPreservingSelection } from './pm-plugins/
 import { selectionPreservationPluginKey } from './pm-plugins/selection-preservation/plugin-key';
 import { createSelectionPreservationPlugin } from './pm-plugins/selection-preservation/pm-plugin';
 import { selectNode } from './pm-plugins/utils/getSelection';
-import BlockMenu from './ui/block-menu';
-import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
 export const blockControlsPlugin = ({
   api
@@ -70,8 +68,7 @@ export const blockControlsPlugin = ({
           rootPos,
           rootAnchorName,
           rootNodeType
-        },
-        closeMenu: editorExperiment('platform_editor_controls', 'variant1') && !expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? true : undefined
+        }
       });
       return tr;
     },
@@ -276,28 +273,9 @@ export const blockControlsPlugin = ({
     }
     return sharedState;
   },
-  contentComponent({
-    editorView,
-    popupsMountPoint,
-    popupsBoundariesElement,
-    popupsScrollableElement
-  }) {
-    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
-      }));
-    }
+  contentComponent() {
+    return /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
+      api: api
+    });
   }
 });

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

@@ -16,7 +16,6 @@ import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/ad
 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 { getAnchorAttrName } from '../ui/utils/dom-attr-name';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
 import { dragHandleDecoration, emptyParagraphNodeDecorations, findHandleDec } from './decorations-drag-handle';
@@ -531,7 +530,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 && flags.toolbarFlagsEnabled || expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+  if (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) {

package/dist/es2019/ui/consts.js

@@ -362,9 +362,4 @@ export const DEFAULT_COLUMN_DISTRIBUTIONS = {
   3: 33.33,
   4: 25,
   5: 20
-};
-export const BLOCK_MENU_WIDTH = 220;
-
-// 	Temporarily disable BLOCK MENU feature until Q4 FY25.
-//  For more details, refer to ticket ED-26972 https://product-fabric.atlassian.net/browse/ED-26972
-export const BLOCK_MENU_ENABLED = false;
+};

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

@@ -17,7 +17,7 @@ import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { deleteSelectedRange } from '@atlaskit/editor-common/selection';
 import { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFullPageNarrowBreakout, akEditorTableToolbarSize, relativeSizeToBaseFontSize } from '@atlaskit/editor-shared-styles/consts';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
@@ -36,9 +36,9 @@ import { key } from '../pm-plugins/main';
 import { selectionPreservationPluginKey } from '../pm-plugins/selection-preservation/plugin-key';
 import { getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { getControlBottomCSSValue, getControlHeightCSSValue, getLeftPosition, getNodeHeight, getTopPosition, shouldBeSticky, shouldMaskNodeControls } from '../pm-plugins/utils/drag-handle-positions';
-import { isHandleCorrelatedToSelection, isNodeWithCodeBlock, selectNode } from '../pm-plugins/utils/getSelection';
+import { isHandleCorrelatedToSelection, selectNode } from '../pm-plugins/utils/getSelection';
 import { alignAnchorHeadInDirectionOfPos, expandSelectionHeadToNodeAtPos } from '../pm-plugins/utils/selection';
-import { BLOCK_MENU_ENABLED, DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH, DRAG_HANDLE_ZINDEX, dragHandleGap, nodeMargins, spacingBetweenNodesForPreview, STICKY_CONTROLS_TOP_MARGIN, topPositionAdjustment } from './consts';
+import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH, DRAG_HANDLE_ZINDEX, dragHandleGap, nodeMargins, spacingBetweenNodesForPreview, STICKY_CONTROLS_TOP_MARGIN, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
 import { refreshAnchorName } from './utils/anchor-name';
 import { getAnchorAttrName } from './utils/dom-attr-name';
@@ -455,53 +455,13 @@ export const DragHandle = ({
       const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       const $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
       if (!isMultiSelect || tr.selection.empty || !e.shiftKey) {
-        if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-          const node = tr.doc.nodeAt(startPos);
-          const nodeSize = node ? node.nodeSize : 1;
-          // It this will be required in other places, where selectNode is used, we should
-          // move it inside of the newGetSelection in the selectNode
-          if (nodeType === 'blockquote' && isNodeWithCodeBlock(tr, startPos, nodeSize)) {
-            const selection = new NodeSelection(tr.doc.resolve(startPos));
-            tr.setSelection(selection);
-          } else {
-            tr = selectNode(tr, startPos, nodeType, api);
-          }
-        } else {
-          tr = selectNode(tr, startPos, nodeType, api);
-        }
-        const rootPos = editorExperiment('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
-        const triggerByNode = expValEqualsNoExposure('platform_synced_block', 'isEnabled', true) ? {
-          nodeType,
-          pos: startPos,
-          rootPos
-        } : undefined;
-        if (BLOCK_MENU_ENABLED && editorExperiment('platform_editor_controls', 'variant1')) {
-          var _api$blockControls3;
-          api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.toggleBlockMenu({
-            anchorName,
-            triggerByNode,
-            openedViaKeyboard: false
-          })({
-            tr
-          });
-          e.stopPropagation();
-        } else if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-          var _api$blockControls4;
-          api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu({
-            anchorName,
-            triggerByNode,
-            openedViaKeyboard: false
-          })({
-            tr
-          });
-          e.stopPropagation();
-        }
+        tr = selectNode(tr, startPos, nodeType, api);
       } else if (isTopLevelNode && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-        var _api$blockControls5;
+        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$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.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
         });
       }
@@ -521,7 +481,7 @@ export const DragHandle = ({
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
+  }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType]);
   const handleKeyDown = useCallback(e => {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -564,7 +524,7 @@ export const DragHandle = ({
       api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
         tr
       }) => {
-        var _api$blockControls6, _api$userIntent;
+        var _api$blockControls4, _api$userIntent;
         if (startPos === undefined) {
           return tr;
         }
@@ -578,7 +538,7 @@ export const DragHandle = ({
           pos: startPos,
           rootPos
         } : undefined;
-        api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.toggleBlockMenu({
+        api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu({
           anchorName,
           triggerByNode,
           openedViaKeyboard: true
@@ -596,9 +556,9 @@ export const DragHandle = ({
       api === null || api === void 0 ? void 0 : api.core.actions.execute(({
         tr
       }) => {
-        var _api$blockControls7;
+        var _api$blockControls5;
         deleteSelectedRange(tr);
-        api === null || api === void 0 ? void 0 : (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 ? void 0 : _api$blockControls7.commands.toggleBlockMenu({
+        api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.toggleBlockMenu({
           closeMenu: true
         })({
           tr
@@ -637,8 +597,8 @@ export const DragHandle = ({
             }
             const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls8;
-              api === null || api === void 0 ? void 0 : (_api$blockControls8 = api.blockControls) === null || _api$blockControls8 === void 0 ? void 0 : _api$blockControls8.commands.setMultiSelectPositions()({
+              var _api$blockControls6;
+              api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.setMultiSelectPositions()({
                 tr
               });
             } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -753,7 +713,7 @@ export const DragHandle = ({
         api === null || api === void 0 ? void 0 : (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions.execute(({
           tr
         }) => {
-          var _api$blockControls$sh3, _api$blockControls9, _api$analytics3;
+          var _api$blockControls$sh3, _api$blockControls7, _api$analytics3;
           let nodeTypes, hasSelectedMultipleNodes;
           const resolvedMovingNode = tr.doc.resolve(start);
           const maybeNode = resolvedMovingNode.nodeAfter;
@@ -766,7 +726,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$blockControls9 = api.blockControls) === null || _api$blockControls9 === void 0 ? void 0 : _api$blockControls9.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 ? void 0 : (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 ? void 0 : _api$blockControls7.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr
           });
           tr.setMeta('scrollIntoView', false);

package/dist/esm/blockControlsPlugin.js

@@ -19,8 +19,6 @@ import { startPreservingSelection as _startPreservingSelection, stopPreservingSe
 import { selectionPreservationPluginKey } from './pm-plugins/selection-preservation/plugin-key';
 import { createSelectionPreservationPlugin } from './pm-plugins/selection-preservation/pm-plugin';
 import { selectNode } from './pm-plugins/utils/getSelection';
-import BlockMenu from './ui/block-menu';
-import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
 export var blockControlsPlugin = function blockControlsPlugin(_ref) {
   var api = _ref.api;
@@ -73,8 +71,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
               rootPos: rootPos,
               rootAnchorName: rootAnchorName,
               rootNodeType: rootNodeType
-            },
-            closeMenu: editorExperiment('platform_editor_controls', 'variant1') && !expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? true : undefined
+            }
           }));
           return tr;
         };
@@ -279,28 +276,10 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       }
       return sharedState;
     },
-    contentComponent: function contentComponent(_ref8) {
-      var editorView = _ref8.editorView,
-        popupsMountPoint = _ref8.popupsMountPoint,
-        popupsBoundariesElement = _ref8.popupsBoundariesElement,
-        popupsScrollableElement = _ref8.popupsScrollableElement;
-      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
-        }));
-      }
+    contentComponent: function contentComponent() {
+      return /*#__PURE__*/React.createElement(GlobalStylesWrapper, {
+        api: api
+      });
     }
   };
 };

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

@@ -19,7 +19,6 @@ import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/ad
 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 { getAnchorAttrName } from '../ui/utils/dom-attr-name';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
 import { dragHandleDecoration, emptyParagraphNodeDecorations, findHandleDec } from './decorations-drag-handle';
@@ -526,7 +525,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 && flags.toolbarFlagsEnabled || expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+  if (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) {

package/dist/esm/ui/consts.js

@@ -346,9 +346,4 @@ export var DEFAULT_COLUMN_DISTRIBUTIONS = {
   3: 33.33,
   4: 25,
   5: 20
-};
-export var BLOCK_MENU_WIDTH = 220;
-
-// 	Temporarily disable BLOCK MENU feature until Q4 FY25.
-//  For more details, refer to ticket ED-26972 https://product-fabric.atlassian.net/browse/ED-26972
-export var BLOCK_MENU_ENABLED = false;
+};