@atlaskit/editor-core 180.0.0 → 181.0.0

package/dist/es2019/editor.js

@@ -1,119 +1,105 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /** @jsx jsx */
-import React, { Fragment } from 'react';
-import { css, jsx } from '@emotion/react';
+import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
-import memoizeOne from 'memoize-one';
-import uuid from 'uuid/v4';
-import { name, version } from './version-wrapper';
-import { combineExtensionProviders } from '@atlaskit/editor-common/extensions';
+import React from 'react';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { BaseTheme, WithCreateAnalyticsEvent, WidthProvider } from '@atlaskit/editor-common/ui';
-import { getAnalyticsAppearance, startMeasure, stopMeasure, clearMeasure, measureTTI, getTTISeverity } from '@atlaskit/editor-common/utils';
-import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
-import { akEditorFullPageDefaultFontSize } from '@atlaskit/editor-shared-styles';
+import { WithCreateAnalyticsEvent } from '@atlaskit/editor-common/ui';
+import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
+import { name, version } from './version-wrapper';
 import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { getUiComponent } from './create-editor';
+import uuid from 'uuid/v4';
 import EditorActions from './actions';
-import { ReactEditorView } from './create-editor';
-import EditorContext from './ui/EditorContext';
-import { PortalProviderWithThemeProviders, PortalRenderer } from './ui/PortalProvider';
-import { nextMajorVersion } from './version-wrapper';
-import { ContextAdapter } from './nodeviews/context-adapter';
-import measurements from './utils/performance/measure-enum';
+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 { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import prepareQuickInsertProvider from './utils/prepare-quick-insert-provider';
-import { fireAnalyticsEvent, EVENT_TYPE, ACTION_SUBJECT, ACTION } from './plugins/analytics';
-import ErrorBoundary from './create-editor/ErrorBoundary';
-import { createFeatureFlagsFromProps } from './create-editor/feature-flags-from-props';
-import { RenderTracking } from './utils/performance/components/RenderTracking';
-const fullHeight = css`
-  height: 100%;
-`;
+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';
 export default class Editor extends React.Component {
+  /**
+   * WARNING: Code should be shared between Editor + EditorNext
+   * If you are making changes that affect both, consider making them
+   * in editor-next/editor-internal.tsx or editor-next/editor-utils.ts
+   */
+
   constructor(props, context) {
     var _props$performanceTra, _props$performanceTra2, _props$featureFlags;
     super(props);
-    _defineProperty(this, "prepareExtensionProvider", memoizeOne(extensionProviders => {
-      if (!extensionProviders) {
-        return;
-      }
-      if (typeof extensionProviders === 'function') {
-        return combineExtensionProviders(extensionProviders(this.editorActions));
-      }
-      return combineExtensionProviders(extensionProviders);
-    }));
+    _defineProperty(this, "prepareExtensionProvider", prepareExtensionProvider(() => this.editorActions));
     _defineProperty(this, "prepareQuickInsertProvider", (extensionProvider, quickInsert) => {
       return prepareQuickInsertProvider(this.editorActions, extensionProvider, quickInsert, this.createAnalyticsEvent);
     });
     _defineProperty(this, "handleSave", view => {
-      if (!this.props.onSave) {
-        return;
-      }
-      return this.props.onSave(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);
     });
     _defineProperty(this, "handleAnalyticsEvent", data => fireAnalyticsEvent(this.createAnalyticsEvent)(data));
+    _defineProperty(this, "getExperienceStore", () => this.experienceStore);
     this.providerFactory = new ProviderFactory();
-    this.deprecationWarnings(props);
-    this.onEditorCreated = this.onEditorCreated.bind(this);
-    this.onEditorDestroyed = this.onEditorDestroyed.bind(this);
+    deprecationWarnings(props);
     this.editorActions = (context || {}).editorActions || new EditorActions();
-    this.trackEditorActions(this.editorActions, props);
     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$performanceTra5, _props$performanceTra6, _props$performanceTra7, _props$performanceTra8;
+      var _props$performanceTra3, _props$performanceTra4, _props$performanceTra5, _props$performanceTra6;
       measureTTI((tti, ttiFromInvocation, canceled) => {
-        var _props$performanceTra3, _props$performanceTra4, _props$featureFlags2;
-        if ((_props$performanceTra3 = props.performanceTracking) !== null && _props$performanceTra3 !== void 0 && (_props$performanceTra4 = _props$performanceTra3.ttiTracking) !== null && _props$performanceTra4 !== void 0 && _props$performanceTra4.enabled && this.createAnalyticsEvent) {
-          var _ttiTracking;
-          const ttiEvent = {
-            payload: {
-              action: ACTION.EDITOR_TTI,
-              actionSubject: ACTION_SUBJECT.EDITOR,
-              attributes: {
-                tti,
-                ttiFromInvocation,
-                canceled
-              },
-              eventType: EVENT_TYPE.OPERATIONAL
-            }
-          };
-          if ((_ttiTracking = props.performanceTracking.ttiTracking) !== null && _ttiTracking !== void 0 && _ttiTracking.trackSeverity) {
-            const {
-              ttiSeverityNormalThreshold,
-              ttiSeverityDegradedThreshold,
-              ttiFromInvocationSeverityNormalThreshold,
-              ttiFromInvocationSeverityDegradedThreshold
-            } = props.performanceTracking.ttiTracking;
-            const {
-              ttiSeverity,
-              ttiFromInvocationSeverity
-            } = getTTISeverity(tti, ttiFromInvocation, ttiSeverityNormalThreshold, ttiSeverityDegradedThreshold, ttiFromInvocationSeverityNormalThreshold, ttiFromInvocationSeverityDegradedThreshold);
-            ttiEvent.payload.attributes.ttiSeverity = ttiSeverity;
-            ttiEvent.payload.attributes.ttiFromInvocationSeverity = ttiFromInvocationSeverity;
-          }
-          fireAnalyticsEvent(this.createAnalyticsEvent)(ttiEvent);
-        }
-        if ((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.ufo) {
-          var _this$experienceStore, _this$experienceStore2;
-          (_this$experienceStore = this.experienceStore) === null || _this$experienceStore === void 0 ? void 0 : _this$experienceStore.mark(EditorExperience.loadEditor, ACTION.EDITOR_TTI, tti);
-          (_this$experienceStore2 = this.experienceStore) === null || _this$experienceStore2 === void 0 ? void 0 : _this$experienceStore2.success(EditorExperience.loadEditor);
-        }
-      }, (_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.ttiIdleThreshold, (_props$performanceTra7 = props.performanceTracking) === null || _props$performanceTra7 === void 0 ? void 0 : (_props$performanceTra8 = _props$performanceTra7.ttiTracking) === null || _props$performanceTra8 === void 0 ? void 0 : _props$performanceTra8.ttiCancelTimeout);
+        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
+      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, this.sendDurationAnalytics(ACTION.EDITOR_MOUNTED));
-    this.handleProviders(this.props);
+    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
@@ -127,21 +113,34 @@ export default class Editor extends React.Component {
       const quickInsertProvider = this.prepareQuickInsertProvider(extensionProvider, quickInsert);
       this.setState({
         extensionProvider,
-        quickInsertProvider
-      }, () => this.handleProviders(this.props));
+        quickInsertProvider,
+        preset
+      }, () => handleProviders(this.providerFactory, getProvidersFromEditorProps(this.props), this.state.extensionProvider, this.state.quickInsertProvider));
       return;
     }
-    this.handleProviders(this.props);
+    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$props, _this$props$performan, _this$props$performan2, _this$props$featureFl;
+    var _this$props2, _this$props2$performa, _this$props2$performa2, _this$props$featureFl;
     this.unregisterEditorFromActions();
     this.providerFactory.destroy();
     clearMeasure(measurements.EDITOR_MOUNTED);
-    ((_this$props = this.props) === null || _this$props === void 0 ? void 0 : (_this$props$performan = _this$props.performanceTracking) === null || _this$props$performan === void 0 ? void 0 : (_this$props$performan2 = _this$props$performan.onEditorReadyCallbackTracking) === null || _this$props$performan2 === void 0 ? void 0 : _this$props$performan2.enabled) && clearMeasure(measurements.ON_EDITOR_READY_CALLBACK);
+    ((_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$experienceStore3;
-      (_this$experienceStore3 = this.experienceStore) === null || _this$experienceStore3 === void 0 ? void 0 : _this$experienceStore3.abortAll({
+      var _this$experienceStore;
+      (_this$experienceStore = this.experienceStore) === null || _this$experienceStore === void 0 ? void 0 : _this$experienceStore.abortAll({
         reason: 'editor component unmounted'
       });
     }
@@ -154,72 +153,7 @@ export default class Editor extends React.Component {
    * and need to find a workaround.
    */
   trackEditorActions(editorActions, props) {
-    var _props$performanceTra9, _props$performanceTra10;
-    if (props !== null && props !== void 0 && (_props$performanceTra9 = props.performanceTracking) !== null && _props$performanceTra9 !== void 0 && (_props$performanceTra10 = _props$performanceTra9.contentRetrievalTracking) !== null && _props$performanceTra10 !== void 0 && _props$performanceTra10.enabled) {
-      const DEFAULT_SAMPLING_RATE = 100;
-      const getValue = editorActions.getValue.bind(editorActions);
-      if (!editorActions._contentRetrievalTracking) {
-        editorActions._contentRetrievalTracking = {
-          samplingCounters: {
-            success: 1,
-            failure: 1
-          },
-          getValueTracked: false
-        };
-      }
-      const {
-        _contentRetrievalTracking: {
-          samplingCounters,
-          getValueTracked
-        }
-      } = editorActions;
-      if (!getValueTracked) {
-        const getValueWithTracking = async () => {
-          try {
-            var _props$performanceTra11, _props$performanceTra12, _props$performanceTra13;
-            const value = await getValue();
-            if (samplingCounters.success === ((_props$performanceTra11 = props === null || props === void 0 ? void 0 : (_props$performanceTra12 = props.performanceTracking) === null || _props$performanceTra12 === void 0 ? void 0 : (_props$performanceTra13 = _props$performanceTra12.contentRetrievalTracking) === null || _props$performanceTra13 === void 0 ? void 0 : _props$performanceTra13.successSamplingRate) !== null && _props$performanceTra11 !== void 0 ? _props$performanceTra11 : DEFAULT_SAMPLING_RATE)) {
-              this.handleAnalyticsEvent({
-                payload: {
-                  action: ACTION.EDITOR_CONTENT_RETRIEVAL_PERFORMED,
-                  actionSubject: ACTION_SUBJECT.EDITOR,
-                  attributes: {
-                    success: true
-                  },
-                  eventType: EVENT_TYPE.OPERATIONAL
-                }
-              });
-              samplingCounters.success = 0;
-            }
-            samplingCounters.success++;
-            return value;
-          } catch (err) {
-            var _props$performanceTra14, _props$performanceTra15, _props$performanceTra16;
-            if (samplingCounters.failure === ((_props$performanceTra14 = props === null || props === void 0 ? void 0 : (_props$performanceTra15 = props.performanceTracking) === null || _props$performanceTra15 === void 0 ? void 0 : (_props$performanceTra16 = _props$performanceTra15.contentRetrievalTracking) === null || _props$performanceTra16 === void 0 ? void 0 : _props$performanceTra16.failureSamplingRate) !== null && _props$performanceTra14 !== void 0 ? _props$performanceTra14 : DEFAULT_SAMPLING_RATE)) {
-              var _props$performanceTra17, _props$performanceTra18;
-              this.handleAnalyticsEvent({
-                payload: {
-                  action: ACTION.EDITOR_CONTENT_RETRIEVAL_PERFORMED,
-                  actionSubject: ACTION_SUBJECT.EDITOR,
-                  attributes: {
-                    success: false,
-                    errorInfo: err.toString(),
-                    errorStack: props !== null && props !== void 0 && (_props$performanceTra17 = props.performanceTracking) !== null && _props$performanceTra17 !== void 0 && (_props$performanceTra18 = _props$performanceTra17.contentRetrievalTracking) !== null && _props$performanceTra18 !== void 0 && _props$performanceTra18.reportErrorStack ? err.stack : undefined
-                  },
-                  eventType: EVENT_TYPE.OPERATIONAL
-                }
-              });
-              samplingCounters.failure = 0;
-            }
-            samplingCounters.failure++;
-            throw err;
-          }
-        };
-        editorActions.getValue = getValueWithTracking;
-        editorActions._contentRetrievalTracking.getValueTracked = true;
-      }
-    }
-    return editorActions;
+    return trackEditorActions(editorActions, props.performanceTracking, value => this.handleAnalyticsEvent(value));
   }
 
   /**
@@ -236,85 +170,7 @@ export default class Editor extends React.Component {
    * and need to find a workaround.
    */
   onEditorCreated(instance) {
-    var _this$props$featureFl2;
-    this.registerEditorForActions(instance.view, instance.eventDispatcher, instance.transformer);
-    if ((_this$props$featureFl2 = this.props.featureFlags) !== null && _this$props$featureFl2 !== void 0 && _this$props$featureFl2.ufo) {
-      this.experienceStore = ExperienceStore.getInstance(instance.view);
-      this.experienceStore.start(EditorExperience.loadEditor, this.startTime);
-    }
-    if (this.props.onEditorReady) {
-      var _this$props2, _this$props2$performa, _this$props2$performa2, _this$props$featureFl3;
-      const measureEditorReady = ((_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) || ((_this$props$featureFl3 = this.props.featureFlags) === null || _this$props$featureFl3 === void 0 ? void 0 : _this$props$featureFl3.ufo);
-      measureEditorReady && startMeasure(measurements.ON_EDITOR_READY_CALLBACK);
-      this.props.onEditorReady(this.editorActions);
-      measureEditorReady && stopMeasure(measurements.ON_EDITOR_READY_CALLBACK, this.sendDurationAnalytics(ACTION.ON_EDITOR_READY_CALLBACK));
-    }
-  }
-  sendDurationAnalytics(action) {
-    return async (duration, startTime) => {
-      var _this$props$featureFl4;
-      const contextIdentifier = await this.props.contextIdentifierProvider;
-      const objectId = contextIdentifier === null || contextIdentifier === void 0 ? void 0 : contextIdentifier.objectId;
-      if (this.createAnalyticsEvent) {
-        fireAnalyticsEvent(this.createAnalyticsEvent)({
-          payload: {
-            action,
-            actionSubject: ACTION_SUBJECT.EDITOR,
-            attributes: {
-              duration,
-              startTime,
-              objectId
-            },
-            eventType: EVENT_TYPE.OPERATIONAL
-          }
-        });
-      }
-      if ((_this$props$featureFl4 = this.props.featureFlags) !== null && _this$props$featureFl4 !== void 0 && _this$props$featureFl4.ufo) {
-        var _this$experienceStore4, _this$experienceStore5;
-        (_this$experienceStore4 = this.experienceStore) === null || _this$experienceStore4 === void 0 ? void 0 : _this$experienceStore4.mark(EditorExperience.loadEditor, action, startTime + duration);
-        (_this$experienceStore5 = this.experienceStore) === null || _this$experienceStore5 === void 0 ? void 0 : _this$experienceStore5.addMetadata(EditorExperience.loadEditor, {
-          objectId
-        });
-      }
-    };
-  }
-  deprecationWarnings(props) {
-    var _props$allowTextColor;
-    if (process.env.NODE_ENV === 'production') {
-      return;
-    }
-    const nextVersion = nextMajorVersion();
-    const deprecatedProperties = {
-      allowTasksAndDecisions: {
-        message: 'To allow tasks and decisions use taskDecisionProvider – <Editor taskDecisionProvider={{ provider }} />',
-        type: 'removed'
-      },
-      allowConfluenceInlineComment: {
-        message: 'To integrate inline comments use experimental annotationProvider – <Editor annotationProviders={{ provider }} />',
-        type: 'removed'
-      },
-      smartLinks: {
-        message: 'To use smartLinks, pass the same object into the smartlinks key of linking - <Editor linking={{ smartLinks: {existing object} }}.',
-        type: 'removed'
-      }
-    };
-    Object.keys(deprecatedProperties).forEach(property => {
-      if (props.hasOwnProperty(property)) {
-        const meta = deprecatedProperties[property];
-        const type = meta.type || 'enabled by default';
-
-        // eslint-disable-next-line no-console
-        console.warn(`${property} property is deprecated. ${meta.message || ''} [Will be ${type} in editor-core@${nextVersion}]`);
-      }
-    });
-    if (props.hasOwnProperty('allowTables') && typeof props.allowTables !== 'boolean' && (!props.allowTables || !props.allowTables.advanced)) {
-      // eslint-disable-next-line no-console
-      console.warn(`Advanced table options are deprecated (except isHeaderRowRequired) to continue using advanced table features use - <Editor allowTables={{ advanced: true }} /> [Will be changed in editor-core@${nextVersion}]`);
-    }
-    if (props.hasOwnProperty('allowTextColor') && typeof props.allowTextColor !== 'boolean' && (props === null || props === void 0 ? void 0 : (_props$allowTextColor = props.allowTextColor) === null || _props$allowTextColor === void 0 ? void 0 : _props$allowTextColor.allowMoreTextColors) !== undefined) {
-      // eslint-disable-next-line no-console
-      console.warn(`"allowMoreTextColors" field of "allowTextColor" property is deprecated. It will be removedin editor-core@${nextVersion}. The color palette now shows more colors by default.`);
-    }
+    onEditorCreated(instance, this.props, experienceStore => this.experienceStore = experienceStore, this.getExperienceStore, () => this.createAnalyticsEvent, this.editorActions, this.startTime, (view, dispatcher, transformerForActions) => this.registerEditorForActions(view, dispatcher, transformerForActions));
   }
 
   /**
@@ -324,69 +180,27 @@ export default class Editor extends React.Component {
    * and need to find a workaround.
    */
   onEditorDestroyed(_instance) {
+    var _this$props$onDestroy, _this$props3;
     this.unregisterEditorFromActions();
-    if (this.props.onDestroy) {
-      this.props.onDestroy();
-    }
+    (_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.
+   */
+
+  /**
+   * @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);
   }
-  unregisterEditorFromActions() {
-    if (this.editorActions) {
-      this.editorActions._privateUnregisterEditor();
-    }
-  }
-  handleProviders(props) {
-    var _linking$smartLinks;
-    const {
-      emojiProvider,
-      mentionProvider,
-      taskDecisionProvider,
-      contextIdentifierProvider,
-      collabEditProvider,
-      activityProvider,
-      presenceProvider,
-      macroProvider,
-      legacyImageUploadProvider,
-      media,
-      collabEdit,
-      autoformattingProvider,
-      searchProvider,
-      UNSAFE_cards,
-      smartLinks,
-      linking
-    } = props;
-    const {
-      extensionProvider,
-      quickInsertProvider
-    } = this.state;
-    this.providerFactory.setProvider('emojiProvider', emojiProvider);
-    this.providerFactory.setProvider('mentionProvider', mentionProvider);
-    this.providerFactory.setProvider('taskDecisionProvider', taskDecisionProvider);
-    this.providerFactory.setProvider('contextIdentifierProvider', contextIdentifierProvider);
-    this.providerFactory.setProvider('mediaProvider', media && media.provider);
-    this.providerFactory.setProvider('imageUploadProvider', legacyImageUploadProvider);
-    this.providerFactory.setProvider('collabEditProvider', collabEdit && collabEdit.provider ? collabEdit.provider : collabEditProvider);
-    this.providerFactory.setProvider('activityProvider', activityProvider);
-    this.providerFactory.setProvider('searchProvider', searchProvider);
-    this.providerFactory.setProvider('presenceProvider', presenceProvider);
-    this.providerFactory.setProvider('macroProvider', macroProvider);
-    const 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) {
-      this.providerFactory.setProvider('cardProvider', cardProvider);
-    }
-    this.providerFactory.setProvider('autoformattingProvider', autoformattingProvider);
-    if (extensionProvider) {
-      this.providerFactory.setProvider('extensionProvider', Promise.resolve(extensionProvider));
-    }
-    if (quickInsertProvider) {
-      this.providerFactory.setProvider('quickInsertProvider', quickInsertProvider);
-    }
-  }
-  getBaseFontSize() {
-    return !['comment', 'chromeless', 'mobile'].includes(this.props.appearance) ? akEditorFullPageDefaultFontSize : undefined;
-  }
 
   /**
    * @private
@@ -394,20 +208,10 @@ export default class Editor extends React.Component {
    * Please reach out to the Editor team if you were previously using this
    * and need to find a workaround.
    */
-
+  unregisterEditorFromActions() {
+    this.editorActions._privateUnregisterEditor();
+  }
   render() {
-    var _this$props$performan3, _this$props$performan4;
-    const Component = getUiComponent(this.props.appearance);
-    const overriddenEditorProps = {
-      ...this.props,
-      onSave: this.props.onSave ? this.handleSave : undefined,
-      // noop all analytic events, even if a handler is still passed.
-      analyticsHandler: undefined
-    };
-    const featureFlags = createFeatureFlagsFromProps(this.props);
-    const renderTracking = (_this$props$performan3 = this.props.performanceTracking) === null || _this$props$performan3 === void 0 ? void 0 : (_this$props$performan4 = _this$props$performan3.renderTracking) === null || _this$props$performan4 === void 0 ? void 0 : _this$props$performan4.editor;
-    const renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
-    const useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
     return jsx(FabricEditorAnalyticsContext, {
       data: {
         packageName: name,
@@ -417,102 +221,22 @@ export default class Editor extends React.Component {
         editorSessionId: this.editorSessionId
       }
     }, jsx(WithCreateAnalyticsEvent, {
-      render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(Fragment, null, renderTrackingEnabled && jsx(RenderTracking, {
-        componentProps: this.props,
-        action: ACTION.RE_RENDERED,
-        actionSubject: ACTION_SUBJECT.EDITOR,
+      render: createAnalyticsEvent => (this.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
+        props: this.props,
         handleAnalyticsEvent: this.handleAnalyticsEvent,
-        propsToIgnore: ['defaultValue'],
-        useShallow: useShallow
-      }), jsx(ErrorBoundary, {
-        createAnalyticsEvent: createAnalyticsEvent,
-        contextIdentifierProvider: this.props.contextIdentifierProvider
-      }, jsx(WidthProvider, {
-        css: fullHeight
-      }, jsx(EditorContext, {
-        editorActions: this.editorActions
-      }, jsx(ContextAdapter, null, jsx(PortalProviderWithThemeProviders, {
-        onAnalyticsEvent: this.handleAnalyticsEvent,
-        useAnalyticsContext: this.props.UNSAFE_useAnalyticsContext,
-        render: portalProviderAPI => jsx(Fragment, null, jsx(ReactEditorView, {
-          editorProps: overriddenEditorProps,
-          createAnalyticsEvent: createAnalyticsEvent,
-          portalProviderAPI: portalProviderAPI,
-          providerFactory: this.providerFactory,
-          onEditorCreated: this.onEditorCreated,
-          onEditorDestroyed: this.onEditorDestroyed,
-          allowAnalyticsGASV3: this.props.allowAnalyticsGASV3,
-          disabled: this.props.disabled,
-          render: ({
-            editor,
-            view,
-            eventDispatcher,
-            config,
-            dispatchAnalyticsEvent,
-            editorRef
-          }) => {
-            var _this$props$featureFl5, _this$props$featureFl6;
-            return jsx(BaseTheme, {
-              baseFontSize: this.getBaseFontSize()
-            }, jsx(Component, {
-              innerRef: editorRef,
-              appearance: this.props.appearance,
-              disabled: this.props.disabled,
-              editorActions: this.editorActions,
-              editorDOMElement: editor,
-              editorView: view,
-              providerFactory: this.providerFactory,
-              eventDispatcher: eventDispatcher,
-              dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-              maxHeight: this.props.maxHeight,
-              minHeight: this.props.minHeight,
-              onSave: this.props.onSave ? this.handleSave : undefined,
-              onCancel: this.props.onCancel,
-              popupsMountPoint: this.props.popupsMountPoint,
-              popupsBoundariesElement: this.props.popupsBoundariesElement,
-              popupsScrollableElement: this.props.popupsScrollableElement,
-              contentComponents: config.contentComponents,
-              primaryToolbarComponents: config.primaryToolbarComponents,
-              primaryToolbarIconBefore: this.props.primaryToolbarIconBefore,
-              secondaryToolbarComponents: config.secondaryToolbarComponents,
-              insertMenuItems: this.props.insertMenuItems,
-              customContentComponents: this.props.contentComponents,
-              customPrimaryToolbarComponents: this.props.primaryToolbarComponents,
-              customSecondaryToolbarComponents: this.props.secondaryToolbarComponents,
-              contextPanel: this.props.contextPanel,
-              collabEdit: this.props.collabEdit,
-              persistScrollGutter: this.props.persistScrollGutter,
-              enableToolbarMinWidth: ((_this$props$featureFl5 = this.props.featureFlags) === null || _this$props$featureFl5 === void 0 ? void 0 : _this$props$featureFl5.toolbarMinWidthOverflow) != null ? !!((_this$props$featureFl6 = this.props.featureFlags) !== null && _this$props$featureFl6 !== void 0 && _this$props$featureFl6.toolbarMinWidthOverflow) : this.props.allowUndoRedoButtons,
-              useStickyToolbar: this.props.useStickyToolbar,
-              featureFlags: featureFlags
-            }));
-          }
-        }), jsx(PortalRenderer, {
-          portalProviderAPI: portalProviderAPI
-        }))
-      }))))))
+        createAnalyticsEvent: this.createAnalyticsEvent,
+        preset: this.state.preset,
+        handleSave: this.handleSave,
+        editorActions: this.editorActions,
+        providerFactory: this.providerFactory,
+        onEditorCreated: this.onEditorCreated,
+        onEditorDestroyed: this.onEditorDestroyed
+      })
     }));
   }
 }
-_defineProperty(Editor, "defaultProps", {
-  appearance: 'comment',
-  disabled: false,
-  extensionHandlers: {},
-  allowHelpDialog: true,
-  allowNewInsertionBehaviour: true,
-  quickInsert: true
-});
-_defineProperty(Editor, "propTypes", {
-  minHeight: ({
-    appearance,
-    minHeight
-  }) => {
-    if (minHeight && appearance && !['comment', 'chromeless'].includes(appearance)) {
-      return new Error('minHeight only supports editor appearance chromeless and comment');
-    }
-    return null;
-  }
-});
+_defineProperty(Editor, "defaultProps", defaultProps);
 _defineProperty(Editor, "contextTypes", {
   editorActions: PropTypes.object
-});
+});
+_defineProperty(Editor, "propTypes", propTypes('minHeight only supports editor appearance chromeless and comment for Editor'));

package/dist/es2019/index.js

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

package/dist/es2019/keymaps/consts.js

@@ -1,12 +1,8 @@
-export const LEFT = 37;
-export const RIGHT = 39;
-export const UP = 38;
-export const DOWN = 40;
-export const KEY_0 = 48;
-export const KEY_1 = 49;
-export const KEY_2 = 50;
-export const KEY_3 = 51;
-export const KEY_4 = 52;
-export const KEY_5 = 53;
-export const KEY_6 = 54;
+const KEY_0 = 48;
+const KEY_1 = 49;
+const KEY_2 = 50;
+const KEY_3 = 51;
+const KEY_4 = 52;
+const KEY_5 = 53;
+const KEY_6 = 54;
 export const HEADING_KEYS = [KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6];

package/dist/es2019/labs/next/internal/hooks/use-analytics/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { fireAnalyticsEvent } from '../../../../../plugins/analytics';
-import { analyticsEventKey } from '../../../../../plugins/analytics/consts';
+import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { analyticsEventKey } from '@atlaskit/editor-common/utils';
 
 /**
  * Subscribes to analytics events fired from editor components