@atlaskit/editor-plugin-block-controls 23.0.2 → 23.0.4

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

@@ -1,5 +1,4 @@
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getNodeTypeWithLevel } from './decorations-common';
 const OPAQUE_BLOCKS = new Set(['table', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'mediaSingle']);
@@ -100,9 +99,6 @@ export const handleSparseMouseOver = (view, event, api) => {
   if (isPanelNodeTypeName(parentNode.type.name) && !(parentDOM instanceof HTMLElement && parentDOM.classList.contains('ak-editor-panel__no-icon')) && $target.index() === 0) {
     return false;
   }
-  if (node.type.name === 'layoutColumn' && parentNode.type.name === 'layoutSection' && parentNode.childCount === 1 && expValEqualsNoExposure('advanced_layouts', 'isEnabled', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return false;
-  }
   const anchors = controls === null || controls === void 0 ? void 0 : controls.surfaceAnchors;
   const anchorName = (_anchors$get = anchors === null || anchors === void 0 ? void 0 : anchors.get(targetPosition)) !== null && _anchors$get !== void 0 ? _anchors$get : api.core.actions.getAnchorIdForNode(node, targetPosition);
   const rootPos = $target.depth > 0 ? $target.before(1) : targetPosition;

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

@@ -233,7 +233,7 @@ const getDecorationAtPos = (state, decorations, pos, to) => {
   return nodeDecAtActivePos;
 };
 export const apply = (api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry, rightSideControlsEnabled = false, quickInsertButtonEnabled = true, anchorRectCache, resizeObserverWidth, pragmaticCleanup, limitedModeTeardown) => {
-  var _meta$multiSelectDnD, _api$editorViewMode, _api$editorViewMode$s, _activeNode, _activeNode2, _meta$activeNode$hand, _activeNode3, _activeNode4, _meta$isDragging2, _meta$toggleMenu, _meta$isDragging3, _meta$toggleMenu2, _meta$toggleMenu3, _meta$toggleMenu4, _meta$toggleMenu5, _meta$toggleMenu6, _meta$toggleMenu7, _meta$toggleMenu8, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
+  var _meta$multiSelectDnD, _api$editorViewMode, _api$editorViewMode$s, _activeNode, _activeNode2, _meta$activeNode$hand, _activeNode3, _activeNode4, _meta$isDragging2, _meta$toggleMenu, _meta$isDragging3, _meta$toggleMenu2, _meta$toggleMenu3, _meta$toggleMenu4, _meta$toggleMenu5, _meta$toggleMenu6, _meta$toggleMenu7, _meta$toggleMenu8, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$lastDragCancell;
   let {
     activeNode,
     decorations,
@@ -253,7 +253,6 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     menuTriggerByNode,
     blockMenuOptions,
     isPMDragging,
-    isShiftDown,
     lastDragCancelled,
     isSelectedViaDragHandle
   } = currentState;
@@ -877,7 +876,6 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
     isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
     multiSelectDnD,
-    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
     lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled,
     isSelectedViaDragHandle: isSelectedViaDragHandleNew
   };
@@ -1124,31 +1122,13 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
               api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
             }
           }
-          if (!event.repeat && event.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-            view.dispatch(view.state.tr.setMeta(key, {
-              ...view.state.tr.getMeta(key),
-              isShiftDown: true
-            }));
-          }
           return false;
         },
-        keyup(view, event) {
+        blur(view, event) {
           var _api$limitedMode0, _api$limitedMode0$sha;
           if (api !== null && api !== void 0 && (_api$limitedMode0 = api.limitedMode) !== null && _api$limitedMode0 !== void 0 && (_api$limitedMode0$sha = _api$limitedMode0.sharedState.currentState()) !== null && _api$limitedMode0$sha !== void 0 && _api$limitedMode0$sha.enabled) {
             return;
           }
-          if (!event.repeat && event.key === 'Shift') {
-            view.dispatch(view.state.tr.setMeta(key, {
-              ...view.state.tr.getMeta(key),
-              isShiftDown: false
-            }));
-          }
-        },
-        blur(view, event) {
-          var _api$limitedMode1, _api$limitedMode1$sha;
-          if (api !== null && api !== void 0 && (_api$limitedMode1 = api.limitedMode) !== null && _api$limitedMode1 !== void 0 && (_api$limitedMode1$sha = _api$limitedMode1.sharedState.currentState()) !== null && _api$limitedMode1$sha !== void 0 && _api$limitedMode1$sha.enabled) {
-            return;
-          }
           if (editorExperiment('platform_editor_controls', 'variant1')) {
             var _api$core2;
             // Focus moving into the registry surface remains inside the editor experience.

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

@@ -1,6 +1,6 @@
 import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/utils';
 import { getBlockControlsMeta, key } from '../main';
 import { newGetSelection } from './getSelection';
@@ -49,35 +49,6 @@ export const getSelectedSlicePosition = (handlePos, tr, api) => {
   };
 };
 
-/**
- * Takes a position and expands the selection to encompass the node at that position. Ignores empty or out of range selections.
- * Ignores positions that are in text blocks (i.e. not start of a node)
- * @returns TextSelection if expanded, otherwise returns Selection that was passed in.
- */
-export const expandSelectionHeadToNodeAtPos = (selection, nodePos) => {
-  const doc = selection.$anchor.doc;
-  if (nodePos < 0 || nodePos > doc.nodeSize - 2 || selection.empty) {
-    return selection;
-  }
-  const $pos = doc.resolve(nodePos);
-  const node = $pos.nodeAfter;
-  if ($pos.node().isTextblock || !node) {
-    return selection;
-  }
-  const $newHead = nodePos < selection.anchor ? $pos : doc.resolve(node.nodeSize + nodePos);
-  const textSelection = new TextSelection(selection.$anchor, $newHead);
-  return textSelection;
-};
-
-/**
- * This swaps the anchor/head for NodeSelections when its anchor > pos.
- * This is because NodeSelection always has an anchor at the start of the node,
- * which may not align with the existing selection.
- */
-export const alignAnchorHeadInDirectionOfPos = (selection, pos) => {
-  return selection instanceof NodeSelection && Math.max(pos, selection.anchor) === selection.anchor ? new TextSelection(selection.$head, selection.$anchor) : selection;
-};
-
 /**
  * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
  *

package/dist/es2019/ui/block-controls-surface-drag-handle-utils.js

@@ -1,10 +1,6 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { nodeMargins, spacingBetweenNodesForPreview } from './consts';
 export const buildLayoutColumnMenuMeta = (anchorPos, openedViaKeyboard) => ({
   anchorPos,
-  ...(fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}),
   openedViaKeyboard
 });
 export const getNodeSpacingForDragPreview = node => {

package/dist/es2019/ui/block-controls-surface-drag-handle.js

@@ -17,14 +17,12 @@ import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
 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 Tooltip from '@atlaskit/tooltip/Tooltip';
 import { selectionPreservationPluginKey } from '../pm-plugins/selection-preservation/plugin-key';
 import { prepareCollapsedHeadingSelection } from '../pm-plugins/utils/collapsed-heading';
 import { expandAndUpdateSelection } from '../pm-plugins/utils/expand-and-update-selection';
 import { isHandleCorrelatedToSelection } from '../pm-plugins/utils/getSelection';
 import { buildLayoutColumnMenuMeta } from './block-controls-surface-drag-handle-utils';
-import { DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH } from './consts';
 import { DragHandleNestedIcon } from './drag-handle-nested-icon';
 import { shouldUseNestedDragHandleIcon } from './should-use-nested-drag-handle-icon';
 import { useSurfaceEditorView } from './surface-editor-view-context';
@@ -84,15 +82,13 @@ export const BlockControlsSurfaceDragHandle = ({
     activeNodeAnchorName,
     handleOptions,
     interactionState,
-    isShiftDown,
     selection
   } = useSharedPluginStateWithSelector(api, ['blockControls', 'interaction', 'selection'], states => {
-    var _states$blockControls, _states$blockControls2, _states$blockControls3, _states$blockControls4, _states$interactionSt, _states$blockControls5, _states$selectionStat;
+    var _states$blockControls, _states$blockControls2, _states$blockControls3, _states$blockControls4, _states$interactionSt, _states$selectionStat;
     return {
       activeNodeAnchorName: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : (_states$blockControls2 = _states$blockControls.activeNode) === null || _states$blockControls2 === void 0 ? void 0 : _states$blockControls2.anchorName,
       handleOptions: (_states$blockControls3 = states.blockControlsState) === null || _states$blockControls3 === void 0 ? void 0 : (_states$blockControls4 = _states$blockControls3.activeNode) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.handleOptions,
       interactionState: (_states$interactionSt = states.interactionState) === null || _states$interactionSt === void 0 ? void 0 : _states$interactionSt.interactionState,
-      isShiftDown: (_states$blockControls5 = states.blockControlsState) === null || _states$blockControls5 === void 0 ? void 0 : _states$blockControls5.isShiftDown,
       selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
     };
   });
@@ -102,21 +98,9 @@ export const BlockControlsSurfaceDragHandle = ({
   }, [pos, selection, view]);
   const isLayoutColumn = nodeType === 'layoutColumn';
   const isTopLevelNode = (activeNode === null || activeNode === void 0 ? void 0 : activeNode.parentType) === 'doc';
-  const isDisabled = useMemo(() => {
-    var _api$blockControls$sh;
-    if (!isShiftDown || !view || view.state.selection.empty || !fg('platform_editor_elements_dnd_shift_click_select')) {
-      return false;
-    }
-    if (isLayoutColumn && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return false;
-    }
-    const multiSelect = 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 = (multiSelect === null || multiSelect === void 0 ? void 0 : multiSelect.anchor) !== undefined ? view.state.doc.resolve(multiSelect.anchor) : view.state.selection.$anchor;
-    return !isTopLevelNode || $anchor.depth > DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH;
-  }, [api, isLayoutColumn, isShiftDown, isTopLevelNode, view]);
   const getAnchorName = useCallback(() => {
-    var _api$blockControls$sh2, _api$blockControls$sh3, _ref, _ref2, _dom$getAttribute, _dom$closest;
-    const surfaceAnchor = posRef.current === undefined ? undefined : api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : (_api$blockControls$sh3 = _api$blockControls$sh2.surfaceAnchors) === null || _api$blockControls$sh3 === void 0 ? void 0 : _api$blockControls$sh3.get(posRef.current);
+    var _api$blockControls$sh, _api$blockControls$sh2, _ref, _ref2, _dom$getAttribute, _dom$closest;
+    const surfaceAnchor = posRef.current === undefined ? undefined : api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : (_api$blockControls$sh2 = _api$blockControls$sh.surfaceAnchors) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.get(posRef.current);
     if (surfaceAnchor) {
       return surfaceAnchor;
     }
@@ -182,7 +166,7 @@ export const BlockControlsSurfaceDragHandle = ({
   }, [api]);
   const handleClick = useCallback(event => {
     var _api$core2;
-    if (!view || isDisabled) {
+    if (!view) {
       return;
     }
     const openedViaKeyboard = event.detail === 0;
@@ -194,7 +178,7 @@ export const BlockControlsSurfaceDragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildLayoutColumnMenuMeta(startPos, openedViaKeyboard));
       }
       const selection = (_selectionPreservatio = (_selectionPreservatio2 = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection) !== null && _selectionPreservatio !== void 0 ? _selectionPreservatio : tr.selection;
@@ -243,7 +227,7 @@ export const BlockControlsSurfaceDragHandle = ({
       return tr;
     });
     view.focus();
-  }, [activeNode === null || activeNode === void 0 ? void 0 : activeNode.rootPos, api, getAnchorName, getPos, isDisabled, nodeType, view]);
+  }, [activeNode === null || activeNode === void 0 ? void 0 : activeNode.rootPos, api, getAnchorName, getPos, nodeType, view]);
   const label = formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   });
@@ -269,7 +253,6 @@ export const BlockControlsSurfaceDragHandle = ({
     ref: buttonRef,
     type: "button",
     "aria-label": label,
-    disabled: isDisabled,
     onClick: handleClick,
     onMouseDown: handleMouseDown
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop -- Pragmatic DnD owns this native drag source.

package/dist/es2019/ui/consts.js

@@ -35,14 +35,6 @@ export const DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = 8;
 export const DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = 2;
 export const DRAG_HANDLE_PARAGRAPH_SMALL_TOP_ADJUSTMENT = 0;
 export const DRAG_HANDLE_WRAPPED_MEDIA_EMBED_TOP_ADJUSTMENT = 8;
-
-/** We only want to shift-select nodes that are at the top level of a document.
- *  This is because funky things happen when selecting inside of tableCells, but we
- *  also want to avoid heavily nested cases to descope potential corner cases.
- *  Various top level nodes have their selection 'from' at depths other than 0,
- *  so we allow for some leniency to capture them all. e.g. Table is depth 3.
- */
-export const DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH = 3;
 export const STICKY_CONTROLS_TOP_MARGIN = 8;
 export const STICKY_CONTROLS_TOP_MARGIN_FOR_STICKY_HEADER = 24;
 export const QUICK_INSERT_HEIGHT = 24;

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

@@ -34,7 +34,7 @@ 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 { 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 { ACTIVE_DRAG_HANDLE_ATTR, ACTIVE_DRAG_HANDLE_FALLBACK_ANCHOR_NAME, DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, 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';
 import { shouldUseNestedDragHandleIcon } from './should-use-nested-drag-handle-icon';
@@ -327,13 +327,9 @@ const getNodeMargins = node => {
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
 
-// Kill switch OFF: omit `isOpen` so the reducer toggles per clicked column. ON: keep
-// `isOpen: true` for legacy always-open. Centralised so all dispatch sites stay in sync.
+// Omit `isOpen` so the reducer toggles the menu for a re-clicked layout column.
 const buildToggleLayoutColumnMenuMeta = (anchorPos, openedViaKeyboard) => ({
   anchorPos,
-  ...(fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}),
   openedViaKeyboard
 });
 const getDragHandleAnchorReference = ({
@@ -355,11 +351,9 @@ export const DragHandle = ({
   handleOptions,
   anchorRectCache
 }) => {
-  var _api$blockControls7;
   const buttonRef = useRef(null);
   const mouseDownRef = useRef(false);
   const [dragHandleSelected, setDragHandleSelected] = useState(false);
-  const [dragHandleDisabled, setDragHandleDisabled] = useState(false);
   const [blockCardWidth, setBlockCardWidth] = useState(768);
   const [positionStylesOld, setPositionStylesOld] = useState({
     display: 'none'
@@ -372,15 +366,13 @@ export const DragHandle = ({
   const {
     macroInteractionUpdates,
     selection,
-    isShiftDown,
     interactionState,
     currentUserIntent
   } = useSharedPluginStateWithSelector(api, ['featureFlags', 'selection', 'blockControls', 'interaction', 'userIntent'], states => {
-    var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _states$interactionSt, _states$userIntentSta;
+    var _states$featureFlagsS, _states$selectionStat, _states$interactionSt, _states$userIntentSta;
     return {
       macroInteractionUpdates: (_states$featureFlagsS = states.featureFlagsState) === null || _states$featureFlagsS === void 0 ? void 0 : _states$featureFlagsS.macroInteractionUpdates,
       selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection,
-      isShiftDown: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : _states$blockControls.isShiftDown,
       interactionState: (_states$interactionSt = states.interactionState) === null || _states$interactionSt === void 0 ? void 0 : _states$interactionSt.interactionState,
       currentUserIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent
     };
@@ -448,7 +440,7 @@ export const DragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       const resolvedStartPos = tr.doc.resolve(startPos);
@@ -519,7 +511,7 @@ export const DragHandle = ({
         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)) {
+        if (nodeType === 'layoutColumn') {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         const triggerByNode = {
@@ -935,20 +927,6 @@ export const DragHandle = ({
     }
     setDragHandleSelected(isHandleCorrelatedToSelection(view.state, selection, start));
   }, [start, selection, view]);
-  useEffect(() => {
-    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$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)) {
-      setDragHandleDisabled(true);
-    } else {
-      setDragHandleDisabled(false);
-    }
-  }, [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)
   });
@@ -1049,7 +1027,6 @@ export const DragHandle = ({
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
     ,
     onDrop: handleOnDrop,
-    disabled: dragHandleDisabled,
     "data-editor-block-ctrl-drag-handle": true,
     "data-blocks-drag-handle": fg('confluence_remix_button_right_side_block_fg') || undefined,
     "data-testid": "block-ctrl-drag-handle",
@@ -1113,20 +1090,6 @@ export const DragHandle = ({
   }, jsx("span", {
     css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStylesNoBackground, buttonWrapperStylesPatch]
   }, renderButton()))));
-  const stickyWithoutTooltip = () => jsx(Box
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-  , {
-    style: positionStylesOld
-    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-    ,
-    xcss: [dragHandleContainerStyles],
-    as: "span",
-    testId: "block-ctrl-drag-handle-container"
-  }, jsx("span", {
-    css: [tooltipContainerStyles, shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithMask, !shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
-  }, jsx("span", {
-    css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStylesNoBackground, buttonWrapperStylesPatch]
-  }, renderButton())));
   const buttonWithTooltip = () => jsx(Tooltip, {
     content: tooltipContent,
     ignoreTooltipPointerEvents: true
@@ -1139,13 +1102,10 @@ export const DragHandle = ({
       });
     }
   }, renderButton());
-  const tooltipContent = isLayoutColumn && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+  const tooltipContent = isLayoutColumn && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
-  const isTooltip = !dragHandleDisabled;
-  const stickyRender = isTooltip ? stickyWithTooltip() : stickyWithoutTooltip();
-  const render = isTooltip ? buttonWithTooltip() : renderButton();
-  return editorExperiment('platform_editor_controls', 'variant1') ? stickyRender : render;
+  return editorExperiment('platform_editor_controls', 'variant1') ? stickyWithTooltip() : buttonWithTooltip();
 };
 export const DragHandleWithVisibility = ({
   view,
@@ -1159,9 +1119,9 @@ export const DragHandleWithVisibility = ({
   anchorRectCache
 }) => {
   const rightSideControlsEnabled = useSharedPluginStateWithSelector(api, ['blockControls'], states => {
-    var _states$blockControls2, _states$blockControls3;
+    var _states$blockControls, _states$blockControls2;
     return {
-      rightSideControlsEnabled: (_states$blockControls2 = (_states$blockControls3 = states.blockControlsState) === null || _states$blockControls3 === void 0 ? void 0 : _states$blockControls3.rightSideControlsEnabled) !== null && _states$blockControls2 !== void 0 ? _states$blockControls2 : false
+      rightSideControlsEnabled: (_states$blockControls = (_states$blockControls2 = states.blockControlsState) === null || _states$blockControls2 === void 0 ? void 0 : _states$blockControls2.rightSideControlsEnabled) !== null && _states$blockControls !== void 0 ? _states$blockControls : false
     };
   }).rightSideControlsEnabled;
   // Layout column drag handles sit at the top-centre of each column, not on a left/right edge.

package/dist/es2019/ui/should-use-nested-drag-handle-icon.js

@@ -1,14 +1,9 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
-
-// Nested icon for non-top-level nodes. Exception: with the
-// kill switch OFF, layout columns use the full block handle instead.
-// TODO: EDITOR-7732 - remove this whole function when
-// `platform_editor_layout_column_menu_kill_switch_1` is cleaned up
+// Nested layout columns use the full block handle; other non-top-level nodes use the nested icon.
 export const shouldUseNestedDragHandleIcon = (isTopLevelNode, isLayoutColumn) => {
   if (isTopLevelNode) {
     return false;
   }
-  if (isLayoutColumn && !fg('platform_editor_layout_column_menu_kill_switch_1')) {
+  if (isLayoutColumn) {
     return false;
   }
   return true;

package/dist/esm/blockControlsPlugin.js

@@ -11,7 +11,6 @@ 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 { 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';
@@ -80,7 +79,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
           // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
           // word boundaries, which raw textContent fusion breaks.
-          if (preservedSelection instanceof CellSelection && expValEquals('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+          if (preservedSelection instanceof CellSelection) {
             // Use node(1) to reliably target the table node regardless of $anchorCell depth.
             // node(-1) would return tableRow if $anchorCell is at tableCell depth.
             var tableNode = preservedSelection.$anchorCell.node(1);
@@ -451,7 +450,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, _selectionPreservatio;
+      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$lastDra, _key$getState0, _interactionTrackingP, _key$getState$isSelec, _key$getState1, _selectionPreservatio;
       if (!editorState) {
         return undefined;
       }
@@ -465,10 +464,9 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         isDragging: (_key$getState$isDragg = (_key$getState7 = key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isDragging) !== null && _key$getState$isDragg !== void 0 ? _key$getState$isDragg : false,
         isPMDragging: (_key$getState$isPMDra = (_key$getState8 = key.getState(editorState)) === null || _key$getState8 === void 0 ? void 0 : _key$getState8.isPMDragging) !== null && _key$getState$isPMDra !== void 0 ? _key$getState$isPMDra : false,
         multiSelectDnD: (_key$getState$multiSe = (_key$getState9 = key.getState(editorState)) === null || _key$getState9 === void 0 ? void 0 : _key$getState9.multiSelectDnD) !== null && _key$getState$multiSe !== void 0 ? _key$getState$multiSe : undefined,
-        isShiftDown: (_key$getState$isShift = (_key$getState0 = key.getState(editorState)) === null || _key$getState0 === void 0 ? void 0 : _key$getState0.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined,
-        lastDragCancelled: (_key$getState$lastDra = (_key$getState1 = key.getState(editorState)) === null || _key$getState1 === void 0 ? void 0 : _key$getState1.lastDragCancelled) !== null && _key$getState$lastDra !== void 0 ? _key$getState$lastDra : false,
+        lastDragCancelled: (_key$getState$lastDra = (_key$getState0 = key.getState(editorState)) === null || _key$getState0 === void 0 ? void 0 : _key$getState0.lastDragCancelled) !== null && _key$getState$lastDra !== void 0 ? _key$getState$lastDra : false,
         isEditing: (_interactionTrackingP = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP === void 0 ? void 0 : _interactionTrackingP.isEditing,
-        isSelectedViaDragHandle: (_key$getState$isSelec = (_key$getState10 = key.getState(editorState)) === null || _key$getState10 === void 0 ? void 0 : _key$getState10.isSelectedViaDragHandle) !== null && _key$getState$isSelec !== void 0 ? _key$getState$isSelec : false
+        isSelectedViaDragHandle: (_key$getState$isSelec = (_key$getState1 = key.getState(editorState)) === null || _key$getState1 === void 0 ? void 0 : _key$getState1.isSelectedViaDragHandle) !== null && _key$getState$isSelec !== void 0 ? _key$getState$isSelec : false
       };
       if (registryBlockControlsEnabled) {
         var surfaces = sparseSurfacesKey.getState(editorState);

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

@@ -243,11 +243,6 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      // Don't show drag handle for layout column in a single column layout,
-      // unless the layout column menu is enabled (menu needs the handle to be accessible).
-      return false;
-    }
     var targetPos = view.state.doc.resolve(pos).pos;
     var rootAnchorName;
     var rootNodeType;

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

@@ -1,5 +1,4 @@
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getNodeTypeWithLevel } from './decorations-common';
 var OPAQUE_BLOCKS = new Set(['table', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'mediaSingle']);
@@ -103,9 +102,6 @@ export var handleSparseMouseOver = function handleSparseMouseOver(view, event, a
   if (isPanelNodeTypeName(parentNode.type.name) && !(parentDOM instanceof HTMLElement && parentDOM.classList.contains('ak-editor-panel__no-icon')) && $target.index() === 0) {
     return false;
   }
-  if (node.type.name === 'layoutColumn' && parentNode.type.name === 'layoutSection' && parentNode.childCount === 1 && expValEqualsNoExposure('advanced_layouts', 'isEnabled', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return false;
-  }
   var anchors = controls === null || controls === void 0 ? void 0 : controls.surfaceAnchors;
   var anchorName = (_anchors$get = anchors === null || anchors === void 0 ? void 0 : anchors.get(targetPosition)) !== null && _anchors$get !== void 0 ? _anchors$get : api.core.actions.getAnchorIdForNode(node, targetPosition);
   var rootPos = $target.depth > 0 ? $target.before(1) : targetPosition;

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

@@ -234,7 +234,7 @@ var getDecorationAtPos = function getDecorationAtPos(state, decorations, pos, to
   return nodeDecAtActivePos;
 };
 var _apply = function apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, nodeDecorationRegistry) {
-  var _meta$multiSelectDnD, _api$editorViewMode, _activeNode, _activeNode2, _meta$activeNode$hand, _activeNode3, _activeNode4, _meta$isDragging2, _meta$toggleMenu, _meta$isDragging3, _meta$toggleMenu2, _meta$toggleMenu3, _meta$toggleMenu4, _meta$toggleMenu5, _meta$toggleMenu6, _meta$toggleMenu7, _meta$toggleMenu8, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
+  var _meta$multiSelectDnD, _api$editorViewMode, _activeNode, _activeNode2, _meta$activeNode$hand, _activeNode3, _activeNode4, _meta$isDragging2, _meta$toggleMenu, _meta$isDragging3, _meta$toggleMenu2, _meta$toggleMenu3, _meta$toggleMenu4, _meta$toggleMenu5, _meta$toggleMenu6, _meta$toggleMenu7, _meta$toggleMenu8, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$lastDragCancell;
   var rightSideControlsEnabled = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
   var quickInsertButtonEnabled = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : true;
   var anchorRectCache = arguments.length > 10 ? arguments[10] : undefined;
@@ -255,7 +255,6 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     menuTriggerByNode = currentState.menuTriggerByNode,
     blockMenuOptions = currentState.blockMenuOptions,
     isPMDragging = currentState.isPMDragging,
-    isShiftDown = currentState.isShiftDown,
     lastDragCancelled = currentState.lastDragCancelled,
     isSelectedViaDragHandle = currentState.isSelectedViaDragHandle;
   var isActiveNodeDeleted = false;
@@ -966,7 +965,6 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
     isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
     multiSelectDnD: multiSelectDnD,
-    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
     lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled,
     isSelectedViaDragHandle: isSelectedViaDragHandleNew
   };
@@ -1210,29 +1208,13 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
             }
           }
-          if (!event.repeat && event.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-            view.dispatch(view.state.tr.setMeta(key, _objectSpread(_objectSpread({}, view.state.tr.getMeta(key)), {}, {
-              isShiftDown: true
-            })));
-          }
           return false;
         },
-        keyup: function keyup(view, event) {
+        blur: function blur(view, event) {
           var _api$limitedMode0;
           if (api !== null && api !== void 0 && (_api$limitedMode0 = api.limitedMode) !== null && _api$limitedMode0 !== void 0 && (_api$limitedMode0 = _api$limitedMode0.sharedState.currentState()) !== null && _api$limitedMode0 !== void 0 && _api$limitedMode0.enabled) {
             return;
           }
-          if (!event.repeat && event.key === 'Shift') {
-            view.dispatch(view.state.tr.setMeta(key, _objectSpread(_objectSpread({}, view.state.tr.getMeta(key)), {}, {
-              isShiftDown: false
-            })));
-          }
-        },
-        blur: function blur(view, event) {
-          var _api$limitedMode1;
-          if (api !== null && api !== void 0 && (_api$limitedMode1 = api.limitedMode) !== null && _api$limitedMode1 !== void 0 && (_api$limitedMode1 = _api$limitedMode1.sharedState.currentState()) !== null && _api$limitedMode1 !== void 0 && _api$limitedMode1.enabled) {
-            return;
-          }
           if (editorExperiment('platform_editor_controls', 'variant1')) {
             var _api$core2;
             // Focus moving into the registry surface remains inside the editor experience.

package/dist/esm/pm-plugins/utils/selection.js

@@ -1,6 +1,6 @@
 import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/utils';
 import { getBlockControlsMeta, key } from '../main';
 import { newGetSelection } from './getSelection';
@@ -48,35 +48,6 @@ export var getSelectedSlicePosition = function getSelectedSlicePosition(handlePo
   };
 };
 
-/**
- * Takes a position and expands the selection to encompass the node at that position. Ignores empty or out of range selections.
- * Ignores positions that are in text blocks (i.e. not start of a node)
- * @returns TextSelection if expanded, otherwise returns Selection that was passed in.
- */
-export var expandSelectionHeadToNodeAtPos = function expandSelectionHeadToNodeAtPos(selection, nodePos) {
-  var doc = selection.$anchor.doc;
-  if (nodePos < 0 || nodePos > doc.nodeSize - 2 || selection.empty) {
-    return selection;
-  }
-  var $pos = doc.resolve(nodePos);
-  var node = $pos.nodeAfter;
-  if ($pos.node().isTextblock || !node) {
-    return selection;
-  }
-  var $newHead = nodePos < selection.anchor ? $pos : doc.resolve(node.nodeSize + nodePos);
-  var textSelection = new TextSelection(selection.$anchor, $newHead);
-  return textSelection;
-};
-
-/**
- * This swaps the anchor/head for NodeSelections when its anchor > pos.
- * This is because NodeSelection always has an anchor at the start of the node,
- * which may not align with the existing selection.
- */
-export var alignAnchorHeadInDirectionOfPos = function alignAnchorHeadInDirectionOfPos(selection, pos) {
-  return selection instanceof NodeSelection && Math.max(pos, selection.anchor) === selection.anchor ? new TextSelection(selection.$head, selection.$anchor) : selection;
-};
-
 /**
  * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
  *

package/dist/esm/ui/block-controls-surface-drag-handle-utils.js

@@ -1,16 +1,9 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { nodeMargins, spacingBetweenNodesForPreview } from './consts';
 export var buildLayoutColumnMenuMeta = function buildLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
-  return _objectSpread(_objectSpread({
-    anchorPos: anchorPos
-  }, fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}), {}, {
+  return {
+    anchorPos: anchorPos,
     openedViaKeyboard: openedViaKeyboard
-  });
+  };
 };
 export var getNodeSpacingForDragPreview = function getNodeSpacingForDragPreview(node) {
   var _spacingBetweenNodesF2;