@atlaskit/editor-plugin-floating-toolbar 3.6.0 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 4.0.0
+
+### Major Changes
+
+- [#141095](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141095)
+  [`c12941b65dc2a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c12941b65dc2a) -
+  **WHAT**: Remove `@atlaskit/editor-plugin-block-controls` as a dependency from
+  `@atlaskit/editor-plugin-floating-toolbar`. Add `@atlaskit/editor-plugin-user-intent` as a
+  dependency and replace isDragging check from block controls with this user intention current
+  intention check.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.6.1
+
+### Patch Changes
+
+- [#139216](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139216)
+  [`e8f596d2b1910`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e8f596d2b1910) -
+  [ux] Cleaned up platform_editor_controls_patch_1 FG
+- Updated dependencies
+
 ## 3.6.0
 
 ### Minor Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -212,10 +212,13 @@ function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'blockControls']),
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
+    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+    'blockControls']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
+    userIntentState = _useSharedPluginState.userIntentState,
     blockControlsState = _useSharedPluginState.blockControlsState;
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
@@ -223,11 +226,22 @@ function ContentComponent(_ref5) {
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
-  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
-    return null;
-  }
-  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-    return null;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_user_intent_plugin')) {
+    if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
+      return null;
+    }
+
+    // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
+    // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+    // 	return null;
+    // }
+  } else {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
+      return null;
+    }
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+      return null;
+    }
   }
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
@@ -278,7 +292,7 @@ function ContentComponent(_ref5) {
       return toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp];
     });
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1')) {
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     var _items2;
     // Consolidate floating toolbar items
     var toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);

package/dist/es2019/floatingToolbarPlugin.js

@@ -198,8 +198,12 @@ export function ContentComponent({
     floatingToolbarState,
     editorDisabledState,
     editorViewModeState,
+    userIntentState,
+    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
     blockControlsState
-  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'blockControls']);
+  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
+  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+  'blockControls']);
   const {
     configWithNodeInfo,
     floatingToolbarData
@@ -207,11 +211,22 @@ export function ContentComponent({
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
-  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
-    return null;
-  }
-  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
-    return null;
+  if (fg('platform_editor_user_intent_plugin')) {
+    if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
+      return null;
+    }
+
+    // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
+    // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+    // 	return null;
+    // }
+  } else {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
+      return null;
+    }
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+      return null;
+    }
   }
   const {
     config,
@@ -261,7 +276,7 @@ export function ContentComponent({
     const toolbarItemViewModeProp = 'supportsViewMode';
     items = iterableItems.filter(item => toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp]);
   }
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_1')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     var _items2;
     // Consolidate floating toolbar items
     const toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);

package/dist/esm/floatingToolbarPlugin.js

@@ -200,10 +200,13 @@ export function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'blockControls']),
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
+    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+    'blockControls']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
+    userIntentState = _useSharedPluginState.userIntentState,
     blockControlsState = _useSharedPluginState.blockControlsState;
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
@@ -211,11 +214,22 @@ export function ContentComponent(_ref5) {
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
-  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
-    return null;
-  }
-  if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
-    return null;
+  if (fg('platform_editor_user_intent_plugin')) {
+    if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
+      return null;
+    }
+
+    // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
+    // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+    // 	return null;
+    // }
+  } else {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
+      return null;
+    }
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+      return null;
+    }
   }
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
@@ -266,7 +280,7 @@ export function ContentComponent(_ref5) {
       return toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp];
     });
   }
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_1')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     var _items2;
     // Consolidate floating toolbar items
     var toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);

package/dist/types/floatingToolbarPluginType.d.ts

@@ -1,5 +1,4 @@
 import type { FloatingToolbarConfig, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import type { ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 import type { CopyButtonPlugin } from '@atlaskit/editor-plugin-copy-button';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
@@ -8,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export type ConfigWithNodeInfo = {
@@ -33,9 +33,9 @@ export type FloatingToolbarPluginDependencies = [
     CopyButtonPlugin,
     EditorDisabledPlugin,
     OptionalPlugin<EditorViewModePlugin>,
-    OptionalPlugin<BlockControlsPlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
-    OptionalPlugin<EmojiPlugin>
+    OptionalPlugin<EmojiPlugin>,
+    OptionalPlugin<UserIntentPlugin>
 ];
 export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
     dependencies: FloatingToolbarPluginDependencies;

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

@@ -1,5 +1,4 @@
 import type { FloatingToolbarConfig, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import type { ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 import type { CopyButtonPlugin } from '@atlaskit/editor-plugin-copy-button';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
@@ -8,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export type ConfigWithNodeInfo = {
@@ -33,9 +33,9 @@ export type FloatingToolbarPluginDependencies = [
     CopyButtonPlugin,
     EditorDisabledPlugin,
     OptionalPlugin<EditorViewModePlugin>,
-    OptionalPlugin<BlockControlsPlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
-    OptionalPlugin<EmojiPlugin>
+    OptionalPlugin<EmojiPlugin>,
+    OptionalPlugin<UserIntentPlugin>
 ];
 export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
     dependencies: FloatingToolbarPluginDependencies;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "3.6.0",
+	"version": "4.0.0",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,28 +28,28 @@
 		"@atlaskit/adf-utils": "^19.19.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/checkbox": "^17.0.0",
-		"@atlaskit/editor-common": "^103.2.0",
+		"@atlaskit/editor-common": "^103.11.0",
 		"@atlaskit/editor-palette": "^2.1.0",
-		"@atlaskit/editor-plugin-block-controls": "^3.8.0",
 		"@atlaskit/editor-plugin-context-panel": "^4.0.0",
 		"@atlaskit/editor-plugin-copy-button": "^2.0.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
-		"@atlaskit/editor-plugin-emoji": "^3.5.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
+		"@atlaskit/editor-plugin-emoji": "^3.6.0",
 		"@atlaskit/editor-plugin-extension": "^5.2.0",
-		"@atlaskit/editor-plugin-table": "^10.6.0",
+		"@atlaskit/editor-plugin-table": "^10.8.0",
+		"@atlaskit/editor-plugin-user-intent": "^0.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/emoji": "^69.0.0",
-		"@atlaskit/icon": "^25.5.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/menu": "^3.2.0",
 		"@atlaskit/modal-dialog": "^14.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.4.0",
-		"@atlaskit/select": "^20.2.0",
+		"@atlaskit/select": "^20.3.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
-		"@atlaskit/tokens": "^4.7.0",
+		"@atlaskit/tmp-editor-statsig": "^4.12.0",
+		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -132,14 +132,14 @@
 		"platform_editor_fix_floating_toolbar_scrollbar": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean"
 		},
 		"platform_editor_controls_patch_4": {
 			"type": "boolean"
+		},
+		"platform_editor_user_intent_plugin": {
+			"type": "boolean"
 		}
 	}
 }