@atlaskit/editor-core 153.1.4 → 153.1.5

package/dist/cjs/actions/index.js

@@ -31,9 +31,9 @@ var _eventDispatcher = require("../event-dispatcher");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils2 = require("@atlaskit/editor-common/utils");
 
-var _utils2 = require("../plugins/extension/utils");
+var _utils3 = require("../plugins/extension/utils");
 
 var EditorActions = /*#__PURE__*/function () {
   function EditorActions() {
@@ -44,7 +44,7 @@ var EditorActions = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "dispatchAnalyticsEvent", function (payload) {
       if (_this.eventDispatcher) {
         var dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
-        dispatch(_editorCommon.analyticsEventKey, {
+        dispatch(_utils2.analyticsEventKey, {
           payload: payload
         });
       }
@@ -240,7 +240,7 @@ var EditorActions = /*#__PURE__*/function () {
       if ((_this$editorView = this.editorView) !== null && _this$editorView !== void 0 && _this$editorView.state) {
         var _findNodePosWithLocal, _this$editorView2;
 
-        return (_findNodePosWithLocal = (0, _utils2.findNodePosWithLocalId)((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, id)) === null || _findNodePosWithLocal === void 0 ? void 0 : _findNodePosWithLocal.node;
+        return (_findNodePosWithLocal = (0, _utils3.findNodePosWithLocalId)((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, id)) === null || _findNodePosWithLocal === void 0 ? void 0 : _findNodePosWithLocal.node;
       }
     }
   }, {

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

@@ -31,10 +31,12 @@ var _uuid = _interopRequireDefault(require("uuid"));
 
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _ufo = require("@atlaskit/editor-common/ufo");
 
+var _ui = require("@atlaskit/editor-common/ui");
+
 var _analytics = require("../plugins/analytics");
 
 var _consts = require("../plugins/analytics/consts");
@@ -240,7 +242,7 @@ var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component) {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return (0, _editorCommon.sniffUserBrowserExtensions)({
+                return (0, _utils.sniffUserBrowserExtensions)({
                   extensions: ['grammarly'],
                   async: true,
                   asyncTimeoutMs: 20000
@@ -266,7 +268,7 @@ var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.IntlNextErrorBoundary, null, this.props.children);
+      return /*#__PURE__*/_react.default.createElement(_ui.IntlNextErrorBoundary, null, this.props.children);
     }
   }]);
   return ErrorBoundaryWithEditorView;

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

@@ -36,13 +36,13 @@ var _prosemirrorView = require("prosemirror-view");
 
 var _reactIntlNext = require("react-intl-next");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _ufo = require("@atlaskit/editor-common/ufo");
 
 var _eventDispatcher = require("../event-dispatcher");
 
-var _utils = require("../utils");
+var _utils2 = require("../utils");
 
 var _useComponentRendererTracking = require("../utils/react-hooks/use-component-renderer-tracking");
 
@@ -286,7 +286,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       var doc;
 
       if (options.doc) {
-        doc = (0, _utils.processRawValue)(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, _this.contentTransformer, _this.dispatchAnalyticsEvent);
+        doc = (0, _utils2.processRawValue)(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, _this.contentTransformer, _this.dispatchAnalyticsEvent);
       }
 
       var selection;
@@ -312,14 +312,14 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       var trackinEnabled = _this.transactionTracking.enabled;
 
       _this.config.onEditorViewStateUpdatedCallbacks.forEach(function (entry) {
-        trackinEnabled && (0, _editorCommon.startMeasure)("\uD83E\uDD89 ".concat(entry.pluginName, "::onEditorViewStateUpdated"));
+        trackinEnabled && (0, _utils.startMeasure)("\uD83E\uDD89 ".concat(entry.pluginName, "::onEditorViewStateUpdated"));
         entry.callback({
           originalTransaction: originalTransaction,
           transactions: transactions,
           oldEditorState: oldEditorState,
           newEditorState: newEditorState
         });
-        trackinEnabled && (0, _editorCommon.stopMeasure)("\uD83E\uDD89 ".concat(entry.pluginName, "::onEditorViewStateUpdated"));
+        trackinEnabled && (0, _utils.stopMeasure)("\uD83E\uDD89 ".concat(entry.pluginName, "::onEditorViewStateUpdated"));
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "trackValidTransactions", function () {
@@ -492,18 +492,18 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       };
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createEditorView", function (node) {
-      (0, _editorCommon.measureRender)(_measureEnum.default.PROSEMIRROR_RENDERED, function (duration, startTime) {
+      (0, _utils.measureRender)(_measureEnum.default.PROSEMIRROR_RENDERED, function (duration, startTime) {
         var _this$props$editorPro5, _this$props$editorPro6, _proseMirrorRenderedT, _proseMirrorRenderedT2;
 
         var proseMirrorRenderedTracking = (_this$props$editorPro5 = _this.props.editorProps) === null || _this$props$editorPro5 === void 0 ? void 0 : (_this$props$editorPro6 = _this$props$editorPro5.performanceTracking) === null || _this$props$editorPro6 === void 0 ? void 0 : _this$props$editorPro6.proseMirrorRenderedTracking;
-        var forceSeverityTracking = typeof proseMirrorRenderedTracking === 'undefined' && (0, _editorCommon.shouldForceTracking)();
-        _this.proseMirrorRenderedSeverity = !!forceSeverityTracking || proseMirrorRenderedTracking !== null && proseMirrorRenderedTracking !== void 0 && proseMirrorRenderedTracking.trackSeverity ? (0, _editorCommon.getAnalyticsEventSeverity)(duration, (_proseMirrorRenderedT = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityNormalThreshold) !== null && _proseMirrorRenderedT !== void 0 ? _proseMirrorRenderedT : _consts.PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, (_proseMirrorRenderedT2 = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityDegradedThreshold) !== null && _proseMirrorRenderedT2 !== void 0 ? _proseMirrorRenderedT2 : _consts.PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD) : undefined;
+        var forceSeverityTracking = typeof proseMirrorRenderedTracking === 'undefined' && (0, _utils.shouldForceTracking)();
+        _this.proseMirrorRenderedSeverity = !!forceSeverityTracking || proseMirrorRenderedTracking !== null && proseMirrorRenderedTracking !== void 0 && proseMirrorRenderedTracking.trackSeverity ? (0, _utils.getAnalyticsEventSeverity)(duration, (_proseMirrorRenderedT = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityNormalThreshold) !== null && _proseMirrorRenderedT !== void 0 ? _proseMirrorRenderedT : _consts.PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, (_proseMirrorRenderedT2 = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityDegradedThreshold) !== null && _proseMirrorRenderedT2 !== void 0 ? _proseMirrorRenderedT2 : _consts.PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD) : undefined;
 
         if (_this.view) {
           var _getContextIdentifier, _this$experienceStore9, _this$experienceStore10;
 
           var nodes = (0, _document.getNodesCount)(_this.view.state.doc);
-          var ttfb = (0, _editorCommon.getResponseEndTime)();
+          var ttfb = (0, _utils.getResponseEndTime)();
 
           _this.dispatchAnalyticsEvent({
             action: _analytics.ACTION.PROSEMIRROR_RENDERED,
@@ -604,7 +604,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "dispatchAnalyticsEvent", function (payload) {
       if (_this.props.allowAnalyticsGASV3 && _this.eventDispatcher) {
         var dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
-        dispatch(_editorCommon.analyticsEventKey, {
+        dispatch(_utils.analyticsEventKey, {
           payload: payload
         });
       }
@@ -642,7 +642,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
     // we dispatch analytics events in plugin initialisation
 
 
-    _this.eventDispatcher.on(_editorCommon.analyticsEventKey, _this.handleAnalyticsEvent);
+    _this.eventDispatcher.on(_utils.analyticsEventKey, _this.handleAnalyticsEvent);
 
     _this.eventDispatcher.on('resetEditorState', _this.resetEditorState);
 
@@ -787,7 +787,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       } // this.view will be destroyed when React unmounts in handleEditorViewRef
 
 
-      this.eventDispatcher.off(_editorCommon.analyticsEventKey, this.handleAnalyticsEvent);
+      this.eventDispatcher.off(_utils.analyticsEventKey, this.handleAnalyticsEvent);
       this.eventDispatcher.off('resetEditorState', this.resetEditorState);
     } // Helper to allow tests to inject plugins directly
 
@@ -842,11 +842,11 @@ var _default = (0, _reactIntlNext.injectIntl)(ReactEditorView);
 exports.default = _default;
 
 function getUAPrefix() {
-  if (_editorCommon.browser.chrome) {
+  if (_utils.browser.chrome) {
     return 'ua-chrome';
-  } else if (_editorCommon.browser.ie) {
+  } else if (_utils.browser.ie) {
     return 'ua-ie';
-  } else if (_editorCommon.browser.gecko) {
+  } else if (_utils.browser.gecko) {
     return 'ua-firefox';
   }
 

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

@@ -13,7 +13,7 @@ exports.sortByRank = sortByRank;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _sortByOrder = require("./sort-by-order");
 
@@ -159,7 +159,7 @@ function createPMPlugins(config) {
 }
 
 function createErrorReporter(errorReporterHandler) {
-  var errorReporter = new _editorCommon.ErrorReporter();
+  var errorReporter = new _utils.ErrorReporter();
 
   if (errorReporterHandler) {
     errorReporter.handler = errorReporterHandler;

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

@@ -25,7 +25,7 @@ var _mediaCommon = require("@atlaskit/media-common");
 
 var _default = require("../labs/next/presets/default");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -116,7 +116,8 @@ function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent) {
     cardOptions: props.smartLinks || props.UNSAFE_cards,
     codeBlock: _objectSpread(_objectSpread({}, props.codeBlock), {}, {
       useLongPressSelection: false,
-      appearance: props.appearance
+      appearance: props.appearance,
+      allowCompositionInputOverride: isMobile
     })
   };
 }
@@ -281,7 +282,7 @@ function createPluginsList(props, prevProps, createAnalyticsEvent) {
     }
 
     preset.add([_plugins.collabEditPlugin, _objectSpread(_objectSpread({}, collabEditOptions), {}, {
-      EXPERIMENTAL_allowInternalErrorAnalytics: (_collabEditOptions$EX = collabEditOptions.EXPERIMENTAL_allowInternalErrorAnalytics) !== null && _collabEditOptions$EX !== void 0 ? _collabEditOptions$EX : (0, _editorCommon.shouldForceTracking)()
+      EXPERIMENTAL_allowInternalErrorAnalytics: (_collabEditOptions$EX = collabEditOptions.EXPERIMENTAL_allowInternalErrorAnalytics) !== null && _collabEditOptions$EX !== void 0 ? _collabEditOptions$EX : (0, _utils.shouldForceTracking)()
     })]);
   }
 
@@ -422,7 +423,7 @@ function createPluginsList(props, prevProps, createAnalyticsEvent) {
     }]);
   }
 
-  if (props.UNSAFE_allowFragmentMark) {
+  if (props.allowFragmentMark) {
     preset.add(_plugins.fragmentMarkPlugin);
   }
 

package/dist/cjs/editor.js

@@ -39,7 +39,13 @@ var _v = _interopRequireDefault(require("uuid/v4"));
 
 var _versionWrapper = require("./version-wrapper");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _extensions = require("@atlaskit/editor-common/extensions");
+
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
+
+var _ui = require("@atlaskit/editor-common/ui");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _ufo = require("@atlaskit/editor-common/ufo");
 
@@ -59,7 +65,7 @@ var _contextAdapter = require("./nodeviews/context-adapter");
 
 var _measureEnum = _interopRequireDefault(require("./utils/performance/measure-enum"));
 
-var _extensions = require("./utils/extensions");
+var _extensions2 = require("./utils/extensions");
 
 var _analytics = require("./plugins/analytics");
 
@@ -79,7 +85,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; } }
 
-var WidthProviderFullHeight = (0, _styledComponents.default)(_editorCommon.WidthProvider)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  height: 100%;\n"])));
+var WidthProviderFullHeight = (0, _styledComponents.default)(_ui.WidthProvider)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  height: 100%;\n"])));
 
 var Editor = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(Editor, _React$Component);
@@ -99,15 +105,15 @@ var Editor = /*#__PURE__*/function (_React$Component) {
       }
 
       if (typeof extensionProviders === 'function') {
-        return (0, _editorCommon.combineExtensionProviders)(extensionProviders(_this.editorActions));
+        return (0, _extensions.combineExtensionProviders)(extensionProviders(_this.editorActions));
       }
 
-      return (0, _editorCommon.combineExtensionProviders)(extensionProviders);
+      return (0, _extensions.combineExtensionProviders)(extensionProviders);
     }));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "prepareQuickInsertProvider", function (extensionProvider, quickInsert) {
       var quickInsertProvider = quickInsert && typeof quickInsert !== 'boolean' && quickInsert.provider;
-      var extensionQuickInsertProvider = extensionProvider && (0, _extensions.extensionProviderToQuickInsertProvider)(extensionProvider, _this.editorActions, _this.createAnalyticsEvent);
-      return quickInsertProvider && extensionQuickInsertProvider ? (0, _extensions.combineQuickInsertProviders)([quickInsertProvider, extensionQuickInsertProvider]) : quickInsertProvider || extensionQuickInsertProvider;
+      var extensionQuickInsertProvider = extensionProvider && (0, _extensions2.extensionProviderToQuickInsertProvider)(extensionProvider, _this.editorActions, _this.createAnalyticsEvent);
+      return quickInsertProvider && extensionQuickInsertProvider ? (0, _extensions2.combineQuickInsertProviders)([quickInsertProvider, extensionQuickInsertProvider]) : quickInsertProvider || extensionQuickInsertProvider;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSave", function (view) {
       if (!_this.props.onSave) {
@@ -119,7 +125,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleAnalyticsEvent", function (data) {
       return (0, _analytics.fireAnalyticsEvent)(_this.createAnalyticsEvent)(data);
     });
-    _this.providerFactory = new _editorCommon.ProviderFactory();
+    _this.providerFactory = new _providerFactory.ProviderFactory();
 
     _this.deprecationWarnings(props);
 
@@ -131,12 +137,12 @@ var Editor = /*#__PURE__*/function (_React$Component) {
 
     _this.editorSessionId = (0, _v.default)();
     _this.startTime = performance.now();
-    (0, _editorCommon.startMeasure)(_measureEnum.default.EDITOR_MOUNTED);
+    (0, _utils.startMeasure)(_measureEnum.default.EDITOR_MOUNTED);
 
     if ((_props$performanceTra = props.performanceTracking) !== null && _props$performanceTra !== void 0 && (_props$performanceTra2 = _props$performanceTra.ttiTracking) !== null && _props$performanceTra2 !== void 0 && _props$performanceTra2.enabled || (_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.ufo) {
       var _props$performanceTra5, _props$performanceTra6, _props$performanceTra7, _props$performanceTra8;
 
-      (0, _editorCommon.measureTTI)(function (tti, ttiFromInvocation, canceled) {
+      (0, _utils.measureTTI)(function (tti, ttiFromInvocation, canceled) {
         var _props$performanceTra3, _props$performanceTra4, _props$featureFlags2;
 
         if ((_props$performanceTra3 = props.performanceTracking) !== null && _props$performanceTra3 !== void 0 && (_props$performanceTra4 = _props$performanceTra3.ttiTracking) !== null && _props$performanceTra4 !== void 0 && _props$performanceTra4.enabled && _this.createAnalyticsEvent) {
@@ -162,7 +168,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
                 ttiFromInvocationSeverityNormalThreshold = _ttiTracking2.ttiFromInvocationSeverityNormalThreshold,
                 ttiFromInvocationSeverityDegradedThreshold = _ttiTracking2.ttiFromInvocationSeverityDegradedThreshold;
 
-            var _getTTISeverity = (0, _editorCommon.getTTISeverity)(tti, ttiFromInvocation, ttiSeverityNormalThreshold, ttiSeverityDegradedThreshold, ttiFromInvocationSeverityNormalThreshold, ttiFromInvocationSeverityDegradedThreshold),
+            var _getTTISeverity = (0, _utils.getTTISeverity)(tti, ttiFromInvocation, ttiSeverityNormalThreshold, ttiSeverityDegradedThreshold, ttiFromInvocationSeverityNormalThreshold, ttiFromInvocationSeverityDegradedThreshold),
                 ttiSeverity = _getTTISeverity.ttiSeverity,
                 ttiFromInvocationSeverity = _getTTISeverity.ttiFromInvocationSeverity;
 
@@ -196,7 +202,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   (0, _createClass2.default)(Editor, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      (0, _editorCommon.stopMeasure)(_measureEnum.default.EDITOR_MOUNTED, this.sendDurationAnalytics(_analytics.ACTION.EDITOR_MOUNTED));
+      (0, _utils.stopMeasure)(_measureEnum.default.EDITOR_MOUNTED, this.sendDurationAnalytics(_analytics.ACTION.EDITOR_MOUNTED));
       this.handleProviders(this.props);
     }
   }, {
@@ -232,8 +238,8 @@ var Editor = /*#__PURE__*/function (_React$Component) {
 
       this.unregisterEditorFromActions();
       this.providerFactory.destroy();
-      (0, _editorCommon.clearMeasure)(_measureEnum.default.EDITOR_MOUNTED);
-      ((_this$props2 = this.props) === null || _this$props2 === void 0 ? void 0 : (_this$props2$performa = _this$props2.performanceTracking) === null || _this$props2$performa === void 0 ? void 0 : (_this$props2$performa2 = _this$props2$performa.onEditorReadyCallbackTracking) === null || _this$props2$performa2 === void 0 ? void 0 : _this$props2$performa2.enabled) && (0, _editorCommon.clearMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK);
+      (0, _utils.clearMeasure)(_measureEnum.default.EDITOR_MOUNTED);
+      ((_this$props2 = this.props) === null || _this$props2 === void 0 ? void 0 : (_this$props2$performa = _this$props2.performanceTracking) === null || _this$props2$performa === void 0 ? void 0 : (_this$props2$performa2 = _this$props2$performa.onEditorReadyCallbackTracking) === null || _this$props2$performa2 === void 0 ? void 0 : _this$props2$performa2.enabled) && (0, _utils.clearMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK);
 
       if ((_this$props$featureFl = this.props.featureFlags) !== null && _this$props$featureFl !== void 0 && _this$props$featureFl.ufo) {
         var _this$experienceStore3;
@@ -362,9 +368,9 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         var _this$props3, _this$props3$performa, _this$props3$performa2, _this$props$featureFl3;
 
         var measureEditorReady = ((_this$props3 = this.props) === null || _this$props3 === void 0 ? void 0 : (_this$props3$performa = _this$props3.performanceTracking) === null || _this$props3$performa === void 0 ? void 0 : (_this$props3$performa2 = _this$props3$performa.onEditorReadyCallbackTracking) === null || _this$props3$performa2 === void 0 ? void 0 : _this$props3$performa2.enabled) || ((_this$props$featureFl3 = this.props.featureFlags) === null || _this$props$featureFl3 === void 0 ? void 0 : _this$props$featureFl3.ufo);
-        measureEditorReady && (0, _editorCommon.startMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK);
+        measureEditorReady && (0, _utils.startMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK);
         this.props.onEditorReady(this.editorActions);
-        measureEditorReady && (0, _editorCommon.stopMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK, this.sendDurationAnalytics(_analytics.ACTION.ON_EDITOR_READY_CALLBACK));
+        measureEditorReady && (0, _utils.stopMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK, this.sendDurationAnalytics(_analytics.ACTION.ON_EDITOR_READY_CALLBACK));
       }
     }
   }, {
@@ -551,10 +557,10 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           packageName: _versionWrapper.name,
           packageVersion: _versionWrapper.version,
           componentName: 'editorCore',
-          appearance: (0, _editorCommon.getAnalyticsAppearance)(this.props.appearance),
+          appearance: (0, _utils.getAnalyticsAppearance)(this.props.appearance),
           editorSessionId: this.editorSessionId
         }
-      }, /*#__PURE__*/_react.default.createElement(_editorCommon.WithCreateAnalyticsEvent, {
+      }, /*#__PURE__*/_react.default.createElement(_ui.WithCreateAnalyticsEvent, {
         render: function render(createAnalyticsEvent) {
           return (_this5.createAnalyticsEvent = createAnalyticsEvent) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderTrackingEnabled && /*#__PURE__*/_react.default.createElement(_useComponentRendererTracking.RenderTracking, {
             componentProps: _this5.props,
@@ -589,7 +595,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
                       eventDispatcher = _ref3.eventDispatcher,
                       config = _ref3.config,
                       dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-                  return /*#__PURE__*/_react.default.createElement(_editorCommon.BaseTheme, {
+                  return /*#__PURE__*/_react.default.createElement(_ui.BaseTheme, {
                     dynamicTextSizing: _this5.props.allowDynamicTextSizing && _this5.props.appearance !== 'full-width',
                     baseFontSize: _this5.getBaseFontSize()
                   }, /*#__PURE__*/_react.default.createElement(Component, {
@@ -632,7 +638,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         }
       }));
 
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.LegacyToNextIntlProvider, null, /*#__PURE__*/_react.default.createElement(_editorCommon.IntlLegacyFallbackProvider, null, editor));
+      return /*#__PURE__*/_react.default.createElement(_ui.LegacyToNextIntlProvider, null, /*#__PURE__*/_react.default.createElement(_ui.IntlLegacyFallbackProvider, null, editor));
     }
   }]);
   return Editor;

package/dist/cjs/index.js

@@ -475,6 +475,12 @@ Object.defineProperty(exports, "setBlockTypeWithAnalytics", {
     return _commands3.setBlockTypeWithAnalytics;
   }
 });
+Object.defineProperty(exports, "setIsExpanded", {
+  enumerable: true,
+  get: function get() {
+    return _commands7.setIsExpanded;
+  }
+});
 Object.defineProperty(exports, "setKeyboardHeight", {
   enumerable: true,
   get: function get() {

package/dist/cjs/keymaps/index.js

@@ -78,7 +78,7 @@ Object.defineProperty(exports, "UP", {
     return _consts.UP;
   }
 });
-exports.backspace = exports.altPaste = exports.addRowBefore = exports.addRowAfter = exports.addLink = exports.addInlineComment = exports.addColumnBefore = exports.addColumnAfter = exports.addAltText = void 0;
+exports.backspace = exports.altPaste = exports.alignRight = exports.alignLeft = exports.addRowBefore = exports.addRowAfter = exports.addLink = exports.addInlineComment = exports.addColumnBefore = exports.addColumnAfter = exports.addAltText = void 0;
 exports.bindKeymapWithCommand = bindKeymapWithCommand;
 exports.find = exports.escape = exports.enter = exports.deleteKey = exports.cut = exports.ctrlBackSpace = exports.copy = exports.clearFormatting = void 0;
 exports.findKeyMapForBrowser = findKeyMapForBrowser;
@@ -88,7 +88,7 @@ exports.findShortcutByKeymap = findShortcutByKeymap;
 exports.insertRule = exports.insertNewLine = exports.indentList = exports.indent = exports.forwardDelete = void 0;
 exports.makeKeyMapWithCommon = makeKeyMapWithCommon;
 exports.makeKeymap = makeKeymap;
-exports.toggleUnderline = exports.toggleTable = exports.toggleStrikethrough = exports.toggleOrderedList = exports.toggleItalic = exports.toggleHeading6 = exports.toggleHeading5 = exports.toggleHeading4 = exports.toggleHeading3 = exports.toggleHeading2 = exports.toggleHeading1 = exports.toggleCode = exports.toggleBulletList = exports.toggleBold = exports.toggleBlockQuote = exports.tab = exports.submit = exports.splitListItem = exports.splitCodeBlock = exports.space = exports.shiftTab = exports.shiftEnter = exports.shiftBackspace = exports.setNormalText = exports.redo = exports.previousCell = exports.pastePlainText = exports.paste = exports.outdentList = exports.outdent = exports.openHelp = exports.nextCell = exports.moveUp = exports.moveRight = exports.moveLeft = exports.moveDown = void 0;
+exports.toggleUnderline = exports.toggleTable = exports.toggleSuperscript = exports.toggleSubscript = exports.toggleStrikethrough = exports.toggleOrderedList = exports.toggleItalic = exports.toggleHeading6 = exports.toggleHeading5 = exports.toggleHeading4 = exports.toggleHeading3 = exports.toggleHeading2 = exports.toggleHeading1 = exports.toggleCode = exports.toggleBulletList = exports.toggleBold = exports.toggleBlockQuote = exports.tab = exports.submit = exports.splitListItem = exports.splitCodeBlock = exports.space = exports.shiftTab = exports.shiftEnter = exports.shiftBackspace = exports.setNormalText = exports.redo = exports.previousCell = exports.pastePlainText = exports.paste = exports.outdentList = exports.outdent = exports.openHelp = exports.nextCell = exports.moveUp = exports.moveRight = exports.moveLeft = exports.moveDown = void 0;
 exports.tooltip = tooltip;
 exports.undo = void 0;
 
@@ -96,7 +96,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
@@ -116,6 +116,10 @@ var toggleUnderline = makeKeyMapWithCommon('Underline', 'Mod-u');
 exports.toggleUnderline = toggleUnderline;
 var toggleStrikethrough = makeKeyMapWithCommon('Strikethrough', 'Mod-Shift-s');
 exports.toggleStrikethrough = toggleStrikethrough;
+var toggleSubscript = makeKeyMapWithCommon('Subscript', 'Mod-Shift-,');
+exports.toggleSubscript = toggleSubscript;
+var toggleSuperscript = makeKeyMapWithCommon('Superscript', 'Mod-Shift-.');
+exports.toggleSuperscript = toggleSuperscript;
 var toggleCode = makeKeyMapWithCommon('Code', 'Mod-Shift-m');
 exports.toggleCode = toggleCode;
 var pastePlainText = makeKeyMapWithCommon('Paste Plain Text', 'Mod-Shift-v');
@@ -224,6 +228,10 @@ var altPaste = makeKeyMapWithCommon('Paste', 'Mod-Shift-v');
 exports.altPaste = altPaste;
 var find = makeKeyMapWithCommon('Find', 'Mod-f');
 exports.find = find;
+var alignLeft = makeKeyMapWithCommon('Align Left', 'Mod-Shift-l');
+exports.alignLeft = alignLeft;
+var alignRight = makeKeyMapWithCommon('Align Right', 'Mod-Shift-r');
+exports.alignRight = alignRight;
 var arrowKeysMap = {
   // for reference: https://wincent.com/wiki/Unicode_representations_of_modifier_keys
   ARROWLEFT: "\u2190",
@@ -239,7 +247,7 @@ exports.TooltipShortcut = TooltipShortcut;
 function formatShortcut(keymap) {
   var shortcut;
 
-  if (_editorCommon.browser.mac) {
+  if (_utils.browser.mac) {
     // for reference: https://wincent.com/wiki/Unicode_representations_of_modifier_keys
     shortcut = keymap.mac.replace(/Cmd/i, "\u2318").replace(/Shift/i, "\u21E7").replace(/Ctrl/i, "\u2303").replace(/Alt/i, "\u2325").replace(/Backspace/i, "\u232B").replace(/Enter/i, "\u23CE");
   } else {
@@ -255,7 +263,7 @@ function formatShortcut(keymap) {
   }
 
   keys[keys.length - 1] = arrowKeysMap[lastKey.toUpperCase()] || lastKey;
-  return keys.join(_editorCommon.browser.mac ? '' : '+');
+  return keys.join(_utils.browser.mac ? '' : '+');
 }
 
 function tooltip(keymap, description) {
@@ -295,14 +303,14 @@ function findShortcutByDescription(description) {
 }
 
 function findShortcutByKeymap(keymap) {
-  if (_editorCommon.browser.mac) {
+  if (_utils.browser.mac) {
     return keymap.mac;
   }
 
   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];
 
 function makeKeymap(description, windows, mac, common) {
   return {
@@ -334,7 +342,7 @@ function bindKeymapWithCommand(shortcut, cmd, keymap) {
 
 function findKeyMapForBrowser(keyMap) {
   if (keyMap) {
-    if (_editorCommon.browser.mac) {
+    if (_utils.browser.mac) {
       return keyMap.mac;
     }
 

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

@@ -23,7 +23,7 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _analyticsNext = require("@atlaskit/analytics-next");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
@@ -37,7 +37,7 @@ var _styles = require("../../ui/styles");
 
 var _commonStyles = require("../../plugins/table/ui/common-styles.css");
 
-var _ui = _interopRequireDefault(require("../../plugins/collab-edit/ui"));
+var _ui2 = _interopRequireDefault(require("../../plugins/collab-edit/ui"));
 
 var _Editor = require("./Editor");
 
@@ -145,7 +145,7 @@ function FullPage(props) {
   var config = (0, _Editor.useEditorSharedConfig)();
   return /*#__PURE__*/_react.default.createElement(_context.ContextPanelWidthProvider, null, /*#__PURE__*/_react.default.createElement(_Editor.Editor, (0, _extends2.default)({}, props, {
     onAnalyticsEvent: handleAnalyticsEvent
-  }), /*#__PURE__*/_react.default.createElement(_editorCommon.BaseTheme, {
+  }), /*#__PURE__*/_react.default.createElement(_ui.BaseTheme, {
     dynamicTextSizing: allowDynamicTextSizing
   }, /*#__PURE__*/_react.default.createElement(FullPageEditorWrapper, {
     className: "akEditor"
@@ -154,7 +154,7 @@ function FullPage(props) {
     showKeyline: showKeyline
   }, /*#__PURE__*/_react.default.createElement(_Toolbar.Toolbar, {
     containerElement: scrollContainerRef.current
-  }), /*#__PURE__*/_react.default.createElement(MainToolbarCustomComponentsSlot, null, !config ? null : /*#__PURE__*/_react.default.createElement(_ui.default, {
+  }), /*#__PURE__*/_react.default.createElement(MainToolbarCustomComponentsSlot, null, !config ? null : /*#__PURE__*/_react.default.createElement(_ui2.default, {
     editorView: config.editorView,
     eventDispatcher: config.eventDispatcher,
     inviteToEditHandler: collabEdit === null || collabEdit === void 0 ? void 0 : collabEdit.inviteToEditHandler,

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) {