@atlaskit/editor-core 184.0.0 → 185.0.0

package/.eslintrc.js

@@ -8,13 +8,13 @@ module.exports = {
             target: 'packages/editor/editor-core/src/**/*',
             from: `packages/editor/editor-core/src/plugins/*/!(types)*`,
             message:
-              '[ELR101] Avoid importing dependencies from editor plugins. Move shared code to a common location. go/elr101',
+              '[ELR101] Avoid importing dependencies from editor plugins. Type-only imports are an exception. Move shared code to a common location. go/elr101',
           },
           {
             target: 'packages/editor/editor-core/src/**/*',
             from: `packages/editor/editor-core/src/plugins/*/!(types)**/*`,
             message:
-              '[ELR101] Avoid importing dependencies from editor plugins. Move shared code to a common location. go/elr101',
+              '[ELR101] Avoid importing dependencies from editor plugins. Type-only imports are an exception. Move shared code to a common location. go/elr101',
           },
         ],
       },
@@ -23,7 +23,11 @@ module.exports = {
   },
   overrides: [
     {
-      files: ['**/__tests__/**/*.{js,ts,tsx}', 'examples/**/*.{js,ts,tsx}'],
+      files: [
+        '**/__tests__/**/*.{js,ts,tsx}',
+        'examples/**/*.{js,ts,tsx}',
+        '**/*.{test,spec}.{js,ts,tsx}',
+      ],
       rules: {
         'import/no-restricted-paths': ['off'],
         'react/no-danger': 'off',

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @atlaskit/editor-core
 
+## 185.0.0
+
+### Major Changes
+
+- [`741b3acd455`](https://bitbucket.org/atlassian/atlassian-frontend/commits/741b3acd455) - This major change includes:
+
+  - `EditorMigrationComponent` being renamed to `Editor`. This includes making component methods which should never be used private (which should never be used in normal operation and have been deprecated for several releases).
+  - `EditorMigrationComponent` is now removed
+  - Removing `useEditorNext` feature flag
+
+  This change was made as part of our strategy to move to a new architecture with `EditorMigrationComponent`, now that the component has served its purpose it is no longer required.
+
+  Any references to this component can be updated like so:
+
+  Before:
+
+  ```ts
+  import { EditorMigrationComponent } from '@atlaskit/editor-core';
+  ```
+
+  After:
+
+  ```ts
+  import { Editor } from '@atlaskit/editor-core';
+  ```
+
+### Minor Changes
+
+- [`26d9c8cb4b1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/26d9c8cb4b1) - Extract decorations plugin from editor-core to its own package.
+
+### Patch Changes
+
+- [`4fe16193baa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4fe16193baa) - [ux] fix element browser adding component twice
+- [`6f5276b3eb1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6f5276b3eb1) - ED-17921 updated placeholder text analytics event to use new analyticsAPI
+- [`1df016865b3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1df016865b3) - [ED-17443] Update escape key behaviour when typeahead is open
+- [`65ff31a2ad4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/65ff31a2ad4) - use onError prop on smart card to handle errors
+- Updated dependencies
+
+## 184.0.4
+
+### Patch Changes
+
+- [`42486e5e512`](https://bitbucket.org/atlassian/atlassian-frontend/commits/42486e5e512) - Updated `ColorPickerButton`'s size prop type from number to string for width and height, allowing use of space tokens.
+
 ## 184.0.0
 
 ### Major Changes

package/dist/cjs/create-editor/feature-flags-from-props.js

@@ -32,7 +32,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 function createFeatureFlagsFromProps(props) {
-  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46, _props$featureFlags47;
+  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46;
   var normalizedFeatureFlags = (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags);
   var tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
 
@@ -79,7 +79,6 @@ function createFeatureFlagsFromProps(props) {
     useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags43 = props.featureFlags) === null || _props$featureFlags43 === void 0 ? void 0 : _props$featureFlags43.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags44 = props.featureFlags) !== null && _props$featureFlags44 !== void 0 && _props$featureFlags44.useSomewhatSemanticTextColorNames) : false)),
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
     preventPopupOverflow: Boolean(typeof ((_props$featureFlags45 = props.featureFlags) === null || _props$featureFlags45 === void 0 ? void 0 : _props$featureFlags45['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags46 = props.featureFlags) !== null && _props$featureFlags46 !== void 0 && _props$featureFlags46['prevent-popup-overflow']) : false),
-    useEditorNext: normalizedFeatureFlags.useEditorNext === true || ((_props$featureFlags47 = props.featureFlags) === null || _props$featureFlags47 === void 0 ? void 0 : _props$featureFlags47.useEditorNext) === true,
     // duplicated logic from `create-plugins-list.ts` due to presets not being finalised
     useBetterTypeaheadNavigation: Boolean(typeof pseudoNormalisedUseBetterTypeaheadNavigation === 'boolean' ? !!pseudoNormalisedUseBetterTypeaheadNavigation : true)
   });

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

@@ -13,13 +13,9 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("@atlaskit/editor-common/utils");
 var _react = require("@emotion/react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react2 = _interopRequireDefault(require("react"));
-var _versionWrapper = require("../version-wrapper");
-var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-context");
-var _v = _interopRequireDefault(require("uuid/v4"));
 var _actions = _interopRequireDefault(require("../actions"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorInternal = _interopRequireDefault(require("./editor-internal"));
@@ -32,10 +28,15 @@ 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; } } /** @jsx jsx */
+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 { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
+// import { name, version } from '../version-wrapper';
+// import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
+// import uuid from 'uuid/v4';
 var EditorNext = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(EditorNext, _React$Component);
   var _super = _createSuper(EditorNext);
+  // private editorSessionId: string;
+
   function EditorNext(props, context) {
     var _this;
     (0, _classCallCheck2.default)(this, EditorNext);
@@ -55,7 +56,7 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     });
     (0, _deprecationWarnings.default)(props);
     _this.editorActions = (context || {}).editorActions || new _actions.default();
-    _this.editorSessionId = (0, _v.default)();
+    // this.editorSessionId = uuid();
     _this.startTime = performance.now();
     _this.onEditorCreated = _this.onEditorCreated.bind((0, _assertThisInitialized2.default)(_this));
     _this.onEditorDestroyed = _this.onEditorDestroyed.bind((0, _assertThisInitialized2.default)(_this));
@@ -98,39 +99,45 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this3 = this;
-      return (0, _react.jsx)(_analyticsNamespacedContext.FabricEditorAnalyticsContext, {
-        data: {
-          packageName: _versionWrapper.name,
-          packageVersion: _versionWrapper.version,
-          componentName: 'editorCore',
-          appearance: (0, _utils.getAnalyticsAppearance)(this.props.appearance),
-          editorSessionId: this.editorSessionId
-        }
-      }, (0, _react.jsx)(_ui.WithCreateAnalyticsEvent, {
-        render: function render(createAnalyticsEvent) {
-          return (_this3.createAnalyticsEvent = createAnalyticsEvent) && (0, _react.jsx)(_editorInternal.default, {
-            props: _this3.props,
-            handleAnalyticsEvent: _this3.handleAnalyticsEvent,
-            createAnalyticsEvent: _this3.createAnalyticsEvent,
-            preset: _this3.props.preset,
-            handleSave: _this3.handleSave,
-            editorActions: _this3.editorActions,
-            getExperienceStore: _this3.getExperienceStore,
-            onEditorCreated: _this3.onEditorCreated,
-            onEditorDestroyed: _this3.onEditorDestroyed
-          });
-        }
-      }));
+      // 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 (
+        // <FabricEditorAnalyticsContext
+        //   data={{
+        //     packageName: name,
+        //     packageVersion: version,
+        //     componentName: 'editorCore',
+        //     appearance: getAnalyticsAppearance(this.props.appearance),
+        //     editorSessionId: this.editorSessionId,
+        //   }}
+        // >
+        (0, _react.jsx)(_ui.WithCreateAnalyticsEvent, {
+          render: function render(createAnalyticsEvent) {
+            return (_this3.createAnalyticsEvent = createAnalyticsEvent) && (0, _react.jsx)(_editorInternal.default, {
+              props: _this3.props,
+              handleAnalyticsEvent: _this3.handleAnalyticsEvent,
+              createAnalyticsEvent: _this3.createAnalyticsEvent,
+              preset: _this3.props.preset,
+              handleSave: _this3.handleSave,
+              editorActions: _this3.editorActions,
+              getExperienceStore: _this3.getExperienceStore,
+              onEditorCreated: _this3.onEditorCreated,
+              onEditorDestroyed: _this3.onEditorDestroyed
+            });
+          }
+        })
+        // </FabricEditorAnalyticsContext>
+      );
     }
   }]);
   return EditorNext;
 }(_react2.default.Component);
 exports.default = EditorNext;
-/**
- * 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
- */
 (0, _defineProperty2.default)(EditorNext, "defaultProps", _editorPropTypes.defaultProps);
 (0, _defineProperty2.default)(EditorNext, "contextTypes", {
   editorActions: _propTypes.default.object

package/dist/cjs/editor.js

@@ -12,268 +12,50 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("@emotion/react");
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react2 = _interopRequireDefault(require("react"));
-var _providerFactory = require("@atlaskit/editor-common/provider-factory");
-var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("@atlaskit/editor-common/utils");
-var _versionWrapper = require("./version-wrapper");
+var _editorPropTypes = require("./editor-next/utils/editorPropTypes");
+var _editorNext = _interopRequireDefault(require("./editor-next"));
+var _useUniversalPreset = _interopRequireDefault(require("./labs/next/presets/useUniversalPreset"));
 var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-context");
+var _versionWrapper = require("./version-wrapper");
+var _utils = require("@atlaskit/editor-common/utils");
 var _v = _interopRequireDefault(require("uuid/v4"));
-var _actions = _interopRequireDefault(require("./actions"));
-var _editorInternal = require("./editor-next/editor-internal");
-var _editorPropTypes = require("./editor-next/utils/editorPropTypes");
-var _trackEditorActions2 = _interopRequireDefault(require("./editor-next/utils/trackEditorActions"));
-var _onEditorCreated2 = _interopRequireDefault(require("./editor-next/utils/onEditorCreated"));
-var _deprecationWarnings = _interopRequireDefault(require("./editor-next/utils/deprecationWarnings"));
-var _featureFlagsFromProps = require("./create-editor/feature-flags-from-props");
-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 _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; } } /** @jsx jsx */
+var EditorNextWrapper = function EditorNextWrapper(_ref) {
+  var props = _ref.props;
+  var preset = (0, _useUniversalPreset.default)({
+    props: props
+  });
+  return (0, _react.jsx)(_editorNext.default, (0, _extends2.default)({
+    preset: preset
+  }, props));
+};
 var Editor = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(Editor, _React$Component);
   var _super = _createSuper(Editor);
-  function Editor(props, context) {
-    var _props$performanceTra, _props$performanceTra2, _props$featureFlags;
+  function Editor() {
     var _this;
     (0, _classCallCheck2.default)(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.
-     */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "prepareExtensionProvider", (0, _prepareExtensionProvider.default)(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.
-     */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "prepareQuickInsertProvider", function (extensionProvider, quickInsert) {
-      return (0, _prepareQuickInsertProvider.default)(_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.
-     */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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.
-     */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleAnalyticsEvent", function (data) {
-      return (0, _analytics.fireAnalyticsEvent)(_this.createAnalyticsEvent)(data);
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getFeatureFlags", function () {
-      return (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(_this.props);
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getExperienceStore", function () {
-      return _this.experienceStore;
-    });
-    _this.providerFactory = new _providerFactory.ProviderFactory();
-    (0, _deprecationWarnings.default)(props);
-    _this.editorActions = (context || {}).editorActions || new _actions.default();
-    _this.editorSessionId = (0, _v.default)();
-    _this.startTime = performance.now();
-    _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.trackEditorActions(_this.editorActions, props);
-
-    /**
-     * Consider any changes here to corresponding file for `EditorNext` in
-     * `useEditorConstructor` (editor-next/hooks/useEditorMeasuresConstructor.ts)
-     */
-    (0, _utils.startMeasure)(_measureEnum.default.EDITOR_MOUNTED);
-    if ((_props$performanceTra = props.performanceTracking) !== null && _props$performanceTra !== void 0 && (_props$performanceTra2 = _props$performanceTra.ttiTracking) !== null && _props$performanceTra2 !== void 0 && _props$performanceTra2.enabled || (_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.ufo) {
-      var _props$performanceTra3, _props$performanceTra4, _props$performanceTra5, _props$performanceTra6;
-      (0, _utils.measureTTI)(function (tti, ttiFromInvocation, canceled) {
-        (0, _editorMeasureTTICallback.default)(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 = (0, _createPluginsList.createPreset)(props, undefined, _this.createAnalyticsEvent);
-    _this.state = {
-      extensionProvider: _extensionProvider,
-      quickInsertProvider: quickInsertProvider,
-      preset: preset
-    };
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "editorSessionId", (0, _v.default)());
     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)
-   */
   (0, _createClass2.default)(Editor, [{
-    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, (0, _getProvidersFromEditorProps.default)(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 = (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;
-      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 (0, _handleProviders.default)(_this2.providerFactory, (0, _getProvidersFromEditorProps.default)(_this2.props), _this2.state.extensionProvider, _this2.state.quickInsertProvider);
-        });
-        return;
-      }
-      if (needsANewPreset) {
-        this.setState({
-          preset: preset
-        });
-        return;
-      }
-      (0, _handleProviders.default)(this.providerFactory, (0, _getProvidersFromEditorProps.default)(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();
-      (0, _utils.clearMeasure)(_measureEnum.default.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) && (0, _utils.clearMeasure)(_measureEnum.default.ON_EDITOR_READY_CALLBACK);
-      if ((_this$props$featureFl = this.props.featureFlags) !== null && _this$props$featureFl !== void 0 && _this$props$featureFl.ufo) {
-        var _this$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 (0, _trackEditorActions2.default)(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;
-      (0, _onEditorCreated2.default)(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 (0, _react.jsx)(_analyticsNamespacedContext.FabricEditorAnalyticsContext, {
         data: {
           packageName: _versionWrapper.name,
@@ -282,33 +64,12 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           appearance: (0, _utils.getAnalyticsAppearance)(this.props.appearance),
           editorSessionId: this.editorSessionId
         }
-      }, (0, _react.jsx)(_ui.WithCreateAnalyticsEvent, {
-        render: function render(createAnalyticsEvent) {
-          return (_this5.createAnalyticsEvent = createAnalyticsEvent) && (0, _react.jsx)(_editorInternal.EditorInternalWithoutHooks, {
-            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
-          });
-        }
+      }, (0, _react.jsx)(EditorNextWrapper, {
+        props: this.props
       }));
     }
   }]);
   return Editor;
 }(_react2.default.Component);
 exports.default = Editor;
-/**
- * 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
- */
-(0, _defineProperty2.default)(Editor, "defaultProps", _editorPropTypes.defaultProps);
-(0, _defineProperty2.default)(Editor, "contextTypes", {
-  editorActions: _propTypes.default.object
-});
-(0, _defineProperty2.default)(Editor, "propTypes", (0, _editorPropTypes.propTypes)('minHeight only supports editor appearance chromeless and comment for Editor'));
+(0, _defineProperty2.default)(Editor, "defaultProps", _editorPropTypes.defaultProps);