@atlaskit/editor-core 153.1.4 → 154.0.0

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

@@ -13,9 +13,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactIntlNext = require("react-intl-next");
+var _ui = require("@atlaskit/editor-common/ui");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _reactIntlNext = require("react-intl-next");
 
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 
@@ -83,7 +83,7 @@ function BaseEditorInternal(_ref, context) {
       editorSharedConfig = _useEditor2[0],
       mountEditor = _useEditor2[1];
 
-  return /*#__PURE__*/_react.default.createElement(_editorCommon.WidthProvider, null, /*#__PURE__*/_react.default.createElement(_EditorContext.default, {
+  return /*#__PURE__*/_react.default.createElement(_ui.WidthProvider, null, /*#__PURE__*/_react.default.createElement(_EditorContext.default, {
     editorActions: editorActions
   }, /*#__PURE__*/_react.default.createElement(_sharedConfig.EditorSharedConfigProvider, {
     value: editorSharedConfig

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

@@ -14,11 +14,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _measureEnum = _interopRequireDefault(require("../../../../../utils/performance/measure-enum"));
 
-var _utils = require("../../../../../utils");
+var _utils2 = require("../../../../../utils");
 
 var _analytics = require("../../../../../plugins/analytics");
 
@@ -39,7 +39,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) { (0, _defineProperty2.default)(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 useEditor(config) {
-  (0, _editorCommon.startMeasure)(_measureEnum.default.EDITOR_MOUNTED);
+  (0, _utils.startMeasure)(_measureEnum.default.EDITOR_MOUNTED);
 
   var _useCreateEditor = useCreateEditor(config),
       _useCreateEditor2 = (0, _slicedToArray2.default)(_useCreateEditor, 2),
@@ -79,7 +79,7 @@ function useCreateEditor(config) {
 
     setEditorSharedConfig(function (editorSharedConfig) {
       if (!editorSharedConfig) {
-        (0, _editorCommon.measureRender)(_measureEnum.default.PROSEMIRROR_RENDERED, function (duration, startTime) {
+        (0, _utils.measureRender)(_measureEnum.default.PROSEMIRROR_RENDERED, function (duration, startTime) {
           if (sharedConfig && sharedConfig.dispatch) {
             sharedConfig.dispatch(_consts.analyticsEventKey, {
               payload: {
@@ -88,8 +88,8 @@ function useCreateEditor(config) {
                 attributes: {
                   duration: duration,
                   startTime: startTime,
-                  nodes: (0, _utils.getNodesCount)(sharedConfig.editorView.state.doc),
-                  ttfb: (0, _editorCommon.getResponseEndTime)()
+                  nodes: (0, _utils2.getNodesCount)(sharedConfig.editorView.state.doc),
+                  ttfb: (0, _utils.getResponseEndTime)()
                 },
                 eventType: _analytics.EVENT_TYPE.OPERATIONAL
               }
@@ -101,7 +101,7 @@ function useCreateEditor(config) {
       var sharedConfig = editorSharedConfig || (0, _createEditor.createEditor)(_objectSpread(_objectSpread({}, config), {}, {
         ref: ref
       }));
-      (0, _editorCommon.stopMeasure)(_measureEnum.default.EDITOR_MOUNTED, function (duration, startTime) {
+      (0, _utils.stopMeasure)(_measureEnum.default.EDITOR_MOUNTED, function (duration, startTime) {
         if (!sharedConfig) {
           return;
         } // Fire editor mounted event

package/dist/cjs/nodeviews/ReactNodeView.js

@@ -17,7 +17,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _pluginKey = require("../plugins/analytics/plugin-key");
 
@@ -108,11 +108,11 @@ var ReactNodeView = /*#__PURE__*/function () {
           samplingRate = _this$performanceOpti.samplingRate,
           slowThreshold = _this$performanceOpti.slowThreshold,
           trackingEnabled = _this$performanceOpti.enabled;
-      trackingEnabled && (0, _editorCommon.startMeasure)("\uD83E\uDD89".concat(this.node.type.name, "::ReactNodeView"));
+      trackingEnabled && (0, _utils.startMeasure)("\uD83E\uDD89".concat(this.node.type.name, "::ReactNodeView"));
       this.renderReactComponent(function () {
         return _this2.render(_this2.reactComponentProps, _this2.handleRef);
       });
-      trackingEnabled && (0, _editorCommon.stopMeasure)("\uD83E\uDD89".concat(this.node.type.name, "::ReactNodeView"), function (duration) {
+      trackingEnabled && (0, _utils.stopMeasure)("\uD83E\uDD89".concat(this.node.type.name, "::ReactNodeView"), function (duration) {
         if (++nodeViewEventsCounter % samplingRate === 0 && duration > slowThreshold) {
           _this2.dispatchAnalyticsEvent({
             action: _analytics.ACTION.REACT_NODEVIEW_RENDERED,

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

@@ -19,6 +19,8 @@ var _commands = require("./commands");
 
 var _ToolbarAlignment = _interopRequireDefault(require("./ui/ToolbarAlignment"));
 
+var _keymap = require("./pm-plugins/keymap");
+
 var defaultConfig = {
   align: 'start'
 };
@@ -40,6 +42,11 @@ var alignmentPlugin = function alignmentPlugin() {
           var dispatch = _ref.dispatch;
           return (0, _main.createPlugin)(dispatch, defaultConfig);
         }
+      }, {
+        name: 'annotationKeymap',
+        plugin: function plugin() {
+          return (0, _keymap.keymapPlugin)();
+        }
       }];
     },
     primaryToolbarComponent: function primaryToolbarComponent(_ref2) {

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.keymapPlugin = keymapPlugin;
+
+var _prosemirrorKeymap = require("prosemirror-keymap");
+
+var _keymaps = require("../../../keymaps");
+
+var _commands = require("../commands");
+
+function keymapPlugin() {
+  var list = {};
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.alignLeft.common, (0, _commands.changeAlignment)('start'), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.alignRight.common, (0, _commands.changeAlignment)('end'), list);
+  return (0, _prosemirrorKeymap.keymap)(list);
+}

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

@@ -79,7 +79,7 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hide", function () {
-      if (_this.state.isOpen === true) {
+      if (_this.state.isOpen) {
         _this.setState({
           isOpen: false
         });
@@ -107,7 +107,7 @@ 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,
@@ -117,8 +117,10 @@ 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.default.createElement(_styles.TriggerWrapper, null, _iconMap.iconMap[pluginState.align], /*#__PURE__*/_react.default.createElement(_styles.ExpandIconWrapper, null, /*#__PURE__*/_react.default.createElement(_chevronDown.default, {
             label: ""

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

@@ -7,9 +7,9 @@ exports.editorAnalyticsChannel = exports.analyticsEventKey = void 0;
 
 var _analyticsListeners = require("@atlaskit/analytics-listeners");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
-var analyticsEventKey = _editorCommon.analyticsEventKey;
+var analyticsEventKey = _utils.analyticsEventKey;
 exports.analyticsEventKey = analyticsEventKey;
 var editorAnalyticsChannel = _analyticsListeners.FabricChannel.editor;
 exports.editorAnalyticsChannel = editorAnalyticsChannel;

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

@@ -14,11 +14,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _types = require("./types");
 
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 
 var _pluginKey = require("./plugin-key");
 
@@ -45,7 +45,7 @@ function createPlugin(options) {
     return;
   }
 
-  var hasRequiredPerformanceAPIs = (0, _editorCommon.isPerformanceAPIAvailable)();
+  var hasRequiredPerformanceAPIs = (0, _utils.isPerformanceAPIAvailable)();
   return new _prosemirrorState.Plugin({
     key: _pluginKey.analyticsPluginKey,
     state: {
@@ -58,7 +58,7 @@ function createPlugin(options) {
         var _getFeatureFlags;
 
         if ((_getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state)) !== null && _getFeatureFlags !== void 0 && _getFeatureFlags.catchAllTracking) {
-          var analyticsEventWithChannel = (0, _utils.getAnalyticsEventsFromTransaction)(tr);
+          var analyticsEventWithChannel = (0, _utils2.getAnalyticsEventsFromTransaction)(tr);
 
           if (analyticsEventWithChannel.length > 0) {
             var _iterator = _createForOfIteratorHelper(analyticsEventWithChannel),
@@ -74,7 +74,7 @@ function createPlugin(options) {
                 // that has an analytics event.
                 if (hasRequiredPerformanceAPIs && tr.docChanged && payload.action !== _types.ACTION.INSERTED && payload.action !== _types.ACTION.DELETED) {
                   var measureName = "".concat(payload.actionSubject, ":").concat(payload.action, ":").concat(payload.actionSubjectId);
-                  (0, _editorCommon.measureRender)(measureName, function (duration) {
+                  (0, _utils.measureRender)(measureName, function (duration) {
                     (0, _fireAnalyticsEvent.fireAnalyticsEvent)(pluginState.createAnalyticsEvent)({
                       payload: extendPayload(payload, duration),
                       channel: channel

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

@@ -19,7 +19,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _nodeviews = require("../../../nodeviews");
 
@@ -101,7 +101,7 @@ var getAnnotationViewClassname = function getAnnotationViewClassname(isUnresolve
     return;
   }
 
-  return hasFocus ? _editorCommon.AnnotationSharedClassNames.focus : _editorCommon.AnnotationSharedClassNames.blur;
+  return hasFocus ? _styles.AnnotationSharedClassNames.focus : _styles.AnnotationSharedClassNames.blur;
 };
 
 exports.getAnnotationViewClassname = getAnnotationViewClassname;

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

@@ -20,13 +20,15 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorView = require("prosemirror-view");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
 var _types = require("./types");
 
-var _utils = require("../../utils");
+var _utils2 = require("../../utils");
 
 var _analytics = require("../analytics");
 
@@ -78,9 +80,9 @@ exports.filterAnnotationIds = filterAnnotationIds;
 var reorderAnnotations = function reorderAnnotations(annotations, $from) {
   var idSet = surroundingMarks($from).map(filterAnnotationIds);
   annotations.sort(function (a, b) {
-    return (0, _utils.sum)(idSet, function (ids) {
+    return (0, _utils2.sum)(idSet, function (ids) {
       return ids.indexOf(a.id);
-    }) - (0, _utils.sum)(idSet, function (ids) {
+    }) - (0, _utils2.sum)(idSet, function (ids) {
       return ids.indexOf(b.id);
     });
   });
@@ -176,7 +178,7 @@ exports.getSelectionStartRect = getSelectionStartRect;
 
 var addDraftDecoration = function addDraftDecoration(start, end) {
   return _prosemirrorView.Decoration.inline(start, end, {
-    class: "".concat(_editorCommon.AnnotationSharedClassNames.draft)
+    class: "".concat(_styles.AnnotationSharedClassNames.draft)
   });
 };
 
@@ -264,7 +266,7 @@ var getAnnotationsInSelectionCount = function getAnnotationsInSelectionCount(sta
   var _state$selection = state.selection,
       from = _state$selection.from,
       to = _state$selection.to;
-  var annotations = (0, _editorCommon.getAnnotationIdsFromRange)({
+  var annotations = (0, _utils.getAnnotationIdsFromRange)({
     from: from,
     to: to
   }, state.doc, state.schema);
@@ -338,7 +340,7 @@ var hasInvalidNodes = function hasInvalidNodes(state) {
   var selection = state.selection,
       doc = state.doc,
       schema = state.schema;
-  return !(0, _editorCommon.canApplyAnnotationOnRange)({
+  return !(0, _utils.canApplyAnnotationOnRange)({
     from: selection.from,
     to: selection.to
   }, doc, schema);

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

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _ufo = require("@atlaskit/editor-common/ufo");
 
@@ -85,7 +85,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
   var severityThresholdDegraded = (inputTracking === null || inputTracking === void 0 ? void 0 : inputTracking.severityDegradedThreshold) || DEFAULT_TRACK_SEVERITY_THRESHOLD_DEGRADED;
   return new _prosemirrorState.Plugin({
     key: frozenEditorPluginKey,
-    props: (0, _editorCommon.isPerformanceAPIAvailable)() ? {
+    props: (0, _utils.isPerformanceAPIAvailable)() ? {
       handleTextInput: function handleTextInput(view) {
         var state = view.state;
         var now = performance.now();
@@ -135,7 +135,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
             var _nodesCount = allowCountNodes ? (0, _countNodes.countNodes)(view.state) : {};
 
             keystrokeCount = 0;
-            var severity = shouldTrackSeverity ? (0, _editorCommon.getAnalyticsEventSeverity)(diff, severityThresholdNormal, severityThresholdDegraded) : undefined;
+            var severity = shouldTrackSeverity ? (0, _utils.getAnalyticsEventSeverity)(diff, severityThresholdNormal, severityThresholdDegraded) : undefined;
 
             if (inputTracking !== null && inputTracking !== void 0 && inputTracking.enabled) {
               var _getContextIdentifier3;
@@ -180,7 +180,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
       } : undefined
     } : undefined,
     view: function view(_view) {
-      if (!(0, _editorCommon.isPerformanceObserverAvailable)()) {
+      if (!(0, _utils.isPerformanceObserverAvailable)()) {
         return {};
       }
 
@@ -194,7 +194,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
             var duration = perfEntries[i].duration;
 
             if (duration > freezeThreshold) {
-              dispatchLongTaskEvent(dispatchAnalyticsEvent, _view, duration, allowCountNodes, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackInteractionType ? interactionType : undefined, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackSeverity ? (0, _editorCommon.getAnalyticsEventSeverity)(duration, browserFreezeTracking.severityNormalThreshold || NORMAL_SEVERITY_THRESHOLD, browserFreezeTracking.severityDegradedThreshold || DEGRADED_SEVERITY_THRESHOLD) : undefined);
+              dispatchLongTaskEvent(dispatchAnalyticsEvent, _view, duration, allowCountNodes, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackInteractionType ? interactionType : undefined, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackSeverity ? (0, _utils.getAnalyticsEventSeverity)(duration, browserFreezeTracking.severityNormalThreshold || NORMAL_SEVERITY_THRESHOLD, browserFreezeTracking.severityDegradedThreshold || DEGRADED_SEVERITY_THRESHOLD) : undefined);
             }
           }
         }); // register observer for long task notifications

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

@@ -9,7 +9,7 @@ var _prosemirrorView = require("prosemirror-view");
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var inlineCursorTargetStateKey = new _prosemirrorState.PluginKey('inlineCursorTargetPlugin');
 exports.inlineCursorTargetStateKey = inlineCursorTargetStateKey;
@@ -109,7 +109,7 @@ var _default = function _default() {
         if (positions && positions.length) {
           var decorations = positions.map(function (position) {
             var node = document.createElement('span');
-            node.appendChild(document.createTextNode(_editorCommon.ZERO_WIDTH_SPACE));
+            node.appendChild(document.createTextNode(_utils.ZERO_WIDTH_SPACE));
             return _prosemirrorView.Decoration.widget(position, node, {
               raw: true,
               side: -1,

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

@@ -11,11 +11,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _types = require("../types");
 
-var _utils = require("../../../utils");
+var _utils2 = require("../../../utils");
 
 var _commands = require("../commands");
 
@@ -132,7 +132,7 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
 
         return {
           currentBlockType: detectBlockType(availableBlockTypes, state),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(state),
+          blockTypesDisabled: (0, _utils2.areBlockTypesDisabled)(state),
           availableBlockTypes: availableBlockTypes,
           availableWrapperBlockTypes: availableWrapperBlockTypes
         };
@@ -140,7 +140,7 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypes, newState),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState)
+          blockTypesDisabled: (0, _utils2.areBlockTypesDisabled)(newState)
         });
 
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled) {
@@ -162,9 +162,9 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
         var headingLevel = _consts.HEADING_KEYS.indexOf(event.keyCode);
 
         if (headingLevel > -1 && event.altKey) {
-          if (_editorCommon.browser.mac && event.metaKey) {
+          if (_utils.browser.mac && event.metaKey) {
             return autoformatHeading(headingLevel, view);
-          } else if (!_editorCommon.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
+          } else if (!_utils.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
             return autoformatHeading(headingLevel, view);
           }
         } else if (event.key === 'Alt') {

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

@@ -11,9 +11,9 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _styledComponents = require("styled-components");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _templateObject;
 
-var blocktypeStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", ";\n    ", ";\n  }\n"])), _editorCommon.blockquoteSharedStyles, _editorCommon.headingsSharedStyles);
+var blocktypeStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", ";\n    ", ";\n  }\n"])), _styles.blockquoteSharedStyles, _styles.headingsSharedStyles);
 exports.blocktypeStyles = blocktypeStyles;

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

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

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

@@ -87,6 +87,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
             selected: isActive
           }, /*#__PURE__*/_react.default.createElement(Tag, null, formatMessage(blockType.title))),
           value: blockType,
+          label: formatMessage(blockType.title),
           key: "".concat(blockType.name, "-").concat(index),
           elemAfter: /*#__PURE__*/_react.default.createElement(_styled.KeyboardShortcut, {
             selected: isActive
@@ -156,7 +157,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           scrollableElement: popupsScrollableElement,
           zIndex: _editorSharedStyles.akEditorMenuZIndex,
           fitHeight: 360,
-          fitWidth: 106
+          fitWidth: 106,
+          shouldUseDefaultRole: true
         }, /*#__PURE__*/_react.default.createElement(_blocktypeButton.BlockTypeButton, {
           isSmall: isSmall,
           isReducedSpacing: isReducedSpacing,
@@ -164,7 +166,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.default.createElement(_styles.Separator, null));
       }
 
@@ -175,7 +178,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.default.createElement(_styles.Separator, null));
     }
   }]);

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

@@ -13,20 +13,20 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
-var _styles = require("../../../../ui/styles");
+var _styles2 = require("../../../../ui/styles");
 
 var _templateObject, _templateObject2;
 
-var BlockTypeMenuItem = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  > {\n    h1,\n    h2,\n    h3,\n    h4,\n    h5,\n    h6 {\n      margin-top: 0;\n    }\n  }\n  ", ";\n"])), _editorCommon.headingsSharedStyles, function (props) {
+var BlockTypeMenuItem = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  > {\n    h1,\n    h2,\n    h3,\n    h4,\n    h5,\n    h6 {\n      margin-top: 0;\n    }\n  }\n  ", ";\n"])), _styles.headingsSharedStyles, function (props) {
   return (// TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
     props.selected ? "".concat(props.tagName, " { color: white !important; }") : ''
   );
 });
 
 exports.BlockTypeMenuItem = BlockTypeMenuItem;
-var KeyboardShortcut = (0, _styledComponents.default)(_styles.Shortcut)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  margin-left: 16px;\n"])), function (props) {
+var KeyboardShortcut = (0, _styledComponents.default)(_styles2.Shortcut)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  margin-left: 16px;\n"])), function (props) {
   return props.selected ? "color: ".concat(_colors.N400, ";") : '';
 });
 exports.KeyboardShortcut = KeyboardShortcut;

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

@@ -19,7 +19,7 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 
@@ -45,7 +45,7 @@ var BreakoutView = /*#__PURE__*/function () {
 
     (0, _classCallCheck2.default)(this, BreakoutView);
     (0, _defineProperty2.default)(this, "updateWidth", function (widthState) {
-      var width = (0, _editorCommon.calcBreakoutWidth)(_this.node.attrs.mode, widthState.width);
+      var width = (0, _utils.calcBreakoutWidth)(_this.node.attrs.mode, widthState.width);
       var newStyle = "width: ".concat(width, "; ");
       var lineLength = widthState.lineLength;
       var widthPx = (0, _dom.parsePx)(width);

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

@@ -33,7 +33,7 @@ var _reactIntlNext = require("react-intl-next");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _collapse = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/collapse"));
 
@@ -178,7 +178,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         element = closestEl.firstChild;
       }
 
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.Popup, {
+      return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
         ariaLabel: title,
         target: element,
         offset: [5, 0],

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

@@ -24,7 +24,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _nodeviews = require("../../../nodeviews/");
 
@@ -69,7 +69,7 @@ var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.Caption, {
+      return /*#__PURE__*/_react.default.createElement(_ui.Caption, {
         selected: this.insideSelection(),
         hasContent: this.node.content.childCount > 0
       }, /*#__PURE__*/_react.default.createElement("div", {

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

@@ -25,7 +25,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _smartCard = require("@atlaskit/smart-card");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -81,7 +83,7 @@ var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "gapCursorSpan", function () {
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
-      if (_editorCommon.browser.ie && _editorCommon.browser.ie_version < 79) {
+      if (_utils.browser.ie && _utils.browser.ie_version < 79) {
         return;
       } // render an empty span afterwards to get around Webkit bug
       // that puts caret in next editable text element
@@ -98,7 +100,7 @@ var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     key: "UNSAFE_componentWillMount",
     value: function UNSAFE_componentWillMount() {
       var view = this.props.view;
-      var scrollContainer = (0, _editorCommon.findOverflowScrollParent)(view.dom);
+      var scrollContainer = (0, _ui.findOverflowScrollParent)(view.dom);
       this.scrollContainer = scrollContainer || undefined;
     }
   }, {
@@ -138,7 +140,7 @@ exports.BlockCardComponent = BlockCardComponent;
 (0, _defineProperty2.default)(BlockCardComponent, "contextTypes", {
   contextAdapter: _propTypes.default.object
 });
-var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _editorCommon.UnsupportedBlock);
+var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _ui.UnsupportedBlock);
 
 var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   (0, _inherits2.default)(BlockCard, _ReactNodeView);
@@ -155,7 +157,7 @@ var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function createDomRef() {
       var domRef = document.createElement('div');
 
-      if (_editorCommon.browser.chrome && this.reactComponentProps.platform !== 'mobile') {
+      if (_utils.browser.chrome && this.reactComponentProps.platform !== 'mobile') {
         // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
         // see also: https://github.com/ProseMirror/prosemirror/issues/884
         domRef.contentEditable = 'true';