@atlaskit/editor-core 187.4.11 → 187.5.0

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

@@ -1,139 +1,116 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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 = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /** @jsx jsx */
-import React from 'react';
+import { useRef } from 'react';
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
 import uuid from 'uuid/v4';
 import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import { WithCreateAnalyticsEvent } from '@atlaskit/editor-common/ui';
-import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
+import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
+import { getAnalyticsAppearance, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
+import { basePlugin } from '../plugins';
 import EditorActions from '../actions';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
-import { basePlugin } from '../plugins';
 import { name, version } from '../version-wrapper';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next';
+import { useConstructor } from '@atlaskit/editor-common/hooks';
+import { useEditorContext } from '../ui/EditorContext';
+import measurements from '../utils/performance/measure-enum';
 import EditorInternal from './editor-internal';
 import deprecationWarnings from './utils/deprecationWarnings';
-import { propTypes } from './utils/editorPropTypes';
-import _onEditorCreated from './utils/onEditorCreated';
+import sendDurationAnalytics from './utils/sendDurationAnalytics';
 import trackEditorActions from './utils/trackEditorActions';
-var EditorNext = /*#__PURE__*/function (_React$Component) {
-  _inherits(EditorNext, _React$Component);
-  var _super = _createSuper(EditorNext);
-  function EditorNext(props, context) {
-    var _this;
-    _classCallCheck(this, EditorNext);
-    _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "handleSave", function (view) {
-      var _this$props$onSave, _this$props;
-      return (_this$props$onSave = (_this$props = _this.props).onSave) === null || _this$props$onSave === void 0 ? void 0 : _this$props$onSave.call(_this$props, view);
-    });
-    _defineProperty(_assertThisInitialized(_this), "handleAnalyticsEvent", function (data) {
-      return fireAnalyticsEvent(_this.createAnalyticsEvent)(data);
-    });
-    _defineProperty(_assertThisInitialized(_this), "getFeatureFlags", function () {
-      return createFeatureFlagsFromProps(_this.props);
-    });
-    _defineProperty(_assertThisInitialized(_this), "getExperienceStore", function () {
-      return _this.experienceStore;
-    });
+export function Editor(passedProps) {
+  var _editorContext$editor;
+  var defaultProps = {
+    appearance: 'comment',
+    disabled: false,
+    quickInsert: true
+  };
+  var props = _objectSpread(_objectSpread({}, defaultProps), passedProps);
+  var editorContext = useEditorContext();
+  var editorActions = useRef((_editorContext$editor = editorContext === null || editorContext === void 0 ? void 0 : editorContext.editorActions) !== null && _editorContext$editor !== void 0 ? _editorContext$editor : new EditorActions());
+  var startTime = useRef(performance.now());
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  var experienceStore = useRef();
+  var handleAnalyticsEvent = function handleAnalyticsEvent(data) {
+    return fireAnalyticsEvent(createAnalyticsEvent)(data);
+  };
+  useConstructor(function () {
     deprecationWarnings(props);
-    _this.editorActions = (context || {}).editorActions || new EditorActions();
-    _this.editorSessionId = uuid();
-    _this.startTime = performance.now();
-    _this.onEditorCreated = _this.onEditorCreated.bind(_assertThisInitialized(_this));
-    _this.onEditorDestroyed = _this.onEditorDestroyed.bind(_assertThisInitialized(_this));
-    _this.getExperienceStore = _this.getExperienceStore.bind(_assertThisInitialized(_this));
-    trackEditorActions(_this.editorActions, props.performanceTracking, function (value) {
-      return _this.handleAnalyticsEvent(value);
+    trackEditorActions(editorActions.current, props.performanceTracking, function (value) {
+      return handleAnalyticsEvent(value);
     });
-    return _this;
-  }
-  _createClass(EditorNext, [{
-    key: "onEditorCreated",
-    value: function onEditorCreated(instance) {
-      var _this2 = this;
-      _onEditorCreated(instance, this.props, function (experienceStore) {
-        return _this2.experienceStore = experienceStore;
-      }, this.getExperienceStore, function () {
-        return _this2.createAnalyticsEvent;
-      }, this.editorActions, this.startTime, function (view, dispatcher, transformerForActions) {
-        return _this2.registerEditorForActions(view, dispatcher, transformerForActions);
-      });
-    }
-  }, {
-    key: "onEditorDestroyed",
-    value: function onEditorDestroyed(_instance) {
-      var _this$props$onDestroy, _this$props2;
-      this.unregisterEditorFromActions();
-      (_this$props$onDestroy = (_this$props2 = this.props).onDestroy) === null || _this$props$onDestroy === void 0 ? void 0 : _this$props$onDestroy.call(_this$props2);
+  });
+  var getExperienceStore = function getExperienceStore() {
+    return experienceStore.current;
+  };
+  var onEditorCreated = function onEditorCreated(instance) {
+    var _props$featureFlags;
+    editorActions.current._privateRegisterEditor(instance.view, instance.eventDispatcher, instance.transformer, function () {
+      return createFeatureFlagsFromProps(props);
+    });
+    if ((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.ufo) {
+      var _experienceStore$curr;
+      experienceStore.current = ExperienceStore.getInstance(instance.view);
+      (_experienceStore$curr = experienceStore.current) === null || _experienceStore$curr === void 0 ? void 0 : _experienceStore$curr.start(EditorExperience.loadEditor, startTime.current);
     }
-  }, {
-    key: "registerEditorForActions",
-    value: function registerEditorForActions(editorView, eventDispatcher, contentTransformer) {
-      this.editorActions._privateRegisterEditor(editorView, eventDispatcher, contentTransformer, this.getFeatureFlags);
+    if (props.onEditorReady) {
+      var _props$performanceTra, _props$performanceTra2, _props$featureFlags2;
+      var measureEditorReady = (props === null || props === void 0 ? void 0 : (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : (_props$performanceTra2 = _props$performanceTra.onEditorReadyCallbackTracking) === null || _props$performanceTra2 === void 0 ? void 0 : _props$performanceTra2.enabled) || ((_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.ufo);
+      measureEditorReady && startMeasure(measurements.ON_EDITOR_READY_CALLBACK);
+      props.onEditorReady(editorActions.current);
+      measureEditorReady && stopMeasure(measurements.ON_EDITOR_READY_CALLBACK, sendDurationAnalytics(ACTION.ON_EDITOR_READY_CALLBACK, props, getExperienceStore, createAnalyticsEvent));
     }
-  }, {
-    key: "unregisterEditorFromActions",
-    value: function unregisterEditorFromActions() {
-      this.editorActions._privateUnregisterEditor();
+  };
+  var onEditorDestroyed = function onEditorDestroyed(_instance) {
+    var _props$onDestroy;
+    editorActions.current._privateUnregisterEditor();
+    (_props$onDestroy = props.onDestroy) === null || _props$onDestroy === void 0 ? void 0 : _props$onDestroy.call(props);
+  };
+  return jsx(EditorInternal, {
+    props: props,
+    handleAnalyticsEvent: handleAnalyticsEvent,
+    createAnalyticsEvent: createAnalyticsEvent,
+    preset: props.preset,
+    handleSave: function handleSave(view) {
+      var _props$onSave;
+      return (_props$onSave = props.onSave) === null || _props$onSave === void 0 ? void 0 : _props$onSave.call(props, view);
+    },
+    editorActions: editorActions.current,
+    getExperienceStore: getExperienceStore,
+    onEditorCreated: onEditorCreated,
+    onEditorDestroyed: onEditorDestroyed
+  });
+}
+export default function EditorNext(props) {
+  var editorSessionId = useRef(uuid());
+  return jsx(FabricEditorAnalyticsContext, {
+    data: {
+      packageName: name,
+      packageVersion: version,
+      componentName: 'editorCore',
+      appearance: getAnalyticsAppearance(props.appearance),
+      editorSessionId: editorSessionId.current
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this3 = this;
-      return jsx(FabricEditorAnalyticsContext, {
-        data: {
-          packageName: name,
-          packageVersion: version,
-          componentName: 'editorCore',
-          appearance: getAnalyticsAppearance(this.props.appearance),
-          editorSessionId: this.editorSessionId
-        }
-      }, jsx(WithCreateAnalyticsEvent, {
-        render: function render(createAnalyticsEvent) {
-          return (_this3.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-            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
-          });
-        }
-      }));
+  }, jsx(Editor, props));
+}
+EditorNext.propTypes = {
+  minHeight: function minHeight(_ref) {
+    var appearance = _ref.appearance,
+      _minHeight = _ref.minHeight;
+    if (_minHeight && appearance && !['comment', 'chromeless'].includes(appearance)) {
+      return new Error('minHeight only supports editor appearance chromeless and comment for Editor');
     }
-  }]);
-  return EditorNext;
-}(React.Component);
-_defineProperty(EditorNext, "defaultProps", {
-  appearance: 'comment',
-  disabled: false,
-  quickInsert: true
-});
-_defineProperty(EditorNext, "contextTypes", {
-  editorActions: PropTypes.object
-});
-_defineProperty(EditorNext, "propTypes", _objectSpread(_objectSpread({}, propTypes('minHeight only supports editor appearance chromeless and comment for EditorNext')), {}, {
-  preset: function preset(_ref) {
-    var _preset = _ref.preset;
+    return null;
+  },
+  preset: function preset(_ref2) {
+    var _preset = _ref2.preset;
     if (!_preset.has(basePlugin)) {
       return new Error('Presets must contain the base plugin');
     }
     return null;
   }
-}));
-export { EditorNext as default };
+};

package/dist/esm/editor.js

@@ -10,7 +10,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /** @jsx jsx */
 import React from 'react';
 import { jsx } from '@emotion/react';
-import { defaultProps } from './editor-next/utils/editorPropTypes';
 import EditorNext from './editor-next';
 import useUniversalPreset from './labs/next/presets/useUniversalPreset';
 var EditorNextWrapper = function EditorNextWrapper(_ref) {
@@ -39,5 +38,12 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   }]);
   return Editor;
 }(React.Component);
-_defineProperty(Editor, "defaultProps", defaultProps);
+_defineProperty(Editor, "defaultProps", {
+  appearance: 'comment',
+  disabled: false,
+  extensionHandlers: {},
+  allowHelpDialog: true,
+  allowNewInsertionBehaviour: true,
+  quickInsert: true
+});
 export { Editor as default };

package/dist/esm/ui/CollapsedEditor/index.js

@@ -34,7 +34,7 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
   _createClass(CollapsedEditor, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
-      if (this.props.isExpanded && this.editorComponent && (!this.previouslyExpanded || this.previouslyExpanded === undefined)) {
+      if (this.props.isExpanded && (this.editorComponent || this.functionalEditor) && (!this.previouslyExpanded || this.previouslyExpanded === undefined)) {
         var _this$props$onExpand, _this$props;
         (_this$props$onExpand = (_this$props = this.props).onExpand) === null || _this$props$onExpand === void 0 ? void 0 : _this$props$onExpand.call(_this$props);
       }
@@ -48,12 +48,18 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
       if (child.type !== Editor && child.type !== EditorWithActions && child.type !== EditorNext) {
         throw new Error('Expected child to be of type `Editor`');
       }
+      this.functionalEditor = child.type === EditorNext;
       if (!this.props.isExpanded) {
         return /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(ChromeCollapsed, {
           onFocus: this.props.onFocus,
           text: this.props.placeholder
         }));
       }
+
+      // Let's avoid ref logic for functional Editor
+      if (this.functionalEditor) {
+        return child;
+      }
       return /*#__PURE__*/React.cloneElement(child, {
         ref: function ref(editorComponent) {
           return _this2.handleEditorRef(editorComponent, child.ref);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.4.11";
+export var version = "187.5.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

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

package/dist/types/editor-next/editor-internal.d.ts

@@ -1,14 +1,14 @@
 import { jsx } from '@emotion/react';
-import { EditorView } from 'prosemirror-view';
-import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
-import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type { EditorView } from 'prosemirror-view';
+import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
+import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
+import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { AllEditorPresetPluginTypes, Transformer } from '@atlaskit/editor-common/types';
-import { ExperienceStore } from '@atlaskit/editor-common/ufo';
-import EditorActions from '../actions';
-import { EventDispatcher } from '../event-dispatcher';
-import { EditorNextProps, EditorProps } from '../types/editor-props';
+import type { ExperienceStore } from '@atlaskit/editor-common/ufo';
+import type EditorActions from '../actions';
+import type { EventDispatcher } from '../event-dispatcher';
+import type { EditorNextProps, EditorProps } from '../types/editor-props';
 interface Props<PropsType> {
     props: PropsType;
     handleAnalyticsEvent: FireAnalyticsCallback;

package/dist/types/editor-next/index.d.ts

@@ -1,35 +1,11 @@
-/** @jsx jsx */
-import React from 'react';
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
-import { EditorNextProps } from '../types/editor-props';
-import { Context } from './utils/editorPropTypes';
-export default class EditorNext extends React.Component<EditorNextProps> {
-    static defaultProps: {
-        appearance: string;
-        disabled: boolean;
-        quickInsert: boolean;
+import type { EditorNextProps } from '../types/editor-props';
+export declare function Editor(passedProps: EditorNextProps): jsx.JSX.Element;
+declare function EditorNext(props: EditorNextProps): jsx.JSX.Element;
+declare namespace EditorNext {
+    var propTypes: {
+        minHeight: ({ appearance, minHeight, }: Pick<EditorNextProps, "appearance" | "minHeight">) => Error | null;
+        preset: ({ preset }: Pick<EditorNextProps, "preset">) => Error | null;
     };
-    static contextTypes: {
-        editorActions: PropTypes.Requireable<object>;
-    };
-    static propTypes: {
-        preset: ({ preset }: Pick<EditorNextProps, 'preset'>) => Error | null;
-        minHeight: ({ appearance, minHeight, }: Pick<import("../types/editor-props").EditorProps, "appearance" | "minHeight">) => Error | null;
-    };
-    private editorActions;
-    private createAnalyticsEvent?;
-    private editorSessionId;
-    private experienceStore?;
-    private startTime?;
-    constructor(props: EditorNextProps, context: Context);
-    private onEditorCreated;
-    private onEditorDestroyed;
-    private handleSave;
-    private handleAnalyticsEvent;
-    private registerEditorForActions;
-    private getFeatureFlags;
-    private unregisterEditorFromActions;
-    private getExperienceStore;
-    render(): jsx.JSX.Element;
 }
+export default EditorNext;

package/dist/types/editor.d.ts

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import React from 'react';
 import { jsx } from '@emotion/react';
-import { EditorProps } from './types/editor-props';
+import type { EditorProps } from './types/editor-props';
 export type { AllowedBlockTypes, Command, CommandDispatch, DomAtPos, EditorAppearance, EditorAppearanceComponentProps, EditorConfig, EditorInstance, EditorPlugin, EditorProps, ExtensionConfig, ExtensionProvidersProp, FeedbackInfo, MarkConfig, MessageDescriptor, NodeConfig, NodeViewConfig, PluginsOptions, PMPlugin, PMPluginCreateConfig, PMPluginFactory, PMPluginFactoryParams, ReactComponents, ToolbarUIComponentFactory, ToolbarUiComponentFactoryParams, UIComponentFactory, UiComponentFactoryParams, } from './types';
 export default class Editor extends React.Component<EditorProps> {
     static defaultProps: EditorProps;

package/dist/types/types/editor-props.d.ts

@@ -1,39 +1,39 @@
-import { ReactElement, RefObject } from 'react';
-import { Node, Schema } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
-import { ActivityProvider } from '@atlaskit/activity-provider';
-import { CardOptions } from '@atlaskit/editor-common/card';
+import type { ReactElement, RefObject } from 'react';
+import type { Node, Schema } from 'prosemirror-model';
+import type { EditorView } from 'prosemirror-view';
+import type { ActivityProvider } from '@atlaskit/activity-provider';
+import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { ExtensionHandlers, ExtensionProvider } from '@atlaskit/editor-common/extensions';
-import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
+import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import type { ContextIdentifierProvider, Providers, SearchProvider } from '@atlaskit/editor-common/provider-factory';
 import type { AllEditorPresetPluginTypes, Transformer } from '@atlaskit/editor-common/types';
 import type { LinkingOptions } from '@atlaskit/editor-common/types';
 import type { ErrorReportingHandler } from '@atlaskit/editor-common/utils';
-import { PluginConfig as TablesPluginConfig } from '@atlaskit/editor-plugin-table/types';
-import { MentionProvider } from '@atlaskit/mention/resource';
-import { TaskDecisionProvider } from '@atlaskit/task-decision';
-import EditorActions from '../actions';
-import { AnnotationProviders } from '../plugins/annotation/types';
-import { BlockTypePluginOptions } from '../plugins/block-type/types';
-import { CodeBlockOptions } from '../plugins/code-block/types';
-import { CollabEditOptions } from '../plugins/collab-edit/types';
-import { DatePluginConfig } from '../plugins/date/types';
-import { FindReplaceOptions } from '../plugins/find-replace/types';
-import { LayoutPluginOptions } from '../plugins/layout/types';
-import { MediaOptions, MediaState } from '../plugins/media/types';
-import { MentionPluginConfig } from '../plugins/mentions/types';
-import { PanelPluginConfig } from '../plugins/panel/types';
-import { PlaceholderTextOptions } from '../plugins/placeholder-text/types';
-import { QuickInsertOptions } from '../plugins/quick-insert/types';
-import { TextColorPluginConfig } from '../plugins/text-color/pm-plugins/main';
-import { TextFormattingOptions } from '../plugins/text-formatting/types';
-import { MenuItem } from '../ui/DropdownMenu/types';
-import { EditorAppearance } from './editor-appearance';
-import { EditorOnChangeHandler } from './editor-onchange';
-import { EditorPlugin } from './editor-plugin';
-import { EmptyStateHandler } from './empty-state-handler';
-import { ExtensionConfig } from './extension-config';
-import { PerformanceTracking } from './performance-tracking';
+import type { PluginConfig as TablesPluginConfig } from '@atlaskit/editor-plugin-table/types';
+import type { MentionProvider } from '@atlaskit/mention/resource';
+import type { TaskDecisionProvider } from '@atlaskit/task-decision';
+import type EditorActions from '../actions';
+import type { AnnotationProviders } from '../plugins/annotation/types';
+import type { BlockTypePluginOptions } from '../plugins/block-type/types';
+import type { CodeBlockOptions } from '../plugins/code-block/types';
+import type { CollabEditOptions } from '../plugins/collab-edit/types';
+import type { DatePluginConfig } from '../plugins/date/types';
+import type { FindReplaceOptions } from '../plugins/find-replace/types';
+import type { LayoutPluginOptions } from '../plugins/layout/types';
+import type { MediaOptions, MediaState } from '../plugins/media/types';
+import type { MentionPluginConfig } from '../plugins/mentions/types';
+import type { PanelPluginConfig } from '../plugins/panel/types';
+import type { PlaceholderTextOptions } from '../plugins/placeholder-text/types';
+import type { QuickInsertOptions } from '../plugins/quick-insert/types';
+import type { TextColorPluginConfig } from '../plugins/text-color/pm-plugins/main';
+import type { TextFormattingOptions } from '../plugins/text-formatting/types';
+import type { MenuItem } from '../ui/DropdownMenu/types';
+import type { EditorAppearance } from './editor-appearance';
+import type { EditorOnChangeHandler } from './editor-onchange';
+import type { EditorPlugin } from './editor-plugin';
+import type { EmptyStateHandler } from './empty-state-handler';
+import type { ExtensionConfig } from './extension-config';
+import type { PerformanceTracking } from './performance-tracking';
 export type ReactComponents = ReactElement<any> | ReactElement<any>[];
 type ExtensionProviders = (ExtensionProvider | Promise<ExtensionProvider>)[];
 type ExtensionProvidersWithEditorAction = (editorActions?: EditorActions) => ExtensionProviders;
@@ -153,7 +153,6 @@ export interface EditorSharedPropsWithPlugins {
     insertMenuItems?: MenuItem[];
     primaryToolbarComponents?: PrimaryToolbarComponents;
     allowUndoRedoButtons?: boolean;
-    allowTextColor?: boolean | TextColorPluginConfig;
     allowTables?: boolean | TablesPluginConfig;
     /** @deprecated Use smartLinks instead. */
     UNSAFE_cards?: CardOptions;
@@ -256,5 +255,6 @@ export interface EditorPluginFeatureProps {
     uploadErrorHandler?: (state: MediaState) => void;
     waitForMediaUpload?: boolean;
     extensionHandlers?: ExtensionHandlers;
+    allowTextColor?: boolean | TextColorPluginConfig;
 }
 export {};

package/dist/types/ui/CollapsedEditor/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import Editor from '../../editor';
-import EditorNext from '../../editor-next';
 export interface Props {
     placeholder?: string;
     children?: any;
@@ -11,9 +10,10 @@ export interface Props {
 export interface State {
 }
 export default class CollapsedEditor extends React.Component<Props, State> {
-    editorComponent?: Editor | EditorNext;
+    editorComponent?: Editor;
     previouslyExpanded?: boolean;
+    functionalEditor?: boolean;
     componentDidUpdate(): void;
     handleEditorRef: (editorRef?: Editor, editorRefCallback?: any) => void;
-    render(): JSX.Element;
+    render(): any;
 }

package/dist/types-ts4.5/editor-next/editor-internal.d.ts

@@ -1,14 +1,14 @@
 import { jsx } from '@emotion/react';
-import { EditorView } from 'prosemirror-view';
-import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
-import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type { EditorView } from 'prosemirror-view';
+import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
+import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
+import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { AllEditorPresetPluginTypes, Transformer } from '@atlaskit/editor-common/types';
-import { ExperienceStore } from '@atlaskit/editor-common/ufo';
-import EditorActions from '../actions';
-import { EventDispatcher } from '../event-dispatcher';
-import { EditorNextProps, EditorProps } from '../types/editor-props';
+import type { ExperienceStore } from '@atlaskit/editor-common/ufo';
+import type EditorActions from '../actions';
+import type { EventDispatcher } from '../event-dispatcher';
+import type { EditorNextProps, EditorProps } from '../types/editor-props';
 interface Props<PropsType> {
     props: PropsType;
     handleAnalyticsEvent: FireAnalyticsCallback;

package/dist/types-ts4.5/editor-next/index.d.ts

@@ -1,35 +1,11 @@
-/** @jsx jsx */
-import React from 'react';
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
-import { EditorNextProps } from '../types/editor-props';
-import { Context } from './utils/editorPropTypes';
-export default class EditorNext extends React.Component<EditorNextProps> {
-    static defaultProps: {
-        appearance: string;
-        disabled: boolean;
-        quickInsert: boolean;
+import type { EditorNextProps } from '../types/editor-props';
+export declare function Editor(passedProps: EditorNextProps): jsx.JSX.Element;
+declare function EditorNext(props: EditorNextProps): jsx.JSX.Element;
+declare namespace EditorNext {
+    var propTypes: {
+        minHeight: ({ appearance, minHeight, }: Pick<EditorNextProps, "appearance" | "minHeight">) => Error | null;
+        preset: ({ preset }: Pick<EditorNextProps, "preset">) => Error | null;
     };
-    static contextTypes: {
-        editorActions: PropTypes.Requireable<object>;
-    };
-    static propTypes: {
-        preset: ({ preset }: Pick<EditorNextProps, 'preset'>) => Error | null;
-        minHeight: ({ appearance, minHeight, }: Pick<import("../types/editor-props").EditorProps, "appearance" | "minHeight">) => Error | null;
-    };
-    private editorActions;
-    private createAnalyticsEvent?;
-    private editorSessionId;
-    private experienceStore?;
-    private startTime?;
-    constructor(props: EditorNextProps, context: Context);
-    private onEditorCreated;
-    private onEditorDestroyed;
-    private handleSave;
-    private handleAnalyticsEvent;
-    private registerEditorForActions;
-    private getFeatureFlags;
-    private unregisterEditorFromActions;
-    private getExperienceStore;
-    render(): jsx.JSX.Element;
 }
+export default EditorNext;

package/dist/types-ts4.5/editor.d.ts

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import React from 'react';
 import { jsx } from '@emotion/react';
-import { EditorProps } from './types/editor-props';
+import type { EditorProps } from './types/editor-props';
 export type { AllowedBlockTypes, Command, CommandDispatch, DomAtPos, EditorAppearance, EditorAppearanceComponentProps, EditorConfig, EditorInstance, EditorPlugin, EditorProps, ExtensionConfig, ExtensionProvidersProp, FeedbackInfo, MarkConfig, MessageDescriptor, NodeConfig, NodeViewConfig, PluginsOptions, PMPlugin, PMPluginCreateConfig, PMPluginFactory, PMPluginFactoryParams, ReactComponents, ToolbarUIComponentFactory, ToolbarUiComponentFactoryParams, UIComponentFactory, UiComponentFactoryParams, } from './types';
 export default class Editor extends React.Component<EditorProps> {
     static defaultProps: EditorProps;