@atlaskit/editor-core 153.1.4 → 156.0.0

package/dist/es2019/utils/plugin-state-factory.js

@@ -14,7 +14,7 @@
  *  );
  *
  *  export const createPlugin = (dispatch: Dispatch, initialState) =>
- *    new Plugin({
+ *    new SafePlugin({
  *      state: createPluginState(dispatch, initialState),
  *      key: pluginKey
  *    });

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

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

package/dist/es2019/utils/selection.js

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

package/dist/es2019/utils/step.js

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

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

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

package/dist/esm/actions/index.js

@@ -10,8 +10,10 @@ import { processRawValue, isEmptyDocument } from '../utils/document';
 import { getEditorValueWithMedia, __temporaryFixForConfigPanel as _temporaryFixForConfigPanel } from '../utils/action';
 import { createDispatch } from '../event-dispatcher';
 import { safeInsert } from 'prosemirror-utils';
-import { analyticsEventKey } from '@atlaskit/editor-common';
+import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 import { findNodePosWithLocalId } from '../plugins/extension/utils';
+import { getFeatureFlags } from '../plugins/feature-flags-context/get-feature-flags';
+import { getCollabProvider } from '../plugins/collab-edit/native-collab-provider-plugin';
 
 var EditorActions = /*#__PURE__*/function () {
   function EditorActions() {
@@ -29,6 +31,37 @@ var EditorActions = /*#__PURE__*/function () {
         });
       }
     });
+
+    _defineProperty(this, "getResolvedEditorState", function () {
+      return new Promise(function (resolver, reject) {
+        var _getCollabProvider;
+
+        if (!_this.editorView) {
+          reject();
+          return;
+        }
+
+        var featureFlags = getFeatureFlags(_this.editorView.state);
+
+        if (!featureFlags.useNativeCollabPlugin) {
+          var _this$getValue;
+
+          return (_this$getValue = _this.getValue()) === null || _this$getValue === void 0 ? void 0 : _this$getValue.then(function (content) {
+            resolver({
+              content: content,
+              title: null,
+              stepVersion: -1
+            });
+          });
+        }
+
+        (_getCollabProvider = getCollabProvider(_this.editorView.state)) === null || _getCollabProvider === void 0 ? void 0 : _getCollabProvider.getFinalAcknowledgedState().then(function (resolvedEditorState) {
+          resolver(resolvedEditorState);
+        }).catch(function (error) {
+          reject(error);
+        });
+      });
+    });
   }
 
   _createClass(EditorActions, [{

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

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

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

@@ -21,10 +21,11 @@ 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';
+import { freezeUnsafeTransactionProperties } from '../utils/performance/safer-transactions';
 import { RenderTracking } from '../utils/react-hooks/use-component-renderer-tracking';
 import { findChangedNodesFromTransaction, validateNodes, validNode } from '../utils/nodes';
 import createPluginList from './create-plugins-list';
@@ -36,7 +37,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';
@@ -212,21 +213,33 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "createEditorState", function (options) {
-      if (_this.view && !options.resetting) {
-        /**
-         * There's presently a number of issues with changing the schema of a
-         * editor inflight. A significant issue is that we lose the ability
-         * to keep track of a user's history as the internal plugin state
-         * keeps a list of Steps to undo/redo (which are tied to the schema).
-         * Without a good way to do work around this, we prevent this for now.
-         */
-        // eslint-disable-next-line no-console
-        console.warn('The editor does not support changing the schema dynamically.');
-        return _this.editorState;
+      var schema;
+
+      if (_this.view) {
+        if (options.resetting) {
+          /**
+           * ReactEditorView currently does NOT handle dynamic schema,
+           * We are reusing the existing schema, and rely on #reconfigureState
+           * to update `this.config`
+           */
+          schema = _this.view.state.schema;
+        } else {
+          /**
+           * There's presently a number of issues with changing the schema of a
+           * editor inflight. A significant issue is that we lose the ability
+           * to keep track of a user's history as the internal plugin state
+           * keeps a list of Steps to undo/redo (which are tied to the schema).
+           * Without a good way to do work around this, we prevent this for now.
+           */
+          // eslint-disable-next-line no-console
+          console.warn('The editor does not support changing the schema dynamically.');
+          return _this.editorState;
+        }
+      } else {
+        _this.config = processPluginsList(_this.getPlugins(options.props.editorProps, undefined, options.props.createAnalyticsEvent));
+        schema = createSchema(_this.config);
       }
 
-      _this.config = processPluginsList(_this.getPlugins(options.props.editorProps, undefined, options.props.createAnalyticsEvent));
-      var schema = createSchema(_this.config);
       var contentTransformerProvider = options.props.editorProps.contentTransformerProvider;
       var plugins = createPMPlugins({
         schema: schema,
@@ -308,7 +321,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "dispatchTransaction", function (transaction) {
+    _defineProperty(_assertThisInitialized(_this), "dispatchTransaction", function (unsafeTransaction) {
       if (!_this.view) {
         return;
       }
@@ -327,8 +340,12 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
         (_this$experienceStore = _this.experienceStore) === null || _this$experienceStore === void 0 ? void 0 : _this$experienceStore.start(EditorExperience.interaction);
       }
 
-      var nodes = findChangedNodesFromTransaction(transaction);
+      var nodes = findChangedNodesFromTransaction(unsafeTransaction);
       var changedNodesValid = validateNodes(nodes);
+      var transaction = _this.featureFlags.saferDispatchedTransactions ? new Proxy(unsafeTransaction, freezeUnsafeTransactionProperties({
+        dispatchAnalyticsEvent: _this.dispatchAnalyticsEvent,
+        pluginKey: 'unknown-reacteditorview'
+      })) : unsafeTransaction;
 
       if (changedNodesValid) {
         var oldEditorState = _this.view.state; // go ahead and update the state now we know the transaction is good

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

@@ -1,5 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { ErrorReporter } from '@atlaskit/editor-common';
+import { ErrorReporter } from '@atlaskit/editor-common/utils';
 import { sortByOrder } from './sort-by-order';
 import { InstrumentedPlugin } from '../utils/performance/instrumented-plugin';
 export function sortByRank(a, b) {
@@ -98,12 +98,15 @@ export function createPMPlugins(config) {
   var editorConfig = config.editorConfig,
       _config$performanceTr = config.performanceTracking,
       performanceTracking = _config$performanceTr === void 0 ? {} : _config$performanceTr,
-      transactionTracker = config.transactionTracker;
+      transactionTracker = config.transactionTracker,
+      featureFlags = config.featureFlags,
+      dispatchAnalyticsEvent = config.dispatchAnalyticsEvent;
   var _performanceTracking$ = performanceTracking.uiTracking,
       uiTracking = _performanceTracking$ === void 0 ? TRACKING_DEFAULT : _performanceTracking$,
       _performanceTracking$2 = performanceTracking.transactionTracking,
       transactionTracking = _performanceTracking$2 === void 0 ? TRACKING_DEFAULT : _performanceTracking$2;
-  var useInstrumentedPlugin = uiTracking.enabled || transactionTracking.enabled;
+  var saferDispatchedTransactions = featureFlags.saferDispatchedTransactions;
+  var useInstrumentedPlugin = uiTracking.enabled || transactionTracking.enabled || saferDispatchedTransactions;
 
   if (process.env.NODE_ENV === 'development' && transactionTracking.enabled && !transactionTracker) {
     // eslint-disable-next-line no-console
@@ -113,7 +116,9 @@ export function createPMPlugins(config) {
   var instrumentPlugin = useInstrumentedPlugin ? function (plugin) {
     return InstrumentedPlugin.fromPlugin(plugin, {
       uiTracking: uiTracking,
-      transactionTracking: transactionTracking
+      transactionTracking: transactionTracking,
+      saferDispatchedTransactions: saferDispatchedTransactions,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent
     }, transactionTracker);
   } : function (plugin) {
     return plugin;

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

@@ -11,7 +11,7 @@ import { GUTTER_SIZE_MOBILE_IN_PX } from '../plugins/base/pm-plugins/scroll-gutt
 import { createFeatureFlagsFromProps } from '../plugins/feature-flags-context/feature-flags-from-props';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createDefaultPreset } from '../labs/next/presets/default';
-import { shouldForceTracking } from '@atlaskit/editor-common';
+import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 
 var isCodeBlockAllowed = function isCodeBlockAllowed(options) {
   var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
@@ -46,7 +46,7 @@ export function getScrollGutterOptions(props) {
   return undefined;
 }
 export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent) {
-  var _props$performanceTra, _props$performanceTra2, _props$textFormatting;
+  var _props$performanceTra, _props$featureFlags, _props$performanceTra2, _props$textFormatting;
 
   var appearance = props.appearance;
   var isMobile = appearance === 'mobile';
@@ -60,7 +60,8 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     featureFlags: createFeatureFlagsFromProps(props),
     paste: {
       cardOptions: props.smartLinks || props.UNSAFE_cards,
-      sanitizePrivateContent: props.sanitizePrivateContent
+      sanitizePrivateContent: props.sanitizePrivateContent,
+      plainTextPasteLinkification: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.plainTextPasteLinkification) === true
     },
     base: {
       allowInlineCursorTarget: !isMobile,
@@ -97,7 +98,8 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     cardOptions: props.smartLinks || props.UNSAFE_cards,
     codeBlock: _objectSpread(_objectSpread({}, props.codeBlock), {}, {
       useLongPressSelection: false,
-      appearance: props.appearance
+      appearance: props.appearance,
+      allowCompositionInputOverride: isMobile
     })
   };
 }
@@ -150,7 +152,8 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
   if (props.allowExpand) {
     preset.add([expandPlugin, {
       allowInsertion: isExpandInsertionEnabled(props),
-      useLongPressSelection: false
+      useLongPressSelection: false,
+      appearance: props.appearance
     }]);
   }
 
@@ -189,7 +192,6 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
       createAnalyticsEvent: createAnalyticsEvent,
       sanitizePrivateContent: props.sanitizePrivateContent,
       insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
-      useInlineWrapper: isMobile,
       allowZeroWidthSpaceAfter: !isMobile,
       HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent
     }]);
@@ -198,7 +200,6 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
   if (props.emojiProvider) {
     preset.add([emojiPlugin, {
       createAnalyticsEvent: createAnalyticsEvent,
-      useInlineWrapper: isMobile,
       allowZeroWidthSpaceAfter: !isMobile
     }]);
   }
@@ -253,7 +254,8 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     var _collabEditOptions$EX;
 
     var collabEditOptions = {
-      sanitizePrivateContent: props.sanitizePrivateContent
+      sanitizePrivateContent: props.sanitizePrivateContent,
+      createAnalyticsEvent: createAnalyticsEvent
     };
 
     if (props.collabEdit) {
@@ -337,7 +339,6 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     statusMenuDisabled = _typeof(props.allowStatus) === 'object' ? props.allowStatus.menuDisabled : false;
     preset.add([statusPlugin, {
       menuDisabled: statusMenuDisabled,
-      useInlineWrapper: isMobile,
       allowZeroWidthSpaceAfter: !isMobile
     }]);
   }
@@ -402,7 +403,7 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     }]);
   }
 
-  if (props.UNSAFE_allowFragmentMark) {
+  if (props.allowFragmentMark) {
     preset.add(fragmentMarkPlugin);
   }
 

package/dist/esm/editor.js

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

package/dist/esm/index.js

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

package/dist/esm/keymaps/index.js

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

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

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

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

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

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

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React from 'react';
-import { measureRender, getResponseEndTime, startMeasure, stopMeasure } from '@atlaskit/editor-common';
+import { measureRender, getResponseEndTime, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 import measurements from '../../../../../utils/performance/measure-enum';
 import { getNodesCount } from '../../../../../utils';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, PLATFORMS } from '../../../../../plugins/analytics';

package/dist/esm/labs/next/presets/cxhtml.js

@@ -13,7 +13,9 @@ export function useCXHTMLPreset(_ref) {
 
   var _useDefaultPreset = useDefaultPreset({
     featureFlags: featureFlags,
-    paste: {}
+    paste: {
+      plainTextPasteLinkification: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.plainTextPasteLinkification
+    }
   }),
       _useDefaultPreset2 = _slicedToArray(_useDefaultPreset, 1),
       preset = _useDefaultPreset2[0];

package/dist/esm/labs/next/presets/mobile.js

@@ -38,7 +38,9 @@ export function useMobilePreset(_ref) {
 
   var _useDefaultPreset = useDefaultPreset({
     featureFlags: featureFlags,
-    paste: {}
+    paste: {
+      plainTextPasteLinkification: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.plainTextPasteLinkification
+    }
   }),
       _useDefaultPreset2 = _slicedToArray(_useDefaultPreset, 1),
       preset = _useDefaultPreset2[0];
@@ -69,8 +71,7 @@ export function useMobilePreset(_ref) {
     disableDefaultItems: true
   }]);
   preset.add([statusPlugin, {
-    menuDisabled: false,
-    useInlineWrapper: true
+    menuDisabled: false
   }]);
   preset.add([placeholderPlugin, {
     placeholder: placeholder
@@ -86,12 +87,8 @@ export function useMobilePreset(_ref) {
     allowBlockCards: true,
     platform: 'mobile'
   }]);
-  preset.add([mentionsPlugin, {
-    useInlineWrapper: true
-  }]);
-  preset.add([emojiPlugin, {
-    useInlineWrapper: true
-  }]); // End
+  preset.add([mentionsPlugin]);
+  preset.add([emojiPlugin]); // End
 
   if (maxContentSize) {
     preset.add([maxContentSizePlugin, maxContentSize]);

package/dist/esm/nodeviews/ReactNodeView.js

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

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

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

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

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

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

@@ -4,7 +4,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { isAlignable } from '../commands';
 import { getActiveAlignment } from '../utils';
 export function createInitialPluginState(editorState, pluginConfig) {
@@ -15,7 +16,7 @@ export function createInitialPluginState(editorState, pluginConfig) {
 }
 export var pluginKey = new PluginKey('alignmentPlugin');
 export function createPlugin(dispatch, pluginConfig) {
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     state: {
       init: function init(_config, editorState) {

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/icon-map.js

@@ -1,15 +1,29 @@
 import EditorAlignLeftIcon from '@atlaskit/icon/glyph/editor/align-left';
 import EditorAlignRightIcon from '@atlaskit/icon/glyph/editor/align-right';
 import EditorAlignCenterIcon from '@atlaskit/icon/glyph/editor/align-center';
+import { useIntl } from 'react-intl-next';
+import { messages } from './messages';
 import React from 'react';
-export var iconMap = {
-  start: /*#__PURE__*/React.createElement(EditorAlignLeftIcon, {
-    label: "Align left"
-  }),
-  end: /*#__PURE__*/React.createElement(EditorAlignRightIcon, {
-    label: "Align right"
-  }),
-  center: /*#__PURE__*/React.createElement(EditorAlignCenterIcon, {
-    label: "Align center"
-  })
+var iconAndMessageMap = {
+  start: {
+    Component: EditorAlignLeftIcon,
+    label: messages.alignLeft
+  },
+  end: {
+    Component: EditorAlignRightIcon,
+    label: messages.alignRight
+  },
+  center: {
+    Component: EditorAlignCenterIcon,
+    label: messages.alignCenter
+  }
+};
+export var IconMap = function IconMap(props) {
+  var _iconAndMessageMap$pr = iconAndMessageMap[props.alignment],
+      Component = _iconAndMessageMap$pr.Component,
+      label = _iconAndMessageMap$pr.label;
+  var intl = useIntl();
+  return /*#__PURE__*/React.createElement(Component, {
+    label: intl.formatMessage(label)
+  });
 };

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

@@ -17,7 +17,7 @@ import ToolbarButton from '../../../../ui/ToolbarButton';
 import Dropdown from '../../../../ui/Dropdown';
 import Alignment from '../../../../ui/Alignment';
 import { ExpandIconWrapper, Separator, TriggerWrapper, Wrapper } from './styles';
-import { iconMap } from './icon-map';
+import { IconMap } from './icon-map';
 import { messages } from './messages';
 export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
   _inherits(AlignmentToolbar, _React$Component);
@@ -60,7 +60,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "hide", function () {
-      if (_this.state.isOpen === true) {
+      if (_this.state.isOpen) {
         _this.setState({
           isOpen: false
         });
@@ -89,7 +89,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
-        isOpen: this.state.isOpen,
+        isOpen: isOpen,
         handleClickOutside: this.hide,
         handleEscapeKeydown: this.hide,
         fitWidth: 112,
@@ -99,10 +99,14 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           disabled: disabled,
           selected: isOpen,
           title: title,
-          "aria-label": "Text alignment",
           className: "align-btn",
+          "aria-label": title,
+          "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, {
+          iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(IconMap, {
+            alignment: pluginState.align
+          }), /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
             label: ""
           })))
         })