@atlaskit/editor-plugin-floating-toolbar 1.2.2 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.2.3
+
+### Patch Changes
+
+- [#80728](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80728) [`aac7ad9bb32d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/aac7ad9bb32d) - [ux] The table's floating toolbar dropdown menu a11y annnouncement.
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/cjs/ui/DropdownMenu.js

@@ -17,6 +17,7 @@ var _reactIntlNext = require("react-intl-next");
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _done = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/done"));
 var _menu = require("@atlaskit/menu");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -133,6 +134,18 @@ var DropdownMenuItem = function DropdownMenuItem(_ref) {
       e.preventDefault();
     }
   }, [item.disabled]);
+  var isAriaChecked = function isAriaChecked(item) {
+    var selected = item.selected,
+      domItemOptions = item.domItemOptions;
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') && (domItemOptions === null || domItemOptions === void 0 ? void 0 : domItemOptions.type) === 'item-checkbox') {
+      return selected;
+    }
+    return undefined;
+  };
+  var hasRole = function hasRole(item) {
+    var domItemOptions = item.domItemOptions;
+    return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') && (domItemOptions === null || domItemOptions === void 0 ? void 0 : domItemOptions.type) === 'item-checkbox' ? 'menuitemcheckbox' : undefined;
+  };
   (0, _react.useEffect)(function () {
     var labelRefCurrent = labelRef.current;
     // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -158,7 +171,9 @@ var DropdownMenuItem = function DropdownMenuItem(_ref) {
     onMouseLeave: handleItemMouseLeave,
     onMouseOut: handleItemMouseOut,
     onFocus: handleItemOnFocus,
-    onBlur: handleItemOnBlur
+    onBlur: handleItemOnBlur,
+    role: hasRole(item),
+    "aria-checked": isAriaChecked(item)
   }, (0, _react2.jsx)("span", {
     ref: labelRef,
     css: labelStyles
@@ -190,7 +205,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         intl = _this$props.intl,
         editorView = _this$props.editorView;
       return (0, _react2.jsx)("div", {
-        css: menuContainerStyles
+        css: menuContainerStyles,
+        role: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') ? 'menu' : undefined
       }, items.filter(function (item) {
         return !item.hidden;
       }).map(function (item, idx) {
@@ -211,6 +227,15 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         showSelected = _this$props$showSelec === void 0 ? true : _this$props$showSelec;
       var selected = item.selected;
       if (showSelected && selected) {
+        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33')) {
+          return (0, _react2.jsx)("span", {
+            "aria-hidden": "true"
+          }, (0, _react2.jsx)(_done.default, {
+            primaryColor: "var(--ds-icon-selected, ".concat(_colors.B400, ")"),
+            size: "small",
+            label: intl.formatMessage(_floatingToolbar.messages.confirmModalOK)
+          }));
+        }
         return (0, _react2.jsx)(_done.default, {
           primaryColor: "var(--ds-icon-selected, ".concat(_colors.B400, ")"),
           size: "small",

package/dist/es2019/ui/DropdownMenu.js

@@ -7,6 +7,7 @@ import { injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import { ButtonItem } from '@atlaskit/menu';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
@@ -119,6 +120,22 @@ const DropdownMenuItem = ({
       e.preventDefault();
     }
   }, [item.disabled]);
+  const isAriaChecked = item => {
+    const {
+      selected,
+      domItemOptions
+    } = item;
+    if (getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') && (domItemOptions === null || domItemOptions === void 0 ? void 0 : domItemOptions.type) === 'item-checkbox') {
+      return selected;
+    }
+    return undefined;
+  };
+  const hasRole = item => {
+    const {
+      domItemOptions
+    } = item;
+    return getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') && (domItemOptions === null || domItemOptions === void 0 ? void 0 : domItemOptions.type) === 'item-checkbox' ? 'menuitemcheckbox' : undefined;
+  };
   useEffect(() => {
     const labelRefCurrent = labelRef.current;
     // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -144,7 +161,9 @@ const DropdownMenuItem = ({
     onMouseLeave: handleItemMouseLeave,
     onMouseOut: handleItemMouseOut,
     onFocus: handleItemOnFocus,
-    onBlur: handleItemOnBlur
+    onBlur: handleItemOnBlur,
+    role: hasRole(item),
+    "aria-checked": isAriaChecked(item)
   }, jsx("span", {
     ref: labelRef,
     css: labelStyles
@@ -168,7 +187,8 @@ class Dropdown extends Component {
       editorView
     } = this.props;
     return jsx("div", {
-      css: menuContainerStyles
+      css: menuContainerStyles,
+      role: getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') ? 'menu' : undefined
     }, items.filter(item => !item.hidden).map((item, idx) => jsx(DropdownMenuItem, {
       key: idx,
       item: item,
@@ -186,6 +206,15 @@ class Dropdown extends Component {
       selected
     } = item;
     if (showSelected && selected) {
+      if (getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33')) {
+        return jsx("span", {
+          "aria-hidden": "true"
+        }, jsx(EditorDoneIcon, {
+          primaryColor: `var(--ds-icon-selected, ${B400})`,
+          size: "small",
+          label: intl.formatMessage(messages.confirmModalOK)
+        }));
+      }
       return jsx(EditorDoneIcon, {
         primaryColor: `var(--ds-icon-selected, ${B400})`,
         size: "small",

package/dist/esm/ui/DropdownMenu.js

@@ -15,6 +15,7 @@ import { injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import { ButtonItem } from '@atlaskit/menu';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
@@ -129,6 +130,18 @@ var DropdownMenuItem = function DropdownMenuItem(_ref) {
       e.preventDefault();
     }
   }, [item.disabled]);
+  var isAriaChecked = function isAriaChecked(item) {
+    var selected = item.selected,
+      domItemOptions = item.domItemOptions;
+    if (getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') && (domItemOptions === null || domItemOptions === void 0 ? void 0 : domItemOptions.type) === 'item-checkbox') {
+      return selected;
+    }
+    return undefined;
+  };
+  var hasRole = function hasRole(item) {
+    var domItemOptions = item.domItemOptions;
+    return getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') && (domItemOptions === null || domItemOptions === void 0 ? void 0 : domItemOptions.type) === 'item-checkbox' ? 'menuitemcheckbox' : undefined;
+  };
   useEffect(function () {
     var labelRefCurrent = labelRef.current;
     // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -154,7 +167,9 @@ var DropdownMenuItem = function DropdownMenuItem(_ref) {
     onMouseLeave: handleItemMouseLeave,
     onMouseOut: handleItemMouseOut,
     onFocus: handleItemOnFocus,
-    onBlur: handleItemOnBlur
+    onBlur: handleItemOnBlur,
+    role: hasRole(item),
+    "aria-checked": isAriaChecked(item)
   }, jsx("span", {
     ref: labelRef,
     css: labelStyles
@@ -186,7 +201,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         intl = _this$props.intl,
         editorView = _this$props.editorView;
       return jsx("div", {
-        css: menuContainerStyles
+        css: menuContainerStyles,
+        role: getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33') ? 'menu' : undefined
       }, items.filter(function (item) {
         return !item.hidden;
       }).map(function (item, idx) {
@@ -207,6 +223,15 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         showSelected = _this$props$showSelec === void 0 ? true : _this$props$showSelec;
       var selected = item.selected;
       if (showSelected && selected) {
+        if (getBooleanFF('platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33')) {
+          return jsx("span", {
+            "aria-hidden": "true"
+          }, jsx(EditorDoneIcon, {
+            primaryColor: "var(--ds-icon-selected, ".concat(B400, ")"),
+            size: "small",
+            label: intl.formatMessage(messages.confirmModalOK)
+          }));
+        }
         return jsx(EditorDoneIcon, {
           primaryColor: "var(--ds-icon-selected, ".concat(B400, ")"),
           size: "small",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-floating-toolbar",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Floating toolbar plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@atlaskit/adf-utils": "^19.0.0",
-    "@atlaskit/button": "^17.7.0",
+    "@atlaskit/button": "^17.11.0",
     "@atlaskit/checkbox": "^13.1.0",
-    "@atlaskit/editor-common": "^78.17.0",
+    "@atlaskit/editor-common": "^78.23.0",
     "@atlaskit/editor-palette": "1.5.3",
     "@atlaskit/editor-plugin-context-panel": "^1.0.0",
     "@atlaskit/editor-plugin-copy-button": "^1.0.0",
@@ -35,16 +35,16 @@
     "@atlaskit/editor-plugin-editor-disabled": "^1.0.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
     "@atlaskit/editor-plugin-extension": "^1.1.0",
-    "@atlaskit/editor-plugin-table": "^7.5.0",
+    "@atlaskit/editor-plugin-table": "^7.6.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/menu": "^2.1.0",
     "@atlaskit/modal-dialog": "^12.10.0",
     "@atlaskit/platform-feature-flags": "^0.2.5",
-    "@atlaskit/select": "^17.3.0",
-    "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.42.0",
+    "@atlaskit/select": "^17.6.0",
+    "@atlaskit/theme": "^12.7.0",
+    "@atlaskit/tokens": "^1.43.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
@@ -109,6 +109,9 @@
   "platform-feature-flags": {
     "platform.editor.a11y-floating-toolbar-markup_vexmo": {
       "type": "boolean"
+    },
+    "platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33": {
+      "type": "boolean"
     }
   }
 }