@atlaskit/editor-core 180.1.0 → 181.0.0

package/dist/cjs/editor-next/index.js

@@ -27,7 +27,9 @@ var _editorPropTypes = require("./utils/editorPropTypes");
 var _trackEditorActions = _interopRequireDefault(require("./utils/trackEditorActions"));
 var _onEditorCreated2 = _interopRequireDefault(require("./utils/onEditorCreated"));
 var _deprecationWarnings = _interopRequireDefault(require("./utils/deprecationWarnings"));
-var _getEditorPlugins2 = _interopRequireDefault(require("../utils/get-editor-plugins"));
+var _plugins = require("../plugins");
+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; }
+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 _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 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 EditorNext = /*#__PURE__*/function (_React$Component) {
@@ -60,7 +62,6 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     _this.onEditorCreated = _this.onEditorCreated.bind((0, _assertThisInitialized2.default)(_this));
     _this.onEditorDestroyed = _this.onEditorDestroyed.bind((0, _assertThisInitialized2.default)(_this));
     _this.getExperienceStore = _this.getExperienceStore.bind((0, _assertThisInitialized2.default)(_this));
-    _this.getEditorPlugins = _this.getEditorPlugins.bind((0, _assertThisInitialized2.default)(_this));
     (0, _trackEditorActions.default)(_this.editorActions, props.performanceTracking, function (value) {
       return _this.handleAnalyticsEvent(value);
     });
@@ -113,7 +114,7 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
             props: _this3.props,
             handleAnalyticsEvent: _this3.handleAnalyticsEvent,
             createAnalyticsEvent: _this3.createAnalyticsEvent,
-            getEditorPlugins: _this3.getEditorPlugins,
+            preset: _this3.props.preset,
             handleSave: _this3.handleSave,
             editorActions: _this3.editorActions,
             getExperienceStore: _this3.getExperienceStore,
@@ -123,11 +124,6 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
         }
       }));
     }
-  }, {
-    key: "getEditorPlugins",
-    value: function getEditorPlugins(props) {
-      return (0, _getEditorPlugins2.default)(props);
-    }
   }]);
   return EditorNext;
 }(_react2.default.Component);
@@ -136,4 +132,12 @@ exports.default = EditorNext;
 (0, _defineProperty2.default)(EditorNext, "contextTypes", {
   editorActions: _propTypes.default.object
 });
-(0, _defineProperty2.default)(EditorNext, "propTypes", (0, _editorPropTypes.propTypes)('minHeight only supports editor appearance chromeless and comment for EditorNext'));
+(0, _defineProperty2.default)(EditorNext, "propTypes", _objectSpread(_objectSpread({}, (0, _editorPropTypes.propTypes)('minHeight only supports editor appearance chromeless and comment for EditorNext')), {}, {
+  preset: function preset(_ref) {
+    var _preset = _ref.preset;
+    if (!_preset.has(_plugins.basePlugin)) {
+      return new Error('Presets must contain the base plugin');
+    }
+    return null;
+  }
+}));

package/dist/cjs/editor-next/utils/getProvidersFromEditorProps.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getProvidersFromEditorProps;
+function getProvidersFromEditorProps(_ref) {
+  var _linking$smartLinks;
+  var linking = _ref.linking,
+    smartLinks = _ref.smartLinks,
+    UNSAFE_cards = _ref.UNSAFE_cards,
+    autoformattingProvider = _ref.autoformattingProvider,
+    media = _ref.media,
+    emojiProvider = _ref.emojiProvider,
+    mentionProvider = _ref.mentionProvider,
+    legacyImageUploadProvider = _ref.legacyImageUploadProvider,
+    taskDecisionProvider = _ref.taskDecisionProvider,
+    contextIdentifierProvider = _ref.contextIdentifierProvider,
+    searchProvider = _ref.searchProvider,
+    macroProvider = _ref.macroProvider,
+    activityProvider = _ref.activityProvider,
+    collabEdit = _ref.collabEdit,
+    collabEditProvider = _ref.collabEditProvider,
+    presenceProvider = _ref.presenceProvider;
+  var cardProvider = (linking === null || linking === void 0 ? void 0 : (_linking$smartLinks = linking.smartLinks) === null || _linking$smartLinks === void 0 ? void 0 : _linking$smartLinks.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider;
+  return {
+    mediaProvider: media === null || media === void 0 ? void 0 : media.provider,
+    emojiProvider: emojiProvider,
+    mentionProvider: mentionProvider,
+    autoformattingProvider: autoformattingProvider,
+    cardProvider: cardProvider,
+    activityProvider: activityProvider,
+    imageUploadProvider: legacyImageUploadProvider,
+    taskDecisionProvider: taskDecisionProvider,
+    contextIdentifierProvider: contextIdentifierProvider,
+    searchProvider: searchProvider,
+    presenceProvider: presenceProvider,
+    macroProvider: macroProvider,
+    collabEditProvider: collabEdit && collabEdit.provider ? collabEdit.provider : collabEditProvider
+  };
+}

package/dist/cjs/editor-next/utils/handleProviders.js

@@ -13,36 +13,31 @@ exports.default = handleProviders;
  * @param extensionProvider
  * @param quickInsertProvider
  */
-function handleProviders(providerFactory, props, extensionProvider, quickInsertProvider) {
-  var _linking$smartLinks;
-  var emojiProvider = props.emojiProvider,
-    mentionProvider = props.mentionProvider,
-    taskDecisionProvider = props.taskDecisionProvider,
-    contextIdentifierProvider = props.contextIdentifierProvider,
-    collabEditProvider = props.collabEditProvider,
-    activityProvider = props.activityProvider,
-    presenceProvider = props.presenceProvider,
-    macroProvider = props.macroProvider,
-    legacyImageUploadProvider = props.legacyImageUploadProvider,
-    media = props.media,
-    collabEdit = props.collabEdit,
-    autoformattingProvider = props.autoformattingProvider,
-    searchProvider = props.searchProvider,
-    UNSAFE_cards = props.UNSAFE_cards,
-    smartLinks = props.smartLinks,
-    linking = props.linking;
+function handleProviders(providerFactory, _ref, extensionProvider, quickInsertProvider) {
+  var emojiProvider = _ref.emojiProvider,
+    mentionProvider = _ref.mentionProvider,
+    taskDecisionProvider = _ref.taskDecisionProvider,
+    contextIdentifierProvider = _ref.contextIdentifierProvider,
+    collabEditProvider = _ref.collabEditProvider,
+    activityProvider = _ref.activityProvider,
+    presenceProvider = _ref.presenceProvider,
+    macroProvider = _ref.macroProvider,
+    imageUploadProvider = _ref.imageUploadProvider,
+    mediaProvider = _ref.mediaProvider,
+    autoformattingProvider = _ref.autoformattingProvider,
+    searchProvider = _ref.searchProvider,
+    cardProvider = _ref.cardProvider;
   providerFactory.setProvider('emojiProvider', emojiProvider);
   providerFactory.setProvider('mentionProvider', mentionProvider);
   providerFactory.setProvider('taskDecisionProvider', taskDecisionProvider);
   providerFactory.setProvider('contextIdentifierProvider', contextIdentifierProvider);
-  providerFactory.setProvider('mediaProvider', media && media.provider);
-  providerFactory.setProvider('imageUploadProvider', legacyImageUploadProvider);
-  providerFactory.setProvider('collabEditProvider', collabEdit && collabEdit.provider ? collabEdit.provider : collabEditProvider);
+  providerFactory.setProvider('mediaProvider', mediaProvider);
+  providerFactory.setProvider('imageUploadProvider', imageUploadProvider);
+  providerFactory.setProvider('collabEditProvider', collabEditProvider);
   providerFactory.setProvider('activityProvider', activityProvider);
   providerFactory.setProvider('searchProvider', searchProvider);
   providerFactory.setProvider('presenceProvider', presenceProvider);
   providerFactory.setProvider('macroProvider', macroProvider);
-  var cardProvider = (linking === null || linking === void 0 ? void 0 : (_linking$smartLinks = linking.smartLinks) === null || _linking$smartLinks === void 0 ? void 0 : _linking$smartLinks.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider;
   if (cardProvider) {
     providerFactory.setProvider('cardProvider', cardProvider);
   }

package/dist/cjs/editor.js

@@ -31,10 +31,12 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _prepareQuickInsertProvider = _interopRequireDefault(require("./utils/prepare-quick-insert-provider"));
 var _prepareExtensionProvider = _interopRequireDefault(require("./utils/prepare-extension-provider"));
 var _handleProviders = _interopRequireDefault(require("./editor-next/utils/handleProviders"));
+var _getProvidersFromEditorProps = _interopRequireDefault(require("./editor-next/utils/getProvidersFromEditorProps"));
 var _measureEnum = _interopRequireDefault(require("./utils/performance/measure-enum"));
 var _editorMeasureTTICallback = _interopRequireDefault(require("./editor-next/utils/editorMeasureTTICallback"));
 var _sendDurationAnalytics = _interopRequireDefault(require("./editor-next/utils/sendDurationAnalytics"));
-var _getEditorPlugins2 = _interopRequireDefault(require("./utils/get-editor-plugins"));
+var _createPluginsList = require("./create-editor/create-plugins-list");
+var _presetUtils = require("./create-editor/preset-utils");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 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 Editor = /*#__PURE__*/function (_React$Component) {
@@ -74,7 +76,6 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     _this.startTime = performance.now();
     _this.onEditorCreated = _this.onEditorCreated.bind((0, _assertThisInitialized2.default)(_this));
     _this.onEditorDestroyed = _this.onEditorDestroyed.bind((0, _assertThisInitialized2.default)(_this));
-    _this.getEditorPlugins = _this.getEditorPlugins.bind((0, _assertThisInitialized2.default)(_this));
     _this.getExperienceStore = _this.getExperienceStore.bind((0, _assertThisInitialized2.default)(_this));
     _this.trackEditorActions(_this.editorActions, props);
 
@@ -96,9 +97,11 @@ var Editor = /*#__PURE__*/function (_React$Component) {
      */
     var _extensionProvider = _this.prepareExtensionProvider(props.extensionProviders);
     var quickInsertProvider = _this.prepareQuickInsertProvider(_extensionProvider, props.quickInsert);
+    var preset = (0, _createPluginsList.createPreset)(props, undefined, _this.createAnalyticsEvent);
     _this.state = {
       extensionProvider: _extensionProvider,
-      quickInsertProvider: quickInsertProvider
+      quickInsertProvider: quickInsertProvider,
+      preset: preset
     };
     return _this;
   }
@@ -112,7 +115,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       (0, _utils.stopMeasure)(_measureEnum.default.EDITOR_MOUNTED, (0, _sendDurationAnalytics.default)(_analytics.ACTION.EDITOR_MOUNTED, this.props, this.getExperienceStore, this.createAnalyticsEvent));
-      (0, _handleProviders.default)(this.providerFactory, this.props, this.state.extensionProvider, this.state.quickInsertProvider);
+      (0, _handleProviders.default)(this.providerFactory, (0, _getProvidersFromEditorProps.default)(this.props), this.state.extensionProvider, this.state.quickInsertProvider);
     }
 
     /**
@@ -123,6 +126,8 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this2 = this;
+      var needsANewPreset = (0, _presetUtils.shouldRecreatePreset)(prevProps, this.props);
+      var preset = needsANewPreset ? (0, _createPluginsList.createPreset)(this.props, prevProps, this.createAnalyticsEvent) : this.state.preset;
       var _this$props2 = this.props,
         extensionProviders = _this$props2.extensionProviders,
         quickInsert = _this$props2.quickInsert;
@@ -135,13 +140,20 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         var quickInsertProvider = this.prepareQuickInsertProvider(extensionProvider, quickInsert);
         this.setState({
           extensionProvider: extensionProvider,
-          quickInsertProvider: quickInsertProvider
+          quickInsertProvider: quickInsertProvider,
+          preset: preset
         }, function () {
-          return (0, _handleProviders.default)(_this2.providerFactory, _this2.props, _this2.state.extensionProvider, _this2.state.quickInsertProvider);
+          return (0, _handleProviders.default)(_this2.providerFactory, (0, _getProvidersFromEditorProps.default)(_this2.props), _this2.state.extensionProvider, _this2.state.quickInsertProvider);
         });
         return;
       }
-      (0, _handleProviders.default)(this.providerFactory, this.props, this.state.extensionProvider, this.state.quickInsertProvider);
+      if (needsANewPreset) {
+        this.setState({
+          preset: preset
+        });
+        return;
+      }
+      (0, _handleProviders.default)(this.providerFactory, (0, _getProvidersFromEditorProps.default)(this.props), this.state.extensionProvider, this.state.quickInsertProvider);
     }
 
     /**
@@ -268,7 +280,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
             props: _this5.props,
             handleAnalyticsEvent: _this5.handleAnalyticsEvent,
             createAnalyticsEvent: _this5.createAnalyticsEvent,
-            getEditorPlugins: _this5.getEditorPlugins,
+            preset: _this5.state.preset,
             handleSave: _this5.handleSave,
             editorActions: _this5.editorActions,
             providerFactory: _this5.providerFactory,
@@ -278,11 +290,6 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         }
       }));
     }
-  }, {
-    key: "getEditorPlugins",
-    value: function getEditorPlugins(props) {
-      return (0, _getEditorPlugins2.default)(props);
-    }
   }]);
   return Editor;
 }(_react2.default.Component);

package/dist/cjs/keymaps/consts.js

@@ -3,28 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UP = exports.RIGHT = exports.LEFT = exports.KEY_6 = exports.KEY_5 = exports.KEY_4 = exports.KEY_3 = exports.KEY_2 = exports.KEY_1 = exports.KEY_0 = exports.HEADING_KEYS = exports.DOWN = void 0;
-var LEFT = 37;
-exports.LEFT = LEFT;
-var RIGHT = 39;
-exports.RIGHT = RIGHT;
-var UP = 38;
-exports.UP = UP;
-var DOWN = 40;
-exports.DOWN = DOWN;
+exports.HEADING_KEYS = void 0;
 var KEY_0 = 48;
-exports.KEY_0 = KEY_0;
 var KEY_1 = 49;
-exports.KEY_1 = KEY_1;
 var KEY_2 = 50;
-exports.KEY_2 = KEY_2;
 var KEY_3 = 51;
-exports.KEY_3 = KEY_3;
 var KEY_4 = 52;
-exports.KEY_4 = KEY_4;
 var KEY_5 = 53;
-exports.KEY_5 = KEY_5;
 var KEY_6 = 54;
-exports.KEY_6 = KEY_6;
 var HEADING_KEYS = [KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6];
 exports.HEADING_KEYS = HEADING_KEYS;

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

@@ -8,8 +8,6 @@ exports.EditorPresetCXHTML = EditorPresetCXHTML;
 exports.useCXHTMLPreset = useCXHTMLPreset;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
-var _editorPluginTable = require("@atlaskit/editor-plugin-table");
-var _plugins = require("../../../plugins");
 var _Editor = require("../Editor");
 var _default = require("./default");
 // #region Imports
@@ -24,58 +22,59 @@ function useCXHTMLPreset(_ref) {
       paste: {}
     }),
     _useDefaultPreset2 = (0, _slicedToArray2.default)(_useDefaultPreset, 1),
-    preset = _useDefaultPreset2[0];
-  preset.add([_plugins.basePlugin, {
-    allowInlineCursorTarget: true,
-    allowScrollGutter: {
-      getScrollElement: function getScrollElement(_view) {
-        return document.querySelector('.fabric-editor-popup-scroll-parent') || null;
-      }
-    }
-  }]);
-  preset.add([_editorPluginTable.tablesPlugin, {
-    tableOptions: {
-      advanced: true
-    }
-  }]);
-  preset.add([_plugins.panelPlugin, {
-    allowCustomPanel: true
-  }]);
-  preset.add(_plugins.listPlugin);
-  preset.add(_plugins.textColorPlugin);
-  preset.add(_plugins.breakoutPlugin);
-  preset.add(_plugins.jiraIssuePlugin);
-  preset.add(_plugins.extensionPlugin);
-  preset.add(_plugins.rulePlugin);
-  preset.add(_plugins.datePlugin);
-  preset.add(_plugins.layoutPlugin);
-  preset.add(_plugins.indentationPlugin);
-  preset.add([_plugins.cardPlugin, {
-    allowBlockCards: true,
-    platform: 'web'
-  }]);
-  preset.add([_plugins.statusPlugin, {
-    menuDisabled: false
-  }]);
-  preset.add(_plugins.tasksAndDecisionsPlugin);
-  preset.add(_plugins.insertBlockPlugin);
-  preset.add([_plugins.placeholderPlugin, {
-    placeholder: placeholder
-  }]);
-  if (mentionProvider) {
-    preset.add(_plugins.mentionsPlugin);
-  }
-  if (mediaProvider) {
-    preset.add([_plugins.mediaPlugin, {
-      provider: mediaProvider,
-      allowMediaSingle: true,
-      allowMediaGroup: true,
-      allowResizing: true,
-      allowLinking: true,
-      allowResizingInTables: true,
-      allowAltTextOnImages: true
-    }]);
-  }
+    defaultPreset = _useDefaultPreset2[0];
+  var preset = defaultPreset;
+  //.add([
+  //  basePlugin,
+  //  {
+  //    allowInlineCursorTarget: true,
+  //    allowScrollGutter: {
+  //      getScrollElement: (_view) =>
+  //        document.querySelector('.fabric-editor-popup-scroll-parent') ||
+  //        null,
+  //    },
+  //  },
+  //])
+  //.add([tablesPlugin, { tableOptions: { advanced: true } }])
+  //.add([panelPlugin, { allowCustomPanel: true }])
+  //.add(listPlugin)
+  //.add(textColorPlugin)
+  //.add(breakoutPlugin)
+  //.add(jiraIssuePlugin)
+  //.add(extensionPlugin)
+  //.add(rulePlugin)
+  //.add(datePlugin)
+  //.add(layoutPlugin)
+  //.add(indentationPlugin)
+  //.add([cardPlugin, { allowBlockCards: true, platform: 'web' }])
+  //.add([statusPlugin, { menuDisabled: false }])
+  //.add(tasksAndDecisionsPlugin)
+  //.add(insertBlockPlugin)
+  ////.add([placeholderPlugin, { placeholder }])
+  //.maybeAdd(mentionsPlugin, (plugin, builder) => {
+  //  if (mentionProvider) {
+  //    return builder.add(plugin);
+  //  }
+  //  return builder;
+  //})
+  //.maybeAdd(mediaPlugin, (plugin, builder) => {
+  //  if (mediaProvider) {
+  //    preset.add([
+  //      plugin,
+  //      {
+  //        provider: mediaProvider,
+  //        allowMediaSingle: true,
+  //        allowMediaGroup: true,
+  //        allowResizing: true,
+  //        allowLinking: true,
+  //        allowResizingInTables: true,
+  //        allowAltTextOnImages: true,
+  //      },
+  //    ]);
+  //  }
+  //  return builder;
+  //});
+
   return [preset];
 }
 function EditorPresetCXHTML(props) {
@@ -84,7 +83,9 @@ function EditorPresetCXHTML(props) {
   var _useCXHTMLPreset = useCXHTMLPreset(props),
     _useCXHTMLPreset2 = (0, _slicedToArray2.default)(_useCXHTMLPreset, 1),
     preset = _useCXHTMLPreset2[0];
-  var plugins = preset.getEditorPlugins(excludes);
+  var plugins = preset.build({
+    excludePlugins: excludes
+  });
   return /*#__PURE__*/_react.default.createElement(_Editor.PresetProvider, {
     value: plugins
   }, children);

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

@@ -4,11 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EditorPresetDefault = EditorPresetDefault;
 exports.createDefaultPreset = createDefaultPreset;
 exports.useDefaultPreset = useDefaultPreset;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireDefault(require("react"));
 var _paste = _interopRequireDefault(require("../../../plugins/paste"));
 var _blockType = _interopRequireDefault(require("../../../plugins/block-type"));
 var _clearMarksOnChangeToEmptyDocument = _interopRequireDefault(require("../../../plugins/clear-marks-on-change-to-empty-document"));
@@ -23,8 +20,6 @@ var _submitEditor = _interopRequireDefault(require("../../../plugins/submit-edit
 var _fakeTextCursor = _interopRequireDefault(require("../../../plugins/fake-text-cursor"));
 var _featureFlagsContext = _interopRequireDefault(require("../../../plugins/feature-flags-context"));
 var _floatingToolbar = _interopRequireDefault(require("../../../plugins/floating-toolbar"));
-var _Editor = require("../Editor");
-var _preset = require("./preset");
 var _clipboard = _interopRequireDefault(require("../../../plugins/clipboard"));
 var _placeholder = _interopRequireDefault(require("../../../plugins/placeholder"));
 var _annotation = _interopRequireDefault(require("../../../plugins/annotation"));
@@ -32,6 +27,7 @@ var _quickInsert = _interopRequireDefault(require("../../../plugins/quick-insert
 var _selection = _interopRequireDefault(require("../../../plugins/selection"));
 var _codeBlock = _interopRequireDefault(require("../../../plugins/code-block"));
 var _undoRedo = _interopRequireDefault(require("../../../plugins/undo-redo"));
+var _preset = require("@atlaskit/editor-common/preset");
 // #region Imports
 
 /**
@@ -39,35 +35,21 @@ var _undoRedo = _interopRequireDefault(require("../../../plugins/undo-redo"));
  * their placement in the editor toolbar
  */
 function createDefaultPreset(options) {
-  var _options$featureFlags;
-  var preset = new _preset.Preset();
-  preset.add([_paste.default, options.paste]);
-  preset.add(_clipboard.default);
-  preset.add([_base.default, options.base]);
-  if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {
-    preset.add(_undoRedo.default);
-  }
-  preset.add([_blockType.default, options.blockType]);
-  preset.add([_placeholder.default, options.placeholder]);
-  preset.add(_clearMarksOnChangeToEmptyDocument.default);
-  if (options.annotationProviders) {
-    preset.add([_annotation.default, options.annotationProviders]);
-  }
-  preset.add([_hyperlink.default, options.hyperlinkOptions]);
-  preset.add([_textFormatting.default, options.textFormatting]);
-  preset.add(_width.default);
-  preset.add([_quickInsert.default, options.quickInsert]);
-  preset.add([_typeAhead.default, options.typeAhead || {
+  var preset = new _preset.EditorPresetBuilder().add([_paste.default, options.paste]).add(_clipboard.default).add([_base.default, options.base]).maybeAdd(_undoRedo.default, 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) {
+      return builder.add(p);
+    }
+    return builder;
+  }).add([_blockType.default, options.blockType]).add([_placeholder.default, options.placeholder]).add(_clearMarksOnChangeToEmptyDocument.default).maybeAdd(_annotation.default, function (p, builder) {
+    if (options.annotationProviders) {
+      return builder.add([p, options.annotationProviders]);
+    }
+    return builder;
+  }).add([_hyperlink.default, options.hyperlinkOptions]).add([_textFormatting.default, options.textFormatting]).add(_width.default).add([_quickInsert.default, options.quickInsert]).add([_typeAhead.default, options.typeAhead || {
     createAnalyticsEvent: options.createAnalyticsEvent
-  }]);
-  preset.add(_unsupportedContent.default);
-  preset.add(_editorDisabled.default);
-  preset.add([_submitEditor.default, options.submitEditor]);
-  preset.add(_fakeTextCursor.default);
-  preset.add(_floatingToolbar.default);
-  preset.add([_featureFlagsContext.default, options.featureFlags || {}]);
-  preset.add([_selection.default, options.selection]);
-  preset.add([_codeBlock.default, options.codeBlock || {
+  }]).add(_unsupportedContent.default).add(_editorDisabled.default).add([_submitEditor.default, options.submitEditor]).add(_fakeTextCursor.default).add(_floatingToolbar.default).add([_featureFlagsContext.default, options.featureFlags || {}]).add([_selection.default, options.selection]).add([_codeBlock.default, options.codeBlock || {
     appearance: 'full-page'
   }]);
   return preset;
@@ -75,13 +57,4 @@ function createDefaultPreset(options) {
 function useDefaultPreset(props) {
   var preset = createDefaultPreset(props);
   return [preset];
-}
-function EditorPresetDefault(props) {
-  var _useDefaultPreset = useDefaultPreset(props),
-    _useDefaultPreset2 = (0, _slicedToArray2.default)(_useDefaultPreset, 1),
-    preset = _useDefaultPreset2[0];
-  var plugins = preset.getEditorPlugins();
-  return /*#__PURE__*/_react.default.createElement(_Editor.PresetProvider, {
-    value: plugins
-  }, props.children);
 }