@atlaskit/editor-plugin-block-controls 20.0.0 → 20.0.2

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

@@ -379,7 +379,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
         // Which caused the drag handle onClick event not firing, then block menu wouldn't be opened
         // This is caused by the mappedPos.deletedAfter sometimes returning true in webkit browsers even though the active node still exists
         // This is likely a prosemirror and safari integration bug, but to unblock the issue, we are going to use mappedPos.deleted in safari for now
-        if (browser.webkit && editorExperiment('platform_editor_block_menu', true)) {
+        if (browser.webkit) {
           mappedPos = tr.mapping.mapResult(activeNode.pos);
           isActiveNodeDeleted = mappedPos.deleted;
         } else {
@@ -803,7 +803,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     // handle - so findHandleDec is always empty. Don't clear activeNode in that case.
     const hasHandleOrViewModeControls = !flags.legacyDragHandleEnabled || isViewMode && rightSideControlsEnabled || findHandleDec(decorations, (_latestActiveNode11 = latestActiveNode) === null || _latestActiveNode11 === void 0 ? void 0 : _latestActiveNode11.pos, (_latestActiveNode12 = latestActiveNode) === null || _latestActiveNode12 === void 0 ? void 0 : _latestActiveNode12.pos).length > 0;
     // Keep the registry surface mounted while its Block Menu owns focus.
-    const keepActiveNodeForOpenBlockMenu = !flags.legacyDragHandleEnabled && isMenuOpen && editorExperiment('platform_editor_block_menu', true);
+    const keepActiveNodeForOpenBlockMenu = !flags.legacyDragHandleEnabled && isMenuOpen;
     newActiveNode = meta !== null && meta !== void 0 && meta.editorBlurred && !keepActiveNodeForOpenBlockMenu || !(meta !== null && meta !== void 0 && meta.activeNode) && !hasHandleOrViewModeControls ? null : latestActiveNode;
   } else {
     var _latestActiveNode13, _latestActiveNode14;
@@ -822,15 +822,11 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     });
   }
   let isMenuOpenNew = isMenuOpen;
-  if (editorExperiment('platform_editor_block_menu', true)) {
-    if (meta !== null && meta !== void 0 && meta.closeMenu) {
-      isMenuOpenNew = false;
-    } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
-      const isSameAnchor = (meta === null || meta === void 0 ? void 0 : meta.toggleMenu.anchorName) === menuTriggerBy;
-      isMenuOpenNew = menuTriggerBy === undefined || isSameAnchor || !isMenuOpen && !isSameAnchor ? !isMenuOpen : isMenuOpen;
-    }
+  if (meta !== null && meta !== void 0 && meta.closeMenu) {
+    isMenuOpenNew = false;
   } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
-    isMenuOpenNew = !isMenuOpen;
+    const isSameAnchor = (meta === null || meta === void 0 ? void 0 : meta.toggleMenu.anchorName) === menuTriggerBy;
+    isMenuOpenNew = menuTriggerBy === undefined || isSameAnchor || !isMenuOpen && !isSameAnchor ? !isMenuOpen : isMenuOpen;
   }
   let isSelectedViaDragHandleNew;
   if (flags.toolbarFlagsEnabled) {
@@ -845,13 +841,13 @@ 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: flags.toolbarFlagsEnabled || editorExperiment('platform_editor_block_menu', true) ? (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
+    menuTriggerBy: (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy,
     menuTriggerByNode: (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu2 = meta.toggleMenu) === null || _meta$toggleMenu2 === void 0 ? void 0 : _meta$toggleMenu2.triggerByNode) || menuTriggerByNode,
-    blockMenuOptions: editorExperiment('platform_editor_block_menu', true) ? {
+    blockMenuOptions: {
       canMoveUp: (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu3 = meta.toggleMenu) === null || _meta$toggleMenu3 === void 0 ? void 0 : _meta$toggleMenu3.moveUp) !== undefined ? meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu4 = meta.toggleMenu) === null || _meta$toggleMenu4 === void 0 ? void 0 : _meta$toggleMenu4.moveUp : blockMenuOptions === null || blockMenuOptions === void 0 ? void 0 : blockMenuOptions.canMoveUp,
       canMoveDown: (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu5 = meta.toggleMenu) === null || _meta$toggleMenu5 === void 0 ? void 0 : _meta$toggleMenu5.moveDown) !== undefined ? meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu6 = meta.toggleMenu) === null || _meta$toggleMenu6 === void 0 ? void 0 : _meta$toggleMenu6.moveDown : blockMenuOptions === null || blockMenuOptions === void 0 ? void 0 : blockMenuOptions.canMoveDown,
       openedViaKeyboard: (meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu7 = meta.toggleMenu) === null || _meta$toggleMenu7 === void 0 ? void 0 : _meta$toggleMenu7.openedViaKeyboard) !== undefined ? meta === null || meta === void 0 ? void 0 : (_meta$toggleMenu8 = meta.toggleMenu) === null || _meta$toggleMenu8 === void 0 ? void 0 : _meta$toggleMenu8.openedViaKeyboard : blockMenuOptions === null || blockMenuOptions === void 0 ? void 0 : blockMenuOptions.openedViaKeyboard
-    } : 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,
@@ -1100,12 +1096,12 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
             }
           }
           if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
-            const isDragHandle = event.target.closest(editorExperiment('platform_editor_block_menu', true) ? DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle="true"]') !== null;
+            const isDragHandle = event.target.closest(DRAG_HANDLE_SELECTOR) !== null;
             api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
           }
           if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
             var _api$blockControls$sh2, _api$blockControls$sh3;
-            const isBlockMenuOpen = (api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.isMenuOpen) && editorExperiment('platform_editor_block_menu', true);
+            const isBlockMenuOpen = api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.isMenuOpen;
             // when block menu is just open, and we press arrow keys, we want to use the arrow keys to navigate the block menu
             // in this scenario, isSelectedViaDragHandle should not be set to false
             if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle && !isBlockMenuOpen) {

package/dist/es2019/pm-plugins/utils/expand-and-update-selection.js

@@ -1,10 +1,8 @@
 import { selectNodeAtPos } from '@atlaskit/editor-common/node-selection';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
-import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { selectNode } from './getSelection';
 import { adjustSelectionBoundsForEdgePositions } from './selection';
 const isPosWithinRange = (pos, range) => {
@@ -60,9 +58,7 @@ export const expandAndUpdateSelection = ({
   if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiBlockRange(expandedRange.range)) {
     // Then create a selection from the start of the first node to the end of the last node
     tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, expandedRange.$from.pos), Math.max(selection.to, expandedRange.$to.pos)));
-  } else if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform_editor_maui_jira_updates') && (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || editorExperiment('platform_editor_block_menu', true))) {
+  } else if (fg('platform_editor_maui_jira_updates')) {
     // Under the gate (and when on the simplified newGetSelection path), use
     // the platform-level composer — same path as open-remix-modal, no drift.
     selectNodeAtPos(tr, startPos, nodeType);

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -5,7 +5,6 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 export const getInlineNodePos = (doc, start, nodeSize) => {
   const $startPos = doc.resolve(start);
   // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
@@ -38,46 +37,6 @@ export const isNodeWithCodeBlock = (tr, start, nodeSize) => {
   });
   return hasCodeBlock;
 };
-const isNodeWithMediaOrExtension = (doc, start, nodeSize) => {
-  const $startPos = doc.resolve(start);
-  let hasMediaOrExtension = false;
-  doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, n => {
-    if (['media', 'extension'].includes(n.type.name)) {
-      hasMediaOrExtension = true;
-    }
-  });
-  return hasMediaOrExtension;
-};
-const oldGetSelection = (tr, start) => {
-  const node = tr.doc.nodeAt(start);
-  const isNodeSelection = node && NodeSelection.isSelectable(node);
-  const nodeSize = node ? node.nodeSize : 1;
-  const $startPos = tr.doc.resolve(start);
-  const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
-  const isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize);
-  const isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isListWithMediaOrExtension || isBlockQuoteWithMediaOrExtension ||
-  // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
-  ['decisionList', 'layoutColumn'].includes(nodeName || '')) {
-    return new NodeSelection($startPos);
-  } else if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
-    const $mediaStartPos = tr.doc.resolve(start + 1);
-    return new NodeSelection($mediaStartPos);
-  } else if (
-  // Even though mediaGroup is not selectable,
-  // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
-  nodeName === 'mediaGroup') {
-    return new NodeSelection($startPos);
-  } else if (nodeName === 'taskList') {
-    return TextSelection.create(tr.doc, start, start + nodeSize);
-  } else {
-    const {
-      inlineNodePos,
-      inlineNodeEndPos
-    } = getInlineNodePos(tr.doc, start, nodeSize);
-    return new TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
-  }
-};
 
 /**
  * Gets the appropriate selection for the node at the given start position.
@@ -88,76 +47,31 @@ const oldGetSelection = (tr, start) => {
  * @returns The appropriate selection for the node.
  */
 export const newGetSelection = (doc, selectionEmpty, start) => {
-  // Under the gate, delegate to getNodeSelectionForPos only when
-  // platform_editor_block_menu is on — getNodeSelectionForPos matches that
-  // simplified path (NodeSelection for all nodes). When block_menu is off,
-  // fall through to the oldGetSelection branch which handles expand/taskList/
-  // inline nodes correctly with TextSelection.
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform_editor_maui_jira_updates') && editorExperiment('platform_editor_block_menu', true)) {
+  if (fg('platform_editor_maui_jira_updates')) {
     return getNodeSelectionForPos(doc, start) || false;
   }
   const node = doc.nodeAt(start);
-  const isNodeSelection = node && NodeSelection.isSelectable(node);
-  const nodeSize = node ? node.nodeSize : 1;
   const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
-  if (editorExperiment('platform_editor_block_menu', true)) {
-    // if mediaGroup only has a single child, we want to select the child
-    if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
-      const $mediaStartPos = doc.resolve(start + 1);
-      return new NodeSelection($mediaStartPos);
-    }
-    return new NodeSelection(doc.resolve(start));
-  }
-
-  // this is a fix for empty paragraph selection - put first to avoid any extra work
-  if (nodeName === 'paragraph' && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0) {
-    return false;
-  }
-  const isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(doc, start, nodeSize);
-  const isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(doc, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(doc, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isListWithMediaOrExtension || isBlockQuoteWithMediaOrExtension ||
-  // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
-  ['decisionList', 'layoutColumn'].includes(nodeName || '') || nodeName === 'mediaGroup' && typeof (node === null || node === void 0 ? void 0 : node.childCount) === 'number' && (node === null || node === void 0 ? void 0 : node.childCount) > 1) {
-    return new NodeSelection(doc.resolve(start));
-  }
 
   // if mediaGroup only has a single child, we want to select the child
-  if (nodeName === 'mediaGroup') {
+  if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
     const $mediaStartPos = doc.resolve(start + 1);
     return new NodeSelection($mediaStartPos);
   }
-  if (nodeName === 'taskList') {
-    return TextSelection.create(doc, start, start + nodeSize);
-  }
-  const {
-    inlineNodePos,
-    inlineNodeEndPos
-  } = getInlineNodePos(doc, start, nodeSize);
-  return new TextSelection(doc.resolve(inlineNodePos), doc.resolve(inlineNodeEndPos));
+  return new NodeSelection(doc.resolve(start));
 };
-export const getSelection = (tr, start, api) => {
-  if (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || editorExperiment('platform_editor_block_menu', true)) {
-    return newGetSelection(tr.doc, tr.selection.empty, start);
-  }
-  return oldGetSelection(tr, start);
+export const getSelection = (tr, start) => {
+  return newGetSelection(tr.doc, tr.selection.empty, start);
 };
 export const selectNode = (tr, start, nodeType, api) => {
-  // Only use the platform path when already on the simplified newGetSelection
-  // branch — i.e. when platform_editor_block_menu is on or toolbar flags are
-  // enabled. This preserves oldGetSelection behaviour (e.g. taskList →
-  // TextSelection) in legacy contexts where those flags are off.
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform_editor_maui_jira_updates') && editorExperiment('platform_editor_block_menu', true)) {
+  if (fg('platform_editor_maui_jira_updates')) {
     return selectNodeAtPos(tr, start, nodeType);
   }
   if (nodeType === 'table') {
     tr = selectTableClosestToPos(tr, tr.doc.resolve(start + 1));
     return tr;
   }
-  const selection = getSelection(tr, start, api);
+  const selection = getSelection(tr, start);
   if (selection) {
     tr.setSelection(selection);
   }

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

@@ -14,7 +14,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
-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';
@@ -35,7 +34,6 @@ import { getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics
 import { getControlBottomCSSValue, getControlHeightCSSValue, getLeftPosition, getNodeHeight, getTopPosition, shouldBeSticky, shouldMaskNodeControls } from '../pm-plugins/utils/drag-handle-positions';
 import { expandAndUpdateSelection } from '../pm-plugins/utils/expand-and-update-selection';
 import { isHandleCorrelatedToSelection, selectNode } from '../pm-plugins/utils/getSelection';
-import { alignAnchorHeadInDirectionOfPos, expandSelectionHeadToNodeAtPos } from '../pm-plugins/utils/selection';
 import { ACTIVE_DRAG_HANDLE_ATTR, ACTIVE_DRAG_HANDLE_FALLBACK_ANCHOR_NAME, DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH, DRAG_HANDLE_ZINDEX, dragHandleGap, nodeMargins, spacingBetweenNodesForPreview, STICKY_CONTROLS_TOP_MARGIN, STICKY_CONTROLS_TOP_MARGIN_FOR_STICKY_HEADER, topPositionAdjustment } from './consts';
 import { DragHandleNestedIcon } from './drag-handle-nested-icon';
 import { dragPreview } from './drag-preview';
@@ -187,11 +185,6 @@ const dragHandleButtonStylesOld = css({
     backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
-const focusedStylesOld = css({
-  '&:focus': {
-    outline: `${"var(--ds-border-width-focused, 2px)"} solid ${"var(--ds-border-focused, #4688EC)"}`
-  }
-});
 const focusedStyles = css({
   '&:focus-visible': {
     outline: `${"var(--ds-border-width-focused, 2px)"} solid ${"var(--ds-border-focused, #4688EC)"}`
@@ -362,7 +355,7 @@ export const DragHandle = ({
   handleOptions,
   anchorRectCache
 }) => {
-  var _api$core4, _api$blockControls8;
+  var _api$blockControls7;
   const buttonRef = useRef(null);
   const mouseDownRef = useRef(false);
   const [dragHandleSelected, setDragHandleSelected] = useState(false);
@@ -497,89 +490,20 @@ export const DragHandle = ({
     });
     view.focus();
   }, [api, view, getPos, nodeType, anchorName]);
-  const handleOnClick = useCallback(e => {
-    var _api$core2;
-    api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
-      tr
-    }) => {
-      var _api$blockControls$sh, _api$analytics2;
-      const startPos = getPos();
-      if (startPos === undefined) {
-        return tr;
-      }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
-      }
-      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 (tr.selection.empty || !e.shiftKey) {
-        tr = selectNode(tr, startPos, nodeType, api);
-      } else if (isTopLevelNodeValue && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-        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$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.setMultiSelectPositions()({
-          tr
-        });
-      }
-      const resolvedMovingNode = tr.doc.resolve(startPos);
-      const maybeNode = resolvedMovingNode.nodeAfter;
-      tr.setMeta('scrollIntoView', false);
-      api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
-        eventType: EVENT_TYPE.UI,
-        action: ACTION.CLICKED,
-        actionSubject: ACTION_SUBJECT.BUTTON,
-        actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: {
-          nodeDepth: resolvedMovingNode.depth,
-          nodeTypes: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-        }
-      })(tr);
-      return tr;
-    });
-    view.focus();
-  }, [api, view, getPos, isTopLevelNodeValue, nodeType]);
-  const handleKeyDown = useCallback(e => {
-    // allow user to use spacebar to select the node
-    if (!e.repeat && e.key === ' ') {
-      var _api$core3;
-      const startPos = getPos();
-      api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
-        tr
-      }) => {
-        if (startPos === undefined) {
-          return tr;
-        }
-        const node = tr.doc.nodeAt(startPos);
-        if (!node) {
-          return tr;
-        }
-        const $startPos = tr.doc.resolve(startPos + node.nodeSize);
-        const selection = new TextSelection($startPos);
-        tr.setSelection(selection);
-        return tr;
-      });
-    } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(pressed => pressed)) {
-      // If not trying to press shortcut keys,
-      // return focus to editor to resume editing from caret position
-      view.focus();
-    }
-  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, view]);
   const handleKeyDownNew = useCallback(e => {
     // allow user to use spacebar to select the node
     if (e.key === 'Enter' || !e.repeat && e.key === ' ') {
-      var _getDocument, _api$core5;
+      var _getDocument, _api$core2;
       if (((_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.activeElement) !== buttonRef.current) {
         return;
       }
       e.preventDefault();
       e.stopPropagation();
       const startPos = getPos();
-      api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
         tr
       }) => {
-        var _selectionPreservatio2, _api$blockControls4, _api$blockControls5, _api$userIntent;
+        var _selectionPreservatio2, _api$blockControls3, _api$blockControls4, _api$userIntent;
         if (startPos === undefined) {
           return tr;
         }
@@ -592,7 +516,7 @@ export const DragHandle = ({
           nodeType,
           api
         });
-        api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.startPreservingSelection()({
+        api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.startPreservingSelection()({
           tr
         });
         if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
@@ -603,7 +527,7 @@ export const DragHandle = ({
           pos: startPos,
           rootPos: tr.doc.resolve(startPos).before(1)
         };
-        api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.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
@@ -636,8 +560,8 @@ export const DragHandle = ({
       onGenerateDragPreview: ({
         nativeSetDragImage
       }) => {
-        var _api$core6, _api$blockControls$sh2;
-        api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
+        var _api$core3, _api$blockControls$sh;
+        api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
           tr
         }) => {
           const handlePos = getPos();
@@ -646,8 +570,8 @@ export const DragHandle = ({
           }
           const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
           if (!tr.selection.empty && newHandlePosCheck) {
-            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()({
+            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 {
@@ -663,7 +587,7 @@ export const DragHandle = ({
         } = state;
         let sliceFrom = selection.from;
         let sliceTo = selection.to;
-        const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.multiSelectDnD;
+        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;
         if (mSelect) {
           const {
             anchor,
@@ -754,18 +678,18 @@ export const DragHandle = ({
         });
       },
       onDragStart() {
-        var _api$core7;
+        var _api$core4;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 ? void 0 : (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions.execute(({
+        api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(({
           tr
         }) => {
-          var _api$blockControls$sh3, _api$blockControls7, _api$analytics3;
+          var _api$blockControls$sh2, _api$blockControls6, _api$analytics2;
           let nodeTypes, hasSelectedMultipleNodes;
           const resolvedMovingNode = tr.doc.resolve(start);
           const maybeNode = resolvedMovingNode.nodeAfter;
-          const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh3 === void 0 ? void 0 : _api$blockControls$sh3.multiSelectDnD;
+          const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.multiSelectDnD;
           if (mSelect) {
             const attributes = getMultiSelectAnalyticsAttributes(tr, mSelect.anchor, mSelect.head);
             nodeTypes = attributes.nodeTypes;
@@ -774,11 +698,11 @@ export const DragHandle = ({
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          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)({
+          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);
-          api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
+          api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
             eventType: EVENT_TYPE.UI,
             action: ACTION.DRAGGED,
             actionSubject: ACTION_SUBJECT.ELEMENT,
@@ -1010,11 +934,11 @@ export const DragHandle = ({
     setDragHandleSelected(isHandleCorrelatedToSelection(view.state, selection, start));
   }, [start, selection, view]);
   useEffect(() => {
-    var _api$blockControls$sh4;
+    var _api$blockControls$sh3;
     if (isShiftDown === undefined || view.state.selection.empty || !fg('platform_editor_elements_dnd_shift_click_select')) {
       return;
     }
-    const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.multiSelectDnD;
+    const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh3 === void 0 ? void 0 : _api$blockControls$sh3.multiSelectDnD;
     const $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? view.state.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : view.state.selection.$anchor;
     const isLayoutColumnMenuEnabled = expValEquals('platform_editor_layout_column_menu', 'isEnabled', true);
     if (isShiftDown && !(isLayoutColumnMenuEnabled && isLayoutColumn) && (!isTopLevelNodeValue || isTopLevelNodeValue && $anchor.depth > DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH)) {
@@ -1022,15 +946,15 @@ export const DragHandle = ({
     } else {
       setDragHandleDisabled(false);
     }
-  }, [api === null || api === void 0 ? void 0 : (_api$blockControls8 = api.blockControls) === null || _api$blockControls8 === void 0 ? void 0 : _api$blockControls8.sharedState, isLayoutColumn, isShiftDown, isTopLevelNodeValue, view]);
-  const dragHandleMessage = editorExperiment('platform_editor_block_menu', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  }, [api === null || api === void 0 ? void 0 : (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 ? void 0 : _api$blockControls7.sharedState, isLayoutColumn, isShiftDown, isTopLevelNodeValue, view]);
+  const dragHandleMessage = formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: jsx("br", null)
-  }) : formatMessage(blockControlsMessages.dragToMove);
+  });
 
   // Create a string version for aria-label
-  const dragHandleAriaLabel = expValEquals('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  const dragHandleAriaLabel = formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
-  }) : formatMessage(blockControlsMessages.dragToMove);
+  });
   let helpDescriptors = isTopLevelNodeValue ? [{
     description: dragHandleMessage
   }, {
@@ -1111,15 +1035,15 @@ export const DragHandle = ({
     css: [editorExperiment('platform_editor_controls', 'variant1') ? dragHandleButtonStyles : dragHandleButtonStylesOld, editorExperiment('platform_editor_controls', 'variant1') && dragHandleColor,
     // ED-26266: Fixed the drag handle highlight when selecting multiple line in Firefox
     // See https://product-fabric.atlassian.net/browse/ED-26266
-    browser.gecko && dragHandleMultiLineSelectionFixFirefox, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && hasHadInteraction && selectedStyles, editorExperiment('platform_editor_preview_panel_responsiveness', true) && editorExperiment('platform_editor_controls', 'control') && dragHandleButtonSmallScreenStyles, editorExperiment('platform_editor_block_menu', true) && isFocused && keyboardFocusedDragHandleStyles, editorExperiment('platform_editor_block_menu', true) ? focusedStyles : focusedStylesOld, dragHandleButtonScaledStyles],
+    browser.gecko && dragHandleMultiLineSelectionFixFirefox, editorExperiment('advanced_layouts', true) && isLayoutColumn && layoutColumnDragHandleStyles, dragHandleSelected && hasHadInteraction && selectedStyles, editorExperiment('platform_editor_preview_panel_responsiveness', true) && editorExperiment('platform_editor_controls', 'control') && dragHandleButtonSmallScreenStyles, isFocused && keyboardFocusedDragHandleStyles, focusedStyles, dragHandleButtonScaledStyles],
     ref: buttonRef
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: !editorExperiment('platform_editor_controls', 'variant1') ? positionStylesOld : {},
     onMouseDown: expValEqualsNoExposure('platform_editor_selection_toolbar_block_handle', 'isEnabled', true) ? handleMouseDown : undefined,
-    onMouseUp: editorExperiment('platform_editor_block_menu', true) ? handleMouseUp : undefined,
-    onClick: editorExperiment('platform_editor_block_menu', true) ? handleOnClickNew : handleOnClick,
-    onKeyDown: editorExperiment('platform_editor_block_menu', true) ? handleKeyDownNew : handleKeyDown
+    onMouseUp: handleMouseUp,
+    onClick: handleOnClickNew,
+    onKeyDown: handleKeyDownNew
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
     ,
     onDrop: handleOnDrop,
@@ -1129,13 +1053,11 @@ export const DragHandle = ({
     "data-testid": "block-ctrl-drag-handle",
     "aria-label": dragHandleAriaLabel,
     onBlur: () => {
-      if (editorExperiment('platform_editor_block_menu', true)) {
-        setIsFocused(false);
-      }
+      setIsFocused(false);
       const pos = getPos();
       if (pos !== undefined) {
-        var _api$core8;
-        api === null || api === void 0 ? void 0 : (_api$core8 = api.core) === null || _api$core8 === void 0 ? void 0 : _api$core8.actions.execute(({
+        var _api$core5;
+        api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
           tr
         }) => {
           tr.setMeta(key, {

package/dist/esm/blockControlsPlugin.js

@@ -10,8 +10,8 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { handleKeyDownWithPreservedSelection } from './editor-commands/handle-key-down-with-preserved-selection';
 import { mapPreservedSelection as _mapPreservedSelection } from './editor-commands/map-preserved-selection';
 import { moveNode } from './editor-commands/move-node';
@@ -146,15 +146,17 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           }
         });
       }
-      if (editorExperiment('platform_editor_block_menu', true)) {
-        pmPlugins.push({
-          name: 'blockControlsSelectionPreservationPlugin',
-          plugin: createSelectionPreservationPlugin(api)
-        });
-      }
+      pmPlugins.push({
+        name: 'blockControlsSelectionPreservationPlugin',
+        plugin: createSelectionPreservationPlugin(api)
+      });
 
       // platform_editor_controls note: quick insert rendering fixes
-      if (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
+      //
+      // Not registered under the registry migration: the decoration puts an inline
+      // `margin-top: 0` on the first document node, which fights features that render their own
+      // content above it — a leading show-diff widget is left flush against the node below.
+      if (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) && legacyBlockControlsEnabled) {
         pmPlugins.push({
           name: 'firstNodeDec',
           plugin: firstNodeDecPlugin
@@ -205,9 +207,6 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         return function (_ref6) {
           var _api$userIntent, _api$blockControls2, _options$anchorName, _api$blockControls3;
           var tr = _ref6.tr;
-          if (!editorExperiment('platform_editor_block_menu', true)) {
-            return tr;
-          }
           var currMeta = tr.getMeta(key);
           var currentUserIntent = api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent;
           var isMenuCurrentlyOpen = api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.sharedState.currentState()) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.isMenuOpen;
@@ -418,7 +417,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$menuTri2, _key$getState3, _key$getState$blockMe, _key$getState4, _key$getState$activeN, _key$getState5, _key$getState$activeD, _key$getState6, _key$getState$isDragg, _key$getState7, _key$getState$isPMDra, _key$getState8, _key$getState$multiSe, _key$getState9, _key$getState$isShift, _key$getState0, _key$getState$lastDra, _key$getState1, _interactionTrackingP, _key$getState$isSelec, _key$getState10;
+      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$menuTri2, _key$getState3, _key$getState$blockMe, _key$getState4, _key$getState$activeN, _key$getState5, _key$getState$activeD, _key$getState6, _key$getState$isDragg, _key$getState7, _key$getState$isPMDra, _key$getState8, _key$getState$multiSe, _key$getState9, _key$getState$isShift, _key$getState0, _key$getState$lastDra, _key$getState1, _interactionTrackingP, _key$getState$isSelec, _key$getState10, _selectionPreservatio;
       if (!editorState) {
         return undefined;
       }
@@ -448,10 +447,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         sharedState.rightSideControlsEnabled = rightSideControlsEnabled;
         sharedState.hoverSide = rightSideControlsEnabled ? (_interactionTrackingP4 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP4 === void 0 ? void 0 : _interactionTrackingP4.hoverSide : undefined;
       }
-      if (editorExperiment('platform_editor_block_menu', true)) {
-        var _selectionPreservatio;
-        sharedState.preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
-      }
+      sharedState.preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
       return sharedState;
     },
     contentComponent: function contentComponent(_ref0) {

package/dist/esm/editor-commands/move-node-with-block-menu.js

@@ -3,7 +3,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { DIRECTION } from '@atlaskit/editor-common/types';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { key } from '../pm-plugins/main';
 import { mapPreservedSelection } from '../pm-plugins/utils/selection';
 import { moveNode } from './move-node';
@@ -23,9 +22,6 @@ export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction
   return function (_ref) {
     var _api$blockControls$sh;
     var tr = _ref.tr;
-    if (!editorExperiment('platform_editor_block_menu', true)) {
-      return tr;
-    }
     var preservedSelection = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
     var selection = preservedSelection !== null && preservedSelection !== void 0 ? preservedSelection : tr.selection;
 

package/dist/esm/editor-commands/move-node.js

@@ -374,7 +374,7 @@ export var moveNode = function moveNode(api) {
           tr: tr
         });
       }
-      var preservedSelection = editorExperiment('platform_editor_block_menu', true) ? api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection : undefined;
+      var preservedSelection = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
       if (preservedSelection) {
         var $from = tr.doc.resolve(Math.min(start, preservedSelection.from));
         var expandedRange = $from.blockRange(preservedSelection.$to);
@@ -478,7 +478,7 @@ export var moveNode = function moveNode(api) {
       }));
       if (
       // when move node via block menu, we need to keep the focus on block menu popup, so don't move focus to editor in this scenario
-      !(inputMethod === INPUT_METHOD.BLOCK_MENU && editorExperiment('platform_editor_block_menu', true))) {
+      inputMethod !== INPUT_METHOD.BLOCK_MENU) {
         api === null || api === void 0 || api.core.actions.focus();
       }
       var $mappedTo = tr.doc.resolve(mappedTo);