@atlaskit/editor-plugin-block-controls 11.5.4 → 11.5.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 11.5.5
+
+### Patch Changes
+
+- [`523f77de83059`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/523f77de83059) -
+  Suppress drag handle tooltip while layout column menu is open. Adds layoutColumnMenuPopupOpen user
+  intent and wraps LayoutColumnMenu with UserIntentPopupWrapper.
+- Updated dependencies
+
 ## 11.5.4
 
 ### Patch Changes

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

@@ -375,19 +375,21 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     _useState0 = (0, _slicedToArray2.default)(_useState9, 2),
     isFocused = _useState0[0],
     setIsFocused = _useState0[1];
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['featureFlags', 'selection', 'blockControls', 'interaction'], function (states) {
-      var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _states$interactionSt;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['featureFlags', 'selection', 'blockControls', 'interaction', 'userIntent'], function (states) {
+      var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _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
+        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
       };
     }),
     macroInteractionUpdates = _useSharedPluginState.macroInteractionUpdates,
     selection = _useSharedPluginState.selection,
     isShiftDown = _useSharedPluginState.isShiftDown,
-    interactionState = _useSharedPluginState.interactionState;
+    interactionState = _useSharedPluginState.interactionState,
+    currentUserIntent = _useSharedPluginState.currentUserIntent;
   var start = getPos();
   var isLayoutColumn = nodeType === 'layoutColumn';
 
@@ -1060,9 +1062,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     }, (0, _react2.jsx)("span", {
       css: [tooltipContainerStyles, (0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && ((0, _expValEquals.expValEquals)('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && (0, _platformFeatureFlags.fg)('platform_editor_table_sticky_header_patch_6') ? tooltipContainerStylesImprovedStickyHeaderWithMask : tooltipContainerStylesStickyHeaderWithMask), !(0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
     }, (0, _react2.jsx)(_tooltip.default, {
-      content: (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
-        helpDescriptors: helpDescriptors
-      }),
+      content: tooltipContent,
       ignoreTooltipPointerEvents: true,
       position: 'top'
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
@@ -1095,9 +1095,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   };
   var buttonWithTooltip = function buttonWithTooltip() {
     return (0, _react2.jsx)(_tooltip.default, {
-      content: (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
-        helpDescriptors: helpDescriptors
-      }),
+      content: tooltipContent,
       ignoreTooltipPointerEvents: true
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
@@ -1109,6 +1107,9 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       }
     }, renderButton());
   };
+  var tooltipContent = isLayoutColumn && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
+    helpDescriptors: helpDescriptors
+  });
   var isTooltip = !dragHandleDisabled;
   var stickyRender = isTooltip ? stickyWithTooltip() : stickyWithoutTooltip();
   var render = isTooltip ? buttonWithTooltip() : renderButton();

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

@@ -358,14 +358,16 @@ export const DragHandle = ({
     macroInteractionUpdates,
     selection,
     isShiftDown,
-    interactionState
-  } = useSharedPluginStateWithSelector(api, ['featureFlags', 'selection', 'blockControls', 'interaction'], states => {
-    var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _states$interactionSt;
+    interactionState,
+    currentUserIntent
+  } = useSharedPluginStateWithSelector(api, ['featureFlags', 'selection', 'blockControls', 'interaction', 'userIntent'], states => {
+    var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _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
+      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
     };
   });
   const start = getPos();
@@ -1039,9 +1041,7 @@ export const DragHandle = ({
   }, jsx("span", {
     css: [tooltipContainerStyles, shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && (expValEquals('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && fg('platform_editor_table_sticky_header_patch_6') ? tooltipContainerStylesImprovedStickyHeaderWithMask : tooltipContainerStylesStickyHeaderWithMask), !shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
   }, jsx(Tooltip, {
-    content: jsx(TooltipContentWithMultipleShortcuts, {
-      helpDescriptors: helpDescriptors
-    }),
+    content: tooltipContent,
     ignoreTooltipPointerEvents: true,
     position: 'top'
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
@@ -1070,9 +1070,7 @@ export const DragHandle = ({
     css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
   }, renderButton())));
   const buttonWithTooltip = () => jsx(Tooltip, {
-    content: jsx(TooltipContentWithMultipleShortcuts, {
-      helpDescriptors: helpDescriptors
-    }),
+    content: tooltipContent,
     ignoreTooltipPointerEvents: true
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
@@ -1083,6 +1081,9 @@ export const DragHandle = ({
       });
     }
   }, renderButton());
+  const tooltipContent = isLayoutColumn && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+    helpDescriptors: helpDescriptors
+  });
   const isTooltip = !dragHandleDisabled;
   const stickyRender = isTooltip ? stickyWithTooltip() : stickyWithoutTooltip();
   const render = isTooltip ? buttonWithTooltip() : renderButton();

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

@@ -371,19 +371,21 @@ export var DragHandle = function DragHandle(_ref) {
     _useState0 = _slicedToArray(_useState9, 2),
     isFocused = _useState0[0],
     setIsFocused = _useState0[1];
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['featureFlags', 'selection', 'blockControls', 'interaction'], function (states) {
-      var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _states$interactionSt;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['featureFlags', 'selection', 'blockControls', 'interaction', 'userIntent'], function (states) {
+      var _states$featureFlagsS, _states$selectionStat, _states$blockControls, _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
+        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
       };
     }),
     macroInteractionUpdates = _useSharedPluginState.macroInteractionUpdates,
     selection = _useSharedPluginState.selection,
     isShiftDown = _useSharedPluginState.isShiftDown,
-    interactionState = _useSharedPluginState.interactionState;
+    interactionState = _useSharedPluginState.interactionState,
+    currentUserIntent = _useSharedPluginState.currentUserIntent;
   var start = getPos();
   var isLayoutColumn = nodeType === 'layoutColumn';
 
@@ -1056,9 +1058,7 @@ export var DragHandle = function DragHandle(_ref) {
     }, jsx("span", {
       css: [tooltipContainerStyles, shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && (expValEquals('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && fg('platform_editor_table_sticky_header_patch_6') ? tooltipContainerStylesImprovedStickyHeaderWithMask : tooltipContainerStylesStickyHeaderWithMask), !shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
     }, jsx(Tooltip, {
-      content: jsx(TooltipContentWithMultipleShortcuts, {
-        helpDescriptors: helpDescriptors
-      }),
+      content: tooltipContent,
       ignoreTooltipPointerEvents: true,
       position: 'top'
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
@@ -1091,9 +1091,7 @@ export var DragHandle = function DragHandle(_ref) {
   };
   var buttonWithTooltip = function buttonWithTooltip() {
     return jsx(Tooltip, {
-      content: jsx(TooltipContentWithMultipleShortcuts, {
-        helpDescriptors: helpDescriptors
-      }),
+      content: tooltipContent,
       ignoreTooltipPointerEvents: true
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
@@ -1105,6 +1103,9 @@ export var DragHandle = function DragHandle(_ref) {
       }
     }, renderButton());
   };
+  var tooltipContent = isLayoutColumn && expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+    helpDescriptors: helpDescriptors
+  });
   var isTooltip = !dragHandleDisabled;
   var stickyRender = isTooltip ? stickyWithTooltip() : stickyWithoutTooltip();
   var render = isTooltip ? buttonWithTooltip() : renderButton();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "11.5.4",
+	"version": "11.5.5",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.50.0",
+		"@atlaskit/editor-common": "^114.54.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"