@atlaskit/editor-plugin-floating-toolbar 8.2.9 → 8.2.11

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 8.2.11
+
+### Patch Changes
+
+- [`28ba94dae8f9a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/28ba94dae8f9a) -
+  [ux] EDITOR-2458 Replace usage of \_\_suppressAllToolbars with userIntentPlugin
+- Updated dependencies
+
+## 8.2.10
+
+### Patch Changes
+
+- [`9842848622554`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9842848622554) -
+  ENGHEALTH-23797:Fixed aria prohibited attr from selection marker
+- Updated dependencies
+
 ## 8.2.9
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -25,6 +25,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 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 _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
@@ -147,6 +148,7 @@ var floatingToolbarPlugin = exports.floatingToolbarPlugin = function floatingToo
           var providerFactory = _ref2.providerFactory,
             getIntl = _ref2.getIntl;
           return floatingToolbarPluginFactory({
+            api: api,
             floatingToolbarHandlers: floatingToolbarHandlers,
             providerFactory: providerFactory,
             getIntl: getIntl
@@ -253,15 +255,13 @@ 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 ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_hide_floating_toolbar')) {
+  var userIntentEnabled = Boolean((pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.userIntent) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_user_intent', 'isEnabled', true));
+  if (((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_hide_floating_toolbar')) && !userIntentEnabled) {
+    return null;
+  }
+  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && ['dragging', 'tablePopupOpen', 'commenting', 'resizing', 'blockMenuOpen'].includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) && userIntentEnabled) {
     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;
-  // }
-
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
 
@@ -431,6 +431,7 @@ function ContentComponent(_ref5) {
     fallbackComponent: null
   }, /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     ariaLabel: title,
+    role: (0, _platformFeatureFlags.fg)('platform_editor_a11y_add_role_to_popup') ? 'toolbar' : undefined,
     offset: offset,
     target: targetRef,
     alignY: "bottom",
@@ -551,7 +552,8 @@ function sanitizeFloatingToolbarConfig(config) {
 function floatingToolbarPluginFactory(options) {
   var floatingToolbarHandlers = options.floatingToolbarHandlers,
     providerFactory = options.providerFactory,
-    getIntl = options.getIntl;
+    getIntl = options.getIntl,
+    api = options.api;
   var intl = getIntl();
   var getConfigWithNodeInfo = function getConfigWithNodeInfo(editorState) {
     var activeConfigs = [];
@@ -559,7 +561,13 @@ function floatingToolbarPluginFactory(options) {
       var handler = floatingToolbarHandlers[index];
       var config = handler(editorState, intl, providerFactory, activeConfigs);
       if (config) {
-        if (config.__suppressAllToolbars && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+        var _api$userIntent;
+        var userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_user_intent', 'isEnabled', true));
+        if (config.__suppressAllToolbars && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !userIntentEnabled) {
+          activeConfigs = undefined;
+          break;
+        }
+        if (userIntentEnabled && ['dragging', 'tablePopupOpen', 'commenting', 'resizing', 'blockMenuOpen'].includes((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) || '')) {
           activeConfigs = undefined;
           break;
         }

package/dist/es2019/floatingToolbarPlugin.js

@@ -14,6 +14,7 @@ import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemi
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 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 { copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
@@ -136,6 +137,7 @@ export const floatingToolbarPlugin = ({
           providerFactory,
           getIntl
         }) => floatingToolbarPluginFactory({
+          api,
           floatingToolbarHandlers,
           providerFactory,
           getIntl
@@ -243,15 +245,13 @@ 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 ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_hide_floating_toolbar')) {
+  const userIntentEnabled = Boolean((pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
+  if (((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_hide_floating_toolbar')) && !userIntentEnabled) {
+    return null;
+  }
+  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && ['dragging', 'tablePopupOpen', 'commenting', 'resizing', 'blockMenuOpen'].includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) && userIntentEnabled) {
     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;
-  // }
-
   const {
     config,
     node
@@ -417,6 +417,7 @@ export function ContentComponent({
     fallbackComponent: null
   }, /*#__PURE__*/React.createElement(Popup, {
     ariaLabel: title,
+    role: fg('platform_editor_a11y_add_role_to_popup') ? 'toolbar' : undefined,
     offset: offset,
     target: targetRef,
     alignY: "bottom",
@@ -536,7 +537,8 @@ export function floatingToolbarPluginFactory(options) {
   const {
     floatingToolbarHandlers,
     providerFactory,
-    getIntl
+    getIntl,
+    api
   } = options;
   const intl = getIntl();
   const getConfigWithNodeInfo = editorState => {
@@ -545,7 +547,13 @@ export function floatingToolbarPluginFactory(options) {
       const handler = floatingToolbarHandlers[index];
       const config = handler(editorState, intl, providerFactory, activeConfigs);
       if (config) {
-        if (config.__suppressAllToolbars && editorExperiment('platform_editor_controls', 'variant1')) {
+        var _api$userIntent, _api$userIntent$share;
+        const userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
+        if (config.__suppressAllToolbars && editorExperiment('platform_editor_controls', 'variant1') && !userIntentEnabled) {
+          activeConfigs = undefined;
+          break;
+        }
+        if (userIntentEnabled && ['dragging', 'tablePopupOpen', 'commenting', 'resizing', 'blockMenuOpen'].includes((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) || '')) {
           activeConfigs = undefined;
           break;
         }

package/dist/esm/floatingToolbarPlugin.js

@@ -18,6 +18,7 @@ import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemi
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 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 { copyNode as _copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
@@ -138,6 +139,7 @@ export var floatingToolbarPlugin = function floatingToolbarPlugin(_ref) {
           var providerFactory = _ref2.providerFactory,
             getIntl = _ref2.getIntl;
           return floatingToolbarPluginFactory({
+            api: api,
             floatingToolbarHandlers: floatingToolbarHandlers,
             providerFactory: providerFactory,
             getIntl: getIntl
@@ -244,15 +246,13 @@ 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 ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_hide_floating_toolbar')) {
+  var userIntentEnabled = Boolean((pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
+  if (((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_hide_floating_toolbar')) && !userIntentEnabled) {
+    return null;
+  }
+  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && ['dragging', 'tablePopupOpen', 'commenting', 'resizing', 'blockMenuOpen'].includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) && userIntentEnabled) {
     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;
-  // }
-
   var config = configWithNodeInfo.config,
     node = configWithNodeInfo.node;
 
@@ -422,6 +422,7 @@ export function ContentComponent(_ref5) {
     fallbackComponent: null
   }, /*#__PURE__*/React.createElement(Popup, {
     ariaLabel: title,
+    role: fg('platform_editor_a11y_add_role_to_popup') ? 'toolbar' : undefined,
     offset: offset,
     target: targetRef,
     alignY: "bottom",
@@ -542,7 +543,8 @@ function sanitizeFloatingToolbarConfig(config) {
 export function floatingToolbarPluginFactory(options) {
   var floatingToolbarHandlers = options.floatingToolbarHandlers,
     providerFactory = options.providerFactory,
-    getIntl = options.getIntl;
+    getIntl = options.getIntl,
+    api = options.api;
   var intl = getIntl();
   var getConfigWithNodeInfo = function getConfigWithNodeInfo(editorState) {
     var activeConfigs = [];
@@ -550,7 +552,13 @@ export function floatingToolbarPluginFactory(options) {
       var handler = floatingToolbarHandlers[index];
       var config = handler(editorState, intl, providerFactory, activeConfigs);
       if (config) {
-        if (config.__suppressAllToolbars && editorExperiment('platform_editor_controls', 'variant1')) {
+        var _api$userIntent;
+        var userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
+        if (config.__suppressAllToolbars && editorExperiment('platform_editor_controls', 'variant1') && !userIntentEnabled) {
+          activeConfigs = undefined;
+          break;
+        }
+        if (userIntentEnabled && ['dragging', 'tablePopupOpen', 'commenting', 'resizing', 'blockMenuOpen'].includes((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) || '')) {
           activeConfigs = undefined;
           break;
         }

package/dist/types/floatingToolbarPlugin.d.ts

@@ -51,6 +51,7 @@ export declare const pluginKey: PluginKey<FloatingToolbarPluginState>;
  * @returns A SafePlugin instance that manages floating toolbar state and behavior
  */
 export declare function floatingToolbarPluginFactory(options: {
+    api: ExtractInjectionAPI<FloatingToolbarPlugin> | undefined;
     floatingToolbarHandlers: Array<FloatingToolbarHandler>;
     getIntl: () => IntlShape;
     providerFactory: ProviderFactory;

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

@@ -51,6 +51,7 @@ export declare const pluginKey: PluginKey<FloatingToolbarPluginState>;
  * @returns A SafePlugin instance that manages floating toolbar state and behavior
  */
 export declare function floatingToolbarPluginFactory(options: {
+    api: ExtractInjectionAPI<FloatingToolbarPlugin> | undefined;
     floatingToolbarHandlers: Array<FloatingToolbarHandler>;
     getIntl: () => IntlShape;
     providerFactory: ProviderFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "8.2.9",
+	"version": "8.2.11",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,23 +31,23 @@
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
-		"@atlaskit/editor-plugin-emoji": "^7.4.0",
-		"@atlaskit/editor-plugin-extension": "^9.1.0",
+		"@atlaskit/editor-plugin-emoji": "^7.5.0",
+		"@atlaskit/editor-plugin-extension": "^9.2.0",
 		"@atlaskit/editor-plugin-interaction": "^9.0.0",
-		"@atlaskit/editor-plugin-table": "^15.2.0",
+		"@atlaskit/editor-plugin-table": "^15.3.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/emoji": "^69.6.0",
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/menu": "^8.4.0",
-		"@atlaskit/modal-dialog": "^14.5.0",
+		"@atlaskit/modal-dialog": "^14.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^16.0.0",
+		"@atlaskit/primitives": "^16.1.0",
 		"@atlaskit/select": "^21.3.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.16.0",
+		"@atlaskit/tmp-editor-statsig": "^13.21.0",
 		"@atlaskit/tokens": "^7.0.0",
-		"@atlaskit/tooltip": "^20.6.0",
+		"@atlaskit/tooltip": "^20.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0",
@@ -57,7 +57,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.15.0",
+		"@atlaskit/editor-common": "^110.19.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -125,6 +125,9 @@
 		"platform_editor_fix_confirm_table_removal": {
 			"type": "boolean"
 		},
+		"platform_editor_a11y_add_role_to_popup": {
+			"type": "boolean"
+		},
 		"platform_editor_update_modal_close_button": {
 			"type": "boolean"
 		},