@atlaskit/editor-plugin-block-controls 13.0.6 → 13.1.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 13.1.0
+
+### Minor Changes
+
+- [`bb48c26acb8ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bb48c26acb8ba) -
+  Add platform_editor_layout_column_menu_kill_switch_1 kill switch and render the full block drag
+  handle icon for layout columns when the new behaviour is enabled (gate OFF). When the new
+  behaviour is enabled, re-clicking the layout column whose menu is already open now closes the
+  menu, while clicking a different column switches the menu to that column. The layout column menu
+  now opens below the drag handle with left-aligned edges (relying on the popup's built-in placement
+  to invert horizontally or nudge up when space is tight) instead of the previous centred
+  prefer-above behaviour. The layout column Delete hover/focus danger preview now matches the table
+  delete affordance exactly, using the translucent color.blanket.danger fill and a 1px
+  color.border.danger border instead of the previous low-alpha fill with a 2px border, and clears
+  the concurrent blue selected blanket while the danger preview is active so the preview reads as
+  pure red with no blue cast.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.0.7
+
+### Patch Changes
+
+- [`c664929c3f15d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c664929c3f15d) -
+  Clean up experiment `platform_editor_clean_up_widget_mark_logic`
+- [`5c279743e9b74`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c279743e9b74) -
+  Fire an exposure event for the `remix_button_right_margin_hover` experiment.
+- Updated dependencies
+
 ## 13.0.6
 
 ### Patch Changes

package/dist/cjs/pm-plugins/decorations-drag-handle.js

@@ -75,7 +75,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, pos),
+    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }
@@ -84,7 +84,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     type: _decorationsCommon.TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(_decorationsCommon.TYPE_HANDLE_DEC, "-").concat((0, _uuid.default)()),
-    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? (0, _marks.getActiveBlockMarks)(editorState, pos) : undefined,
+    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }

package/dist/cjs/pm-plugins/decorations-quick-insert-button.js

@@ -62,7 +62,7 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, rootPos),
+    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(_) {
       if ((0, _platformFeatureFlags.fg)('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/cjs/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -123,7 +123,9 @@ var processHoverSide = function processHoverSide(view, api) {
   }
 
   // Added right-margin hover, gated so it can be rolled back. When off, fall through to midpoint.
-  if ((0, _experiments.editorExperiment)('remix_button_right_margin_hover', true)) {
+  if ((0, _experiments.editorExperiment)('remix_button_right_margin_hover', true, {
+    exposure: true
+  })) {
     var closestBlock = target === null || target === void 0 ? void 0 : target.closest(BLOCK_SELECTORS);
     var blockElement = closestBlock instanceof HTMLElement ? closestBlock : null;
 

package/dist/cjs/pm-plugins/utils/marks.js

@@ -3,61 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMatchingBlockMarks = exports.getActiveBlockMarks = void 0;
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-var getActiveBlockMarks = exports.getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
-  var alignment = state.schema.marks.alignment;
-  var resolvedPos = state.doc.resolve(pos);
-
-  // find all active marks at the position
-  var marks = resolvedPos.marks();
-  var supportedMarks = marks.filter(function (mark) {
-    return mark.type === alignment;
-  });
-
-  /**
-   * Fix for widget positioning at alignment mark boundaries.
-   * When the previous node has alignment but the next node doesn't, we need to prevent
-   * the widget from inheriting alignment marks. This ensures the widget is positioned
-   * correctly at the boundary rather than being absorbed into the alignment wrapper.
-   */
-  if (supportedMarks.length > 0 && (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
-    var _resolvedPos$nodeAfte;
-    var nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(function (mark) {
-      return mark.type === alignment;
-    })) || [];
-
-    // Compare alignment values to ensure they are the same
-    var alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(function (mark) {
-      return nextNodeMarks.some(function (nextMark) {
-        return nextMark.eq(mark);
-      });
-    });
-
-    // previous node has alignment but next node does not have alignment or alignment values differ
-    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
-      return [];
-    }
-  }
-  return supportedMarks;
-};
-
+exports.getMatchingBlockMarks = void 0;
 /** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
 var hasMatchingMark = function hasMatchingMark(mark, marks) {
   var found = mark.type.isInSet(marks);

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

@@ -41,6 +41,7 @@ var _selection = require("../pm-plugins/utils/selection");
 var _consts2 = require("./consts");
 var _dragHandleNestedIcon = require("./drag-handle-nested-icon");
 var _dragPreview = require("./drag-preview");
+var _shouldUseNestedDragHandleIcon = require("./should-use-nested-drag-handle-icon");
 var _anchorName = require("./utils/anchor-name");
 var _domAttrName = require("./utils/dom-attr-name");
 var _visibilityContainer = require("./visibility-container");
@@ -370,6 +371,18 @@ var getNodeMargins = function getNodeMargins(node) {
   }
   return _consts2.nodeMargins[nodeTypeName] || _consts2.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.
+var buildToggleLayoutColumnMenuMeta = function buildToggleLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
+  return _objectSpread(_objectSpread({
+    anchorPos: anchorPos
+  }, (0, _platformFeatureFlags.fg)('platform_editor_layout_column_menu_kill_switch_1') ? {
+    isOpen: true
+  } : {}), {}, {
+    openedViaKeyboard: openedViaKeyboard
+  });
+};
 var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   var _api$core4, _api$blockControls8;
   var view = _ref.view,
@@ -498,11 +511,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         return tr;
       }
       if (nodeType === 'layoutColumn' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', {
-          anchorPos: startPos,
-          isOpen: true,
-          openedViaKeyboard: false
-        });
+        tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
       var selection = ((_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
@@ -553,11 +562,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         return tr;
       }
       if (nodeType === 'layoutColumn' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', {
-          anchorPos: startPos,
-          isOpen: true,
-          openedViaKeyboard: false
-        });
+        tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       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;
@@ -645,11 +650,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           tr: tr
         });
         if (nodeType === 'layoutColumn' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-          tr.setMeta('toggleLayoutColumnMenu', {
-            anchorPos: startPos,
-            isOpen: true,
-            openedViaKeyboard: true
-          });
+          tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         var rootPos = (0, _experiments.editorExperiment)('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
         var triggerByNode = (0, _experiments.editorExperiment)('platform_synced_block', true) ? {
@@ -1091,7 +1092,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
         ,
         onDragStart: handleIconDragStart
-      }, (0, _expValEquals.expValEquals)('platform_editor_nested_drag_handle_icon', 'isEnabled', true) && !isTopLevelNodeValue ? (0, _react2.jsx)(_dragHandleNestedIcon.DragHandleNestedIcon, null) : (0, _react2.jsx)(_dragHandleVertical.default, {
+      }, (0, _shouldUseNestedDragHandleIcon.shouldUseNestedDragHandleIcon)(isTopLevelNodeValue, isLayoutColumn) ? (0, _react2.jsx)(_dragHandleNestedIcon.DragHandleNestedIcon, null) : (0, _react2.jsx)(_dragHandleVertical.default, {
         spacing: "spacious",
         label: "",
         size: "small"

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldUseNestedDragHandleIcon = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+// Nested icon for non-top-level nodes when the experiment is on. 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
+var shouldUseNestedDragHandleIcon = exports.shouldUseNestedDragHandleIcon = function shouldUseNestedDragHandleIcon(isTopLevelNode, isLayoutColumn) {
+  if (!(0, _expValEquals.expValEquals)('platform_editor_nested_drag_handle_icon', 'isEnabled', true)) {
+    return false;
+  }
+  if (isTopLevelNode) {
+    return false;
+  }
+  if (isLayoutColumn && !(0, _platformFeatureFlags.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
+    return false;
+  }
+  return true;
+};

package/dist/es2019/pm-plugins/decorations-drag-handle.js

@@ -10,7 +10,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_DRAG_HANDLE_ATTR } from '../ui/consts';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 const TYPE_ACTIVE_HANDLE_DEC = 'active-drag-handle-node';
 
 /**
@@ -62,7 +62,7 @@ export const dragHandleDecoration = ({
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: node => {
       unbind && unbind();
     }
@@ -71,7 +71,7 @@ export const dragHandleDecoration = ({
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: `${TYPE_HANDLE_DEC}-${uuid()}`,
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? getActiveBlockMarks(editorState, pos) : undefined,
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: node => {
       unbind && unbind();
     }

package/dist/es2019/pm-plugins/decorations-quick-insert-button.js

@@ -7,7 +7,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_QUICK_INSERT_ATTR } from '../ui/consts';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 const TYPE_QUICK_INSERT = 'INSERT_BUTTON';
 const TYPE_ACTIVE_QUICK_INSERT_NODE = 'active-quick-insert-node';
 export const findQuickInsertInsertButtonDecoration = (decorations, from, to) => {
@@ -48,7 +48,7 @@ export const quickInsertButtonDecoration = ({
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: _ => {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/es2019/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -104,7 +104,9 @@ const processHoverSide = (view, api) => {
   }
 
   // Added right-margin hover, gated so it can be rolled back. When off, fall through to midpoint.
-  if (editorExperiment('remix_button_right_margin_hover', true)) {
+  if (editorExperiment('remix_button_right_margin_hover', true, {
+    exposure: true
+  })) {
     const closestBlock = target === null || target === void 0 ? void 0 : target.closest(BLOCK_SELECTORS);
     const blockElement = closestBlock instanceof HTMLElement ? closestBlock : null;
 

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

@@ -1,52 +1,3 @@
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-export const getActiveBlockMarks = (state, pos) => {
-  const {
-    alignment
-  } = state.schema.marks;
-  const resolvedPos = state.doc.resolve(pos);
-
-  // find all active marks at the position
-  const marks = resolvedPos.marks();
-  const supportedMarks = marks.filter(mark => mark.type === alignment);
-
-  /**
-   * Fix for widget positioning at alignment mark boundaries.
-   * When the previous node has alignment but the next node doesn't, we need to prevent
-   * the widget from inheriting alignment marks. This ensures the widget is positioned
-   * correctly at the boundary rather than being absorbed into the alignment wrapper.
-   */
-  if (supportedMarks.length > 0 && expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
-    var _resolvedPos$nodeAfte;
-    const nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(mark => mark.type === alignment)) || [];
-
-    // Compare alignment values to ensure they are the same
-    const alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(mark => nextNodeMarks.some(nextMark => nextMark.eq(mark)));
-
-    // previous node has alignment but next node does not have alignment or alignment values differ
-    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
-      return [];
-    }
-  }
-  return supportedMarks;
-};
-
 /** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
 const hasMatchingMark = (mark, marks) => {
   const found = mark.type.isInSet(marks);

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

@@ -38,6 +38,7 @@ import { alignAnchorHeadInDirectionOfPos, expandSelectionHeadToNodeAtPos } from
 import { ACTIVE_DRAG_HANDLE_ATTR, 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';
+import { shouldUseNestedDragHandleIcon } from './should-use-nested-drag-handle-icon';
 import { refreshAnchorName } from './utils/anchor-name';
 import { getAnchorAttrName } from './utils/dom-attr-name';
 import { VisibilityContainer } from './visibility-container';
@@ -364,6 +365,16 @@ 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.
+const buildToggleLayoutColumnMenuMeta = (anchorPos, openedViaKeyboard) => ({
+  anchorPos,
+  ...(fg('platform_editor_layout_column_menu_kill_switch_1') ? {
+    isOpen: true
+  } : {}),
+  openedViaKeyboard
+});
 export const DragHandle = ({
   view,
   api,
@@ -473,11 +484,7 @@ export const DragHandle = ({
         return tr;
       }
       if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', {
-          anchorPos: startPos,
-          isOpen: true,
-          openedViaKeyboard: false
-        });
+        tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       const resolvedStartPos = tr.doc.resolve(startPos);
       const selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
@@ -529,11 +536,7 @@ export const DragHandle = ({
         return tr;
       }
       if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', {
-          anchorPos: startPos,
-          isOpen: true,
-          openedViaKeyboard: false
-        });
+        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;
@@ -621,11 +624,7 @@ export const DragHandle = ({
           tr
         });
         if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-          tr.setMeta('toggleLayoutColumnMenu', {
-            anchorPos: startPos,
-            isOpen: true,
-            openedViaKeyboard: true
-          });
+          tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         const rootPos = editorExperiment('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
         const triggerByNode = editorExperiment('platform_synced_block', true) ? {
@@ -1073,7 +1072,7 @@ export const DragHandle = ({
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
     ,
     onDragStart: handleIconDragStart
-  }, expValEquals('platform_editor_nested_drag_handle_icon', 'isEnabled', true) && !isTopLevelNodeValue ? jsx(DragHandleNestedIcon, null) : jsx(DragHandleVerticalIcon, {
+  }, shouldUseNestedDragHandleIcon(isTopLevelNodeValue, isLayoutColumn) ? jsx(DragHandleNestedIcon, null) : jsx(DragHandleVerticalIcon, {
     spacing: "spacious",
     label: "",
     size: "small"

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

@@ -0,0 +1,19 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+// Nested icon for non-top-level nodes when the experiment is on. 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
+export const shouldUseNestedDragHandleIcon = (isTopLevelNode, isLayoutColumn) => {
+  if (!expValEquals('platform_editor_nested_drag_handle_icon', 'isEnabled', true)) {
+    return false;
+  }
+  if (isTopLevelNode) {
+    return false;
+  }
+  if (isLayoutColumn && !fg('platform_editor_layout_column_menu_kill_switch_1')) {
+    return false;
+  }
+  return true;
+};

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -11,7 +11,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_DRAG_HANDLE_ATTR } from '../ui/consts';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 var TYPE_ACTIVE_HANDLE_DEC = 'active-drag-handle-node';
 
 /**
@@ -67,7 +67,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }
@@ -76,7 +76,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? getActiveBlockMarks(editorState, pos) : undefined,
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }

package/dist/esm/pm-plugins/decorations-quick-insert-button.js

@@ -8,7 +8,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_QUICK_INSERT_ATTR } from '../ui/consts';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 var TYPE_QUICK_INSERT = 'INSERT_BUTTON';
 var TYPE_ACTIVE_QUICK_INSERT_NODE = 'active-quick-insert-node';
 export var findQuickInsertInsertButtonDecoration = function findQuickInsertInsertButtonDecoration(decorations, from, to) {
@@ -54,7 +54,7 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(_) {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/esm/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -118,7 +118,9 @@ var processHoverSide = function processHoverSide(view, api) {
   }
 
   // Added right-margin hover, gated so it can be rolled back. When off, fall through to midpoint.
-  if (editorExperiment('remix_button_right_margin_hover', true)) {
+  if (editorExperiment('remix_button_right_margin_hover', true, {
+    exposure: true
+  })) {
     var closestBlock = target === null || target === void 0 ? void 0 : target.closest(BLOCK_SELECTORS);
     var blockElement = closestBlock instanceof HTMLElement ? closestBlock : null;
 

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

@@ -1,58 +1,3 @@
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-export var getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
-  var alignment = state.schema.marks.alignment;
-  var resolvedPos = state.doc.resolve(pos);
-
-  // find all active marks at the position
-  var marks = resolvedPos.marks();
-  var supportedMarks = marks.filter(function (mark) {
-    return mark.type === alignment;
-  });
-
-  /**
-   * Fix for widget positioning at alignment mark boundaries.
-   * When the previous node has alignment but the next node doesn't, we need to prevent
-   * the widget from inheriting alignment marks. This ensures the widget is positioned
-   * correctly at the boundary rather than being absorbed into the alignment wrapper.
-   */
-  if (supportedMarks.length > 0 && expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
-    var _resolvedPos$nodeAfte;
-    var nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(function (mark) {
-      return mark.type === alignment;
-    })) || [];
-
-    // Compare alignment values to ensure they are the same
-    var alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(function (mark) {
-      return nextNodeMarks.some(function (nextMark) {
-        return nextMark.eq(mark);
-      });
-    });
-
-    // previous node has alignment but next node does not have alignment or alignment values differ
-    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
-      return [];
-    }
-  }
-  return supportedMarks;
-};
-
 /** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
 var hasMatchingMark = function hasMatchingMark(mark, marks) {
   var found = mark.type.isInSet(marks);

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

@@ -43,6 +43,7 @@ import { alignAnchorHeadInDirectionOfPos, expandSelectionHeadToNodeAtPos } from
 import { ACTIVE_DRAG_HANDLE_ATTR, 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';
+import { shouldUseNestedDragHandleIcon } from './should-use-nested-drag-handle-icon';
 import { refreshAnchorName } from './utils/anchor-name';
 import { getAnchorAttrName } from './utils/dom-attr-name';
 import { VisibilityContainer } from './visibility-container';
@@ -366,6 +367,18 @@ var getNodeMargins = function 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.
+var buildToggleLayoutColumnMenuMeta = function buildToggleLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
+  return _objectSpread(_objectSpread({
+    anchorPos: anchorPos
+  }, fg('platform_editor_layout_column_menu_kill_switch_1') ? {
+    isOpen: true
+  } : {}), {}, {
+    openedViaKeyboard: openedViaKeyboard
+  });
+};
 export var DragHandle = function DragHandle(_ref) {
   var _api$core4, _api$blockControls8;
   var view = _ref.view,
@@ -494,11 +507,7 @@ export var DragHandle = function DragHandle(_ref) {
         return tr;
       }
       if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', {
-          anchorPos: startPos,
-          isOpen: true,
-          openedViaKeyboard: false
-        });
+        tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
       var selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
@@ -549,11 +558,7 @@ export var DragHandle = function DragHandle(_ref) {
         return tr;
       }
       if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        tr.setMeta('toggleLayoutColumnMenu', {
-          anchorPos: startPos,
-          isOpen: true,
-          openedViaKeyboard: false
-        });
+        tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       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;
@@ -641,11 +646,7 @@ export var DragHandle = function DragHandle(_ref) {
           tr: tr
         });
         if (nodeType === 'layoutColumn' && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-          tr.setMeta('toggleLayoutColumnMenu', {
-            anchorPos: startPos,
-            isOpen: true,
-            openedViaKeyboard: true
-          });
+          tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         var rootPos = editorExperiment('platform_synced_block', true) ? tr.doc.resolve(startPos).before(1) : undefined;
         var triggerByNode = editorExperiment('platform_synced_block', true) ? {
@@ -1087,7 +1088,7 @@ export var DragHandle = function DragHandle(_ref) {
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
         ,
         onDragStart: handleIconDragStart
-      }, expValEquals('platform_editor_nested_drag_handle_icon', 'isEnabled', true) && !isTopLevelNodeValue ? jsx(DragHandleNestedIcon, null) : jsx(DragHandleVerticalIcon, {
+      }, shouldUseNestedDragHandleIcon(isTopLevelNodeValue, isLayoutColumn) ? jsx(DragHandleNestedIcon, null) : jsx(DragHandleVerticalIcon, {
         spacing: "spacious",
         label: "",
         size: "small"

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

@@ -0,0 +1,19 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+// Nested icon for non-top-level nodes when the experiment is on. 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
+export var shouldUseNestedDragHandleIcon = function shouldUseNestedDragHandleIcon(isTopLevelNode, isLayoutColumn) {
+  if (!expValEquals('platform_editor_nested_drag_handle_icon', 'isEnabled', true)) {
+    return false;
+  }
+  if (isTopLevelNode) {
+    return false;
+  }
+  if (isLayoutColumn && !fg('platform_editor_layout_column_menu_kill_switch_1')) {
+    return false;
+  }
+  return true;
+};

package/dist/types/pm-plugins/utils/marks.d.ts

@@ -1,22 +1,5 @@
 import type { Mark, MarkType } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-export declare const getActiveBlockMarks: (state: EditorState, pos: number) => Mark[];
 /**
  * Returns supported block marks at `pos` only when both adjacent siblings
  * share the exact same set of those marks. Returns `[]` when they differ,

package/dist/types/ui/should-use-nested-drag-handle-icon.d.ts

@@ -0,0 +1 @@
+export declare const shouldUseNestedDragHandleIcon: (isTopLevelNode: boolean, isLayoutColumn: boolean) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "13.0.6",
+	"version": "13.1.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,20 +27,20 @@
 		"@atlaskit/editor-plugin-editor-disabled": "^12.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^14.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^11.0.0",
-		"@atlaskit/editor-plugin-interaction": "^21.0.0",
+		"@atlaskit/editor-plugin-interaction": "^22.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^9.0.0",
 		"@atlaskit/editor-plugin-metrics": "^13.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^12.0.0",
 		"@atlaskit/editor-plugin-selection": "^12.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^9.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^12.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^12.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^10.0.0",
 		"@atlaskit/editor-plugin-width": "^13.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/icon": "^36.0.0",
-		"@atlaskit/icon-lab": "^7.0.0",
+		"@atlaskit/icon-lab": "^7.1.0",
 		"@atlaskit/link": "^4.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^2.0.0",
@@ -48,8 +48,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.0.0",
 		"@atlaskit/primitives": "^20.0.0",
 		"@atlaskit/theme": "^26.0.0",
-		"@atlaskit/tmp-editor-statsig": "^109.1.0",
-		"@atlaskit/tokens": "^14.0.0",
+		"@atlaskit/tmp-editor-statsig": "^111.0.0",
+		"@atlaskit/tokens": "^15.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -59,7 +59,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.8.0",
+		"@atlaskit/editor-common": "^116.11.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -141,12 +141,16 @@
 		},
 		"confluence_frontend_native_tabs_extension": {
 			"type": "boolean"
+		},
+		"platform_editor_layout_column_menu_kill_switch_1": {
+			"type": "boolean",
+			"referenceOnly": true
 		}
 	},
 	"devDependencies": {
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"react-intl": "^6.6.2"
+		"react-intl": "^7.0.0"
 	}
 }