@atlaskit/editor-core 153.1.3 → 155.0.0

package/dist/esm/plugins/feature-flags-context/index.js

@@ -1,12 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { useEditorContext } from '../../ui/EditorContext';
-export var pluginKey = new PluginKey('featureFlagsContextPlugin');
+import { pluginKey } from './plugin-key';
 
 var featureFlagsContextPlugin = function featureFlagsContextPlugin() {
   var featureFlags = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -16,7 +16,7 @@ var featureFlagsContextPlugin = function featureFlagsContextPlugin() {
       return [{
         name: 'featureFlagsContext',
         plugin: function plugin() {
-          return new Plugin({
+          return new SafePlugin({
             key: pluginKey,
             state: {
               init: function init() {

package/dist/esm/plugins/feature-flags-context/plugin-key.js

@@ -0,0 +1,2 @@
+import { PluginKey } from 'prosemirror-state';
+export var pluginKey = new PluginKey('featureFlagsContextPlugin');

package/dist/esm/plugins/feedback-dialog/index.js

@@ -3,9 +3,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React from 'react';
 import { PluginKey } from 'prosemirror-state';

package/dist/esm/plugins/find-replace/plugin.js

@@ -1,11 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DecorationSet } from 'prosemirror-view';
 import { pluginFactory } from '../../utils/plugin-state-factory';
 import reducer from './reducer';
@@ -128,7 +128,7 @@ var _pluginFactory = pluginFactory(findReplacePluginKey, reducer(function () {
 
 export { createCommand, getPluginState, createPluginState };
 export var createPlugin = function createPlugin(dispatch) {
-  return new Plugin({
+  return new SafePlugin({
     key: findReplacePluginKey,
     state: createPluginState(dispatch, function () {
       return initialState;

package/dist/esm/plugins/find-replace/reducer.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import { FindReplaceActionTypes } from './actions';
 

package/dist/esm/plugins/find-replace/ui/Find.js

@@ -76,6 +76,19 @@ var Find = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "isComposing", false);
 
+    _defineProperty(_assertThisInitialized(_this), "syncFindText", function () {
+      var _this$state;
+
+      // If the external prop findText changes and we aren't in a composition we should update to
+      // use the external prop value.
+      //
+      // An example of where this may happen is when a find occurs through the user selecting some text
+      // and pressing Mod-f.
+      if (!_this.isComposing && _this.props.findText !== ((_this$state = _this.state) === null || _this$state === void 0 ? void 0 : _this$state.localFindText)) {
+        _this.updateFindValue(_this.props.findText || '');
+      }
+    });
+
     _defineProperty(_assertThisInitialized(_this), "skipWhileComposing", function (fn) {
       if (_this.isComposing) {
         return;
@@ -188,7 +201,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
     // occur to this value which do not originate from this component.
 
     _this.state = {
-      localFindText: _this.props.findText || ''
+      localFindText: ''
     };
     return _this;
   }
@@ -198,21 +211,13 @@ var Find = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       this.props.onFindTextfieldRefSet(this.findTextfieldRef);
       this.focusFindTextfield();
+      this.syncFindText();
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
-      this.focusFindTextfield(); // If the external prop findText changes and we aren't in a composition we should update to the
-      // use the external prop value.
-      //
-      // An example of where this may happen is when a find occurs through the user selecting some text
-      // and pressing Mod-f.
-
-      if (!this.isComposing && this.props.findText !== this.state.localFindText) {
-        this.setState({
-          localFindText: this.props.findText || ''
-        });
-      }
+      this.focusFindTextfield();
+      this.syncFindText();
     }
   }, {
     key: "render",

package/dist/esm/plugins/find-replace/ui/FindReplaceToolbarButton.js

@@ -132,7 +132,9 @@ var FindReplaceToolbarButton = /*#__PURE__*/function (_React$PureComponent) {
           iconBefore: /*#__PURE__*/React.createElement(EditorSearchIcon, {
             label: title
           }),
-          onClick: this.toggleOpen
+          onClick: this.toggleOpen,
+          "aria-expanded": isActive,
+          "aria-haspopup": true
         })
       }, /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(FindReplace, _extends({
         findText: findText,

package/dist/esm/plugins/find-replace/ui/FindReplaceTooltipButton.js

@@ -7,9 +7,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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); }; }
 

package/dist/esm/plugins/floating-toolbar/index.js

@@ -1,14 +1,15 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React from 'react';
-import { Plugin, PluginKey, AllSelection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey, AllSelection } from 'prosemirror-state';
 import { findDomRefAtPos, findSelectedNodeOfType } from 'prosemirror-utils';
 import camelCase from 'lodash/camelCase';
-import { Popup } from '@atlaskit/editor-common'; // AFP-2532 TODO: Fix automatic suppressions below
+import { Popup } from '@atlaskit/editor-common/ui'; // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 
 import WithPluginState from '../../ui/WithPluginState';
@@ -318,7 +319,7 @@ function floatingToolbarPluginFactory(options) {
     return newPluginState;
   };
 
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     state: {
       init: function init() {

package/dist/esm/plugins/floating-toolbar/pm-plugins/toolbar-data/plugin.js

@@ -1,8 +1,8 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { pluginKey } from './plugin-key';
 import { createPluginState } from './plugin-factory';
 export var createPlugin = function createPlugin(dispatch) {
-  return new Plugin({
+  return new SafePlugin({
     state: createPluginState(dispatch, {}),
     key: pluginKey
   });

package/dist/esm/plugins/floating-toolbar/pm-plugins/toolbar-data/reducer.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 export var reducer = function reducer(pluginState, action) {
   switch (action.type) {

package/dist/esm/plugins/floating-toolbar/ui/Button.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["buttonStyles"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React from 'react';
 import Tooltip from '@atlaskit/tooltip';
@@ -29,7 +30,9 @@ export default (function (_ref) {
       tooltipContent = _ref.tooltipContent,
       testId = _ref.testId,
       _ref$hideTooltipOnCli = _ref.hideTooltipOnClick,
-      hideTooltipOnClick = _ref$hideTooltipOnCli === void 0 ? true : _ref$hideTooltipOnCli;
+      hideTooltipOnClick = _ref$hideTooltipOnCli === void 0 ? true : _ref$hideTooltipOnCli,
+      ariaHasPopup = _ref.ariaHasPopup,
+      tabIndex = _ref.tabIndex;
   // Check if there's only an icon and add additional styles
   var iconOnly = (icon || iconAfter) && !children;
   var customSpacing = iconOnly ? iconOnlySpacing : {};
@@ -45,7 +48,7 @@ export default (function (_ref) {
     theme: function theme(adgTheme, themeProps) {
       var _adgTheme = adgTheme(themeProps),
           buttonStyles = _adgTheme.buttonStyles,
-          rest = _objectWithoutProperties(_adgTheme, ["buttonStyles"]);
+          rest = _objectWithoutProperties(_adgTheme, _excluded);
 
       return _objectSpread({
         buttonStyles: _objectSpread(_objectSpread(_objectSpread({}, buttonStyles), customSpacing), appearance === 'danger' && getButtonStyles({
@@ -56,11 +59,12 @@ export default (function (_ref) {
       }, rest);
     },
     "aria-label": title,
+    "aria-pressed": selected,
     spacing: 'compact',
     href: href,
     target: target,
     appearance: appearance,
-    "aria-haspopup": true,
+    "aria-haspopup": ariaHasPopup,
     iconBefore: icon || undefined,
     iconAfter: iconAfter,
     onClick: onClick,
@@ -68,6 +72,11 @@ export default (function (_ref) {
     isDisabled: disabled,
     testId: testId,
     onFocus: onFocus,
-    onBlur: onBlur
+    onBlur: onBlur // @ts-ignore
+    // tabIndex set as 0 by default in the design system  ButtonBase component
+    // this is not expected for all buttons, we have to use tabIndex={null} for some cases
+    // should be fixed here https://a11y-internal.atlassian.net/browse/DST-287
+    ,
+    tabIndex: tabIndex
   }, children)));
 });

package/dist/esm/plugins/floating-toolbar/ui/DropdownMenu.js

@@ -21,6 +21,8 @@ import { B400 } from '@atlaskit/theme/colors'; // eslint-disable-next-line @atla
 import Item, { itemThemeNamespace } from '@atlaskit/item';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import Tooltip from '@atlaskit/tooltip';
+import { injectIntl } from 'react-intl-next';
+import messages from './messages';
 export var menuItemDimensions = {
   width: 175,
   height: 32
@@ -66,7 +68,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
           hide = _this$props.hide,
           dispatchCommand = _this$props.dispatchCommand,
-          items = _this$props.items;
+          items = _this$props.items,
+          intl = _this$props.intl;
       return /*#__PURE__*/React.createElement(ThemeProvider, {
         theme: _defineProperty({}, itemThemeNamespace, editorItemTheme)
       }, /*#__PURE__*/React.createElement(MenuContainer, null, items.filter(function (item) {
@@ -75,7 +78,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         var itemContent = /*#__PURE__*/React.createElement(Item, {
           key: idx,
           isCompact: true,
-          elemBefore: _this.renderSelected(item),
+          elemBefore: _this.renderSelected(item, intl),
           onClick: function onClick() {
             /**
              * The order of dispatching the event and hide() is important, because
@@ -102,14 +105,14 @@ var Dropdown = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "renderSelected",
-    value: function renderSelected(item) {
+    value: function renderSelected(item, intl) {
       var selected = item.selected;
 
       if (selected !== undefined) {
         return selected ? /*#__PURE__*/React.createElement(EditorDoneIcon, {
           primaryColor: B400,
           size: "small",
-          label: "test question"
+          label: intl.formatMessage(messages.confirmModalOK)
         }) : /*#__PURE__*/React.createElement(Spacer, null);
       }
 
@@ -120,4 +123,4 @@ var Dropdown = /*#__PURE__*/function (_Component) {
   return Dropdown;
 }(Component);
 
-export { Dropdown as default };
+export default injectIntl(Dropdown);

package/dist/esm/plugins/floating-toolbar/ui/EmojiPickerButton.js

@@ -6,7 +6,8 @@ var _templateObject, _templateObject2;
 import React from 'react';
 import styled from 'styled-components';
 import Button from '@atlaskit/button';
-import { Popup, withOuterListeners, WithProviders } from '@atlaskit/editor-common';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory';
+import { Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
 import { EmojiPicker } from '@atlaskit/emoji';
 import Tooltip from '@atlaskit/tooltip';
 import EditorEmojiAddIcon from './EditorEmojiAddIcon'; // helps adjusts position of popup
@@ -36,6 +37,20 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
     props.onChange && props.onChange(emoji);
   };
 
+  var isDetachedElement = function isDetachedElement(el) {
+    return !document.body.contains(el);
+  };
+
+  var handleEmojiClickOutside = function handleEmojiClickOutside(e) {
+    // Ignore click events for detached elements.
+    // Workaround for CETI-240 - where two onClicks fire - one when the upload button is
+    // still in the document, and one once it's detached. Does not always occur, and
+    // may be a side effect of a react render optimisation
+    if (e && e.target && !isDetachedElement(e.target)) {
+      togglePopup();
+    }
+  };
+
   var renderPicker = function renderPicker(providers) {
     if (!providers.emojiProvider) {
       return null;
@@ -45,7 +60,7 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
       emojiProvider: providers.emojiProvider,
       onSelection: updateEmoji,
       onPickerRef: function onPickerRef() {},
-      handleClickOutside: togglePopup
+      handleClickOutside: handleEmojiClickOutside
     });
   };
 

package/dist/esm/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js

@@ -3,7 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import React, { useEffect, useState } from 'react';
 import Loadable from 'react-loadable';
-import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common';
+import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { nodeToJSON } from '../../../utils';
 import { createExtensionAPI } from '../../extension/extension-api';

package/dist/esm/plugins/floating-toolbar/ui/Select.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React from 'react';
 import Select from '@atlaskit/select';

package/dist/esm/plugins/floating-toolbar/ui/Toolbar.js

@@ -29,6 +29,9 @@ import Input from './Input';
 import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
 import ColorPickerButton from '../../../ui/ColorPickerButton';
 import { EmojiPickerButton } from './EmojiPickerButton';
+import Announcer from '../../../utils/announcer/announcer';
+import { injectIntl } from 'react-intl-next';
+import messages from './messages';
 var akGridSize = gridSize();
 var ToolbarContainer = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  box-shadow: 0 0 1px rgba(9, 30, 66, 0.31),\n    0 4px 8px -2px rgba(9, 30, 66, 0.25);\n  padding: ", "px ", "px;\n  display: flex;\n  line-height: 1;\n  box-sizing: border-box;\n  ", ";\n  & > div {\n    align-items: center;\n  }\n"])), themed({
   light: 'white',
@@ -137,7 +140,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
           editorView = _this$props.editorView,
           node = _this$props.node,
           extensionsProvider = _this$props.extensionsProvider,
-          providerFactory = _this$props.providerFactory;
+          providerFactory = _this$props.providerFactory,
+          intl = _this$props.intl;
 
       if (!items || !items.length) {
         return null;
@@ -146,10 +150,13 @@ var Toolbar = /*#__PURE__*/function (_Component) {
 
       var firstElementIsSelect = items[0].type === 'select';
       return /*#__PURE__*/React.createElement(ToolbarContainer, {
-        "aria-label": "Floating Toolbar",
+        "aria-label": intl.formatMessage(messages.floatingToolbarAriaLabel),
         hasCompactLeftPadding: firstElementIsSelect,
         className: className
-      }, /*#__PURE__*/React.createElement(ButtonGroup, null, items.filter(function (item) {
+      }, /*#__PURE__*/React.createElement(Announcer, {
+        text: intl.formatMessage(messages.floatingToolbarAnnouncer),
+        delay: 250
+      }), /*#__PURE__*/React.createElement(ButtonGroup, null, items.filter(function (item) {
         return !item.hidden;
       }).map(function (item, idx) {
         switch (item.type) {
@@ -191,7 +198,9 @@ var Toolbar = /*#__PURE__*/function (_Component) {
               disabled: item.disabled,
               tooltipContent: item.tooltipContent,
               testId: item.testId,
-              hideTooltipOnClick: item.hideTooltipOnClick
+              hideTooltipOnClick: item.hideTooltipOnClick,
+              ariaHasPopup: item.ariaHasPopup,
+              tabIndex: item.tabIndex
             }, item.showTitle && item.title);
 
           case 'input':
@@ -272,7 +281,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
                 providerFactory: providerFactory,
                 isSelected: item.selected,
                 onChange: function onChange(selected) {
-                  return dispatchCommand(item.onChange(selected.shortName));
+                  return dispatchCommand(item.onChange(selected));
                 }
               });
             }
@@ -316,4 +325,4 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   return Toolbar;
 }(Component);
 
-export { Toolbar as default };
+export default injectIntl(Toolbar);

package/dist/esm/plugins/floating-toolbar/ui/messages.js

@@ -14,5 +14,15 @@ export default defineMessages({
     id: 'fabric.editor.floatingToolbar.confirmModalCancel',
     defaultMessage: 'Cancel',
     description: 'Cancel button for floating toolbar confirmation modal.'
+  },
+  floatingToolbarAriaLabel: {
+    id: 'fabric.editor.floatingToolbar.floatingToolbarAriaLabel',
+    defaultMessage: 'Floating Toolbar',
+    description: "a floating toolbar's aria label"
+  },
+  floatingToolbarAnnouncer: {
+    id: 'fabric.editor.floatingToolbar.floatingToolbarAnnouncer',
+    defaultMessage: 'Floating toolbar controls have been opened',
+    description: "message that will be announced to screenreaders that the floating toolbar is opened"
   }
 });

package/dist/esm/plugins/fragment/index.js

@@ -1,8 +1,9 @@
 import { fragment } from '@atlaskit/adf-schema';
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { pluginKey } from './plugin-key';
+import { createPlugin as createFragmentMarkConsistencyPlugin } from './pm-plugins/fragment-consistency';
 export function createPlugin() {
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey
   });
 }
@@ -15,6 +16,15 @@ var fragmentMarkPlugin = function fragmentMarkPlugin() {
         name: 'fragment',
         mark: fragment
       }];
+    },
+    pmPlugins: function pmPlugins() {
+      return [{
+        name: 'fragmentMarkConsistency',
+        plugin: function plugin(_ref) {
+          var dispatch = _ref.dispatch;
+          return createFragmentMarkConsistencyPlugin(dispatch);
+        }
+      }];
     }
   };
 };