@atlaskit/editor-plugin-block-controls 9.1.0 → 9.1.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 9.1.1
+
+### Patch Changes
+
+- [`ef40f467da8e6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef40f467da8e6) -
+  Fix drag handle not appearing in last layout column and remix button not showing correctly when
+  confluence_remix_button_right_side_block_fg is enabled. Layout column drag handles now always show
+  regardless of hover side, remix button correctly shows on right-side hover only, and layoutSection
+  is always remixable regardless of content.
+- Updated dependencies
+
 ## 9.1.0
 
 ### Minor Changes

package/dist/cjs/blockControlsPlugin.js

@@ -356,7 +356,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
         var _interactionTrackingP2, _interactionTrackingP3, _interactionTrackingP4;
         sharedState.isMouseOut = (_interactionTrackingP2 = (_interactionTrackingP3 = _pmPlugin.interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP3 === void 0 ? void 0 : _interactionTrackingP3.isMouseOut) !== null && _interactionTrackingP2 !== void 0 ? _interactionTrackingP2 : false;
-        // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+        // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
         sharedState.rightSideControlsEnabled = rightSideControlsEnabled;
         sharedState.hoverSide = rightSideControlsEnabled ? (_interactionTrackingP4 = _pmPlugin.interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP4 === void 0 ? void 0 : _interactionTrackingP4.hoverSide : undefined;
       }

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

@@ -13,7 +13,6 @@ var _uuid = _interopRequireDefault(require("uuid"));
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _dragHandle = require("../ui/drag-handle");
 var _decorationsCommon = require("./decorations-common");
@@ -86,7 +85,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     var element = document.createElement('span');
     // inline decoration causes focus issues when refocusing Editor into first line
     element.style.display = 'block';
-    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    if ((0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg')) {
       element.setAttribute('data-blocks-decorator-widget', 'true');
     }
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');

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

@@ -10,7 +10,6 @@ var _uuid = _interopRequireDefault(require("uuid"));
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _quickInsertButton = require("../ui/quick-insert-button");
 var _marks = require("./utils/marks");
@@ -76,7 +75,7 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
     element.style.clear = 'unset';
     element.contentEditable = 'false';
     element.setAttribute('data-blocks-quick-insert-container', 'true');
-    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    if ((0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg')) {
       element.setAttribute('data-blocks-quick-insert-button', 'true');
     }
     element.setAttribute('data-testid', 'block-ctrl-quick-insert-button');

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

@@ -9,8 +9,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _domAttrName = require("../ui/utils/dom-attr-name");
 var _decorationsAnchor = require("./decorations-anchor");
@@ -63,7 +63,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   // We shouldn't be firing mouse over transactions when the editor is disabled,
   // except in view mode when right-side controls are enabled (show controls on block hover)
   var rightSideControlsEnabled = (_api$blockControls$sh = 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.rightSideControlsEnabled) !== null && _api$blockControls$sh !== void 0 ? _api$blockControls$sh : false;
-  if (editorDisabled && (!isViewMode || !(rightSideControlsEnabled && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true)))) {
+  if (editorDisabled && (!isViewMode || !(rightSideControlsEnabled && (0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg')))) {
     return false;
   }
 
@@ -91,7 +91,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
 
   // When hovering over the right-edge button (rendered in a portal outside the block), resolve the
   // block from the container's anchor so activeNode stays set and the button remains visible.
-  if (!rootElement && rightSideControlsEnabled && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true)) {
+  if (!rootElement && rightSideControlsEnabled && (0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg')) {
     var rightEdgeContainer = target === null || target === void 0 ? void 0 : target.closest('[data-blocks-right-edge-button-container]');
     if (rightEdgeContainer) {
       var anchor = rightEdgeContainer.getAttribute('data-blocks-right-edge-button-anchor');

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

@@ -27,7 +27,7 @@ var RIGHT_EDGE_SELECTOR = '[data-blocks-right-edge-button-container]';
 
 /**
  * Process hover position and set left/right side. Only invoked when right-side controls are
- * enabled (confluence_remix_icon_right_side); handleMouseMove returns early otherwise.
+ * enabled (confluence_remix_button_right_side_block_fg); handleMouseMove returns early otherwise.
  */
 var processHoverSide = function processHoverSide(view) {
   var event = pendingByView.get(view);
@@ -88,7 +88,7 @@ var handleMouseMove = exports.handleMouseMove = function handleMouseMove(view, e
     (0, _commands.stopEditing)(view);
   }
 
-  // Only track hover side when right-side controls are enabled (single source: confluence_remix_icon_right_side via config)
+  // Only track hover side when right-side controls are enabled (single source: confluence_remix_button_right_side_block_fg via config)
   if (!rightSideControlsEnabled) {
     return false;
   }

package/dist/cjs/pm-plugins/interaction-tracking/pm-plugin.js

@@ -72,7 +72,7 @@ var createInteractionTrackingPlugin = exports.createInteractionTrackingPlugin =
     },
     view: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? function (view) {
       var editorContentArea = view.dom.closest('.ak-editor-content-area');
-      // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+      // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
 
       var unbindMouseEnter;
       var unbindMouseLeave;

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

@@ -23,7 +23,6 @@ var _element = require("@atlaskit/pragmatic-drag-and-drop-auto-scroll/element");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _domAttrName = require("../ui/utils/dom-attr-name");
 var _decorationsAnchor = require("./decorations-anchor");
@@ -469,7 +468,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
           _iterator.f();
         }
       }
-      if (rightSideControlsEnabled && isViewMode && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true)) {
+      if (rightSideControlsEnabled && isViewMode && (0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg')) {
         var _iterator2 = _createForOfIteratorHelper(nodeDecorationRegistry),
           _step2;
         try {
@@ -651,7 +650,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
       } finally {
         _iterator5.f();
       }
-    } else if (isViewMode && rightSideControlsEnabled && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    } else if (isViewMode && rightSideControlsEnabled && (0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg')) {
       // Remove view-mode right-side decorations when no active node
       var _iterator6 = _createForOfIteratorHelper(nodeDecorationRegistry),
         _step6;
@@ -813,7 +812,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
         var isDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
         if (isDisabled) {
           var _api$editorViewMode2;
-          var remixRightSideEnabled = rightSideControlsEnabled && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true);
+          var remixRightSideEnabled = rightSideControlsEnabled && (0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg');
           // Hide decorations when disabled, except in view mode when right-side controls are enabled
           if (!remixRightSideEnabled || (api === null || api === void 0 || (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 || (_api$editorViewMode2 = _api$editorViewMode2.sharedState.currentState()) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.mode) !== 'view') {
             return;

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

@@ -1094,7 +1094,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         onDrop: handleOnDrop,
         disabled: dragHandleDisabled,
         "data-editor-block-ctrl-drag-handle": true,
-        "data-blocks-drag-handle": (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_remix_icon_right_side', 'isEnabled', true) || undefined,
+        "data-blocks-drag-handle": (0, _platformFeatureFlags.fg)('confluence_remix_button_right_side_block_fg') || undefined,
         "data-testid": "block-ctrl-drag-handle",
         "aria-label": dragHandleAriaLabel,
         onBlur: (0, _experiments.editorExperiment)('platform_editor_block_menu', true) ? function () {
@@ -1195,9 +1195,14 @@ var DragHandleWithVisibility = exports.DragHandleWithVisibility = function DragH
       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;
+  // Layout column drag handles sit at the top-centre of each column, not on a left/right edge.
+  // Don't restrict by hoverSide for layout columns — the drag handle should always be visible
+  // when hovering anywhere over the column, regardless of which side of the layoutSection the
+  // column is on. (The right-side remix button is a separate node decoration and is unaffected.)
+  var isLayoutColumn = nodeType === 'layoutColumn';
   return (0, _react2.jsx)(_visibilityContainer.VisibilityContainer, {
     api: api,
-    controlSide: rightSideControlsEnabled ? 'left' : undefined
+    controlSide: rightSideControlsEnabled && !isLayoutColumn ? 'left' : undefined
   }, (0, _react2.jsx)(DragHandle, {
     view: view,
     api: api,

package/dist/cjs/ui/visibility-container.js

@@ -74,7 +74,7 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
     userIntent = _useSharedPluginState.userIntent,
     rightSideControlsEnabled = _useSharedPluginState.rightSideControlsEnabled;
   var isViewMode = editorViewMode === 'view';
-  // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+  // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
   var shouldRestrictBySide = rightSideControlsEnabled && controlSide !== undefined && !isViewMode;
   // Only restrict by side when hoverSide is known (after mousemove). When undefined, show both
   // controls so drag handle is visible on load and for keyboard-only users.

package/dist/es2019/blockControlsPlugin.js

@@ -339,7 +339,7 @@ export const blockControlsPlugin = ({
       if (editorExperiment('platform_editor_controls', 'variant1')) {
         var _interactionTrackingP2, _interactionTrackingP3, _interactionTrackingP4;
         sharedState.isMouseOut = (_interactionTrackingP2 = (_interactionTrackingP3 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP3 === void 0 ? void 0 : _interactionTrackingP3.isMouseOut) !== null && _interactionTrackingP2 !== void 0 ? _interactionTrackingP2 : false;
-        // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+        // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
         sharedState.rightSideControlsEnabled = rightSideControlsEnabled;
         sharedState.hoverSide = rightSideControlsEnabled ? (_interactionTrackingP4 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP4 === void 0 ? void 0 : _interactionTrackingP4.hoverSide : undefined;
       }

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

@@ -6,7 +6,6 @@ import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
@@ -77,7 +76,7 @@ export const dragHandleDecoration = ({
     const element = document.createElement('span');
     // inline decoration causes focus issues when refocusing Editor into first line
     element.style.display = 'block';
-    if (expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    if (fg('confluence_remix_button_right_side_block_fg')) {
       element.setAttribute('data-blocks-decorator-widget', 'true');
     }
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');

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

@@ -4,7 +4,6 @@ import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
 import { getActiveBlockMarks } from './utils/marks';
@@ -67,7 +66,7 @@ export const quickInsertButtonDecoration = ({
     element.style.clear = 'unset';
     element.contentEditable = 'false';
     element.setAttribute('data-blocks-quick-insert-container', 'true');
-    if (expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    if (fg('confluence_remix_button_right_side_block_fg')) {
       element.setAttribute('data-blocks-quick-insert-button', 'true');
     }
     element.setAttribute('data-testid', 'block-ctrl-quick-insert-button');

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

@@ -1,8 +1,8 @@
 import memoizeOne from 'memoize-one';
 import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -55,7 +55,7 @@ export const handleMouseOver = (view, event, api) => {
   // We shouldn't be firing mouse over transactions when the editor is disabled,
   // except in view mode when right-side controls are enabled (show controls on block hover)
   const rightSideControlsEnabled = (_api$blockControls$sh = api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$s = _api$blockControls2.sharedState.currentState()) === null || _api$blockControls2$s === void 0 ? void 0 : _api$blockControls2$s.rightSideControlsEnabled) !== null && _api$blockControls$sh !== void 0 ? _api$blockControls$sh : false;
-  if (editorDisabled && (!isViewMode || !(rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)))) {
+  if (editorDisabled && (!isViewMode || !(rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg')))) {
     return false;
   }
 
@@ -83,7 +83,7 @@ export const handleMouseOver = (view, event, api) => {
 
   // When hovering over the right-edge button (rendered in a portal outside the block), resolve the
   // block from the container's anchor so activeNode stays set and the button remains visible.
-  if (!rootElement && rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+  if (!rootElement && rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg')) {
     const rightEdgeContainer = target === null || target === void 0 ? void 0 : target.closest('[data-blocks-right-edge-button-container]');
     if (rightEdgeContainer) {
       const anchor = rightEdgeContainer.getAttribute('data-blocks-right-edge-button-anchor');

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

@@ -22,7 +22,7 @@ const RIGHT_EDGE_SELECTOR = '[data-blocks-right-edge-button-container]';
 
 /**
  * Process hover position and set left/right side. Only invoked when right-side controls are
- * enabled (confluence_remix_icon_right_side); handleMouseMove returns early otherwise.
+ * enabled (confluence_remix_button_right_side_block_fg); handleMouseMove returns early otherwise.
  */
 const processHoverSide = view => {
   const event = pendingByView.get(view);
@@ -83,7 +83,7 @@ export const handleMouseMove = (view, event, rightSideControlsEnabled = false) =
     stopEditing(view);
   }
 
-  // Only track hover side when right-side controls are enabled (single source: confluence_remix_icon_right_side via config)
+  // Only track hover side when right-side controls are enabled (single source: confluence_remix_button_right_side_block_fg via config)
   if (!rightSideControlsEnabled) {
     return false;
   }

package/dist/es2019/pm-plugins/interaction-tracking/pm-plugin.js

@@ -61,7 +61,7 @@ export const createInteractionTrackingPlugin = (rightSideControlsEnabled = false
     },
     view: editorExperiment('platform_editor_controls', 'variant1') ? view => {
       const editorContentArea = view.dom.closest('.ak-editor-content-area');
-      // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+      // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
 
       let unbindMouseEnter;
       let unbindMouseLeave;

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

@@ -15,7 +15,6 @@ import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-sc
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName } from '../ui/utils/dom-attr-name';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
@@ -444,7 +443,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
           decorations = decorations.remove(old);
         }
       }
-      if (rightSideControlsEnabled && isViewMode && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+      if (rightSideControlsEnabled && isViewMode && fg('confluence_remix_button_right_side_block_fg')) {
         for (const factory of nodeDecorationRegistry) {
           if (factory.showInViewMode) {
             var _activeNode1, _activeNode10;
@@ -564,7 +563,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
           decorations = decorations.add(newState.doc, [dec]);
         }
       }
-    } else if (isViewMode && rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    } else if (isViewMode && rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg')) {
       // Remove view-mode right-side decorations when no active node
       for (const factory of nodeDecorationRegistry) {
         if (factory.showInViewMode) {
@@ -710,7 +709,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
         const isDisabled = api === null || api === void 0 ? void 0 : (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 ? void 0 : (_api$editorDisabled$s = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled$s === void 0 ? void 0 : _api$editorDisabled$s.editorDisabled;
         if (isDisabled) {
           var _api$editorViewMode2, _api$editorViewMode2$;
-          const remixRightSideEnabled = rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true);
+          const remixRightSideEnabled = rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg');
           // Hide decorations when disabled, except in view mode when right-side controls are enabled
           if (!remixRightSideEnabled || (api === null || api === void 0 ? void 0 : (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 ? void 0 : (_api$editorViewMode2$ = _api$editorViewMode2.sharedState.currentState()) === null || _api$editorViewMode2$ === void 0 ? void 0 : _api$editorViewMode2$.mode) !== 'view') {
             return;

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

@@ -1075,7 +1075,7 @@ export const DragHandle = ({
     onDrop: handleOnDrop,
     disabled: dragHandleDisabled,
     "data-editor-block-ctrl-drag-handle": true,
-    "data-blocks-drag-handle": expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true) || undefined,
+    "data-blocks-drag-handle": fg('confluence_remix_button_right_side_block_fg') || undefined,
     "data-testid": "block-ctrl-drag-handle",
     "aria-label": dragHandleAriaLabel,
     onBlur: editorExperiment('platform_editor_block_menu', true) ? () => setIsFocused(false) : undefined
@@ -1167,9 +1167,14 @@ export const DragHandleWithVisibility = ({
       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;
+  // Layout column drag handles sit at the top-centre of each column, not on a left/right edge.
+  // Don't restrict by hoverSide for layout columns — the drag handle should always be visible
+  // when hovering anywhere over the column, regardless of which side of the layoutSection the
+  // column is on. (The right-side remix button is a separate node decoration and is unaffected.)
+  const isLayoutColumn = nodeType === 'layoutColumn';
   return jsx(VisibilityContainer, {
     api: api,
-    controlSide: rightSideControlsEnabled ? 'left' : undefined
+    controlSide: rightSideControlsEnabled && !isLayoutColumn ? 'left' : undefined
   }, jsx(DragHandle, {
     view: view,
     api: api,

package/dist/es2019/ui/visibility-container.js

@@ -65,7 +65,7 @@ export const VisibilityContainer = ({
     };
   });
   const isViewMode = editorViewMode === 'view';
-  // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+  // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
   const shouldRestrictBySide = rightSideControlsEnabled && controlSide !== undefined && !isViewMode;
   // Only restrict by side when hoverSide is known (after mousemove). When undefined, show both
   // controls so drag handle is visible on load and for keyboard-only users.

package/dist/esm/blockControlsPlugin.js

@@ -349,7 +349,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       if (editorExperiment('platform_editor_controls', 'variant1')) {
         var _interactionTrackingP2, _interactionTrackingP3, _interactionTrackingP4;
         sharedState.isMouseOut = (_interactionTrackingP2 = (_interactionTrackingP3 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP3 === void 0 ? void 0 : _interactionTrackingP3.isMouseOut) !== null && _interactionTrackingP2 !== void 0 ? _interactionTrackingP2 : false;
-        // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+        // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
         sharedState.rightSideControlsEnabled = rightSideControlsEnabled;
         sharedState.hoverSide = rightSideControlsEnabled ? (_interactionTrackingP4 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP4 === void 0 ? void 0 : _interactionTrackingP4.hoverSide : undefined;
       }

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

@@ -7,7 +7,6 @@ import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
@@ -78,7 +77,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
     var element = document.createElement('span');
     // inline decoration causes focus issues when refocusing Editor into first line
     element.style.display = 'block';
-    if (expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    if (fg('confluence_remix_button_right_side_block_fg')) {
       element.setAttribute('data-blocks-decorator-widget', 'true');
     }
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');

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

@@ -4,7 +4,6 @@ import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
 import { getActiveBlockMarks } from './utils/marks';
@@ -68,7 +67,7 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
     element.style.clear = 'unset';
     element.contentEditable = 'false';
     element.setAttribute('data-blocks-quick-insert-container', 'true');
-    if (expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    if (fg('confluence_remix_button_right_side_block_fg')) {
       element.setAttribute('data-blocks-quick-insert-button', 'true');
     }
     element.setAttribute('data-testid', 'block-ctrl-quick-insert-button');

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

@@ -2,8 +2,8 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import memoizeOne from 'memoize-one';
 import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -56,7 +56,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
   // We shouldn't be firing mouse over transactions when the editor is disabled,
   // except in view mode when right-side controls are enabled (show controls on block hover)
   var rightSideControlsEnabled = (_api$blockControls$sh = 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.rightSideControlsEnabled) !== null && _api$blockControls$sh !== void 0 ? _api$blockControls$sh : false;
-  if (editorDisabled && (!isViewMode || !(rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)))) {
+  if (editorDisabled && (!isViewMode || !(rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg')))) {
     return false;
   }
 
@@ -84,7 +84,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
 
   // When hovering over the right-edge button (rendered in a portal outside the block), resolve the
   // block from the container's anchor so activeNode stays set and the button remains visible.
-  if (!rootElement && rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+  if (!rootElement && rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg')) {
     var rightEdgeContainer = target === null || target === void 0 ? void 0 : target.closest('[data-blocks-right-edge-button-container]');
     if (rightEdgeContainer) {
       var anchor = rightEdgeContainer.getAttribute('data-blocks-right-edge-button-anchor');

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

@@ -22,7 +22,7 @@ var RIGHT_EDGE_SELECTOR = '[data-blocks-right-edge-button-container]';
 
 /**
  * Process hover position and set left/right side. Only invoked when right-side controls are
- * enabled (confluence_remix_icon_right_side); handleMouseMove returns early otherwise.
+ * enabled (confluence_remix_button_right_side_block_fg); handleMouseMove returns early otherwise.
  */
 var processHoverSide = function processHoverSide(view) {
   var event = pendingByView.get(view);
@@ -83,7 +83,7 @@ export var handleMouseMove = function handleMouseMove(view, event) {
     stopEditing(view);
   }
 
-  // Only track hover side when right-side controls are enabled (single source: confluence_remix_icon_right_side via config)
+  // Only track hover side when right-side controls are enabled (single source: confluence_remix_button_right_side_block_fg via config)
   if (!rightSideControlsEnabled) {
     return false;
   }

package/dist/esm/pm-plugins/interaction-tracking/pm-plugin.js

@@ -66,7 +66,7 @@ export var createInteractionTrackingPlugin = function createInteractionTrackingP
     },
     view: editorExperiment('platform_editor_controls', 'variant1') ? function (view) {
       var editorContentArea = view.dom.closest('.ak-editor-content-area');
-      // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+      // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
 
       var unbindMouseEnter;
       var unbindMouseLeave;

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

@@ -21,7 +21,6 @@ import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-sc
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName } from '../ui/utils/dom-attr-name';
 import { findNodeDecs, nodeDecorations } from './decorations-anchor';
@@ -462,7 +461,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
           _iterator.f();
         }
       }
-      if (rightSideControlsEnabled && isViewMode && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+      if (rightSideControlsEnabled && isViewMode && fg('confluence_remix_button_right_side_block_fg')) {
         var _iterator2 = _createForOfIteratorHelper(nodeDecorationRegistry),
           _step2;
         try {
@@ -644,7 +643,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
       } finally {
         _iterator5.f();
       }
-    } else if (isViewMode && rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true)) {
+    } else if (isViewMode && rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg')) {
       // Remove view-mode right-side decorations when no active node
       var _iterator6 = _createForOfIteratorHelper(nodeDecorationRegistry),
         _step6;
@@ -807,7 +806,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
         var isDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
         if (isDisabled) {
           var _api$editorViewMode2;
-          var remixRightSideEnabled = rightSideControlsEnabled && expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true);
+          var remixRightSideEnabled = rightSideControlsEnabled && fg('confluence_remix_button_right_side_block_fg');
           // Hide decorations when disabled, except in view mode when right-side controls are enabled
           if (!remixRightSideEnabled || (api === null || api === void 0 || (_api$editorViewMode2 = api.editorViewMode) === null || _api$editorViewMode2 === void 0 || (_api$editorViewMode2 = _api$editorViewMode2.sharedState.currentState()) === null || _api$editorViewMode2 === void 0 ? void 0 : _api$editorViewMode2.mode) !== 'view') {
             return;

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

@@ -1090,7 +1090,7 @@ export var DragHandle = function DragHandle(_ref) {
         onDrop: handleOnDrop,
         disabled: dragHandleDisabled,
         "data-editor-block-ctrl-drag-handle": true,
-        "data-blocks-drag-handle": expValEqualsNoExposure('confluence_remix_icon_right_side', 'isEnabled', true) || undefined,
+        "data-blocks-drag-handle": fg('confluence_remix_button_right_side_block_fg') || undefined,
         "data-testid": "block-ctrl-drag-handle",
         "aria-label": dragHandleAriaLabel,
         onBlur: editorExperiment('platform_editor_block_menu', true) ? function () {
@@ -1191,9 +1191,14 @@ export var DragHandleWithVisibility = function DragHandleWithVisibility(_ref0) {
       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;
+  // Layout column drag handles sit at the top-centre of each column, not on a left/right edge.
+  // Don't restrict by hoverSide for layout columns — the drag handle should always be visible
+  // when hovering anywhere over the column, regardless of which side of the layoutSection the
+  // column is on. (The right-side remix button is a separate node decoration and is unaffected.)
+  var isLayoutColumn = nodeType === 'layoutColumn';
   return jsx(VisibilityContainer, {
     api: api,
-    controlSide: rightSideControlsEnabled ? 'left' : undefined
+    controlSide: rightSideControlsEnabled && !isLayoutColumn ? 'left' : undefined
   }, jsx(DragHandle, {
     view: view,
     api: api,

package/dist/esm/ui/visibility-container.js

@@ -63,7 +63,7 @@ export var VisibilityContainer = function VisibilityContainer(_ref) {
     userIntent = _useSharedPluginState.userIntent,
     rightSideControlsEnabled = _useSharedPluginState.rightSideControlsEnabled;
   var isViewMode = editorViewMode === 'view';
-  // rightSideControlsEnabled is the single source of truth (confluence_remix_icon_right_side from preset)
+  // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
   var shouldRestrictBySide = rightSideControlsEnabled && controlSide !== undefined && !isViewMode;
   // Only restrict by side when hoverSide is known (after mousemove). When undefined, show both
   // controls so drag handle is visible on load and for keyboard-only users.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "9.1.0",
+	"version": "9.1.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/icon": "^34.0.0",
-		"@atlaskit/icon-lab": "^6.2.0",
+		"@atlaskit/icon-lab": "^6.3.0",
 		"@atlaskit/link": "^3.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^54.0.0",
+		"@atlaskit/tmp-editor-statsig": "^54.3.0",
 		"@atlaskit/tokens": "^11.4.0",
 		"@atlaskit/tooltip": "^21.1.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.16.0",
+		"@atlaskit/editor-common": "^112.18.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -149,6 +149,9 @@
 		},
 		"platform_editor_native_anchor_patch_2": {
 			"type": "boolean"
+		},
+		"confluence_remix_button_right_side_block_fg": {
+			"type": "boolean"
 		}
 	}
 }