@atlaskit/editor-plugin-selection-toolbar 4.3.3 → 4.3.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-selection-toolbar
 
+## 4.3.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.3.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.3.3
 
 ### Patch Changes

package/dist/cjs/selectionToolbarPlugin.js

@@ -15,6 +15,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 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 _commands = require("./pm-plugins/commands");
 var _pluginKey = require("./pm-plugins/plugin-key");
@@ -139,8 +140,16 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
               },
               apply: function apply(tr, pluginState) {
                 var meta = tr.getMeta(_pluginKey.selectionToolbarPluginKey);
+                var newPluginState = pluginState;
                 if (meta) {
-                  return _objectSpread(_objectSpread({}, pluginState), meta);
+                  return _objectSpread(_objectSpread({}, newPluginState), meta);
+                }
+                if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+                  var _api$userIntent;
+                  var isBlockMenuOpen = (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen';
+                  newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                    isBlockMenuOpen: isBlockMenuOpen
+                  });
                 }
 
                 // if the toolbarDockingInitialPosition preference has changed
@@ -152,13 +161,13 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
                     previousToolbarDocking = toolbarDockingPreference;
                     var userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
                     if (pluginState.toolbarDocking !== userToolbarDockingPref) {
-                      return _objectSpread(_objectSpread({}, pluginState), {}, {
+                      return _objectSpread(_objectSpread({}, newPluginState), {}, {
                         toolbarDocking: userToolbarDockingPref
                       });
                     }
                   }
                 }
-                return pluginState;
+                return newPluginState;
               }
             },
             view: function view(_view) {
@@ -236,7 +245,8 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
         var _ref3 = _pluginKey.selectionToolbarPluginKey.getState(state),
           selectionStable = _ref3.selectionStable,
           hide = _ref3.hide,
-          toolbarDocking = _ref3.toolbarDocking;
+          toolbarDocking = _ref3.toolbarDocking,
+          isBlockMenuOpen = _ref3.isBlockMenuOpen;
         var isCellSelection = ('$anchorCell' in state.selection);
         var isEditorControlsEnabled = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
         if (state.selection.empty || !selectionStable || hide || state.selection instanceof _state.NodeSelection ||
@@ -255,6 +265,10 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
             return;
           }
         }
+        if (isBlockMenuOpen && isEditorControlsEnabled && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+          // If the block menu is open, do not show the selection toolbar.
+          return;
+        }
 
         // Resolve the selectionToolbarHandlers to a list of SelectionToolbarGroups
         // and filter out any handlers which returned undefined

package/dist/es2019/selectionToolbarPlugin.js

@@ -6,6 +6,7 @@ import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellS
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 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 { setToolbarDocking, toggleToolbar, updateToolbarDocking, forceToolbarDockingWithoutAnalytics } from './pm-plugins/commands';
 import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
@@ -132,12 +133,21 @@ export const selectionToolbarPlugin = ({
               },
               apply(tr, pluginState) {
                 const meta = tr.getMeta(selectionToolbarPluginKey);
+                let newPluginState = pluginState;
                 if (meta) {
                   return {
-                    ...pluginState,
+                    ...newPluginState,
                     ...meta
                   };
                 }
+                if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+                  var _api$userIntent, _api$userIntent$share;
+                  const isBlockMenuOpen = (api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) === 'blockMenuOpen';
+                  newPluginState = {
+                    ...newPluginState,
+                    isBlockMenuOpen
+                  };
+                }
 
                 // if the toolbarDockingInitialPosition preference has changed
                 // update the toolbarDocking state
@@ -149,13 +159,13 @@ export const selectionToolbarPlugin = ({
                     const userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
                     if (pluginState.toolbarDocking !== userToolbarDockingPref) {
                       return {
-                        ...pluginState,
+                        ...newPluginState,
                         toolbarDocking: userToolbarDockingPref
                       };
                     }
                   }
                 }
-                return pluginState;
+                return newPluginState;
               }
             },
             view(view) {
@@ -233,7 +243,8 @@ export const selectionToolbarPlugin = ({
         const {
           selectionStable,
           hide,
-          toolbarDocking
+          toolbarDocking,
+          isBlockMenuOpen
         } = selectionToolbarPluginKey.getState(state);
         const isCellSelection = ('$anchorCell' in state.selection);
         const isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
@@ -253,6 +264,10 @@ export const selectionToolbarPlugin = ({
             return;
           }
         }
+        if (isBlockMenuOpen && isEditorControlsEnabled && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+          // If the block menu is open, do not show the selection toolbar.
+          return;
+        }
 
         // Resolve the selectionToolbarHandlers to a list of SelectionToolbarGroups
         // and filter out any handlers which returned undefined

package/dist/esm/selectionToolbarPlugin.js

@@ -10,6 +10,7 @@ import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellS
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 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 { setToolbarDocking as _setToolbarDocking, toggleToolbar, updateToolbarDocking, forceToolbarDockingWithoutAnalytics as _forceToolbarDockingWithoutAnalytics } from './pm-plugins/commands';
 import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
@@ -132,8 +133,16 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
               },
               apply: function apply(tr, pluginState) {
                 var meta = tr.getMeta(selectionToolbarPluginKey);
+                var newPluginState = pluginState;
                 if (meta) {
-                  return _objectSpread(_objectSpread({}, pluginState), meta);
+                  return _objectSpread(_objectSpread({}, newPluginState), meta);
+                }
+                if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+                  var _api$userIntent;
+                  var isBlockMenuOpen = (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen';
+                  newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+                    isBlockMenuOpen: isBlockMenuOpen
+                  });
                 }
 
                 // if the toolbarDockingInitialPosition preference has changed
@@ -145,13 +154,13 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
                     previousToolbarDocking = toolbarDockingPreference;
                     var userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
                     if (pluginState.toolbarDocking !== userToolbarDockingPref) {
-                      return _objectSpread(_objectSpread({}, pluginState), {}, {
+                      return _objectSpread(_objectSpread({}, newPluginState), {}, {
                         toolbarDocking: userToolbarDockingPref
                       });
                     }
                   }
                 }
-                return pluginState;
+                return newPluginState;
               }
             },
             view: function view(_view) {
@@ -229,7 +238,8 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
         var _ref3 = selectionToolbarPluginKey.getState(state),
           selectionStable = _ref3.selectionStable,
           hide = _ref3.hide,
-          toolbarDocking = _ref3.toolbarDocking;
+          toolbarDocking = _ref3.toolbarDocking,
+          isBlockMenuOpen = _ref3.isBlockMenuOpen;
         var isCellSelection = ('$anchorCell' in state.selection);
         var isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
         if (state.selection.empty || !selectionStable || hide || state.selection instanceof NodeSelection ||
@@ -248,6 +258,10 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
             return;
           }
         }
+        if (isBlockMenuOpen && isEditorControlsEnabled && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+          // If the block menu is open, do not show the selection toolbar.
+          return;
+        }
 
         // Resolve the selectionToolbarHandlers to a list of SelectionToolbarGroups
         // and filter out any handlers which returned undefined

package/dist/types/selectionToolbarPluginType.d.ts

@@ -5,6 +5,7 @@ import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { ToolbarDocking } from './types';
 export type SelectionToolbarPluginOptions = {
@@ -25,7 +26,8 @@ export type SelectionToolbarPlugin = NextEditorPlugin<'selectionToolbar', {
         OptionalPlugin<BlockControlsPlugin>,
         OptionalPlugin<ConnectivityPlugin>,
         OptionalPlugin<UserPreferencesPlugin>,
-        OptionalPlugin<ToolbarPlugin>
+        OptionalPlugin<ToolbarPlugin>,
+        OptionalPlugin<UserIntentPlugin>
     ];
     actions?: {
         suppressToolbar?: () => boolean;

package/dist/types-ts4.5/selectionToolbarPluginType.d.ts

@@ -5,6 +5,7 @@ import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { ToolbarDocking } from './types';
 export type SelectionToolbarPluginOptions = {
@@ -25,7 +26,8 @@ export type SelectionToolbarPlugin = NextEditorPlugin<'selectionToolbar', {
         OptionalPlugin<BlockControlsPlugin>,
         OptionalPlugin<ConnectivityPlugin>,
         OptionalPlugin<UserPreferencesPlugin>,
-        OptionalPlugin<ToolbarPlugin>
+        OptionalPlugin<ToolbarPlugin>,
+        OptionalPlugin<UserIntentPlugin>
     ];
     actions?: {
         suppressToolbar?: () => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-toolbar",
-	"version": "4.3.3",
+	"version": "4.3.5",
 	"description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,6 +39,7 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^4.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^0.2.0",
+		"@atlaskit/editor-plugin-user-intent": "^1.1.0",
 		"@atlaskit/editor-plugin-user-preferences": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-toolbar": "^0.3.0",
@@ -47,13 +48,13 @@
 		"@atlaskit/icon-lab": "^5.6.0",
 		"@atlaskit/menu": "^8.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^9.28.0",
+		"@atlaskit/tmp-editor-statsig": "^11.0.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.23.0",
+		"@atlaskit/editor-common": "^107.25.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"