@atlaskit/editor-core 184.0.4 → 185.0.2

package/dist/esm/editor.js

@@ -5,271 +5,51 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 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; } }
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
 import React from 'react';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { WithCreateAnalyticsEvent } from '@atlaskit/editor-common/ui';
-import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
-import { name, version } from './version-wrapper';
+import { defaultProps } from './editor-next/utils/editorPropTypes';
+import EditorNext from './editor-next';
+import useUniversalPreset from './labs/next/presets/useUniversalPreset';
 import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
+import { name, version } from './version-wrapper';
+import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
 import uuid from 'uuid/v4';
-import EditorActions from './actions';
-import { EditorInternalWithoutHooks as EditorInternal } from './editor-next/editor-internal';
-import { defaultProps, propTypes } from './editor-next/utils/editorPropTypes';
-import _trackEditorActions from './editor-next/utils/trackEditorActions';
-import _onEditorCreated from './editor-next/utils/onEditorCreated';
-import deprecationWarnings from './editor-next/utils/deprecationWarnings';
-import { createFeatureFlagsFromProps } from './create-editor/feature-flags-from-props';
-import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import prepareQuickInsertProvider from './utils/prepare-quick-insert-provider';
-import prepareExtensionProvider from './utils/prepare-extension-provider';
-import handleProviders from './editor-next/utils/handleProviders';
-import getProvidersFromEditorProps from './editor-next/utils/getProvidersFromEditorProps';
-import { startMeasure, clearMeasure, stopMeasure, measureTTI } from '@atlaskit/editor-common/utils';
-import measurements from './utils/performance/measure-enum';
-import editorMeasureTTICallback from './editor-next/utils/editorMeasureTTICallback';
-import { ACTION } from '@atlaskit/editor-common/analytics';
-import sendDurationAnalytics from './editor-next/utils/sendDurationAnalytics';
-import { createPreset } from './create-editor/create-plugins-list';
-import { shouldRecreatePreset } from './create-editor/preset-utils';
+var EditorNextWrapper = function EditorNextWrapper(_ref) {
+  var props = _ref.props;
+  var preset = useUniversalPreset({
+    props: props
+  });
+  return jsx(EditorNext, _extends({
+    preset: preset
+  }, props));
+};
 var Editor = /*#__PURE__*/function (_React$Component) {
   _inherits(Editor, _React$Component);
   var _super = _createSuper(Editor);
-  function Editor(props, context) {
-    var _props$performanceTra, _props$performanceTra2, _props$featureFlags;
+  function Editor() {
     var _this;
     _classCallCheck(this, Editor);
-    _this = _super.call(this, props);
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    _defineProperty(_assertThisInitialized(_this), "prepareExtensionProvider", prepareExtensionProvider(function () {
-      return _this.editorActions;
-    }));
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    _defineProperty(_assertThisInitialized(_this), "prepareQuickInsertProvider", function (extensionProvider, quickInsert) {
-      return prepareQuickInsertProvider(_this.editorActions, extensionProvider, quickInsert, _this.createAnalyticsEvent);
-    });
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    _defineProperty(_assertThisInitialized(_this), "handleSave", function (view) {
-      var _this$props$onSave, _this$props;
-      return (_this$props$onSave = (_this$props = _this.props).onSave) === null || _this$props$onSave === void 0 ? void 0 : _this$props$onSave.call(_this$props, view);
-    });
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    _defineProperty(_assertThisInitialized(_this), "handleAnalyticsEvent", function (data) {
-      return fireAnalyticsEvent(_this.createAnalyticsEvent)(data);
-    });
-    _defineProperty(_assertThisInitialized(_this), "getFeatureFlags", function () {
-      return createFeatureFlagsFromProps(_this.props);
-    });
-    _defineProperty(_assertThisInitialized(_this), "getExperienceStore", function () {
-      return _this.experienceStore;
-    });
-    _this.providerFactory = new ProviderFactory();
-    deprecationWarnings(props);
-    _this.editorActions = (context || {}).editorActions || new EditorActions();
-    _this.editorSessionId = uuid();
-    _this.startTime = performance.now();
-    _this.onEditorCreated = _this.onEditorCreated.bind(_assertThisInitialized(_this));
-    _this.onEditorDestroyed = _this.onEditorDestroyed.bind(_assertThisInitialized(_this));
-    _this.getExperienceStore = _this.getExperienceStore.bind(_assertThisInitialized(_this));
-    _this.trackEditorActions(_this.editorActions, props);
-
-    /**
-     * Consider any changes here to corresponding file for `EditorNext` in
-     * `useEditorConstructor` (editor-next/hooks/useEditorMeasuresConstructor.ts)
-     */
-    startMeasure(measurements.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$performanceTra3, _props$performanceTra4, _props$performanceTra5, _props$performanceTra6;
-      measureTTI(function (tti, ttiFromInvocation, canceled) {
-        editorMeasureTTICallback(tti, ttiFromInvocation, canceled, _this.props.performanceTracking, _this.props.featureFlags, _this.createAnalyticsEvent, _this.experienceStore);
-      }, (_props$performanceTra3 = props.performanceTracking) === null || _props$performanceTra3 === void 0 ? void 0 : (_props$performanceTra4 = _props$performanceTra3.ttiTracking) === null || _props$performanceTra4 === void 0 ? void 0 : _props$performanceTra4.ttiIdleThreshold, (_props$performanceTra5 = props.performanceTracking) === null || _props$performanceTra5 === void 0 ? void 0 : (_props$performanceTra6 = _props$performanceTra5.ttiTracking) === null || _props$performanceTra6 === void 0 ? void 0 : _props$performanceTra6.ttiCancelTimeout);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-
-    /**
-     * Consider any changes here to corresponding file for `EditorNext` in
-     * `useProviderFactory` (editor-next/hooks/useProviderFactory.ts)
-     */
-    var _extensionProvider = _this.prepareExtensionProvider(props.extensionProviders);
-    var quickInsertProvider = _this.prepareQuickInsertProvider(_extensionProvider, props.quickInsert);
-    var preset = createPreset(props, undefined, _this.createAnalyticsEvent);
-    _this.state = {
-      extensionProvider: _extensionProvider,
-      quickInsertProvider: quickInsertProvider,
-      preset: preset
-    };
+    _this = _super.call.apply(_super, [this].concat(args));
+    _defineProperty(_assertThisInitialized(_this), "editorSessionId", uuid());
     return _this;
   }
-
-  /**
-   * Consider any changes here to corresponding file for `EditorNext` in
-   * `useProviderFactory` (editor-next/hooks/useProviderFactory.ts) and
-   * `useMeasureEditorMountTime` (editor-next/hooks/useMeasureEditorMountTime.ts)
-   */
   _createClass(Editor, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      stopMeasure(measurements.EDITOR_MOUNTED, sendDurationAnalytics(ACTION.EDITOR_MOUNTED, this.props, this.getExperienceStore, this.createAnalyticsEvent));
-      handleProviders(this.providerFactory, getProvidersFromEditorProps(this.props), this.state.extensionProvider, this.state.quickInsertProvider);
-    }
-
-    /**
-     * Consider any changes here to corresponding file for `EditorNext` in
-     * `useProviderFactory` (editor-next/hooks/useProviderFactory.ts)
-     */
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
-      var needsANewPreset = shouldRecreatePreset(prevProps, this.props);
-      var preset = needsANewPreset ? createPreset(this.props, prevProps, this.createAnalyticsEvent) : this.state.preset;
-      var _this$props2 = this.props,
-        extensionProviders = _this$props2.extensionProviders,
-        quickInsert = _this$props2.quickInsert;
-      if (extensionProviders && extensionProviders !== prevProps.extensionProviders ||
-      // Though this will introduce some performance regression related to quick insert
-      // loading but we can remove it soon when Forge will move to new API.
-      // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
-      quickInsert && quickInsert !== prevProps.quickInsert) {
-        var extensionProvider = this.prepareExtensionProvider(extensionProviders);
-        var quickInsertProvider = this.prepareQuickInsertProvider(extensionProvider, quickInsert);
-        this.setState({
-          extensionProvider: extensionProvider,
-          quickInsertProvider: quickInsertProvider,
-          preset: preset
-        }, function () {
-          return handleProviders(_this2.providerFactory, getProvidersFromEditorProps(_this2.props), _this2.state.extensionProvider, _this2.state.quickInsertProvider);
-        });
-        return;
-      }
-      if (needsANewPreset) {
-        this.setState({
-          preset: preset
-        });
-        return;
-      }
-      handleProviders(this.providerFactory, getProvidersFromEditorProps(this.props), this.state.extensionProvider, this.state.quickInsertProvider);
-    }
-
-    /**
-     * Consider any changes here to corresponding file for `EditorNext` in
-     * `useProviderFactory` (editor-next/hooks/useProviderFactory.ts) and
-     * `useMeasureEditorMountTime` (editor-next/hooks/useMeasureEditorMountTime.ts)
-     */
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      var _this$props3, _this$props3$performa, _this$props3$performa2, _this$props$featureFl;
-      this.unregisterEditorFromActions();
-      this.providerFactory.destroy();
-      clearMeasure(measurements.EDITOR_MOUNTED);
-      ((_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) && clearMeasure(measurements.ON_EDITOR_READY_CALLBACK);
-      if ((_this$props$featureFl = this.props.featureFlags) !== null && _this$props$featureFl !== void 0 && _this$props$featureFl.ufo) {
-        var _this$experienceStore;
-        (_this$experienceStore = this.experienceStore) === null || _this$experienceStore === void 0 ? void 0 : _this$experienceStore.abortAll({
-          reason: 'editor component unmounted'
-        });
-      }
-    }
-
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an anti-pattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-  }, {
-    key: "trackEditorActions",
-    value: function trackEditorActions(editorActions, props) {
-      var _this3 = this;
-      return _trackEditorActions(editorActions, props.performanceTracking, function (value) {
-        return _this3.handleAnalyticsEvent(value);
-      });
-    }
-  }, {
-    key: "onEditorCreated",
-    value:
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    function onEditorCreated(instance) {
-      var _this4 = this;
-      _onEditorCreated(instance, this.props, function (experienceStore) {
-        return _this4.experienceStore = experienceStore;
-      }, this.getExperienceStore, function () {
-        return _this4.createAnalyticsEvent;
-      }, this.editorActions, this.startTime, function (view, dispatcher, transformerForActions) {
-        return _this4.registerEditorForActions(view, dispatcher, transformerForActions);
-      });
-    }
-
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-  }, {
-    key: "onEditorDestroyed",
-    value: function onEditorDestroyed(_instance) {
-      var _this$props$onDestroy, _this$props4;
-      this.unregisterEditorFromActions();
-      (_this$props$onDestroy = (_this$props4 = this.props).onDestroy) === null || _this$props$onDestroy === void 0 ? void 0 : _this$props$onDestroy.call(_this$props4);
-    }
-  }, {
-    key: "registerEditorForActions",
-    value:
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    function registerEditorForActions(editorView, eventDispatcher, contentTransformer) {
-      this.editorActions._privateRegisterEditor(editorView, eventDispatcher, contentTransformer, this.getFeatureFlags);
-    }
-  }, {
-    key: "unregisterEditorFromActions",
-    value:
-    /**
-     * @private
-     * @deprecated - Do not override this at all, this is an antipattern.
-     * Please reach out to the Editor team if you were previously using this
-     * and need to find a workaround.
-     */
-    function unregisterEditorFromActions() {
-      this.editorActions._privateUnregisterEditor();
-    }
-  }, {
     key: "render",
     value: function render() {
-      var _this5 = this;
+      // TODO: https://product-fabric.atlassian.net/browse/ED-16979
+      // Move `FabricEditorAnalyticsContext` back into `EditorNext`
+      // This was moved out here to workaround the issue that the analytics
+      // context does not wrap the Preset (and therefore does not pass this context
+      // information to analytics calls within plugins). After this cleanup task ^ we will
+      // not have to generate the `createAnalyticsEvent` outside the Preset
+      // and we can move this back into `EditorNext`.
       return jsx(FabricEditorAnalyticsContext, {
         data: {
           packageName: name,
@@ -278,33 +58,12 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           appearance: getAnalyticsAppearance(this.props.appearance),
           editorSessionId: this.editorSessionId
         }
-      }, jsx(WithCreateAnalyticsEvent, {
-        render: function render(createAnalyticsEvent) {
-          return (_this5.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-            props: _this5.props,
-            handleAnalyticsEvent: _this5.handleAnalyticsEvent,
-            createAnalyticsEvent: _this5.createAnalyticsEvent,
-            preset: _this5.state.preset,
-            handleSave: _this5.handleSave,
-            editorActions: _this5.editorActions,
-            providerFactory: _this5.providerFactory,
-            onEditorCreated: _this5.onEditorCreated,
-            onEditorDestroyed: _this5.onEditorDestroyed
-          });
-        }
+      }, jsx(EditorNextWrapper, {
+        props: this.props
       }));
     }
   }]);
   return Editor;
 }(React.Component);
-/**
- * WARNING: Code should be shared between Editor + EditorNext
- * If you are making changes that affect both, consider making them
- * in editor-next/editor-internal.tsx or editor-next/editor-utils.ts
- */
 _defineProperty(Editor, "defaultProps", defaultProps);
-_defineProperty(Editor, "contextTypes", {
-  editorActions: PropTypes.object
-});
-_defineProperty(Editor, "propTypes", propTypes('minHeight only supports editor appearance chromeless and comment for Editor'));
 export { Editor as default };

package/dist/esm/i18n/en_ZZ.js

@@ -8,13 +8,13 @@
 //
 export default {
   'fabric.editor.addAltText': '⁣⁢Alt text‌‍‌؜⁡؜⁡⁣⁤',
+  'fabric.editor.addImageBorder': '⁣⁢Add border⁠⁠‌⁡‍⁡؜‍؜؜⁠⁣⁤',
   'fabric.editor.alignCenter': '⁣⁢Align Center؜؜؜؜⁠⁠⁠‍⁠‍⁣⁤',
   'fabric.editor.alignLeft': '⁣⁢Align left⁠؜‌‌؜⁡‍‍⁠؜⁠؜⁡⁡⁣⁤',
   'fabric.editor.alignRight': '⁣⁢Align Right⁡؜⁡⁡⁠‍‍⁠؜⁣⁤',
   'fabric.editor.alignment': '⁣⁢Text alignment؜⁠⁡‌⁠؜⁡؜⁠⁣⁤',
   'fabric.editor.altText': '⁣⁢Alt text؜⁠؜‌⁡‌⁠‍‍‍‌‌‌‌⁣⁤',
   'fabric.editor.alttext.validation': '⁣⁢Please remove any special characters in alt text.؜⁠‌‍⁡؜⁣⁤',
-  'fabric.editor.annotate': '⁣⁢Annotate‌⁡؜؜⁠‍⁡⁣⁤',
   'fabric.editor.annotationToolbar': '⁣⁢Annotation toolbar‍‍‍‌⁡‍⁠؜⁡‍⁠⁣⁤',
   'fabric.editor.backLink': '⁣⁢Go back‍⁡‌؜‌⁠⁣⁤',
   'fabric.editor.blockCardUnavailable': '⁣⁢The inline link is inside {node} and cannot have its view changed⁠؜⁡⁡⁠؜⁡⁠‍⁠⁠⁡‍⁣⁤',
@@ -62,6 +62,7 @@ export default {
   'fabric.editor.customPanel.description': '⁣⁢Add a note with an emoji and colored background؜؜‍‍⁠‍⁠؜⁡‌؜⁡⁣⁤',
   'fabric.editor.decisionPlaceholder': '⁣⁢Add a decision…⁡‌⁡‍؜⁡⁡⁠‍‌⁣⁤',
   'fabric.editor.defaultAltText': '⁣⁢List item⁡‍؜‌‍⁠‍⁠⁡‌⁣⁤',
+  'fabric.editor.description': '⁣⁢Description⁡‍‍‍‍⁣⁤',
   'fabric.editor.displayBlock': '⁣⁢Display card‍‌؜؜⁡⁠‍؜‍‍‌⁠⁠⁣⁤',
   'fabric.editor.displayEmbed': '⁣⁢Display embed⁡⁡‍⁠⁠‌⁣⁤',
   'fabric.editor.displayInline': '⁣⁢Display inline‍⁡‌‌؜‌⁠⁣⁤',
@@ -77,6 +78,7 @@ export default {
   'fabric.editor.editStatusColor': '⁣⁢Edit Status Color‌‌⁡‌‍؜⁡‍؜⁡⁣⁤',
   'fabric.editor.editStatusText': '⁣⁢Edit Status⁡‍‌‌‍؜⁡؜‍‍؜؜⁣⁤',
   'fabric.editor.editableContentLabel': '⁣⁢Editable content⁠؜‌‍⁠⁡⁠؜⁣⁤',
+  'fabric.editor.editorAssistiveLabel': '⁣⁢Main content area, start typing to enter text.‍‌⁡‌‌⁡؜؜⁣⁤',
   'fabric.editor.editorHelp': '⁣⁢Editor help‌؜‍؜؜‍‌⁠؜⁣⁤',
   'fabric.editor.editors': '⁣⁢Editors‍؜‌‍⁡‍⁠⁡؜‌‌⁡⁣⁤',
   'fabric.editor.elementBrowser.help': '⁣⁢Help⁡؜‌‍‍⁠⁠⁠⁡⁠⁣⁤',
@@ -101,14 +103,18 @@ export default {
   'fabric.editor.error': '⁣⁢Error؜‌⁡‌؜⁡‌⁣⁤',
   'fabric.editor.errorPanel': '⁣⁢Error panel⁠‍؜⁠⁠؜‍⁠⁠⁡⁣⁤',
   'fabric.editor.errorPanel.description': '⁣⁢Call out errors in a colored panel⁡⁠؜⁡‍‌‍؜‍⁣⁤',
-  'fabric.editor.extension.confirmDeleteLinkedModalMessage': '⁣⁢Removing this extension will break anything connected to it.⁠؜⁡‌‌‍‌⁡⁠⁡⁡⁡⁡⁣⁤',
-  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': '⁣⁢Remove extension⁡‍‌‍⁠‌‍‍⁠⁠⁣⁤',
+  'fabric.editor.extension.confirmDeleteLinkedModalMessage': '⁣⁢Deleting {nodeName} will break anything connected to it.‍‍‌؜⁠⁡⁠⁣⁤',
+  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': '⁣⁢Delete⁠؜‌‍⁠⁠⁣⁤',
+  'fabric.editor.extension.deleteElementTitle': '⁣⁢Delete element⁠؜⁠⁡‍؜⁣⁤',
+  'fabric.editor.extension.sourceNoTitledName': '⁣⁢this element‍⁠⁡؜⁡⁠؜‌⁡⁠⁣⁤',
   'fabric.editor.extensions.config-panel.save-indicator': '⁣⁢All changes are always autosaved⁠‍؜‌‌‍‍⁡‌‌‍‌‌⁣⁤',
   'fabric.editor.find': '⁣⁢Find⁠‌⁠‌⁠‍؜⁣⁤',
   'fabric.editor.findNext': '⁣⁢Find next؜‌؜‌؜⁠⁣⁤',
   'fabric.editor.findPrevious': '⁣⁢Find previous⁠⁠⁡⁡‍‍⁡⁡⁣⁤',
   'fabric.editor.findReplaceToolbarButton': '⁣⁢Find and replace؜⁠‍‌⁡⁡؜‌⁡⁠‍‌⁣⁤',
   'fabric.editor.floatingToolbar.confirmModalCancel': '⁣⁢Cancel؜⁡‌‌⁡⁡‍؜⁡؜⁣⁤',
+  'fabric.editor.floatingToolbar.confirmModalCheckboxLabel': '⁣⁢Also delete connected elements؜؜؜؜؜‍⁡‍‌؜‌‌؜‍⁣⁤',
+  'fabric.editor.floatingToolbar.confirmModalConnectedUnit': '{amount, plural, =0 {⁣⁢{name}⁡⁡‌⁡؜‍⁡‍‌⁣⁤} one {⁣⁢{name} (+1 connected element)⁡⁡‌‍⁡‌⁡؜⁣⁤} other {⁣⁢{name} (+{amount,number} connected elements)⁡⁡‌‍⁡‌⁡؜⁣⁤}}',
   'fabric.editor.floatingToolbar.confirmModalHeading': '⁣⁢Are you sure?⁡⁡‌‍⁡‍⁡⁠؜‌‌⁣⁤',
   'fabric.editor.floatingToolbar.confirmModalOK': '⁣⁢OK‍‌؜⁡؜⁡‍⁡⁣⁤',
   'fabric.editor.floatingToolbar.floatingToolbarAnnouncer': '⁣⁢Floating toolbar controls have been opened⁠⁠‌‌؜‍⁣⁤',
@@ -139,6 +145,12 @@ export default {
   'fabric.editor.hyperlink.searchLinkAriaDescription': '⁣⁢Suggestions will appear below as you type into the field⁠‍‍⁠‍‌؜⁡‍‍‍؜‍‌⁣⁤',
   'fabric.editor.hyperlink.searchLinkResults': '{count, plural, =0 {⁣⁢no results found⁡⁠؜؜؜؜⁣⁤} one {⁣⁢{count,number} result found؜⁠؜‌‍⁡‍⁡؜‌⁡‌⁣⁤} other {⁣⁢{count,number} results found؜⁠؜‌‍⁡‍⁡؜‌⁡‌⁣⁤}}',
   'fabric.editor.hyperlinkToolbarPlaceholder': '⁣⁢Paste or search for link‌‌‍؜‌؜‍⁡⁠⁣⁤',
+  'fabric.editor.imageBorderBold': '⁣⁢Bold‍‍‍‌⁠‍⁡‌؜‍⁡‍⁣⁤',
+  'fabric.editor.imageBorderColor': '⁣⁢Color⁠⁠⁠؜؜⁠⁠‍⁡؜؜⁣⁤',
+  'fabric.editor.imageBorderMedium': '⁣⁢Medium⁠‌⁠؜‍⁠؜⁠؜⁣⁤',
+  'fabric.editor.imageBorderOptions': '⁣⁢Border options؜‍‍؜⁠‍⁠؜‌‍‍⁣⁤',
+  'fabric.editor.imageBorderSize': '⁣⁢Size⁠⁡؜⁠⁡؜‌‍⁡⁠‍؜⁠‍⁡⁣⁤',
+  'fabric.editor.imageBorderSubtle': '⁣⁢Subtle⁡⁡‌⁠؜‍‌؜⁣⁤',
   'fabric.editor.improvement': '⁣⁢Improvement⁡⁡‍‍‌⁠‍⁡⁣⁤',
   'fabric.editor.indent': '⁣⁢Indent‌⁠‌⁠‍⁡⁣⁤',
   'fabric.editor.info': '⁣⁢Info⁡⁡‌⁡⁠؜؜‌‍⁠⁣⁤',
@@ -160,9 +172,12 @@ export default {
   'fabric.editor.matchCase': '⁣⁢Match case‌‌⁠⁡‍؜‍‍‌؜⁡⁡⁠‍⁣⁤',
   'fabric.editor.mediaAddLink': '⁣⁢Add link‍⁠⁠‌‍‌⁡‌؜‍⁣⁤',
   'fabric.editor.mediaGroupDeleteLabel': '⁣⁢delete‌‌⁠⁡⁠‍⁠⁣⁤',
+  'fabric.editor.mentionNode.label': '⁣⁢Tagged user⁠‍⁠‌⁡⁡‍‍‌‌⁡؜⁣⁤',
   'fabric.editor.mentionsAddLabel': '⁣⁢add-icon‌‌‌؜⁡‍‍⁡⁡‍‍⁠⁣⁤',
   'fabric.editor.mentionsIconLabel': '⁣⁢Mention⁠⁠⁠⁡‌⁠؜‍؜؜⁡⁠⁠⁣⁤',
   'fabric.editor.moreFormatting': '⁣⁢More formatting‍؜‌‌⁠‍‍؜‍⁡⁣⁤',
+  'fabric.editor.navigate.toolbar.editor': '⁣⁢Navigate to editor toolbar⁠؜⁡⁡⁡‍‌‌‍⁡⁣⁤',
+  'fabric.editor.navigate.toolbar.floating': '⁣⁢Navigate to floating toolbar⁠‍⁠‍⁠‍‍⁣⁤',
   'fabric.editor.noResultsFound': '⁣⁢No results‍؜‌‌‌؜⁡⁣⁤',
   'fabric.editor.noSearchResults': '⁣⁢No search results؜؜‍‍‍؜‍⁡⁣⁤',
   'fabric.editor.normal': '⁣⁢Normal text⁠⁠‍⁠⁠‌⁠‍؜⁡⁠‌⁡⁠⁣⁤',
@@ -183,6 +198,7 @@ export default {
   'fabric.editor.placeholderTextPlaceholder': '⁣⁢Add placeholder text‍‌⁠⁡‍⁡؜⁠‍⁠؜‍⁣⁤',
   'fabric.editor.quickInsert': '⁣⁢Quick insert⁠⁠⁠‌؜⁠⁣⁤',
   'fabric.editor.redo': '⁣⁢Redo⁠؜⁡؜؜⁡‌‍‍⁡⁣⁤',
+  'fabric.editor.removeImageBorder': '⁣⁢Remove border؜⁡‍؜⁡⁡‌⁣⁤',
   'fabric.editor.replace': '⁣⁢Replace‌⁠؜⁠⁠⁠‌⁠⁡⁠⁣⁤',
   'fabric.editor.replaceAll': '⁣⁢Replace all‌⁡؜‍⁠⁣⁤',
   'fabric.editor.replaceWith': '⁣⁢Replace with‍‍⁡؜⁡⁠⁡؜؜⁠⁠⁣⁤',
@@ -191,6 +207,7 @@ export default {
   'fabric.editor.searchResults': '{itemsLength, plural, one {⁣⁢{itemsLength,number} search result available⁡‍‍⁠‍؜⁠؜‌⁡⁣⁤} other {⁣⁢{itemsLength,number} search results available⁡‍‍⁠‍؜⁠؜‌⁡⁣⁤}}',
   'fabric.editor.selectLanguage': '⁣⁢Select language‍⁠‌؜‌⁡‍‌⁣⁤',
   'fabric.editor.settingsLinks': '⁣⁢Go to Link Preferences؜؜‌⁡‍؜⁠⁡⁠⁠‌⁠⁣⁤',
+  'fabric.editor.shortcut': '⁣⁢Text shortcut‌‌‌⁠‌‍⁠‍⁡‌‌⁣⁤',
   'fabric.editor.single': '⁣⁢Single column⁡‍⁠‌؜⁡‍‌‍⁣⁤',
   'fabric.editor.statusPlaceholder': '⁣⁢Set a status⁠؜⁠⁠⁡⁡‍⁣⁤',
   'fabric.editor.story': '⁣⁢Story‌⁡⁡؜؜⁡⁡⁠⁡⁠⁣⁤',
@@ -212,9 +229,17 @@ export default {
   'fabric.editor.threeColumns': '⁣⁢Three columns؜‍‌‍‌‌‌‌⁠؜⁣⁤',
   'fabric.editor.threeColumnsWithSidebars': '⁣⁢Three columns with sidebars؜‌⁠⁠‍⁡؜‍؜؜⁣⁤',
   'fabric.editor.toolbarLabel': '⁣⁢Editor toolbar‌‍؜‍؜⁠‌⁠‍‍⁣⁤',
-  'fabric.editor.toolbarMediaTitle': '⁣⁢Files & images؜⁡⁡‌⁡‌⁡⁡‍⁡⁠⁡⁣⁤',
+  'fabric.editor.toolbarMediaTitle': '⁣⁢Add image, video, or file‌‍‍؜‍⁠⁣⁤',
   'fabric.editor.twoColumns': '⁣⁢Two columns⁡‌‍؜‌‍؜‍‍‍⁡⁣⁤',
-  'fabric.editor.typeAheadResultLabel': '⁣⁢TypeAhead results⁡‌‌⁠؜⁠‍⁠⁣⁤',
+  'fabric.editor.typeAhead.popupLabel': '⁣⁢Typeahead results⁠؜⁡؜⁠‍‍⁠‌⁣⁤',
+  'fabric.editor.typeAhead.quickInsertInputLabel': '⁣⁢Begin typing to search or filter shortcut options⁠⁠‍‌⁡‍⁠؜⁠⁡‍⁣⁤',
+  'fabric.editor.typeAhead.quickInsertPopupLabel': '⁣⁢Shortcuts for inserts and formatting⁡؜؜‌⁡‌‌‌⁣⁤',
+  'fabric.editor.typeahead.emojiInputLabel': '⁣⁢Begin typing to search or filter emoji options‌‍⁠‌⁡⁠⁡⁠‍‍⁡‍⁣⁤',
+  'fabric.editor.typeahead.emojiListItemLabel': '⁣⁢Emoji {name} Text Shortcut {shortcut}⁠؜⁠⁡⁡⁡‍⁡⁡‌‌⁣⁤',
+  'fabric.editor.typeahead.emojiPopupLabel': '⁣⁢Emoji shortcuts؜⁠‍⁡‍⁠⁡⁠⁡‌‍؜‍⁣⁤',
+  'fabric.editor.typeahead.mentionInputLabel': '⁣⁢Begin typing to search for users to tag⁡⁡‌⁠‌؜⁡‍‍⁠‍⁠⁠‌⁣⁤',
+  'fabric.editor.typeahead.mentionPopupLabel': '⁣⁢Users you can tag‌‍‌؜⁡⁡؜⁡⁣⁤',
+  'fabric.editor.typeahead.metionListItemLabel': '⁣⁢User {name} @{shortName}‌‍؜⁠⁡‌‌⁡⁣⁤',
   'fabric.editor.unableToOpenLink': '⁣⁢Unable to open this link⁡؜‍‌‌⁠⁡⁡‌؜⁣⁤',
   'fabric.editor.underline': '⁣⁢Underline⁠⁠‍‍‌‌⁠‍⁣⁤',
   'fabric.editor.undo': '⁣⁢Undo⁡⁡⁡‌⁠⁡‌⁡‌⁠⁡⁣⁤',
@@ -228,5 +253,6 @@ export default {
   'fabric.editor.warningPanel': '⁣⁢Warning panel⁡‍‌؜⁠‌⁡؜⁠؜⁡⁡⁠؜⁣⁤',
   'fabric.editor.warningPanel.description': '⁣⁢Add a note of caution in a colored panel‌⁠⁡‍⁠؜‍⁡⁡⁡⁣⁤',
   'fabric.editor.wrapLeft': '⁣⁢Wrap left؜‍⁡‌⁡⁠‌‌‌⁡⁣⁤',
-  'fabric.editor.wrapRight': '⁣⁢Wrap right‍؜؜⁡؜⁣⁤'
+  'fabric.editor.wrapRight': '⁣⁢Wrap right‍؜؜⁡؜⁣⁤',
+  'fabric.emoji.label': '⁣⁢Emoji‌⁠؜‌⁠‍⁠؜⁠‌؜⁡⁣⁤'
 };

package/dist/esm/index.js

@@ -61,5 +61,4 @@ export { lightModeStatusColorPalette, darkModeStatusColorPalette } from './ui/Co
 export { DEFAULT_BORDER_COLOR } from './ui/ColorPalette/Palettes/common';
 export { default as messages, statusMessages, dateMessages } from './messages';
 export { createTypeAheadTools } from './plugins/type-ahead/api';
-export { createQuickInsertTools } from './plugins/quick-insert/api';
-export { default as EditorMigrationComponent } from './editor-next/editor-migration-component';
+export { createQuickInsertTools } from './plugins/quick-insert/api';

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

@@ -23,6 +23,7 @@ import quickInsertPlugin from '../../../plugins/quick-insert';
 import selectionPlugin from '../../../plugins/selection';
 import codeBlockPlugin from '../../../plugins/code-block';
 import undoRedoPlugin from '../../../plugins/undo-redo';
+import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 // #endregion
 
@@ -51,7 +52,7 @@ export function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add([basePlugin, options.base]).maybeAdd(undoRedoPlugin, function (p, builder) {
+  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

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

@@ -14,7 +14,6 @@ import newlinePreserveMarksPlugin from './pm-plugins/newline-preserve-marks';
 import inlineCursorTargetPlugin from './pm-plugins/inline-cursor-target';
 import betterTypeHistoryPlugin from './pm-plugins/better-type-history';
 import { plugin as reactNodeView } from './pm-plugins/react-nodeview';
-import decorationPlugin, { hoverDecoration } from './pm-plugins/decoration';
 import scrollGutter from './pm-plugins/scroll-gutter';
 import { keymap } from '../../utils/keymap';
 import frozenEditor from './pm-plugins/frozen-editor';
@@ -70,11 +69,6 @@ var basePlugin = function basePlugin(options, api) {
           var dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
           return options !== null && options !== void 0 && (_options$inputTrackin = options.inputTracking) !== null && _options$inputTrackin !== void 0 && _options$inputTrackin.enabled || options !== null && options !== void 0 && options.ufo ? frozenEditor(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking, options.ufo) : undefined;
         }
-      }, {
-        name: 'decorationPlugin',
-        plugin: function plugin() {
-          return decorationPlugin();
-        }
       }, {
         name: 'history',
         plugin: function plugin() {
@@ -150,9 +144,6 @@ var basePlugin = function basePlugin(options, api) {
         name: 'text',
         node: text
       }];
-    },
-    actions: {
-      hoverDecoration: hoverDecoration
     }
   };
 };

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

@@ -61,6 +61,12 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         contentEditable: true
       });
     });
+    _defineProperty(_assertThisInitialized(_this), "onError", function (_ref) {
+      var err = _ref.err;
+      if (err) {
+        throw err;
+      }
+    });
     return _this;
   }
   _createClass(BlockCardComponent, [{
@@ -89,6 +95,7 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         appearance: "block",
         onClick: this.onClick,
         onResolve: this.onResolve,
+        onError: this.onError,
         showActions: platform === 'web',
         platform: platform,
         showServerActions: showServerActions

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

@@ -233,6 +233,12 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       });
       _this.saveOriginalDimensionsAttributes(height, undefined);
     });
+    _defineProperty(_assertThisInitialized(_this), "onError", function (_ref2) {
+      var err = _ref2.err;
+      if (err) {
+        throw err;
+      }
+    });
     return _this;
   }
   _createClass(EmbedCardComponent, [{
@@ -287,6 +293,7 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         appearance: "embed",
         onClick: this.onClick,
         onResolve: this.onResolve,
+        onError: this.onError,
         showActions: platform === 'web',
         isFrameVisible: true,
         inheritDimensions: true,

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

@@ -46,7 +46,11 @@ export var InlineCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       })();
     });
     _defineProperty(_assertThisInitialized(_this), "onError", function (data) {
-      var url = data.url;
+      var url = data.url,
+        err = data.err;
+      if (err) {
+        throw err;
+      }
       _this.onResolve({
         url: url
       });

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -6,8 +6,7 @@ import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE } from '@atlaskit/editor-common/analytics';
 import { nodesBetweenChanged, processRawValue } from '../../../utils';
 import { unlinkPayload } from '../../../utils/linking-utils';
 import { isFromCurrentDomain, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';

package/dist/esm/plugins/card/toolbar.js

@@ -9,8 +9,8 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
-import { linkToolbarMessages, linkMessages } from '../../messages';
-import commonMessages from '../../messages';
+import { linkToolbarMessages } from '../../messages';
+import commonMessages, { linkMessages } from '@atlaskit/editor-common/messages';
 import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
@@ -163,7 +163,7 @@ var withToolbarMetadata = function withToolbarMetadata(command) {
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.analytics) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
@@ -181,7 +181,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     }
     var pluginState = pluginKey.getState(state);
     var currentAppearance = appearanceForNodeType(node.type);
-    var hoverDecoration = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.base) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions.hoverDecoration;
+    var _ref2 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.decorations) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
+      hoverDecoration = _ref2.hoverDecoration;
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -238,8 +239,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$d5;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.width, cardOptions);
+        var _pluginInjectionApi$d6;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.width, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'