@atlaskit/editor-toolbar 0.19.4 → 0.19.6

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 +17 -0
  2. package/dist/cjs/ui/Toolbar.js +3 -3
  3. package/dist/cjs/ui/ToolbarKeyboardNavigationProvider.js +20 -27
  4. package/dist/es2019/ui/Toolbar.js +3 -3
  5. package/dist/es2019/ui/ToolbarKeyboardNavigationProvider.js +20 -27
  6. package/dist/esm/ui/Toolbar.js +3 -3
  7. package/dist/esm/ui/ToolbarKeyboardNavigationProvider.js +20 -27
  8. package/package.json +4 -7
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-toolbar
2
2
 
3
+ ## 0.19.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [`9041ec452a104`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9041ec452a104) -
8
+ [EDITOR-4515] clean up fg platform_editor_toolbar_aifc_patch_7
9
+ - Updated dependencies
10
+
11
+ ## 0.19.5
12
+
13
+ ### Patch Changes
14
+
15
+ - [`aeb74c52331de`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/aeb74c52331de) -
16
+ [EDITOR-4634] remove duplicated toolbar role from toolbar elements behind
17
+ platform_editor_aifc_remove_duplicate_role
18
+ - Updated dependencies
19
+
3
20
  ## 0.19.4
4
21
 
5
22
  ### Patch Changes
package/dist/cjs/ui/Toolbar.js CHANGED
@@ -40,7 +40,7 @@ var Toolbar = exports.Toolbar = function Toolbar(_ref) {
40
40
  var isResponsiveEnabled = (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true);
41
41
  var toolbar = /*#__PURE__*/_react.default.createElement(_compiled.Box, {
42
42
  xcss: (0, _css.cx)(styles.toolbarBase, styles.toolbar, isResponsiveEnabled && styles.toolbarResponsive, isResponsiveEnabled && styles.hiddenSelectors, (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && styles.toolbarSeparator, (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && styles.hiddenSelectorsPatch),
43
- role: "toolbar",
43
+ role: (0, _expValEquals.expValEquals)('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
44
44
  "aria-label": label,
45
45
  testId: testId,
46
46
  "data-toolbar-type": (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'inline' : undefined
@@ -88,14 +88,14 @@ var PrimaryToolbar = exports.PrimaryToolbar = function PrimaryToolbar(_ref2) {
88
88
  reducedBreakpoints: reducedBreakpoints
89
89
  }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
90
90
  xcss: (0, _css.cx)(styles.toolbarBase, styles.primaryToolbar, styles.hiddenSelectors),
91
- role: "toolbar",
91
+ role: (0, _expValEquals.expValEquals)('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
92
92
  "aria-label": label,
93
93
  "data-toolbar-type": (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'primary' : undefined
94
94
  }, children));
95
95
  }
96
96
  return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
97
97
  xcss: (0, _css.cx)(styles.toolbarBase, styles.primaryToolbar),
98
- role: "toolbar",
98
+ role: (0, _expValEquals.expValEquals)('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
99
99
  "aria-label": label,
100
100
  "data-toolbar-type": (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'primary' : undefined
101
101
  }, children);
package/dist/cjs/ui/ToolbarKeyboardNavigationProvider.js CHANGED
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.ToolbarKeyboardNavigationProvider = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _browserApis = require("@atlaskit/browser-apis");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
11
11
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
12
12
  var ToolbarKeyboardNavigationProvider = exports.ToolbarKeyboardNavigationProvider = function ToolbarKeyboardNavigationProvider(_ref) {
13
13
  var children = _ref.children,
@@ -97,34 +97,26 @@ var ToolbarKeyboardNavigationProvider = exports.ToolbarKeyboardNavigationProvide
97
97
  if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
98
98
  return;
99
99
  }
100
- if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7')) {
101
- switch (event.key) {
102
- case 'Escape':
103
- handleEscape(event);
100
+ switch (event.key) {
101
+ case 'Escape':
102
+ handleEscape(event);
103
+ break;
104
+ case 'ArrowLeft':
105
+ event.preventDefault();
106
+ moveFocus('left');
107
+ break;
108
+ case 'ArrowRight':
109
+ event.preventDefault();
110
+ moveFocus('right');
111
+ break;
112
+ case 'Tab':
113
+ {
114
+ handleTab();
104
115
  break;
105
- case 'ArrowLeft':
106
- event.preventDefault();
107
- moveFocus('left');
108
- break;
109
- case 'ArrowRight':
110
- event.preventDefault();
111
- moveFocus('right');
112
- break;
113
- case 'Tab':
114
- {
115
- handleTab();
116
- break;
117
- }
118
- default:
119
- }
120
- } else {
121
- switch (event.key) {
122
- case 'Escape':
123
- handleEscape(event);
124
- break;
125
- default:
126
- }
116
+ }
117
+ default:
127
118
  }
119
+ ;
128
120
  };
129
121
  var globalKeyDownHandler = function globalKeyDownHandler(event) {
130
122
  if (isShortcutToFocusToolbar && isShortcutToFocusToolbar(event)) {
@@ -151,6 +143,7 @@ var ToolbarKeyboardNavigationProvider = exports.ToolbarKeyboardNavigationProvide
151
143
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- ignored via go/DSP-18766
152
144
  className: "custom-key-handler-wrapper",
153
145
  ref: wrapperRef,
146
+ role: (0, _expValEquals.expValEquals)('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? 'toolbar' : undefined,
154
147
  "aria-label": ariaLabel,
155
148
  "aria-controls": ariaControls
156
149
  }, children);
package/dist/es2019/ui/Toolbar.js CHANGED
@@ -34,7 +34,7 @@ export const Toolbar = ({
34
34
  const isResponsiveEnabled = expValEquals('platform_editor_toolbar_aifc_responsive', 'isEnabled', true);
35
35
  const toolbar = /*#__PURE__*/React.createElement(Box, {
36
36
  xcss: cx(styles.toolbarBase, styles.toolbar, isResponsiveEnabled && styles.toolbarResponsive, isResponsiveEnabled && styles.hiddenSelectors, expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && styles.toolbarSeparator, expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && styles.hiddenSelectorsPatch),
37
- role: "toolbar",
37
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
38
38
  "aria-label": label,
39
39
  testId: testId,
40
40
  "data-toolbar-type": expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'inline' : undefined
@@ -86,14 +86,14 @@ export const PrimaryToolbar = ({
86
86
  reducedBreakpoints: reducedBreakpoints
87
87
  }, /*#__PURE__*/React.createElement(Box, {
88
88
  xcss: cx(styles.toolbarBase, styles.primaryToolbar, styles.hiddenSelectors),
89
- role: "toolbar",
89
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
90
90
  "aria-label": label,
91
91
  "data-toolbar-type": expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'primary' : undefined
92
92
  }, children));
93
93
  }
94
94
  return /*#__PURE__*/React.createElement(Box, {
95
95
  xcss: cx(styles.toolbarBase, styles.primaryToolbar),
96
- role: "toolbar",
96
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
97
97
  "aria-label": label,
98
98
  "data-toolbar-type": expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'primary' : undefined
99
99
  }, children);
package/dist/es2019/ui/ToolbarKeyboardNavigationProvider.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React, { useLayoutEffect, useRef } from 'react';
2
2
  import { getDocument } from '@atlaskit/browser-apis';
3
- import { fg } from '@atlaskit/platform-feature-flags';
3
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
4
  export const ToolbarKeyboardNavigationProvider = ({
5
5
  children,
6
6
  childComponentSelector,
@@ -86,34 +86,26 @@ export const ToolbarKeyboardNavigationProvider = ({
86
86
  if (targetElement instanceof HTMLElement && !targetElement.closest(`${childComponentSelector}`)) {
87
87
  return;
88
88
  }
89
- if (fg('platform_editor_toolbar_aifc_patch_7')) {
90
- switch (event.key) {
91
- case 'Escape':
92
- handleEscape(event);
89
+ switch (event.key) {
90
+ case 'Escape':
91
+ handleEscape(event);
92
+ break;
93
+ case 'ArrowLeft':
94
+ event.preventDefault();
95
+ moveFocus('left');
96
+ break;
97
+ case 'ArrowRight':
98
+ event.preventDefault();
99
+ moveFocus('right');
100
+ break;
101
+ case 'Tab':
102
+ {
103
+ handleTab();
93
104
  break;
94
- case 'ArrowLeft':
95
- event.preventDefault();
96
- moveFocus('left');
97
- break;
98
- case 'ArrowRight':
99
- event.preventDefault();
100
- moveFocus('right');
101
- break;
102
- case 'Tab':
103
- {
104
- handleTab();
105
- break;
106
- }
107
- default:
108
- }
109
- } else {
110
- switch (event.key) {
111
- case 'Escape':
112
- handleEscape(event);
113
- break;
114
- default:
115
- }
105
+ }
106
+ default:
116
107
  }
108
+ ;
117
109
  };
118
110
  const globalKeyDownHandler = event => {
119
111
  if (isShortcutToFocusToolbar && isShortcutToFocusToolbar(event)) {
@@ -140,6 +132,7 @@ export const ToolbarKeyboardNavigationProvider = ({
140
132
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- ignored via go/DSP-18766
141
133
  className: "custom-key-handler-wrapper",
142
134
  ref: wrapperRef,
135
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? 'toolbar' : undefined,
143
136
  "aria-label": ariaLabel,
144
137
  "aria-controls": ariaControls
145
138
  }, children);
package/dist/esm/ui/Toolbar.js CHANGED
@@ -33,7 +33,7 @@ export var Toolbar = function Toolbar(_ref) {
33
33
  var isResponsiveEnabled = expValEquals('platform_editor_toolbar_aifc_responsive', 'isEnabled', true);
34
34
  var toolbar = /*#__PURE__*/React.createElement(Box, {
35
35
  xcss: cx(styles.toolbarBase, styles.toolbar, isResponsiveEnabled && styles.toolbarResponsive, isResponsiveEnabled && styles.hiddenSelectors, expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && styles.toolbarSeparator, expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && styles.hiddenSelectorsPatch),
36
- role: "toolbar",
36
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
37
37
  "aria-label": label,
38
38
  testId: testId,
39
39
  "data-toolbar-type": expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'inline' : undefined
@@ -81,14 +81,14 @@ export var PrimaryToolbar = function PrimaryToolbar(_ref2) {
81
81
  reducedBreakpoints: reducedBreakpoints
82
82
  }, /*#__PURE__*/React.createElement(Box, {
83
83
  xcss: cx(styles.toolbarBase, styles.primaryToolbar, styles.hiddenSelectors),
84
- role: "toolbar",
84
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
85
85
  "aria-label": label,
86
86
  "data-toolbar-type": expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'primary' : undefined
87
87
  }, children));
88
88
  }
89
89
  return /*#__PURE__*/React.createElement(Box, {
90
90
  xcss: cx(styles.toolbarBase, styles.primaryToolbar),
91
- role: "toolbar",
91
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? undefined : 'toolbar',
92
92
  "aria-label": label,
93
93
  "data-toolbar-type": expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? 'primary' : undefined
94
94
  }, children);
package/dist/esm/ui/ToolbarKeyboardNavigationProvider.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React, { useLayoutEffect, useRef } from 'react';
2
2
  import { getDocument } from '@atlaskit/browser-apis';
3
- import { fg } from '@atlaskit/platform-feature-flags';
3
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
4
4
  export var ToolbarKeyboardNavigationProvider = function ToolbarKeyboardNavigationProvider(_ref) {
5
5
  var children = _ref.children,
6
6
  childComponentSelector = _ref.childComponentSelector,
@@ -89,34 +89,26 @@ export var ToolbarKeyboardNavigationProvider = function ToolbarKeyboardNavigatio
89
89
  if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
90
90
  return;
91
91
  }
92
- if (fg('platform_editor_toolbar_aifc_patch_7')) {
93
- switch (event.key) {
94
- case 'Escape':
95
- handleEscape(event);
92
+ switch (event.key) {
93
+ case 'Escape':
94
+ handleEscape(event);
95
+ break;
96
+ case 'ArrowLeft':
97
+ event.preventDefault();
98
+ moveFocus('left');
99
+ break;
100
+ case 'ArrowRight':
101
+ event.preventDefault();
102
+ moveFocus('right');
103
+ break;
104
+ case 'Tab':
105
+ {
106
+ handleTab();
96
107
  break;
97
- case 'ArrowLeft':
98
- event.preventDefault();
99
- moveFocus('left');
100
- break;
101
- case 'ArrowRight':
102
- event.preventDefault();
103
- moveFocus('right');
104
- break;
105
- case 'Tab':
106
- {
107
- handleTab();
108
- break;
109
- }
110
- default:
111
- }
112
- } else {
113
- switch (event.key) {
114
- case 'Escape':
115
- handleEscape(event);
116
- break;
117
- default:
118
- }
108
+ }
109
+ default:
119
110
  }
111
+ ;
120
112
  };
121
113
  var globalKeyDownHandler = function globalKeyDownHandler(event) {
122
114
  if (isShortcutToFocusToolbar && isShortcutToFocusToolbar(event)) {
@@ -143,6 +135,7 @@ export var ToolbarKeyboardNavigationProvider = function ToolbarKeyboardNavigatio
143
135
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- ignored via go/DSP-18766
144
136
  className: "custom-key-handler-wrapper",
145
137
  ref: wrapperRef,
138
+ role: expValEquals('platform_editor_aifc_remove_duplicate_role', 'isEnabled', true) ? 'toolbar' : undefined,
146
139
  "aria-label": ariaLabel,
147
140
  "aria-controls": ariaControls
148
141
  }, children);
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "registry": "https://registry.npmjs.org/"
5
5
  },
6
- "version": "0.19.4",
6
+ "version": "0.19.6",
7
7
  "description": "Common UI for Toolbars across the platform",
8
8
  "atlassian": {
9
9
  "team": "Editor: Jenga",
@@ -25,13 +25,13 @@
25
25
  "@atlaskit/browser-apis": "^0.0.1",
26
26
  "@atlaskit/css": "^0.19.0",
27
27
  "@atlaskit/dropdown-menu": "^16.4.0",
28
- "@atlaskit/icon": "^29.4.0",
28
+ "@atlaskit/icon": "^30.0.0",
29
29
  "@atlaskit/icon-lab": "^5.14.0",
30
30
  "@atlaskit/platform-feature-flags": "^1.1.0",
31
31
  "@atlaskit/popup": "^4.13.0",
32
32
  "@atlaskit/primitives": "^17.1.0",
33
- "@atlaskit/tmp-editor-statsig": "^16.25.0",
34
- "@atlaskit/tokens": "^10.0.0",
33
+ "@atlaskit/tmp-editor-statsig": "^16.30.0",
34
+ "@atlaskit/tokens": "^10.1.0",
35
35
  "@atlaskit/tooltip": "^20.14.0",
36
36
  "@babel/runtime": "^7.0.0",
37
37
  "@compiled/react": "^0.18.6",
@@ -81,9 +81,6 @@
81
81
  }
82
82
  },
83
83
  "platform-feature-flags": {
84
- "platform_editor_toolbar_aifc_patch_7": {
85
- "type": "boolean"
86
- },
87
84
  "platform_editor_toolbar_aifc_responsive_improve": {
88
85
  "type": "boolean"
89
86
  },