@atlaskit/editor-plugin-floating-toolbar 1.1.1 → 1.2.1

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-plugin-floating-toolbar
2
2
 
3
+ ## 1.2.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#81374](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81374) [`ae662e160a10`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ae662e160a10) - React 18 types for editor-plugin-floating-toolbar
8
+
9
+ ## 1.2.0
10
+
11
+ ### Minor Changes
12
+
13
+ - [#70153](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70153) [`3a34e7545f18`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3a34e7545f18) - ECA11Y-36: Flaoting toolbar group buttons into radiogroup buttons structure
14
+
15
+ ### Patch Changes
16
+
17
+ - Updated dependencies
18
+
3
19
  ## 1.1.1
4
20
 
5
21
  ### Patch Changes
@@ -24,8 +24,8 @@ var _pluginKey = require("./pm-plugins/toolbar-data/plugin-key");
24
24
  var _ConfirmationModal = require("./ui/ConfirmationModal");
25
25
  var _ToolbarLoader = require("./ui/ToolbarLoader");
26
26
  var _utils2 = require("./utils");
27
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
28
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
27
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
28
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
29
29
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
30
30
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
31
31
  // AFP-2532 TODO: Fix automatic suppressions below
@@ -1,5 +1 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
1
+ "use strict";
@@ -13,8 +13,8 @@ var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-
13
13
  var _checkbox = require("@atlaskit/checkbox");
14
14
  var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
15
15
  var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
16
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
17
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
16
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
17
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
18
18
  var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
19
19
  var _options$getChildrenI;
20
20
  var _useState = (0, _react.useState)(false),
@@ -22,12 +22,12 @@ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-
22
22
  var _DropdownMenu = _interopRequireWildcard(require("./DropdownMenu"));
23
23
  var _templateObject, _templateObject2;
24
24
  /** @jsx jsx */
25
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
26
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
25
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
26
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
27
27
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
28
28
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
29
29
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
30
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
30
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
31
31
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
32
32
  var dropdownExpandContainer = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n margin: 0px ", ";\n"])), "var(--ds-space-negative-050, -4px)");
33
33
 
@@ -21,7 +21,7 @@ var _colors = require("@atlaskit/theme/colors");
21
21
  var _constants = require("@atlaskit/theme/constants");
22
22
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
23
23
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
24
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
24
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
25
25
  // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
26
26
  var menuItemDimensions = exports.menuItemDimensions = {
27
27
  width: 175,
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.EmojiPickerButton = void 0;
8
8
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
- var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
10
9
  var _react = _interopRequireDefault(require("react"));
11
10
  var _react2 = require("@emotion/react");
12
11
  var _button = _interopRequireDefault(require("@atlaskit/button"));
@@ -16,11 +15,13 @@ var _uiReact = require("@atlaskit/editor-common/ui-react");
16
15
  var _emoji = require("@atlaskit/emoji");
17
16
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
18
17
  var _EditorEmojiAddIcon = _interopRequireDefault(require("./EditorEmojiAddIcon"));
19
- var _templateObject;
20
18
  /** @jsx jsx */
19
+
21
20
  // helps adjusts position of popup
22
21
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
23
- var emojiPickerButtonWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n position: relative;\n"])));
22
+ var emojiPickerButtonWrapper = (0, _react2.css)({
23
+ position: 'relative'
24
+ });
24
25
  var EmojiPickerWithListener = (0, _uiReact.withReactEditorViewOuterListeners)(_emoji.EmojiPicker);
25
26
  var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(props) {
26
27
  var buttonRef = _react.default.useRef(null);
@@ -16,8 +16,8 @@ var _extensions = require("@atlaskit/editor-common/extensions");
16
16
  var _ui = require("@atlaskit/editor-common/ui");
17
17
  var _utils = require("@atlaskit/editor-common/utils");
18
18
  var _Separator = _interopRequireDefault(require("./Separator"));
19
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
20
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
19
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
20
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
21
21
  var noop = function noop() {
22
22
  return null;
23
23
  };
@@ -16,10 +16,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
16
16
  var _react = _interopRequireWildcard(require("react"));
17
17
  var _react2 = require("@emotion/react");
18
18
  var _ui = require("@atlaskit/editor-common/ui");
19
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
20
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
19
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
20
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
21
21
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
22
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
22
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
23
23
  // eslint-disable-next-line @repo/internal/react/no-class-components
24
24
  var TextField = exports.default = /*#__PURE__*/function (_Component) {
25
25
  (0, _inherits2.default)(TextField, _Component);
@@ -18,8 +18,8 @@ var _chevronRightLarge = _interopRequireDefault(require("@atlaskit/icon/glyph/ch
18
18
  var _colors = require("@atlaskit/theme/colors");
19
19
  var _templateObject;
20
20
  /** @jsx jsx */
21
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
22
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
21
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
22
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
23
23
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
24
24
  var toolbarScrollButtons = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: grid;\n grid-template-columns: 1fr 1fr;\n grid-gap: ", ";\n padding: ", " ", ";\n border-left: solid ", " 1px;\n flex-shrink: 0;\n align-items: center;\n"])), "var(--ds-space-050, 4px)", "var(--ds-space-050, 4px)", "var(--ds-space-100, 8px)", "var(--ds-border, ".concat(_colors.N30, ")"));
25
25
  var LeftIcon = _chevronLeftLarge.default;
@@ -54,7 +54,6 @@ var ScrollButtons = exports.ScrollButtons = function ScrollButtons(_ref) {
54
54
  setCanScrollLeft(scrollLeft > 0);
55
55
  setCanScrollRight(scrollLeft + offsetWidth < scrollWidth - 1); // -1 to account for half pixel
56
56
  });
57
-
58
57
  var onScroll = function onScroll() {
59
58
  return setCanScrollDebounced();
60
59
  };
@@ -9,8 +9,8 @@ exports.default = Search;
9
9
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
  var _select = _interopRequireDefault(require("@atlaskit/select"));
12
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
13
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
12
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
14
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
15
15
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
16
16
  function Search(props) {
@@ -10,8 +10,8 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
11
11
  var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
12
12
  var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
13
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
14
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
13
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
14
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
15
15
  var SimpleModal = exports.SimpleModal = function SimpleModal(props) {
16
16
  var onConfirm = props.onConfirm,
17
17
  onClose = props.onClose,
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.default = void 0;
9
+ exports.groupItems = groupItems;
9
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
11
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
12
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -25,6 +26,7 @@ var _uiColor = require("@atlaskit/editor-common/ui-color");
25
26
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
26
27
  var _editorPalette = require("@atlaskit/editor-palette");
27
28
  var _commands = require("@atlaskit/editor-plugin-table/commands");
29
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
28
30
  var _forceFocus = require("../pm-plugins/force-focus");
29
31
  var _commands2 = require("../pm-plugins/toolbar-data/commands");
30
32
  var _Dropdown = _interopRequireDefault(require("./Dropdown"));
@@ -36,10 +38,39 @@ var _Select = _interopRequireDefault(require("./Select"));
36
38
  var _Separator = _interopRequireDefault(require("./Separator"));
37
39
  var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
38
40
  /** @jsx jsx */
39
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
40
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
41
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
42
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
41
43
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
42
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
44
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
45
+ function groupItems(items) {
46
+ var groupItems = items.reduce(function (accumulator, item, i) {
47
+ var finalOutput = accumulator.finalOutput,
48
+ buttonGroup = accumulator.buttonGroup;
49
+ if (item.type === 'button') {
50
+ var notLastItem = i < items.length - 1;
51
+ var nextItemIsButton = items[i + 1] && items[i + 1].type === 'button';
52
+ var wasPreviousButton = items[i - 1] && items[i - 1].type === 'button';
53
+ var isRadioButton = notLastItem && nextItemIsButton || wasPreviousButton;
54
+ if (isRadioButton) {
55
+ item.isRadioButton = true;
56
+ buttonGroup.push(item);
57
+ if (!nextItemIsButton && wasPreviousButton) {
58
+ finalOutput.push(buttonGroup);
59
+ accumulator.buttonGroup = [];
60
+ }
61
+ } else {
62
+ finalOutput.push(item);
63
+ }
64
+ } else {
65
+ finalOutput.push(item);
66
+ }
67
+ return accumulator;
68
+ }, {
69
+ buttonGroup: [],
70
+ finalOutput: []
71
+ });
72
+ return groupItems.finalOutput;
73
+ }
43
74
  var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
44
75
  var items = _ref.items,
45
76
  dispatchCommand = _ref.dispatchCommand,
@@ -56,9 +87,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
56
87
  mountRef = _ref.mountRef,
57
88
  api = _ref.api;
58
89
  var emojiAndColourPickerMountPoint = scrollable ? popupsMountPoint || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.fabric-editor-popup-scroll-parent')) || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.ak-editor-content-area')) || undefined : popupsMountPoint;
59
- return (0, _react2.jsx)(_buttonGroup.default, null, items.filter(function (item) {
60
- return !item.hidden;
61
- }).map(function (item, idx) {
90
+ var renderItem = function renderItem(item, idx) {
62
91
  var _api$contextPanel, _api$extension;
63
92
  switch (item.type) {
64
93
  case 'button':
@@ -102,7 +131,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
102
131
  testId: item.testId,
103
132
  hideTooltipOnClick: item.hideTooltipOnClick,
104
133
  ariaHasPopup: item.ariaHasPopup,
105
- tabIndex: item.tabIndex
134
+ tabIndex: item.tabIndex,
135
+ isRadioButton: item.isRadioButton
106
136
  }, item.showTitle && item.title);
107
137
  case 'input':
108
138
  return (0, _react2.jsx)(_Input.default, {
@@ -229,7 +259,32 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
229
259
  key: idx
230
260
  });
231
261
  }
232
- }));
262
+ };
263
+ if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-floating-toolbar-markup_vexmo')) {
264
+ var groupedItems = groupItems(items.filter(function (item) {
265
+ return !item.hidden;
266
+ }));
267
+ return (0, _react2.jsx)(_buttonGroup.default, null, groupedItems.map(function (element, index) {
268
+ var isGroup = Array.isArray(element);
269
+ if (isGroup) {
270
+ return (0, _react2.jsx)("div", {
271
+ key: index,
272
+ css: buttonGroupStyles,
273
+ role: "radiogroup"
274
+ }, element.map(function (item, idx) {
275
+ return renderItem(item, idx);
276
+ }));
277
+ } else {
278
+ return renderItem(element, index);
279
+ }
280
+ }));
281
+ } else {
282
+ return (0, _react2.jsx)(_buttonGroup.default, null, items.filter(function (item) {
283
+ return !item.hidden;
284
+ }).map(function (item, index) {
285
+ return renderItem(item, index);
286
+ }));
287
+ }
233
288
  }, function (prevProps, nextProps) {
234
289
  if (!nextProps.node) {
235
290
  return false;
@@ -238,6 +293,10 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
238
293
  // otherwise it causes an issue where multiple popups stays open
239
294
  return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !(0, _floatingToolbar.areSameItems)(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
240
295
  });
296
+ var buttonGroupStyles = (0, _react2.css)({
297
+ display: 'flex',
298
+ gap: "var(--ds-space-050, 4px)"
299
+ });
241
300
 
242
301
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
243
302
  var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstElementIsSelect) {
@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.ToolbarLoader = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
9
  var _reactLoadable = _interopRequireDefault(require("react-loadable"));
10
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
11
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || (0, _typeof2.default)(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
10
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
11
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
12
12
  var ToolbarLoader = exports.ToolbarLoader = (0, _reactLoadable.default)({
13
13
  loader: function loader() {
14
14
  return Promise.resolve().then(function () {
@@ -1 +0,0 @@
1
- export {};
@@ -11,9 +11,9 @@ import EditorEmojiAddIcon from './EditorEmojiAddIcon';
11
11
 
12
12
  // helps adjusts position of popup
13
13
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
14
- const emojiPickerButtonWrapper = css`
15
- position: relative;
16
- `;
14
+ const emojiPickerButtonWrapper = css({
15
+ position: 'relative'
16
+ });
17
17
  const EmojiPickerWithListener = withReactEditorViewOuterListeners(EmojiPicker);
18
18
  export const EmojiPickerButton = props => {
19
19
  const buttonRef = React.useRef(null);
@@ -42,7 +42,6 @@ export const ScrollButtons = ({
42
42
  setCanScrollLeft(scrollLeft > 0);
43
43
  setCanScrollRight(scrollLeft + offsetWidth < scrollWidth - 1); // -1 to account for half pixel
44
44
  });
45
-
46
45
  const onScroll = () => setCanScrollDebounced();
47
46
  const scrollLeft = () => {
48
47
  var _scrollContainerRef$c, _scrollContainerRef$c2, _scrollContainerRef$c3;
@@ -11,6 +11,7 @@ import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-col
11
11
  import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
12
12
  import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
13
13
  import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
14
+ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
14
15
  import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
15
16
  import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
16
17
  import Dropdown from './Dropdown';
@@ -20,6 +21,37 @@ import Input from './Input';
20
21
  import { ScrollButtons } from './ScrollButtons';
21
22
  import Select from './Select';
22
23
  import Separator from './Separator';
24
+ export function groupItems(items) {
25
+ const groupItems = items.reduce((accumulator, item, i) => {
26
+ let {
27
+ finalOutput,
28
+ buttonGroup
29
+ } = accumulator;
30
+ if (item.type === 'button') {
31
+ const notLastItem = i < items.length - 1;
32
+ const nextItemIsButton = items[i + 1] && items[i + 1].type === 'button';
33
+ const wasPreviousButton = items[i - 1] && items[i - 1].type === 'button';
34
+ const isRadioButton = notLastItem && nextItemIsButton || wasPreviousButton;
35
+ if (isRadioButton) {
36
+ item.isRadioButton = true;
37
+ buttonGroup.push(item);
38
+ if (!nextItemIsButton && wasPreviousButton) {
39
+ finalOutput.push(buttonGroup);
40
+ accumulator.buttonGroup = [];
41
+ }
42
+ } else {
43
+ finalOutput.push(item);
44
+ }
45
+ } else {
46
+ finalOutput.push(item);
47
+ }
48
+ return accumulator;
49
+ }, {
50
+ buttonGroup: [],
51
+ finalOutput: []
52
+ });
53
+ return groupItems.finalOutput;
54
+ }
23
55
  const ToolbarItems = /*#__PURE__*/React.memo(({
24
56
  items,
25
57
  dispatchCommand,
@@ -37,7 +69,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
37
69
  api
38
70
  }) => {
39
71
  const emojiAndColourPickerMountPoint = scrollable ? popupsMountPoint || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.fabric-editor-popup-scroll-parent')) || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.ak-editor-content-area')) || undefined : popupsMountPoint;
40
- return jsx(ButtonGroup, null, items.filter(item => !item.hidden).map((item, idx) => {
72
+ const renderItem = (item, idx) => {
41
73
  var _api$contextPanel, _api$extension;
42
74
  switch (item.type) {
43
75
  case 'button':
@@ -73,7 +105,8 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
73
105
  testId: item.testId,
74
106
  hideTooltipOnClick: item.hideTooltipOnClick,
75
107
  ariaHasPopup: item.ariaHasPopup,
76
- tabIndex: item.tabIndex
108
+ tabIndex: item.tabIndex,
109
+ isRadioButton: item.isRadioButton
77
110
  }, item.showTitle && item.title);
78
111
  case 'input':
79
112
  return jsx(Input, {
@@ -192,7 +225,28 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
192
225
  key: idx
193
226
  });
194
227
  }
195
- }));
228
+ };
229
+ if (getBooleanFF('platform.editor.a11y-floating-toolbar-markup_vexmo')) {
230
+ const groupedItems = groupItems(items.filter(item => !item.hidden));
231
+ return jsx(ButtonGroup, null, groupedItems.map((element, index) => {
232
+ const isGroup = Array.isArray(element);
233
+ if (isGroup) {
234
+ return jsx("div", {
235
+ key: index,
236
+ css: buttonGroupStyles,
237
+ role: "radiogroup"
238
+ }, element.map((item, idx) => {
239
+ return renderItem(item, idx);
240
+ }));
241
+ } else {
242
+ return renderItem(element, index);
243
+ }
244
+ }));
245
+ } else {
246
+ return jsx(ButtonGroup, null, items.filter(item => !item.hidden).map((item, index) => {
247
+ return renderItem(item, index);
248
+ }));
249
+ }
196
250
  }, (prevProps, nextProps) => {
197
251
  if (!nextProps.node) {
198
252
  return false;
@@ -201,6 +255,10 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
201
255
  // otherwise it causes an issue where multiple popups stays open
202
256
  return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !areSameItems(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
203
257
  });
258
+ const buttonGroupStyles = css({
259
+ display: 'flex',
260
+ gap: "var(--ds-space-050, 4px)"
261
+ });
204
262
 
205
263
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
206
264
  const toolbarContainer = (scrollable, hasSelect, firstElementIsSelect) => css`
@@ -1 +0,0 @@
1
- export {};
@@ -10,7 +10,7 @@ var _templateObject, _templateObject2;
10
10
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
11
11
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
12
12
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
13
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
13
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
14
14
  /** @jsx jsx */
15
15
 
16
16
  import React, { Component } from 'react';
@@ -5,7 +5,7 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
5
5
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
6
6
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
7
7
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
8
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
8
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
9
9
  /** @jsx jsx */
10
10
  import { Component, createRef, useCallback, useEffect, useState } from 'react';
11
11
  import { css, jsx } from '@emotion/react';
@@ -1,6 +1,4 @@
1
1
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
- import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
3
- var _templateObject;
4
2
  /** @jsx jsx */
5
3
  import React from 'react';
6
4
  import { css, jsx } from '@emotion/react';
@@ -14,7 +12,9 @@ import EditorEmojiAddIcon from './EditorEmojiAddIcon';
14
12
 
15
13
  // helps adjusts position of popup
16
14
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
17
- var emojiPickerButtonWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: relative;\n"])));
15
+ var emojiPickerButtonWrapper = css({
16
+ position: 'relative'
17
+ });
18
18
  var EmojiPickerWithListener = withReactEditorViewOuterListeners(EmojiPicker);
19
19
  export var EmojiPickerButton = function EmojiPickerButton(props) {
20
20
  var buttonRef = React.useRef(null);
@@ -6,7 +6,7 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
6
6
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
7
7
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
8
8
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
9
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
9
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
10
10
  /** @jsx jsx */
11
11
  import React, { Component } from 'react';
12
12
  import { jsx } from '@emotion/react';
@@ -44,7 +44,6 @@ export var ScrollButtons = function ScrollButtons(_ref) {
44
44
  setCanScrollLeft(scrollLeft > 0);
45
45
  setCanScrollRight(scrollLeft + offsetWidth < scrollWidth - 1); // -1 to account for half pixel
46
46
  });
47
-
48
47
  var onScroll = function onScroll() {
49
48
  return setCanScrollDebounced();
50
49
  };
@@ -9,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
9
9
  import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
10
10
  var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
11
11
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
12
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
12
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
13
13
  /** @jsx jsx */
14
14
  import React, { Component } from 'react';
15
15
  import { css, jsx } from '@emotion/react';
@@ -21,6 +21,7 @@ import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-col
21
21
  import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
22
22
  import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
23
23
  import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
24
+ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
24
25
  import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
25
26
  import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
26
27
  import Dropdown from './Dropdown';
@@ -30,6 +31,35 @@ import Input from './Input';
30
31
  import { ScrollButtons } from './ScrollButtons';
31
32
  import Select from './Select';
32
33
  import Separator from './Separator';
34
+ export function groupItems(items) {
35
+ var groupItems = items.reduce(function (accumulator, item, i) {
36
+ var finalOutput = accumulator.finalOutput,
37
+ buttonGroup = accumulator.buttonGroup;
38
+ if (item.type === 'button') {
39
+ var notLastItem = i < items.length - 1;
40
+ var nextItemIsButton = items[i + 1] && items[i + 1].type === 'button';
41
+ var wasPreviousButton = items[i - 1] && items[i - 1].type === 'button';
42
+ var isRadioButton = notLastItem && nextItemIsButton || wasPreviousButton;
43
+ if (isRadioButton) {
44
+ item.isRadioButton = true;
45
+ buttonGroup.push(item);
46
+ if (!nextItemIsButton && wasPreviousButton) {
47
+ finalOutput.push(buttonGroup);
48
+ accumulator.buttonGroup = [];
49
+ }
50
+ } else {
51
+ finalOutput.push(item);
52
+ }
53
+ } else {
54
+ finalOutput.push(item);
55
+ }
56
+ return accumulator;
57
+ }, {
58
+ buttonGroup: [],
59
+ finalOutput: []
60
+ });
61
+ return groupItems.finalOutput;
62
+ }
33
63
  var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
34
64
  var items = _ref.items,
35
65
  dispatchCommand = _ref.dispatchCommand,
@@ -46,9 +76,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
46
76
  mountRef = _ref.mountRef,
47
77
  api = _ref.api;
48
78
  var emojiAndColourPickerMountPoint = scrollable ? popupsMountPoint || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.fabric-editor-popup-scroll-parent')) || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.ak-editor-content-area')) || undefined : popupsMountPoint;
49
- return jsx(ButtonGroup, null, items.filter(function (item) {
50
- return !item.hidden;
51
- }).map(function (item, idx) {
79
+ var renderItem = function renderItem(item, idx) {
52
80
  var _api$contextPanel, _api$extension;
53
81
  switch (item.type) {
54
82
  case 'button':
@@ -92,7 +120,8 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
92
120
  testId: item.testId,
93
121
  hideTooltipOnClick: item.hideTooltipOnClick,
94
122
  ariaHasPopup: item.ariaHasPopup,
95
- tabIndex: item.tabIndex
123
+ tabIndex: item.tabIndex,
124
+ isRadioButton: item.isRadioButton
96
125
  }, item.showTitle && item.title);
97
126
  case 'input':
98
127
  return jsx(Input, {
@@ -219,7 +248,32 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
219
248
  key: idx
220
249
  });
221
250
  }
222
- }));
251
+ };
252
+ if (getBooleanFF('platform.editor.a11y-floating-toolbar-markup_vexmo')) {
253
+ var groupedItems = groupItems(items.filter(function (item) {
254
+ return !item.hidden;
255
+ }));
256
+ return jsx(ButtonGroup, null, groupedItems.map(function (element, index) {
257
+ var isGroup = Array.isArray(element);
258
+ if (isGroup) {
259
+ return jsx("div", {
260
+ key: index,
261
+ css: buttonGroupStyles,
262
+ role: "radiogroup"
263
+ }, element.map(function (item, idx) {
264
+ return renderItem(item, idx);
265
+ }));
266
+ } else {
267
+ return renderItem(element, index);
268
+ }
269
+ }));
270
+ } else {
271
+ return jsx(ButtonGroup, null, items.filter(function (item) {
272
+ return !item.hidden;
273
+ }).map(function (item, index) {
274
+ return renderItem(item, index);
275
+ }));
276
+ }
223
277
  }, function (prevProps, nextProps) {
224
278
  if (!nextProps.node) {
225
279
  return false;
@@ -228,6 +282,10 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
228
282
  // otherwise it causes an issue where multiple popups stays open
229
283
  return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !areSameItems(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
230
284
  });
285
+ var buttonGroupStyles = css({
286
+ display: 'flex',
287
+ gap: "var(--ds-space-050, 4px)"
288
+ });
231
289
 
232
290
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
233
291
  var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstElementIsSelect) {
@@ -1,16 +1,15 @@
1
- /** @jsx jsx */
2
- import React from 'react';
1
+ import { jsx } from '@emotion/react';
3
2
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
4
3
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
5
4
  import type { EmojiId } from '@atlaskit/emoji';
6
- export declare const EmojiPickerButton: React.FunctionComponent<{
7
- className?: string;
8
- editorView?: EditorView;
9
- idx?: number;
10
- providerFactory?: ProviderFactory;
11
- title?: string;
12
- onChange?: (emoji: EmojiId) => void;
13
- isSelected?: boolean;
14
- mountPoint?: HTMLElement;
15
- setDisableParentScroll?: (disable: boolean) => void;
16
- }>;
5
+ export declare const EmojiPickerButton: (props: {
6
+ className?: string | undefined;
7
+ editorView?: EditorView | undefined;
8
+ idx?: number | undefined;
9
+ providerFactory?: ProviderFactory | undefined;
10
+ title?: string | undefined;
11
+ onChange?: ((emoji: EmojiId) => void) | undefined;
12
+ isSelected?: boolean | undefined;
13
+ mountPoint?: HTMLElement | undefined;
14
+ setDisableParentScroll?: ((disable: boolean) => void) | undefined;
15
+ }) => jsx.JSX.Element;
@@ -34,6 +34,8 @@ export interface Props {
34
34
  ]> | undefined;
35
35
  mediaAssistiveMessage?: string;
36
36
  }
37
+ type GroupedItems = (Item | Item[])[];
38
+ export declare function groupItems(items: Item[]): GroupedItems;
37
39
  export interface State {
38
40
  scrollDisabled: boolean;
39
41
  mounted: boolean;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
2
  import Loadable from 'react-loadable';
3
3
  import type { Props } from './Toolbar';
4
- export declare const ToolbarLoader: import("react").ComponentType<Props> & Loadable.LoadableComponent;
4
+ export declare const ToolbarLoader: import("react").ComponentType<import("react").PropsWithChildren<Props>> & Loadable.LoadableComponent;
@@ -1,16 +1,15 @@
1
- /** @jsx jsx */
2
- import React from 'react';
1
+ import { jsx } from '@emotion/react';
3
2
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
4
3
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
5
4
  import type { EmojiId } from '@atlaskit/emoji';
6
- export declare const EmojiPickerButton: React.FunctionComponent<{
7
- className?: string;
8
- editorView?: EditorView;
9
- idx?: number;
10
- providerFactory?: ProviderFactory;
11
- title?: string;
12
- onChange?: (emoji: EmojiId) => void;
13
- isSelected?: boolean;
14
- mountPoint?: HTMLElement;
15
- setDisableParentScroll?: (disable: boolean) => void;
16
- }>;
5
+ export declare const EmojiPickerButton: (props: {
6
+ className?: string | undefined;
7
+ editorView?: EditorView | undefined;
8
+ idx?: number | undefined;
9
+ providerFactory?: ProviderFactory | undefined;
10
+ title?: string | undefined;
11
+ onChange?: ((emoji: EmojiId) => void) | undefined;
12
+ isSelected?: boolean | undefined;
13
+ mountPoint?: HTMLElement | undefined;
14
+ setDisableParentScroll?: ((disable: boolean) => void) | undefined;
15
+ }) => jsx.JSX.Element;
@@ -34,6 +34,8 @@ export interface Props {
34
34
  ]> | undefined;
35
35
  mediaAssistiveMessage?: string;
36
36
  }
37
+ type GroupedItems = (Item | Item[])[];
38
+ export declare function groupItems(items: Item[]): GroupedItems;
37
39
  export interface State {
38
40
  scrollDisabled: boolean;
39
41
  mounted: boolean;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
2
  import Loadable from 'react-loadable';
3
3
  import type { Props } from './Toolbar';
4
- export declare const ToolbarLoader: import("react").ComponentType<Props> & Loadable.LoadableComponent;
4
+ export declare const ToolbarLoader: import("react").ComponentType<import("react").PropsWithChildren<Props>> & Loadable.LoadableComponent;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-floating-toolbar",
3
- "version": "1.1.1",
3
+ "version": "1.2.1",
4
4
  "description": "Floating toolbar plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -25,25 +25,26 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "@atlaskit/adf-utils": "^19.0.0",
28
- "@atlaskit/button": "^17.4.0",
29
- "@atlaskit/checkbox": "^13.0.0",
30
- "@atlaskit/editor-common": "^78.0.0",
28
+ "@atlaskit/button": "^17.7.0",
29
+ "@atlaskit/checkbox": "^13.1.0",
30
+ "@atlaskit/editor-common": "^78.14.0",
31
31
  "@atlaskit/editor-palette": "1.5.2",
32
32
  "@atlaskit/editor-plugin-context-panel": "^1.0.0",
33
33
  "@atlaskit/editor-plugin-copy-button": "^1.0.0",
34
34
  "@atlaskit/editor-plugin-decorations": "^1.0.0",
35
35
  "@atlaskit/editor-plugin-editor-disabled": "^1.0.0",
36
36
  "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
37
- "@atlaskit/editor-plugin-extension": "^1.0.0",
38
- "@atlaskit/editor-plugin-table": "^7.3.0",
37
+ "@atlaskit/editor-plugin-extension": "^1.1.0",
38
+ "@atlaskit/editor-plugin-table": "^7.5.0",
39
39
  "@atlaskit/editor-prosemirror": "3.0.0",
40
40
  "@atlaskit/emoji": "^67.6.0",
41
- "@atlaskit/icon": "^22.0.0",
41
+ "@atlaskit/icon": "^22.1.0",
42
42
  "@atlaskit/menu": "^2.1.0",
43
43
  "@atlaskit/modal-dialog": "^12.10.0",
44
- "@atlaskit/select": "^17.1.0",
44
+ "@atlaskit/platform-feature-flags": "^0.2.5",
45
+ "@atlaskit/select": "^17.3.0",
45
46
  "@atlaskit/theme": "^12.6.0",
46
- "@atlaskit/tokens": "^1.37.0",
47
+ "@atlaskit/tokens": "^1.41.0",
47
48
  "@atlaskit/tooltip": "^18.1.0",
48
49
  "@babel/runtime": "^7.0.0",
49
50
  "@emotion/react": "^11.7.1",
@@ -106,5 +107,10 @@
106
107
  ]
107
108
  }
108
109
  },
109
- "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
110
+ "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
111
+ "platform-feature-flags": {
112
+ "platform.editor.a11y-floating-toolbar-markup_vexmo": {
113
+ "type": "boolean"
114
+ }
115
+ }
110
116
  }