@atlaskit/editor-core 153.1.4 → 153.1.5

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

@@ -21,7 +21,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 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); }; }
 
@@ -82,9 +82,9 @@ var InstrumentedPlugin = /*#__PURE__*/function (_Plugin) {
           var originalUpdate = view.update;
 
           view.update = function (view, state) {
-            (0, _editorCommon.startMeasure)(measure);
+            (0, _utils.startMeasure)(measure);
             originalUpdate(view, state);
-            (0, _editorCommon.stopMeasure)(measure, function () {});
+            (0, _utils.stopMeasure)(measure, function () {});
           };
         }
 

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

@@ -13,7 +13,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _getPerformanceTiming = require("./get-performance-timing");
 
@@ -68,19 +68,19 @@ var TransactionTracker = /*#__PURE__*/function () {
       }
 
       return {
-        startMeasure: usePerformanceMarks ? _editorCommon.startMeasure : _this.startMeasureSimple,
-        stopMeasure: usePerformanceMarks ? _editorCommon.stopMeasure : _this.stopMeasureSimple
+        startMeasure: usePerformanceMarks ? _utils.startMeasure : _this.startMeasureSimple,
+        stopMeasure: usePerformanceMarks ? _utils.stopMeasure : _this.stopMeasureSimple
       };
     });
     (0, _defineProperty2.default)(this, "startMeasureSimple", function (measureName) {
-      if (!(0, _editorCommon.isPerformanceAPIAvailable)()) {
+      if (!(0, _utils.isPerformanceAPIAvailable)()) {
         return;
       }
 
       _this.measureMap.set(measureName, performance.now());
     });
     (0, _defineProperty2.default)(this, "stopMeasureSimple", function (measureName, onMeasureComplete) {
-      if (!(0, _editorCommon.isPerformanceAPIAvailable)()) {
+      if (!(0, _utils.isPerformanceAPIAvailable)()) {
         return;
       }
 

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

@@ -11,7 +11,7 @@ exports.nonWrappedLayouts = exports.isRichMediaInsideOfBlockNode = exports.float
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
@@ -49,10 +49,10 @@ var alignAttributes = function alignAttributes(layout, oldAttrs) {
   var oldLayout = oldAttrs.layout;
   var oldLayoutIsNonWrapped = nonWrappedLayouts.indexOf(oldLayout) > -1;
   var newLayoutIsNonWrapped = nonWrappedLayouts.indexOf(layout) > -1;
-  var newLayoutIsWrapped = _editorCommon.wrappedLayouts.indexOf(layout) > -1;
-  var oldLayoutIsWrapped = _editorCommon.wrappedLayouts.indexOf(oldLayout) > -1;
+  var newLayoutIsWrapped = _ui.wrappedLayouts.indexOf(layout) > -1;
+  var oldLayoutIsWrapped = _ui.wrappedLayouts.indexOf(oldLayout) > -1;
 
-  if (oldLayoutIsNonWrapped && (0, _editorCommon.shouldAddDefaultWrappedWidth)(layout, originalWidth, lineLength)) {
+  if (oldLayoutIsNonWrapped && (0, _ui.shouldAddDefaultWrappedWidth)(layout, originalWidth, lineLength)) {
     // 'full-width' or 'wide' or 'center' -> 'wrap-left' or 'wrap-right' or 'align-end' or 'align-start'
     if (!width || width >= 100 || oldLayout !== 'center' // == 'full-width' or 'wide'
     ) {
@@ -115,14 +115,14 @@ function calculateSnapPoints(_ref) {
   var snapTargets = [];
 
   for (var i = 0; i < gridWidth; i++) {
-    var pxFromColumns = (0, _editorCommon.calcPxFromColumns)(i, lineLength, gridWidth);
+    var pxFromColumns = (0, _ui.calcPxFromColumns)(i, lineLength, gridWidth);
     snapTargets.push(insideLayout ? pxFromColumns : pxFromColumns - offsetLeft);
   } // full width
 
 
   snapTargets.push(lineLength - offsetLeft);
   var columns = wrappedLayout || insideInlineLike ? 1 : 2;
-  var minimumWidth = (0, _editorCommon.calcPxFromColumns)(columns, lineLength, gridSize);
+  var minimumWidth = (0, _ui.calcPxFromColumns)(columns, lineLength, gridSize);
   var snapPoints = snapTargets.filter(function (width) {
     return width >= minimumWidth;
   });

package/dist/cjs/utils/selection.js

@@ -18,7 +18,7 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _selection = require("../plugins/selection/gap-cursor/selection");
 
@@ -93,7 +93,7 @@ var normaliseNestedLayout = function normaliseNestedLayout(_ref, node) {
 
 
 exports.normaliseNestedLayout = normaliseNestedLayout;
-var isChromeWithSelectionBug = _editorCommon.browser.chrome && !_editorCommon.browser.android && _editorCommon.browser.chrome_version >= 58;
+var isChromeWithSelectionBug = _utils.browser.chrome && !_utils.browser.android && _utils.browser.chrome_version >= 58;
 exports.isChromeWithSelectionBug = isChromeWithSelectionBug;
 
 var isSelectionAtStartOfNode = function isSelectionAtStartOfNode($pos, parentNode) {

package/dist/cjs/utils/step.js

@@ -3,24 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stepAdds = stepAdds;
+exports.stepAddsOneOf = stepAddsOneOf;
 exports.stepHasSlice = void 0;
 
 var stepHasSlice = function stepHasSlice(step) {
   return 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
  */
 
 
 exports.stepHasSlice = stepHasSlice;
 
-function stepAdds(step, nodeType) {
+function stepAddsOneOf(step, nodeTypes) {
   var adds = false;
 
   if (!stepHasSlice(step)) {
@@ -28,7 +27,7 @@ function stepAdds(step, nodeType) {
   }
 
   step.slice.content.descendants(function (node) {
-    if (node.type === nodeType) {
+    if (nodeTypes.has(node.type)) {
       adds = true;
     }
 

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "153.1.4";
+var version = "153.1.5";
 exports.version = version;
 
 var nextMajorVersion = function nextMajorVersion() {

package/dist/cjs/version.json

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

package/dist/es2019/actions/index.js

@@ -6,7 +6,7 @@ import { processRawValue, isEmptyDocument } from '../utils/document';
 import { getEditorValueWithMedia, __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';
 export default class EditorActions {
   constructor() {

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

@@ -2,8 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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/es2019/create-editor/ReactEditorView.js

@@ -4,7 +4,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';
@@ -19,7 +19,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/es2019/create-editor/create-editor.js

@@ -1,4 +1,4 @@
-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/es2019/create-editor/create-plugins-list.js

@@ -4,7 +4,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';
 
 const isCodeBlockAllowed = options => {
   const exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
@@ -88,7 +88,8 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     cardOptions: props.smartLinks || props.UNSAFE_cards,
     codeBlock: { ...props.codeBlock,
       useLongPressSelection: false,
-      appearance: props.appearance
+      appearance: props.appearance,
+      allowCompositionInputOverride: isMobile
     }
   };
 }
@@ -398,7 +399,7 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     }]);
   }
 
-  if (props.UNSAFE_allowFragmentMark) {
+  if (props.allowFragmentMark) {
     preset.add(fragmentMarkPlugin);
   }
 

package/dist/es2019/editor.js

@@ -5,7 +5,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/es2019/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/es2019/keymaps/index.js

@@ -1,5 +1,5 @@
 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 const addAltText = makeKeyMapWithCommon('Add Alt Text', 'Mod-Alt-y');
@@ -7,6 +7,8 @@ export const toggleBold = makeKeyMapWithCommon('Bold', 'Mod-b');
 export const toggleItalic = makeKeyMapWithCommon('Italic', 'Mod-i');
 export const toggleUnderline = makeKeyMapWithCommon('Underline', 'Mod-u');
 export const toggleStrikethrough = makeKeyMapWithCommon('Strikethrough', 'Mod-Shift-s');
+export const toggleSubscript = makeKeyMapWithCommon('Subscript', 'Mod-Shift-,');
+export const toggleSuperscript = makeKeyMapWithCommon('Superscript', 'Mod-Shift-.');
 export const toggleCode = makeKeyMapWithCommon('Code', 'Mod-Shift-m');
 export const pastePlainText = makeKeyMapWithCommon('Paste Plain Text', 'Mod-Shift-v');
 export const clearFormatting = makeKeyMapWithCommon('Clear formatting', 'Mod-\\');
@@ -61,6 +63,8 @@ export const copy = makeKeyMapWithCommon('Copy', 'Mod-c');
 export const paste = makeKeyMapWithCommon('Paste', 'Mod-v');
 export const altPaste = makeKeyMapWithCommon('Paste', 'Mod-Shift-v');
 export const find = makeKeyMapWithCommon('Find', 'Mod-f');
+export const alignLeft = makeKeyMapWithCommon('Align Left', 'Mod-Shift-l');
+export const alignRight = makeKeyMapWithCommon('Align Right', 'Mod-Shift-r');
 const arrowKeysMap = {
   // for reference: https://wincent.com/wiki/Unicode_representations_of_modifier_keys
   ARROWLEFT: '\u2190',
@@ -132,7 +136,7 @@ export function findShortcutByKeymap(keymap) {
 
   return keymap.windows;
 }
-const 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];
+const 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/es2019/labs/next/full-page.js

@@ -4,7 +4,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/es2019/labs/next/internal/components/EditorInternal.js

@@ -1,7 +1,7 @@
 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/es2019/labs/next/internal/hooks/use-editor/index.js

@@ -1,5 +1,5 @@
 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/es2019/nodeviews/ReactNodeView.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 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/es2019/plugins/alignment/index.js

@@ -4,6 +4,7 @@ import WithPluginState from '../../ui/WithPluginState';
 import { pluginKey, createPlugin } from './pm-plugins/main';
 import { changeAlignment } from './commands';
 import ToolbarAlignment from './ui/ToolbarAlignment';
+import { keymapPlugin } from './pm-plugins/keymap';
 export const defaultConfig = {
   align: 'start'
 };
@@ -24,6 +25,9 @@ const alignmentPlugin = () => ({
       plugin: ({
         dispatch
       }) => createPlugin(dispatch, defaultConfig)
+    }, {
+      name: 'annotationKeymap',
+      plugin: () => keymapPlugin()
     }];
   },
 

package/dist/es2019/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() {
+  const list = {};
+  bindKeymapWithCommand(alignLeft.common, changeAlignment('start'), list);
+  bindKeymapWithCommand(alignRight.common, changeAlignment('end'), list);
+  return keymap(list);
+}

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

@@ -36,7 +36,7 @@ export class AlignmentToolbar extends React.Component {
     });
 
     _defineProperty(this, "hide", () => {
-      if (this.state.isOpen === true) {
+      if (this.state.isOpen) {
         this.setState({
           isOpen: false
         });
@@ -62,7 +62,7 @@ export class AlignmentToolbar extends React.Component {
       mountTo: popupsMountPoint,
       boundariesElement: popupsBoundariesElement,
       scrollableElement: popupsScrollableElement,
-      isOpen: this.state.isOpen,
+      isOpen: isOpen,
       handleClickOutside: this.hide,
       handleEscapeKeydown: this.hide,
       fitWidth: 112,
@@ -72,8 +72,10 @@ export class AlignmentToolbar extends 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/es2019/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 const analyticsEventKey = key;
 export const editorAnalyticsChannel = FabricChannel.editor;

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

@@ -1,5 +1,5 @@
 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/es2019/plugins/annotation/nodeviews/index.js

@@ -1,5 +1,5 @@
 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/es2019/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/es2019/plugins/base/pm-plugins/frozen-editor.js

@@ -1,5 +1,5 @@
 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/es2019/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 const inlineCursorTargetStateKey = new PluginKey('inlineCursorTargetPlugin');
 export const SPECIAL_NODES = ['mention', 'emoji'];
 export const isSpecial = node => {

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

@@ -1,5 +1,5 @@
 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/es2019/plugins/block-type/styles.js

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { blockquoteSharedStyles, headingsSharedStyles } from '@atlaskit/editor-common';
+import { blockquoteSharedStyles, headingsSharedStyles } from '@atlaskit/editor-common/styles';
 export const blocktypeStyles = css`
   .ProseMirror {
     ${blockquoteSharedStyles};

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

@@ -22,6 +22,8 @@ export const 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/es2019/plugins/block-type/ui/ToolbarBlockType/index.js

@@ -48,6 +48,7 @@ class ToolbarBlockType extends React.PureComponent {
             selected: isActive
           }, /*#__PURE__*/React.createElement(Tag, null, formatMessage(blockType.title))),
           value: blockType,
+          label: formatMessage(blockType.title),
           key: `${blockType.name}-${index}`,
           elemAfter: /*#__PURE__*/React.createElement(KeyboardShortcut, {
             selected: isActive
@@ -114,7 +115,8 @@ class ToolbarBlockType extends React.PureComponent {
         scrollableElement: popupsScrollableElement,
         zIndex: akEditorMenuZIndex,
         fitHeight: 360,
-        fitWidth: 106
+        fitWidth: 106,
+        shouldUseDefaultRole: true
       }, /*#__PURE__*/React.createElement(BlockTypeButton, {
         isSmall: isSmall,
         isReducedSpacing: isReducedSpacing,
@@ -122,7 +124,8 @@ class ToolbarBlockType extends React.PureComponent {
         disabled: false,
         title: blockTypeTitles[0],
         onClick: this.handleTriggerClick,
-        formatMessage: formatMessage
+        formatMessage: formatMessage,
+        "aria-expanded": active
       }, longestDropdownMenuItem)), /*#__PURE__*/React.createElement(Separator, null));
     }
 
@@ -133,7 +136,8 @@ class ToolbarBlockType extends 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/es2019/plugins/block-type/ui/ToolbarBlockType/styled.js

@@ -1,6 +1,6 @@
 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 const BlockTypeMenuItem = styled.div`
   ${headingsSharedStyles};

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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/es2019/plugins/breakout/ui/LayoutButton.js

@@ -3,7 +3,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/es2019/plugins/caption/nodeviews/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { Caption } from '@atlaskit/editor-common';
+import { Caption } from '@atlaskit/editor-common/ui';
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 export class CaptionNodeView extends SelectionBasedNodeView {
   constructor(...args) {

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

@@ -1,13 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 class BlockCardComponent extends React.PureComponent {
   constructor(...args) {
     super(...args);

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

@@ -5,7 +5,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/es2019/plugins/card/nodeviews/inlineCard.js

@@ -2,8 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';

package/dist/es2019/plugins/card/styles.js

@@ -1,7 +1,7 @@
 import { css } from 'styled-components';
 import { SelectionStyle, getSelectionStyles, akEditorDeleteBorder, akEditorDeleteBackground } from '@atlaskit/editor-shared-styles';
 import { N20 } from '@atlaskit/theme/colors';
-import { SmartCardSharedCssClassName } from '@atlaskit/editor-common';
+import { SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 export const smartCardStyles = css`
   .${SmartCardSharedCssClassName.INLINE_CARD_CONTAINER} {