@atlaskit/editor-core 184.0.0 → 185.0.0

package/dist/cjs/ui/ConfigPanel/Fields/ColorPicker.js

@@ -13,7 +13,6 @@ var _form = require("@atlaskit/form");
 var _editorPalette = require("@atlaskit/editor-palette");
 var _common = require("../../../ui/ColorPalette/Palettes/common");
 var _utils = require("../utils");
-var _constants = require("@atlaskit/theme/constants");
 var _RequiredIndicator = require("./common/RequiredIndicator");
 var _typography = require("@atlaskit/theme/typography");
 var _FieldMessages = _interopRequireDefault(require("../FieldMessages"));
@@ -21,7 +20,7 @@ var _ColorPickerButton = _interopRequireDefault(require("../../ColorPickerButton
 var _ColorPalette = require("../../../ui/ColorPalette");
 var _templateObject, _templateObject2;
 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; } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
+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; } /** @jsx jsx */
 /*
     NOTE: color used here are not yet in atlaskit code
     this is part of extended color pack from ADG, which is yet to be release
@@ -377,13 +376,10 @@ var ColorPicker = function ColorPicker(props) {
     showSomewhatSemanticTooltips: useSomewhatSemanticTextColorNames,
     cols: EXPANDED_COLOR_PICKER_COLUMNS,
     alignX: "right",
-    placement: "ConfigPanel"
-    // TODO: Migrate away from gridSize
-    // Recommendation: Update types of size object to accept string width/height and then replace gridSize with tokens
-    ,
+    placement: "ConfigPanel",
     size: {
-      width: 3 * (0, _constants.gridSize)(),
-      height: 3 * (0, _constants.gridSize)()
+      width: "var(--ds-space-300, 24px)",
+      height: "var(--ds-space-300, 24px)"
     }
   }) : (0, _react.jsx)(_ColorPickerButton.default, {
     title: title,
@@ -394,8 +390,8 @@ var ColorPicker = function ColorPicker(props) {
     alignX: "right",
     placement: "ConfigPanel",
     size: {
-      width: 3 * (0, _constants.gridSize)(),
-      height: 3 * (0, _constants.gridSize)()
+      width: "var(--ds-space-300, 24px)",
+      height: "var(--ds-space-300, 24px)"
     }
   });
 };

package/dist/cjs/ui/ElementBrowser/components/StatelessElementBrowser.js

@@ -84,18 +84,20 @@ function StatelessElementBrowser(props) {
   /* Only for hitting enter to select item when focused on search bar,
    * The actual enter key press is handled on individual items level.
    */
+  var selectedItem = items[selectedItemIndex];
   var onItemsEnterKeyPress = (0, _react.useCallback)(function (e) {
     if (e.key !== 'Enter') {
       return;
     }
-    props.onInsertItem(items[selectedItemIndex]);
-  }, [props, items, selectedItemIndex]);
+    if (onSelectItem && selectedItem != null) {
+      onSelectItem(selectedItem);
+    }
+  }, [onSelectItem, selectedItem]);
 
   /**
    * On arrow key selection and clicks the selectedItemIndex will change.
    * Making sure to update parent component.
    */
-  var selectedItem = items[selectedItemIndex];
   (0, _react.useEffect)(function () {
     if (onSelectItem && selectedItem != null) {
       onSelectItem(selectedItem);

package/dist/cjs/ui/styles.js

@@ -26,8 +26,14 @@ var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
 var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 var buttonGroupStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n\n  & > div {\n    display: flex;\n  }\n"])));
+
+// This style is copied to packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/styles.tsx
+// If you make change here, change in above file as well.
 exports.buttonGroupStyle = buttonGroupStyle;
 var separatorStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n  user-select: none;\n"])), "var(--ds-border, ".concat(_colors.N30, ")"));
+
+// This style is copied to packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/styles.tsx
+// If you make change here, change in above file as well.
 exports.separatorStyles = separatorStyles;
 var wrapperStyle = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n\n  > div,\n  > span {\n    display: flex;\n  }\n\n  > div > div {\n    display: flex;\n  }\n\n  margin-left: 0;\n  min-width: auto;\n"])));
 exports.wrapperStyle = wrapperStyle;

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "184.0.0";
+var version = "185.0.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

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

@@ -21,7 +21,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 export 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;
   const normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   const tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
 
@@ -69,7 +69,6 @@ export 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/es2019/editor-next/index.js

@@ -2,13 +2,14 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /** @jsx jsx */
 
 import { WithCreateAnalyticsEvent } from '@atlaskit/editor-common/ui';
-import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
+// import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import React from 'react';
-import { name, version } from '../version-wrapper';
-import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import uuid from 'uuid/v4';
+// import { name, version } from '../version-wrapper';
+
+// import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
+// import uuid from 'uuid/v4';
 import EditorActions from '../actions';
 import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import EditorInternal from './editor-internal';
@@ -19,6 +20,8 @@ import deprecationWarnings from './utils/deprecationWarnings';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import { basePlugin } from '../plugins';
 export default class EditorNext extends React.Component {
+  // private editorSessionId: string;
+
   constructor(props, context) {
     super(props);
     _defineProperty(this, "handleSave", view => {
@@ -32,7 +35,7 @@ export default class EditorNext extends React.Component {
     _defineProperty(this, "getExperienceStore", () => this.experienceStore);
     deprecationWarnings(props);
     this.editorActions = (context || {}).editorActions || new EditorActions();
-    this.editorSessionId = uuid();
+    // this.editorSessionId = uuid();
     this.startTime = performance.now();
     this.onEditorCreated = this.onEditorCreated.bind(this);
     this.onEditorDestroyed = this.onEditorDestroyed.bind(this);
@@ -54,34 +57,40 @@ export default class EditorNext extends React.Component {
     this.editorActions._privateUnregisterEditor();
   }
   render() {
-    return jsx(FabricEditorAnalyticsContext, {
-      data: {
-        packageName: name,
-        packageVersion: version,
-        componentName: 'editorCore',
-        appearance: getAnalyticsAppearance(this.props.appearance),
-        editorSessionId: this.editorSessionId
-      }
-    }, jsx(WithCreateAnalyticsEvent, {
-      render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-        props: this.props,
-        handleAnalyticsEvent: this.handleAnalyticsEvent,
-        createAnalyticsEvent: this.createAnalyticsEvent,
-        preset: this.props.preset,
-        handleSave: this.handleSave,
-        editorActions: this.editorActions,
-        getExperienceStore: this.getExperienceStore,
-        onEditorCreated: this.onEditorCreated,
-        onEditorDestroyed: this.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,
+      //   }}
+      // >
+      jsx(WithCreateAnalyticsEvent, {
+        render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
+          props: this.props,
+          handleAnalyticsEvent: this.handleAnalyticsEvent,
+          createAnalyticsEvent: this.createAnalyticsEvent,
+          preset: this.props.preset,
+          handleSave: this.handleSave,
+          editorActions: this.editorActions,
+          getExperienceStore: this.getExperienceStore,
+          onEditorCreated: this.onEditorCreated,
+          onEditorDestroyed: this.onEditorDestroyed
+        })
       })
-    }));
+      // </FabricEditorAnalyticsContext>
+    );
   }
 }
-/**
- * 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(EditorNext, "defaultProps", defaultProps);
 _defineProperty(EditorNext, "contextTypes", {
   editorActions: PropTypes.object

package/dist/es2019/editor.js

@@ -1,222 +1,38 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 /** @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';
+const EditorNextWrapper = ({
+  props
+}) => {
+  const preset = useUniversalPreset({
+    props
+  });
+  return jsx(EditorNext, _extends({
+    preset: preset
+  }, props));
+};
 export default class Editor extends React.Component {
-  constructor(props, context) {
-    var _props$performanceTra, _props$performanceTra2, _props$featureFlags;
-    super(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(this, "prepareExtensionProvider", prepareExtensionProvider(() => 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(this, "prepareQuickInsertProvider", (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(this, "handleSave", 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(this, "handleAnalyticsEvent", data => fireAnalyticsEvent(this.createAnalyticsEvent)(data));
-    _defineProperty(this, "getFeatureFlags", () => {
-      return createFeatureFlagsFromProps(this.props);
-    });
-    _defineProperty(this, "getExperienceStore", () => 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(this);
-    this.onEditorDestroyed = this.onEditorDestroyed.bind(this);
-    this.getExperienceStore = this.getExperienceStore.bind(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((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);
-    }
-
-    /**
-     * Consider any changes here to corresponding file for `EditorNext` in
-     * `useProviderFactory` (editor-next/hooks/useProviderFactory.ts)
-     */
-    const _extensionProvider = this.prepareExtensionProvider(props.extensionProviders);
-    const quickInsertProvider = this.prepareQuickInsertProvider(_extensionProvider, props.quickInsert);
-    const preset = createPreset(props, undefined, this.createAnalyticsEvent);
-    this.state = {
-      extensionProvider: _extensionProvider,
-      quickInsertProvider,
-      preset
-    };
-  }
-
-  /**
-   * Consider any changes here to corresponding file for `EditorNext` in
-   * `useProviderFactory` (editor-next/hooks/useProviderFactory.ts) and
-   * `useMeasureEditorMountTime` (editor-next/hooks/useMeasureEditorMountTime.ts)
-   */
-  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)
-   */
-  componentDidUpdate(prevProps) {
-    const needsANewPreset = shouldRecreatePreset(prevProps, this.props);
-    const preset = needsANewPreset ? createPreset(this.props, prevProps, this.createAnalyticsEvent) : this.state.preset;
-    const {
-      extensionProviders,
-      quickInsert
-    } = this.props;
-    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) {
-      const extensionProvider = this.prepareExtensionProvider(extensionProviders);
-      const quickInsertProvider = this.prepareQuickInsertProvider(extensionProvider, quickInsert);
-      this.setState({
-        extensionProvider,
-        quickInsertProvider,
-        preset
-      }, () => handleProviders(this.providerFactory, getProvidersFromEditorProps(this.props), this.state.extensionProvider, this.state.quickInsertProvider));
-      return;
-    }
-    if (needsANewPreset) {
-      this.setState({
-        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)
-   */
-  componentWillUnmount() {
-    var _this$props2, _this$props2$performa, _this$props2$performa2, _this$props$featureFl;
-    this.unregisterEditorFromActions();
-    this.providerFactory.destroy();
-    clearMeasure(measurements.EDITOR_MOUNTED);
-    ((_this$props2 = this.props) === null || _this$props2 === void 0 ? void 0 : (_this$props2$performa = _this$props2.performanceTracking) === null || _this$props2$performa === void 0 ? void 0 : (_this$props2$performa2 = _this$props2$performa.onEditorReadyCallbackTracking) === null || _this$props2$performa2 === void 0 ? void 0 : _this$props2$performa2.enabled) && 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.
-   */
-  trackEditorActions(editorActions, props) {
-    return trackEditorActions(editorActions, props.performanceTracking, value => this.handleAnalyticsEvent(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.
-   */
-  onEditorCreated(instance) {
-    onEditorCreated(instance, this.props, experienceStore => this.experienceStore = experienceStore, this.getExperienceStore, () => this.createAnalyticsEvent, this.editorActions, this.startTime, (view, dispatcher, transformerForActions) => this.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.
-   */
-  onEditorDestroyed(_instance) {
-    var _this$props$onDestroy, _this$props3;
-    this.unregisterEditorFromActions();
-    (_this$props$onDestroy = (_this$props3 = this.props).onDestroy) === null || _this$props$onDestroy === void 0 ? void 0 : _this$props$onDestroy.call(_this$props3);
-  }
-  /**
-   * @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.
-   */
-  registerEditorForActions(editorView, eventDispatcher, contentTransformer) {
-    this.editorActions._privateRegisterEditor(editorView, eventDispatcher, contentTransformer, this.getFeatureFlags);
-  }
-  /**
-   * @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.
-   */
-  unregisterEditorFromActions() {
-    this.editorActions._privateUnregisterEditor();
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "editorSessionId", uuid());
   }
   render() {
+    // 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,
@@ -225,28 +41,9 @@ export default class Editor extends React.Component {
         appearance: getAnalyticsAppearance(this.props.appearance),
         editorSessionId: this.editorSessionId
       }
-    }, jsx(WithCreateAnalyticsEvent, {
-      render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-        props: this.props,
-        handleAnalyticsEvent: this.handleAnalyticsEvent,
-        createAnalyticsEvent: this.createAnalyticsEvent,
-        preset: this.state.preset,
-        handleSave: this.handleSave,
-        editorActions: this.editorActions,
-        providerFactory: this.providerFactory,
-        onEditorCreated: this.onEditorCreated,
-        onEditorDestroyed: this.onEditorDestroyed
-      })
+    }, jsx(EditorNextWrapper, {
+      props: this.props
     }));
   }
 }
-/**
- * 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'));
+_defineProperty(Editor, "defaultProps", defaultProps);