@atlaskit/editor-toolbar 1.5.1 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/ToolbarDropdownItem.js +8 -6
  3. package/dist/cjs/ui/ToolbarMenuContainer.js +2 -1
  4. package/dist/es2019/ui/ToolbarDropdownItem.js +8 -6
  5. package/dist/es2019/ui/ToolbarMenuContainer.js +2 -1
  6. package/dist/esm/ui/ToolbarDropdownItem.js +8 -6
  7. package/dist/esm/ui/ToolbarMenuContainer.js +2 -1
  8. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-toolbar
2
2
 
3
+ ## 1.5.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [`0197bccd3d244`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0197bccd3d244) -
8
+ Add vertical alignment options to layout column menus and rendering.
9
+ - Updated dependencies
10
+
3
11
  ## 1.5.1
4
12
 
5
13
  ### Patch Changes
package/dist/cjs/ui/ToolbarDropdownItem.js CHANGED
@@ -45,16 +45,17 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/(0, _react.forwardRef)(function
45
45
  title = _ref.title,
46
46
  dataExtensionItemKey = _ref['data-extension-item-key'];
47
47
  return /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
48
- role: (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
48
+ role: (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) ? ariaPressed !== undefined && !ariaHasPopup ? 'menuitemradio' : 'menuitem' : (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
49
49
  testId: testId,
50
50
  xcss: (0, _css.cx)(styles.toolbarDropdownItem, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
51
51
  onClick: onClick,
52
52
  tabIndex: tabIndex,
53
53
  "aria-haspopup": ariaHasPopup,
54
- "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined
54
+ "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined,
55
+ "aria-checked": (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) && !ariaHasPopup ? ariaPressed : undefined
55
56
  // platform_editor_enghealth_a11y_jan_fixes: menuitem roles cannot have aria-pressed attribute
56
57
  ,
57
- "aria-pressed": (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
58
+ "aria-pressed": (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) ? undefined : (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
58
59
  "aria-disabled": ariaDisabled,
59
60
  "aria-keyshortcuts": ariaKeyshortcuts,
60
61
  "data-toolbar-component": (0, _experiments.editorExperiment)('platform_synced_block', true) ? 'menu-item' : undefined,
@@ -78,16 +79,17 @@ var CustomDropdownMenuItemAnchor = /*#__PURE__*/(0, _react.forwardRef)(function
78
79
  title = _ref2.title,
79
80
  dataAttributes = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
80
81
  return /*#__PURE__*/_react.default.createElement(_compiled.Anchor, (0, _extends2.default)({
81
- role: (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
82
+ role: (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) ? ariaPressed !== undefined && !ariaHasPopup ? 'menuitemradio' : 'menuitem' : (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
82
83
  testId: testId,
83
84
  xcss: (0, _css.cx)(styles.toolbarDropdownItem, styles.anchor, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
84
85
  onClick: onClick,
85
86
  tabIndex: tabIndex,
86
87
  "aria-haspopup": ariaHasPopup,
87
- "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined
88
+ "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined,
89
+ "aria-checked": (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) && !ariaHasPopup ? ariaPressed : undefined
88
90
  // platform_editor_enghealth_a11y_jan_fixes: menuitem roles cannot have aria-pressed attribute
89
91
  ,
90
- "aria-pressed": (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
92
+ "aria-pressed": (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) ? undefined : (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
91
93
  "aria-disabled": ariaDisabled,
92
94
  "aria-keyshortcuts": ariaKeyshortcuts,
93
95
  "data-toolbar-component": "menu-item",
package/dist/cjs/ui/ToolbarMenuContainer.js CHANGED
@@ -22,6 +22,7 @@ var ToolbarMenuContainer = exports.ToolbarMenuContainer = function ToolbarMenuCo
22
22
  var children = _ref.children;
23
23
  return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
24
24
  xcss: styles.container,
25
- "data-toolbar-component": "menu"
25
+ "data-toolbar-component": "menu",
26
+ role: "menu"
26
27
  }, children);
27
28
  };
package/dist/es2019/ui/ToolbarDropdownItem.js CHANGED
@@ -30,16 +30,17 @@ const CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(({
30
30
  title,
31
31
  'data-extension-item-key': dataExtensionItemKey
32
32
  }, ref) => /*#__PURE__*/React.createElement(Pressable, {
33
- role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
33
+ role: expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? ariaPressed !== undefined && !ariaHasPopup ? 'menuitemradio' : 'menuitem' : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
34
34
  testId: testId,
35
35
  xcss: cx(styles.toolbarDropdownItem, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
36
36
  onClick: onClick,
37
37
  tabIndex: tabIndex,
38
38
  "aria-haspopup": ariaHasPopup,
39
- "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined
39
+ "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined,
40
+ "aria-checked": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && !ariaHasPopup ? ariaPressed : undefined
40
41
  // platform_editor_enghealth_a11y_jan_fixes: menuitem roles cannot have aria-pressed attribute
41
42
  ,
42
- "aria-pressed": expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
43
+ "aria-pressed": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? undefined : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
43
44
  "aria-disabled": ariaDisabled,
44
45
  "aria-keyshortcuts": ariaKeyshortcuts,
45
46
  "data-toolbar-component": editorExperiment('platform_synced_block', true) ? 'menu-item' : undefined,
@@ -62,16 +63,17 @@ const CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(({
62
63
  title,
63
64
  ...dataAttributes
64
65
  }, ref) => /*#__PURE__*/React.createElement(Anchor, _extends({
65
- role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
66
+ role: expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? ariaPressed !== undefined && !ariaHasPopup ? 'menuitemradio' : 'menuitem' : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
66
67
  testId: testId,
67
68
  xcss: cx(styles.toolbarDropdownItem, styles.anchor, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
68
69
  onClick: onClick,
69
70
  tabIndex: tabIndex,
70
71
  "aria-haspopup": ariaHasPopup,
71
- "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined
72
+ "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined,
73
+ "aria-checked": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && !ariaHasPopup ? ariaPressed : undefined
72
74
  // platform_editor_enghealth_a11y_jan_fixes: menuitem roles cannot have aria-pressed attribute
73
75
  ,
74
- "aria-pressed": expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
76
+ "aria-pressed": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? undefined : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
75
77
  "aria-disabled": ariaDisabled,
76
78
  "aria-keyshortcuts": ariaKeyshortcuts,
77
79
  "data-toolbar-component": "menu-item",
package/dist/es2019/ui/ToolbarMenuContainer.js CHANGED
@@ -16,6 +16,7 @@ export const ToolbarMenuContainer = ({
16
16
  }) => {
17
17
  return /*#__PURE__*/React.createElement(Box, {
18
18
  xcss: styles.container,
19
- "data-toolbar-component": "menu"
19
+ "data-toolbar-component": "menu",
20
+ role: "menu"
20
21
  }, children);
21
22
  };
package/dist/esm/ui/ToolbarDropdownItem.js CHANGED
@@ -36,16 +36,17 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(function (_ref, ref)
36
36
  title = _ref.title,
37
37
  dataExtensionItemKey = _ref['data-extension-item-key'];
38
38
  return /*#__PURE__*/React.createElement(Pressable, {
39
- role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
39
+ role: expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? ariaPressed !== undefined && !ariaHasPopup ? 'menuitemradio' : 'menuitem' : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
40
40
  testId: testId,
41
41
  xcss: cx(styles.toolbarDropdownItem, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
42
42
  onClick: onClick,
43
43
  tabIndex: tabIndex,
44
44
  "aria-haspopup": ariaHasPopup,
45
- "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined
45
+ "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined,
46
+ "aria-checked": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && !ariaHasPopup ? ariaPressed : undefined
46
47
  // platform_editor_enghealth_a11y_jan_fixes: menuitem roles cannot have aria-pressed attribute
47
48
  ,
48
- "aria-pressed": expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
49
+ "aria-pressed": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? undefined : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
49
50
  "aria-disabled": ariaDisabled,
50
51
  "aria-keyshortcuts": ariaKeyshortcuts,
51
52
  "data-toolbar-component": editorExperiment('platform_synced_block', true) ? 'menu-item' : undefined,
@@ -69,16 +70,17 @@ var CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(function (_ref2, ref)
69
70
  title = _ref2.title,
70
71
  dataAttributes = _objectWithoutProperties(_ref2, _excluded);
71
72
  return /*#__PURE__*/React.createElement(Anchor, _extends({
72
- role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
73
+ role: expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? ariaPressed !== undefined && !ariaHasPopup ? 'menuitemradio' : 'menuitem' : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menuitem' : undefined,
73
74
  testId: testId,
74
75
  xcss: cx(styles.toolbarDropdownItem, styles.anchor, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
75
76
  onClick: onClick,
76
77
  tabIndex: tabIndex,
77
78
  "aria-haspopup": ariaHasPopup,
78
- "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined
79
+ "aria-expanded": ariaHasPopup ? ariaPressed ? true : false : undefined,
80
+ "aria-checked": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && !ariaHasPopup ? ariaPressed : undefined
79
81
  // platform_editor_enghealth_a11y_jan_fixes: menuitem roles cannot have aria-pressed attribute
80
82
  ,
81
- "aria-pressed": expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
83
+ "aria-pressed": expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) ? undefined : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? undefined : ariaPressed,
82
84
  "aria-disabled": ariaDisabled,
83
85
  "aria-keyshortcuts": ariaKeyshortcuts,
84
86
  "data-toolbar-component": "menu-item",
package/dist/esm/ui/ToolbarMenuContainer.js CHANGED
@@ -15,6 +15,7 @@ export var ToolbarMenuContainer = function ToolbarMenuContainer(_ref) {
15
15
  var children = _ref.children;
16
16
  return /*#__PURE__*/React.createElement(Box, {
17
17
  xcss: styles.container,
18
- "data-toolbar-component": "menu"
18
+ "data-toolbar-component": "menu",
19
+ role: "menu"
19
20
  }, children);
20
21
  };
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "registry": "https://registry.npmjs.org/"
5
5
  },
6
- "version": "1.5.1",
6
+ "version": "1.5.2",
7
7
  "description": "Common UI for Toolbars across the platform",
8
8
  "atlassian": {
9
9
  "react-compiler": {
@@ -32,12 +32,12 @@
32
32
  "@atlaskit/browser-apis": "^0.0.1",
33
33
  "@atlaskit/css": "^0.19.0",
34
34
  "@atlaskit/dropdown-menu": "^16.8.0",
35
- "@atlaskit/icon": "^34.6.0",
35
+ "@atlaskit/icon": "^35.0.0",
36
36
  "@atlaskit/icon-lab": "^6.9.0",
37
37
  "@atlaskit/platform-feature-flags": "^1.1.0",
38
38
  "@atlaskit/popup": "^4.19.0",
39
39
  "@atlaskit/primitives": "^19.0.0",
40
- "@atlaskit/tmp-editor-statsig": "^81.0.0",
40
+ "@atlaskit/tmp-editor-statsig": "^81.1.0",
41
41
  "@atlaskit/tokens": "^13.0.0",
42
42
  "@atlaskit/tooltip": "^22.2.0",
43
43
  "@babel/runtime": "^7.0.0",