@atlaskit/editor-plugin-floating-toolbar 8.2.8 → 8.2.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 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
+
+- [`4f5569bde5e64`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4f5569bde5e64) -
+  Add new 'dragHandleSelected' user intent, use this to control table toolbar when drag handle is
+  selected
+- Updated dependencies
+
 ## 8.2.8
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -270,8 +270,16 @@ function ContentComponent(_ref5) {
     var selection = editorView.state.selection;
     var isCellSelection = '$anchorCell' in selection && !selection.empty;
     var isTextSelected = selection instanceof _state.TextSelection && !selection.empty;
-    if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection) {
-      return null;
+
+    // don't dismiss table toolbar when a cell selection is caused by clicking the drag handle (which has it's own userIntent)
+    if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_user_intent_fix')) {
+      if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection && (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'default') {
+        return null;
+      }
+    } else {
+      if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection) {
+        return null;
+      }
     }
   }
   var items = config.items;
@@ -423,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",

package/dist/es2019/floatingToolbarPlugin.js

@@ -262,8 +262,16 @@ export function ContentComponent({
     const selection = editorView.state.selection;
     const isCellSelection = '$anchorCell' in selection && !selection.empty;
     const isTextSelected = selection instanceof TextSelection && !selection.empty;
-    if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection) {
-      return null;
+
+    // don't dismiss table toolbar when a cell selection is caused by clicking the drag handle (which has it's own userIntent)
+    if (fg('platform_editor_toolbar_aifc_user_intent_fix')) {
+      if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection && (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'default') {
+        return null;
+      }
+    } else {
+      if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection) {
+        return null;
+      }
     }
   }
   let {
@@ -409,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",

package/dist/esm/floatingToolbarPlugin.js

@@ -261,8 +261,16 @@ export function ContentComponent(_ref5) {
     var selection = editorView.state.selection;
     var isCellSelection = '$anchorCell' in selection && !selection.empty;
     var isTextSelected = selection instanceof TextSelection && !selection.empty;
-    if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection) {
-      return null;
+
+    // don't dismiss table toolbar when a cell selection is caused by clicking the drag handle (which has it's own userIntent)
+    if (fg('platform_editor_toolbar_aifc_user_intent_fix')) {
+      if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection && (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'default') {
+        return null;
+      }
+    } else {
+      if (isTextSelected && config.className !== 'hyperlink-floating-toolbar' || isCellSelection) {
+        return null;
+      }
     }
   }
   var items = config.items;
@@ -414,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",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "8.2.8",
+	"version": "8.2.10",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,20 +32,20 @@
 		"@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-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/select": "^21.3.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.13.0",
+		"@atlaskit/tmp-editor-statsig": "^13.19.0",
 		"@atlaskit/tokens": "^7.0.0",
 		"@atlaskit/tooltip": "^20.6.0",
 		"@babel/runtime": "^7.0.0",
@@ -57,7 +57,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.14.0",
+		"@atlaskit/editor-common": "^110.18.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -125,8 +125,14 @@
 		"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"
+		},
+		"platform_editor_toolbar_aifc_user_intent_fix": {
+			"type": "boolean"
 		}
 	}
 }