@atlaskit/editor-core 153.1.4 → 153.1.5

package/dist/es2019/utils/announcer/announcer.js

@@ -0,0 +1,38 @@
+import React, { forwardRef, memo, useState, useEffect } from 'react'; // How to use:
+// https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Live_Regions#Preferring_specialized_live_region_roles
+// Demo: https://dequeuniversity.com/library/aria/liveregion-playground
+// Important: Strongly recommend test your solution in all supported screen readers
+// if you use non default value of properties: ariaAtomic, ariaLive, ariaRelevant, role
+// Note: Text won't be announced if the text message doesn't change after the render.
+// For using a forced announcement in this case, set the 'key' attribute - key={Date.now()}
+
+// Note: Flag 'contentRendered' resolves bug with duplicates messages (NVDA + Firefox)
+// https://github.com/nvaccess/nvda/labels/bug%2Fdouble-speaking
+let timer;
+const Announcer = /*#__PURE__*/forwardRef(({
+  ariaAtomic = 'true',
+  ariaLive = 'polite',
+  ariaRelevant = 'all',
+  role = 'status',
+  text = '',
+  delay = 0
+}, ref) => {
+  const [contentRendered, setContentRendered] = useState(false);
+  useEffect(() => {
+    clearTimeout(timer);
+    setContentRendered(false);
+    timer = setTimeout(() => {
+      setContentRendered(true);
+    }, delay);
+    return () => clearTimeout(timer);
+  }, [text, delay]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: "assistive",
+    ref: ref,
+    role: role,
+    "aria-atomic": ariaAtomic,
+    "aria-relevant": ariaRelevant,
+    "aria-live": ariaLive
+  }, contentRendered && /*#__PURE__*/React.createElement("span", null, text));
+});
+export default /*#__PURE__*/memo(Announcer);

package/dist/es2019/utils/document.js

@@ -1,7 +1,7 @@
 import { Node } from 'prosemirror-model';
 import { transformTextLinkCodeMarks } from '@atlaskit/adf-utils';
 import { sanitizeNodeForPrivacy } from '../utils/filter/privacy-filter';
-import { validateADFEntity, findAndTrackUnsupportedContentNodes } from '@atlaskit/editor-common';
+import { validateADFEntity, findAndTrackUnsupportedContentNodes } from '@atlaskit/editor-common/utils';
 import { getBreakoutMode } from './node-width';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../plugins/analytics/types/enums';
 /**

package/dist/es2019/utils/extensions.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import Loadable from 'react-loadable';
-import { combineProviders, getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-common';
+import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-common/extensions';
+import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../plugins/analytics/types/enums';
 import { fireAnalyticsEvent } from '../plugins/analytics';
 /**

package/dist/es2019/utils/input-rules.js

@@ -180,7 +180,7 @@ const isCursorInsideUnsupportedMarks = (state, marksNameUnsupported) => {
 
 
 import { inputRules as unpredictableInputRulesPlugin, InputRule as UnpredictableInputRule } from 'prosemirror-inputrules';
-import { startMeasure, stopMeasure } from '@atlaskit/editor-common';
+import { startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 
 function createUnpredictableInputRulePlugin(pluginName, rules, isBlockNodeRule = false) {
   const hasUnsupportedMarkForBlockInputRule = (state, start, end) => {

package/dist/es2019/utils/node-width.js

@@ -1,5 +1,5 @@
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
-import { absoluteBreakoutWidth } from '@atlaskit/editor-common';
+import { absoluteBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { akEditorFullWidthLayoutWidth, akLayoutGutterOffset, gridMediumMaxWidth } from '@atlaskit/editor-shared-styles';
 import { LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '../plugins/layout/styles';
 import { BODIED_EXT_PADDING } from '../plugins/extension/ui/Extension/styles';

package/dist/es2019/utils/performance/instrumented-plugin.js

@@ -1,5 +1,5 @@
 import { Plugin } from 'prosemirror-state';
-import { startMeasure, stopMeasure } from '@atlaskit/editor-common';
+import { startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 export class InstrumentedPlugin extends Plugin {
   constructor(spec, options = {}, transactionTracker) {
     const {

package/dist/es2019/utils/performance/track-transactions.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { isPerformanceAPIAvailable, startMeasure, stopMeasure } from '@atlaskit/editor-common';
+import { isPerformanceAPIAvailable, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 import { getTimeSince } from './get-performance-timing';
 export const EVENT_NAME_STATE_APPLY = `🦉 EditorView::state::apply`;
 export const EVENT_NAME_UPDATE_STATE = `🦉 EditorView::updateState`;

package/dist/es2019/utils/rich-media-utils.js

@@ -1,4 +1,4 @@
-import { wrappedLayouts, shouldAddDefaultWrappedWidth, calcPxFromColumns } from '@atlaskit/editor-common';
+import { wrappedLayouts, shouldAddDefaultWrappedWidth, calcPxFromColumns } from '@atlaskit/editor-common/ui';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
 export const nonWrappedLayouts = ['center', 'wide', 'full-width'];

package/dist/es2019/utils/selection.js

@@ -1,6 +1,6 @@
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { NodeSelection, TextSelection, AllSelection } from 'prosemirror-state';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { GapCursorSelection } from '../plugins/selection/gap-cursor/selection';
 export const setNodeSelection = (view, pos) => {
   const {

package/dist/es2019/utils/step.js

@@ -1,13 +1,12 @@
 export const stepHasSlice = step => step && step.hasOwnProperty('slice');
 /**
- * Checks whether a given step adds a given nodeType
+ * Checks whether a given step is adding nodes of given nodeTypes
  *
  * @param step Step to check
- * @param nodeType NodeType being added
- * @returns
+ * @param nodeTypes NodeTypes being added
  */
 
-export function stepAdds(step, nodeType) {
+export function stepAddsOneOf(step, nodeTypes) {
   let adds = false;
 
   if (!stepHasSlice(step)) {
@@ -15,7 +14,7 @@ export function stepAdds(step, nodeType) {
   }
 
   step.slice.content.descendants(node => {
-    if (node.type === nodeType) {
+    if (nodeTypes.has(node.type)) {
       adds = true;
     }
 

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "153.1.4";
+export const version = "153.1.5";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "153.1.4",
+	"version": "153.1.5",
 	"sideEffects": false
 }

package/dist/esm/actions/index.js

@@ -10,7 +10,7 @@ import { processRawValue, isEmptyDocument } from '../utils/document';
 import { getEditorValueWithMedia, __temporaryFixForConfigPanel as _temporaryFixForConfigPanel } from '../utils/action';
 import { createDispatch } from '../event-dispatcher';
 import { safeInsert } from 'prosemirror-utils';
-import { analyticsEventKey } from '@atlaskit/editor-common';
+import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { findNodePosWithLocalId } from '../plugins/extension/utils';
 
 var EditorActions = /*#__PURE__*/function () {

package/dist/esm/create-editor/ErrorBoundary.js

@@ -19,8 +19,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import uuid from 'uuid';
 import memoizeOne from 'memoize-one';
-import { IntlNextErrorBoundary, sniffUserBrowserExtensions } from '@atlaskit/editor-common';
+import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
 import { ExperienceStore } from '@atlaskit/editor-common/ufo';
+import { IntlNextErrorBoundary } from '@atlaskit/editor-common/ui';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../plugins/analytics';
 import { editorAnalyticsChannel } from '../plugins/analytics/consts';
 import { getFeatureFlags } from '../plugins/feature-flags-context';

package/dist/esm/create-editor/ReactEditorView.js

@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import { EditorState, Selection } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { injectIntl } from 'react-intl-next';
-import { browser, getAnalyticsEventSeverity, getResponseEndTime, measureRender, startMeasure, stopMeasure, shouldForceTracking } from '@atlaskit/editor-common';
+import { browser, getAnalyticsEventSeverity, getResponseEndTime, measureRender, startMeasure, stopMeasure, shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { ExperienceStore, EditorExperience, RELIABILITY_INTERVAL } from '@atlaskit/editor-common/ufo';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
 import { processRawValue } from '../utils';
@@ -36,7 +36,7 @@ import { getDocStructure } from '../utils/document-logger';
 import { isFullPage } from '../utils/is-full-page';
 import measurements from '../utils/performance/measure-enum';
 import { getNodesCount } from '../utils/document';
-import { analyticsEventKey } from '@atlaskit/editor-common';
+import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { createSchema } from './create-schema';
 import { PluginPerformanceObserver } from '../utils/performance/plugin-performance-observer';
 import { getParticipantsCount } from '../plugins/collab-edit/get-participants-count';

package/dist/esm/create-editor/create-editor.js

@@ -1,5 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { ErrorReporter } from '@atlaskit/editor-common';
+import { ErrorReporter } from '@atlaskit/editor-common/utils';
 import { sortByOrder } from './sort-by-order';
 import { InstrumentedPlugin } from '../utils/performance/instrumented-plugin';
 export function sortByRank(a, b) {

package/dist/esm/create-editor/create-plugins-list.js

@@ -11,7 +11,7 @@ import { GUTTER_SIZE_MOBILE_IN_PX } from '../plugins/base/pm-plugins/scroll-gutt
 import { createFeatureFlagsFromProps } from '../plugins/feature-flags-context/feature-flags-from-props';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createDefaultPreset } from '../labs/next/presets/default';
-import { shouldForceTracking } from '@atlaskit/editor-common';
+import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 
 var isCodeBlockAllowed = function isCodeBlockAllowed(options) {
   var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
@@ -97,7 +97,8 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     cardOptions: props.smartLinks || props.UNSAFE_cards,
     codeBlock: _objectSpread(_objectSpread({}, props.codeBlock), {}, {
       useLongPressSelection: false,
-      appearance: props.appearance
+      appearance: props.appearance,
+      allowCompositionInputOverride: isMobile
     })
   };
 }
@@ -402,7 +403,7 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     }]);
   }
 
-  if (props.UNSAFE_allowFragmentMark) {
+  if (props.allowFragmentMark) {
     preset.add(fragmentMarkPlugin);
   }
 

package/dist/esm/editor.js

@@ -25,7 +25,10 @@ import styled from 'styled-components';
 import memoizeOne from 'memoize-one';
 import uuid from 'uuid/v4';
 import { name, version } from './version-wrapper';
-import { ProviderFactory, BaseTheme, getAnalyticsAppearance, WithCreateAnalyticsEvent, startMeasure, stopMeasure, clearMeasure, measureTTI, getTTISeverity, combineExtensionProviders, WidthProvider, LegacyToNextIntlProvider, IntlLegacyFallbackProvider } from '@atlaskit/editor-common';
+import { combineExtensionProviders } from '@atlaskit/editor-common/extensions';
+import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import { BaseTheme, WithCreateAnalyticsEvent, WidthProvider, LegacyToNextIntlProvider, IntlLegacyFallbackProvider } from '@atlaskit/editor-common/ui';
+import { getAnalyticsAppearance, startMeasure, stopMeasure, clearMeasure, measureTTI, getTTISeverity } from '@atlaskit/editor-common/utils';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { akEditorFullPageDefaultFontSize } from '@atlaskit/editor-shared-styles';
 import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';

package/dist/esm/index.js

@@ -41,7 +41,7 @@ export { pluginKey as quickInsertPluginKey, memoProcessItems as processQuickInse
 export { insertLink, insertLinkWithAnalyticsMobileNative, insertLinkWithAnalytics, isTextAtPos, isLinkAtPos, updateLink } from './plugins/hyperlink/commands';
 export { historyPluginKey } from './plugins/history';
 export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from './plugins/analytics';
-export { setKeyboardHeight, setMobilePaddingTop } from './plugins/mobile-dimensions/commands'; // Used in editor-test-helpers
+export { setKeyboardHeight, setMobilePaddingTop, setIsExpanded } from './plugins/mobile-dimensions/commands'; // Used in editor-test-helpers
 
 export { setTextSelection, dedupe, getNodesCount, measurements, hasVisibleContent } from './utils';
 export { getListCommands } from './utils/list-commands';

package/dist/esm/keymaps/index.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import React from 'react';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import styled from 'styled-components';
 import { N400 } from '@atlaskit/theme/colors';
 export var addAltText = makeKeyMapWithCommon('Add Alt Text', 'Mod-Alt-y');
@@ -11,6 +11,8 @@ export var toggleBold = makeKeyMapWithCommon('Bold', 'Mod-b');
 export var toggleItalic = makeKeyMapWithCommon('Italic', 'Mod-i');
 export var toggleUnderline = makeKeyMapWithCommon('Underline', 'Mod-u');
 export var toggleStrikethrough = makeKeyMapWithCommon('Strikethrough', 'Mod-Shift-s');
+export var toggleSubscript = makeKeyMapWithCommon('Subscript', 'Mod-Shift-,');
+export var toggleSuperscript = makeKeyMapWithCommon('Superscript', 'Mod-Shift-.');
 export var toggleCode = makeKeyMapWithCommon('Code', 'Mod-Shift-m');
 export var pastePlainText = makeKeyMapWithCommon('Paste Plain Text', 'Mod-Shift-v');
 export var clearFormatting = makeKeyMapWithCommon('Clear formatting', 'Mod-\\');
@@ -65,6 +67,8 @@ export var copy = makeKeyMapWithCommon('Copy', 'Mod-c');
 export var paste = makeKeyMapWithCommon('Paste', 'Mod-v');
 export var altPaste = makeKeyMapWithCommon('Paste', 'Mod-Shift-v');
 export var find = makeKeyMapWithCommon('Find', 'Mod-f');
+export var alignLeft = makeKeyMapWithCommon('Align Left', 'Mod-Shift-l');
+export var alignRight = makeKeyMapWithCommon('Align Right', 'Mod-Shift-r');
 var arrowKeysMap = {
   // for reference: https://wincent.com/wiki/Unicode_representations_of_modifier_keys
   ARROWLEFT: "\u2190",
@@ -133,7 +137,7 @@ export function findShortcutByKeymap(keymap) {
 
   return keymap.windows;
 }
-var ALL = [toggleOrderedList, toggleBulletList, toggleBold, toggleItalic, toggleUnderline, toggleStrikethrough, toggleCode, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleBlockQuote, insertNewLine, insertRule, splitCodeBlock, splitListItem, redo, undo, find, escape, enter, shiftEnter];
+var ALL = [toggleOrderedList, toggleBulletList, toggleBold, toggleItalic, toggleUnderline, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleCode, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleBlockQuote, insertNewLine, insertRule, splitCodeBlock, splitListItem, redo, undo, find, escape, enter, shiftEnter];
 export function makeKeymap(description, windows, mac, common) {
   return {
     description: description,

package/dist/esm/labs/next/full-page.js

@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { N30 } from '@atlaskit/theme/colors';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
-import { BaseTheme } from '@atlaskit/editor-common';
+import { BaseTheme } from '@atlaskit/editor-common/ui';
 import { akEditorMenuZIndex, akEditorToolbarKeylineHeight } from '@atlaskit/editor-shared-styles';
 import ContentStyles from '../../ui/ContentStyles';
 import WidthEmitter from '../../ui/WidthEmitter';

package/dist/esm/labs/next/internal/components/EditorInternal.js

@@ -1,8 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React from 'react';
 import PropTypes from 'prop-types';
+import { WidthProvider } from '@atlaskit/editor-common/ui';
 import { injectIntl } from 'react-intl-next';
-import { WidthProvider } from '@atlaskit/editor-common';
 import { useProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import EditorContext from '../../../../ui/EditorContext';
 import EditorActions from '../../../../actions';

package/dist/esm/labs/next/internal/hooks/use-editor/index.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { measureRender, getResponseEndTime, startMeasure, stopMeasure } from '@atlaskit/editor-common';
+import { measureRender, getResponseEndTime, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 import measurements from '../../../../../utils/performance/measure-enum';
 import { getNodesCount } from '../../../../../utils';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, PLATFORMS } from '../../../../../plugins/analytics';

package/dist/esm/nodeviews/ReactNodeView.js

@@ -3,7 +3,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { startMeasure, stopMeasure } from '@atlaskit/editor-common';
+import { startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 import { analyticsPluginKey } from '../plugins/analytics/plugin-key';
 import { createDispatch } from '../event-dispatcher';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../plugins/analytics';

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

@@ -4,6 +4,7 @@ import WithPluginState from '../../ui/WithPluginState';
 import { pluginKey, createPlugin } from './pm-plugins/main';
 import { changeAlignment as _changeAlignment } from './commands';
 import ToolbarAlignment from './ui/ToolbarAlignment';
+import { keymapPlugin } from './pm-plugins/keymap';
 export var defaultConfig = {
   align: 'start'
 };
@@ -24,6 +25,11 @@ var alignmentPlugin = function alignmentPlugin() {
           var dispatch = _ref.dispatch;
           return createPlugin(dispatch, defaultConfig);
         }
+      }, {
+        name: 'annotationKeymap',
+        plugin: function plugin() {
+          return keymapPlugin();
+        }
       }];
     },
     primaryToolbarComponent: function primaryToolbarComponent(_ref2) {

package/dist/esm/plugins/alignment/pm-plugins/keymap.js

@@ -0,0 +1,9 @@
+import { keymap } from 'prosemirror-keymap';
+import { bindKeymapWithCommand, alignLeft, alignRight } from '../../../keymaps';
+import { changeAlignment } from '../commands';
+export function keymapPlugin() {
+  var list = {};
+  bindKeymapWithCommand(alignLeft.common, changeAlignment('start'), list);
+  bindKeymapWithCommand(alignRight.common, changeAlignment('end'), list);
+  return keymap(list);
+}

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -60,7 +60,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "hide", function () {
-      if (_this.state.isOpen === true) {
+      if (_this.state.isOpen) {
         _this.setState({
           isOpen: false
         });
@@ -89,7 +89,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
-        isOpen: this.state.isOpen,
+        isOpen: isOpen,
         handleClickOutside: this.hide,
         handleEscapeKeydown: this.hide,
         fitWidth: 112,
@@ -99,8 +99,10 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           disabled: disabled,
           selected: isOpen,
           title: title,
-          "aria-label": "Text alignment",
           className: "align-btn",
+          "aria-label": "Text alignment",
+          "aria-expanded": isOpen,
+          "aria-haspopup": true,
           onClick: this.toggleOpen,
           iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, iconMap[pluginState.align], /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
             label: ""

package/dist/esm/plugins/analytics/consts.js

@@ -1,4 +1,4 @@
 import { FabricChannel } from '@atlaskit/analytics-listeners';
-import { analyticsEventKey as key } from '@atlaskit/editor-common';
+import { analyticsEventKey as key } from '@atlaskit/editor-common/utils';
 export var analyticsEventKey = key;
 export var editorAnalyticsChannel = FabricChannel.editor;

package/dist/esm/plugins/analytics/plugin.js

@@ -12,7 +12,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { isPerformanceAPIAvailable, measureRender } from '@atlaskit/editor-common';
+import { isPerformanceAPIAvailable, measureRender } from '@atlaskit/editor-common/utils';
 import { ACTION, EVENT_TYPE } from './types';
 import { getAnalyticsEventsFromTransaction } from './utils';
 import { analyticsPluginKey } from './plugin-key';

package/dist/esm/plugins/annotation/nodeviews/index.js

@@ -9,7 +9,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import React from 'react';
-import { AnnotationSharedClassNames } from '@atlaskit/editor-common';
+import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 import { ReactNodeView } from '../../../nodeviews';
 import WithPluginState from '../../../ui/WithPluginState';
 import { inlineCommentPluginKey } from '../utils';

package/dist/esm/plugins/annotation/utils.js

@@ -1,6 +1,7 @@
 import { PluginKey, TextSelection, AllSelection } from 'prosemirror-state';
 import { Decoration } from 'prosemirror-view';
-import { AnnotationSharedClassNames, canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common';
+import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common/utils';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { AnnotationSelectionType } from './types';
 import { sum } from '../../utils';

package/dist/esm/plugins/base/pm-plugins/frozen-editor.js

@@ -5,7 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { isPerformanceObserverAvailable, isPerformanceAPIAvailable, getAnalyticsEventSeverity } from '@atlaskit/editor-common';
+import { isPerformanceObserverAvailable, isPerformanceAPIAvailable, getAnalyticsEventSeverity } from '@atlaskit/editor-common/utils';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { ACTION, ACTION_SUBJECT, BROWSER_FREEZE_INTERACTION_TYPE, EVENT_TYPE } from '../../analytics';
 import { getParticipantsCount } from '../../collab-edit/get-participants-count';

package/dist/esm/plugins/base/pm-plugins/inline-cursor-target.js

@@ -1,6 +1,6 @@
 import { DecorationSet, Decoration } from 'prosemirror-view';
 import { PluginKey, Plugin } from 'prosemirror-state';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 export var inlineCursorTargetStateKey = new PluginKey('inlineCursorTargetPlugin');
 export var SPECIAL_NODES = ['mention', 'emoji'];
 export var isSpecial = function isSpecial(node) {

package/dist/esm/plugins/block-type/pm-plugins/main.js

@@ -5,7 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { NORMAL_TEXT, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, BLOCK_QUOTE, CODE_BLOCK, PANEL, OTHER, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, HEADINGS_BY_LEVEL } from '../types';
 import { areBlockTypesDisabled } from '../../../utils';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';

package/dist/esm/plugins/block-type/styles.js

@@ -3,5 +3,5 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import { css } from 'styled-components';
-import { blockquoteSharedStyles, headingsSharedStyles } from '@atlaskit/editor-common';
+import { blockquoteSharedStyles, headingsSharedStyles } from '@atlaskit/editor-common/styles';
 export var blocktypeStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", ";\n    ", ";\n  }\n"])), blockquoteSharedStyles, headingsSharedStyles);

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -22,6 +22,8 @@ export var BlockTypeButton = function BlockTypeButton(props) {
     onClick: props.onClick,
     title: labelTextStyles,
     "aria-label": labelTextStyles,
+    "aria-haspopup": true,
+    "aria-expanded": props['aria-expanded'],
     iconAfter: /*#__PURE__*/React.createElement(Wrapper, {
       isSmall: props.isSmall
     }, props.isSmall && /*#__PURE__*/React.createElement(TextStyleIcon, {

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/index.js

@@ -67,6 +67,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
             selected: isActive
           }, /*#__PURE__*/React.createElement(Tag, null, formatMessage(blockType.title))),
           value: blockType,
+          label: formatMessage(blockType.title),
           key: "".concat(blockType.name, "-").concat(index),
           elemAfter: /*#__PURE__*/React.createElement(KeyboardShortcut, {
             selected: isActive
@@ -138,7 +139,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           scrollableElement: popupsScrollableElement,
           zIndex: akEditorMenuZIndex,
           fitHeight: 360,
-          fitWidth: 106
+          fitWidth: 106,
+          shouldUseDefaultRole: true
         }, /*#__PURE__*/React.createElement(BlockTypeButton, {
           isSmall: isSmall,
           isReducedSpacing: isReducedSpacing,
@@ -146,7 +148,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           disabled: false,
           title: blockTypeTitles[0],
           onClick: this.handleTriggerClick,
-          formatMessage: formatMessage
+          formatMessage: formatMessage,
+          "aria-expanded": active
         }, longestDropdownMenuItem)), /*#__PURE__*/React.createElement(Separator, null));
       }
 
@@ -157,7 +160,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         disabled: true,
         title: blockTypeTitles[0],
         onClick: this.handleTriggerClick,
-        formatMessage: formatMessage
+        formatMessage: formatMessage,
+        "aria-expanded": active
       }, longestDropdownMenuItem), /*#__PURE__*/React.createElement(Separator, null));
     }
   }]);

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/styled.js

@@ -4,7 +4,7 @@ var _templateObject, _templateObject2;
 
 import { N400 } from '@atlaskit/theme/colors';
 import styled from 'styled-components';
-import { headingsSharedStyles } from '@atlaskit/editor-common';
+import { headingsSharedStyles } from '@atlaskit/editor-common/styles';
 import { Shortcut } from '../../../../ui/styles';
 export var BlockTypeMenuItem = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", ";\n  > {\n    h1,\n    h2,\n    h3,\n    h4,\n    h5,\n    h6 {\n      margin-top: 0;\n    }\n  }\n  ", ";\n"])), headingsSharedStyles, function (props) {
   return (// TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878

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

@@ -9,7 +9,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React from 'react';
 import { Plugin } from 'prosemirror-state';
 import { breakout } from '@atlaskit/adf-schema';
-import { calcBreakoutWidth } from '@atlaskit/editor-common';
+import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import WithPluginState from '../../ui/WithPluginState';
 import { pluginKey as widthPluginKey } from '../width';
 import LayoutButton from './ui/LayoutButton';

package/dist/esm/plugins/breakout/ui/LayoutButton.js

@@ -17,7 +17,7 @@ import React from 'react';
 import * as colors from '@atlaskit/theme/colors';
 import { injectIntl } from 'react-intl-next';
 import { findParentDomRefOfType, findDomRefAtPos } from 'prosemirror-utils';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import ToolbarButton from '../../../ui/ToolbarButton';

package/dist/esm/plugins/caption/nodeviews/index.js

@@ -11,7 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import React from 'react';
-import { Caption } from '@atlaskit/editor-common';
+import { Caption } from '@atlaskit/editor-common/ui';
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 export var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   _inherits(CaptionNodeView, _SelectionBasedNodeVi);

package/dist/esm/plugins/card/nodeviews/blockCard.js

@@ -12,13 +12,14 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import React from 'react';
 import { Card as SmartCard } from '@atlaskit/smart-card';
-import { UnsupportedBlock, browser } from '@atlaskit/editor-common';
+import { UnsupportedBlock } from '@atlaskit/editor-common/ui';
+import { browser } from '@atlaskit/editor-common/utils';
 import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import { Card } from './genericCard';
 import { ReactNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
-import { findOverflowScrollParent } from '@atlaskit/editor-common';
+import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(BlockCardComponent, _React$PureComponent);
 

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -21,7 +21,8 @@ import { Card as SmartCard } from '@atlaskit/smart-card';
 import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import { Card } from './genericCard';
-import { UnsupportedBlock, MediaSingle as RichMediaWrapper, browser, findOverflowScrollParent } from '@atlaskit/editor-common';
+import { UnsupportedBlock, MediaSingle as RichMediaWrapper, findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { browser } from '@atlaskit/editor-common/utils';
 import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';

package/dist/esm/plugins/card/nodeviews/inlineCard.js

@@ -14,8 +14,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Card as SmartCard } from '@atlaskit/smart-card';
-import { UnsupportedInline, ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
-import { findOverflowScrollParent } from '@atlaskit/editor-common';
+import { UnsupportedInline } from '@atlaskit/editor-common/ui';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import rafSchedule from 'raf-schd';
 import { Card } from './genericCard';
 import ReactNodeView from '../../../nodeviews/ReactNodeView';