@atlaskit/editor-plugin-floating-toolbar 5.1.12 → 5.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 5.2.0
+
+### Minor Changes
+
+- [`e73faa5a52300`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e73faa5a52300) -
+  [ux] ED-28735 Fix selection toolbar opening and closing state
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.1.12
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -23,6 +23,7 @@ var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./pm-plugins/commands");
 var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
@@ -241,6 +242,16 @@ function ContentComponent(_ref5) {
 
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
+
+  // When the new inline editor-toolbar is enabled, suppress floating toolbar for text selections.
+  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+    var selection = editorView.state.selection;
+    var isCellSelection = '$anchorCell' in selection && !selection.empty;
+    var isTextSelected = selection instanceof _state.TextSelection && !selection.empty;
+    if (isTextSelected || isCellSelection) {
+      return null;
+    }
+  }
   var items = config.items;
   var groupLabel = config.groupLabel;
   var title = config.title,

package/dist/es2019/floatingToolbarPlugin.js

@@ -10,8 +10,9 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
@@ -233,6 +234,16 @@ export function ContentComponent({
     config,
     node
   } = configWithNodeInfo;
+
+  // When the new inline editor-toolbar is enabled, suppress floating toolbar for text selections.
+  if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+    const selection = editorView.state.selection;
+    const isCellSelection = '$anchorCell' in selection && !selection.empty;
+    const isTextSelected = selection instanceof TextSelection && !selection.empty;
+    if (isTextSelected || isCellSelection) {
+      return null;
+    }
+  }
   let {
     items
   } = config;

package/dist/esm/floatingToolbarPlugin.js

@@ -14,8 +14,9 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode as _copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
@@ -232,6 +233,16 @@ export function ContentComponent(_ref5) {
 
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
+
+  // When the new inline editor-toolbar is enabled, suppress floating toolbar for text selections.
+  if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+    var selection = editorView.state.selection;
+    var isCellSelection = '$anchorCell' in selection && !selection.empty;
+    var isTextSelected = selection instanceof TextSelection && !selection.empty;
+    if (isTextSelected || isCellSelection) {
+      return null;
+    }
+  }
   var items = config.items;
   var groupLabel = config.groupLabel;
   var title = config.title,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "5.1.12",
+	"version": "5.2.0",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/primitives": "^14.11.0",
 		"@atlaskit/select": "^21.2.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^11.3.0",
+		"@atlaskit/tmp-editor-statsig": "^11.5.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -60,7 +60,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.26.0",
+		"@atlaskit/editor-common": "^107.28.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},