@atlaskit/editor-core 198.6.3 → 198.6.5

package/dist/es2019/create-editor/ReactEditorView.js

@@ -18,7 +18,6 @@ import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemir
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
-import { EditorAPIContext } from '../presets/context';
 import { findChangedNodesFromTransaction } from '../utils/findChangedNodesFromTransaction';
 import { getNodesCount } from '../utils/getNodesCount';
 import { isFullPage } from '../utils/is-full-page';
@@ -95,7 +94,7 @@ export class ReactEditorView extends React.Component {
     return ((_this$props$editorPro3 = this.props.editorProps) === null || _this$props$editorPro3 === void 0 ? void 0 : (_this$props$editorPro4 = _this$props$editorPro3.performanceTracking) === null || _this$props$editorPro4 === void 0 ? void 0 : (_this$props$editorPro5 = _this$props$editorPro4.transactionTracking) === null || _this$props$editorPro5 === void 0 ? void 0 : _this$props$editorPro5.enabled) === false;
   }
   constructor(props) {
-    var _this$props$editorPro12, _props$setEditorApi, _props$editorProps, _props$editorProps$pe, _props$editorProps$pe2;
+    var _this$props$editorPro12, _props$setEditorAPI, _props$editorProps, _props$editorProps$pe, _props$editorProps$pe2;
     super(props);
     _defineProperty(this, "editorRef", /*#__PURE__*/React.createRef());
     // ProseMirror is instantiated prior to the initial React render cycle,
@@ -546,7 +545,7 @@ export class ReactEditorView extends React.Component {
       getEditorView: this.getEditorView
     });
     const _api = this.pluginInjectionAPI.api();
-    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 ? void 0 : _props$setEditorApi.call(props, _api);
+    (_props$setEditorAPI = props.setEditorAPI) === null || _props$setEditorAPI === void 0 ? void 0 : _props$setEditorAPI.call(props, _api);
     this.eventDispatcher = new EventDispatcher();
     this.dispatch = createDispatch(this.eventDispatcher);
     this.errorReporter = createErrorReporter(props.editorProps.errorReporterHandler);
@@ -706,35 +705,10 @@ export class ReactEditorView extends React.Component {
     return this.editorPlugins;
   }
   render() {
-    var _this$props$editorPro14, _this$props$editorPro15;
+    var _this$props$editorPro14, _this$props$editorPro15, _this$props$render, _this$props$render2, _this$props;
     const renderTracking = (_this$props$editorPro14 = this.props.editorProps.performanceTracking) === null || _this$props$editorPro14 === void 0 ? void 0 : (_this$props$editorPro15 = _this$props$editorPro14.renderTracking) === null || _this$props$editorPro15 === void 0 ? void 0 : _this$props$editorPro15.reactEditorView;
     const renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
     const useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
-    if (fg('platform_editor_remove_use_preset_context')) {
-      var _this$props$render, _this$props$render2, _this$props;
-      return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
-        value: {
-          editorRef: this.editorRef,
-          editorView: this.view,
-          popupsMountPoint: this.props.editorProps.popupsMountPoint
-        }
-      }, renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
-        componentProps: this.props,
-        action: ACTION.RE_RENDERED,
-        actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
-        handleAnalyticsEvent: this.handleAnalyticsEvent,
-        useShallow: useShallow
-      }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
-        editor: this.editor,
-        view: this.view,
-        config: this.config,
-        eventDispatcher: this.eventDispatcher,
-        transformer: this.contentTransformer,
-        dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
-        editorRef: this.editorRef,
-        editorAPI: this.props.editorAPI
-      })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
-    }
     return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
       value: {
         editorRef: this.editorRef,
@@ -747,21 +721,16 @@ export class ReactEditorView extends React.Component {
       actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
       handleAnalyticsEvent: this.handleAnalyticsEvent,
       useShallow: useShallow
-    }), this.props.render ? /*#__PURE__*/React.createElement(EditorAPIContext.Consumer, null, ({
-      editorApi
-    }) => {
-      var _this$props$render3, _this$props$render4, _this$props2;
-      return (_this$props$render3 = (_this$props$render4 = (_this$props2 = this.props).render) === null || _this$props$render4 === void 0 ? void 0 : _this$props$render4.call(_this$props2, {
-        editor: this.editor,
-        view: this.view,
-        config: this.config,
-        eventDispatcher: this.eventDispatcher,
-        transformer: this.contentTransformer,
-        dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
-        editorRef: this.editorRef,
-        editorAPI: editorApi
-      })) !== null && _this$props$render3 !== void 0 ? _this$props$render3 : this.editor;
-    }) : this.editor);
+    }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
+      editor: this.editor,
+      view: this.view,
+      config: this.config,
+      eventDispatcher: this.eventDispatcher,
+      transformer: this.contentTransformer,
+      dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
+      editorRef: this.editorRef,
+      editorAPI: this.props.editorAPI
+    })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
   }
 }
 function getUAPrefix() {

package/dist/es2019/ui/Appearance/Chromeless.js

@@ -9,7 +9,6 @@ import React, { Fragment } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { createEditorContentStyle } from '../ContentStyles';
 import PluginSlot from '../PluginSlot';
 import WithFlash from '../WithFlash';
@@ -89,7 +88,7 @@ export default class Editor extends React.Component {
       , {
         className: "ak-editor-content-area",
         featureFlags: featureFlags,
-        viewMode: fg('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
+        viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
       }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
         editorView: editorView,
         editorActions: editorActions,

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -16,7 +16,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import messages from '../../../messages';
 import { ClickAreaBlock } from '../../Addon';
 import { createEditorContentStyle } from '../../ContentStyles';
@@ -210,7 +209,7 @@ export const CommentEditorWithIntl = props => {
         'less-margin': width < akEditorMobileBreakoutPoint
       }),
       featureFlags: featureFlags,
-      viewMode: fg('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
+      viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
     }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
       editorView: editorView,
       editorActions: editorActions,

package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js

@@ -49,7 +49,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
     className: "fabric-editor-popup-scroll-parent",
     featureFlags: props.featureFlags,
     ref: scrollContainerRef,
-    viewMode: fg('platform_editor_remove_use_preset_context') ? props === null || props === void 0 ? void 0 : props.viewMode : undefined
+    viewMode: props === null || props === void 0 ? void 0 : props.viewMode
   }, jsx(ClickAreaBlock, {
     editorView: props.editorView,
     editorDisabled: props.disabled

package/dist/es2019/ui/ContentStyles/index.js

@@ -14,7 +14,6 @@ import { css, jsx, useTheme } from '@emotion/react';
 import { browser } from '@atlaskit/editor-common/browser';
 import { telepointerStyle } from '@atlaskit/editor-common/collab';
 import { EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { MentionSharedCssClassName } from '@atlaskit/editor-common/mention';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
 import { gapCursorStyles } from '@atlaskit/editor-common/selection';
@@ -27,7 +26,6 @@ import { akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSma
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useThemeObserver } from '@atlaskit/tokens';
 import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
-import { usePresetContext } from '../../presets/context';
 import { aiPanelStyles } from './ai-panels';
 import { codeBlockStyles } from './code-block';
 import { dateStyles } from './date';
@@ -376,17 +374,13 @@ export const createEditorContentStyle = styles => {
       colorMode,
       typography
     } = useThemeObserver();
-    const editorAPI = usePresetContext();
-    const {
-      editorViewModeState
-    } = useSharedPluginState(editorAPI, ['editorViewMode']);
     const memoizedStyle = useMemo(() => contentStyles({
       theme,
       colorMode,
       featureFlags,
-      viewMode: fg('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
+      viewMode: props.viewMode,
       typographyTheme: typography
-    }), [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode, typography]);
+    }), [theme, colorMode, featureFlags, props.viewMode, typography]);
     return (
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       jsx("div", {

package/dist/es2019/ui/EditorContext/index.js

@@ -1,12 +1,32 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
+import { EditorContext } from '@atlaskit/editor-common/UNSAFE_do_not_use_editor_context';
 import { fg } from '@atlaskit/platform-feature-flags';
 import EditorActions from '../../actions';
-import { PresetContextProvider } from '../../presets/context';
-const EditorContext = /*#__PURE__*/React.createContext({});
 export const useEditorContext = () => React.useContext(EditorContext);
-export default class LegacyEditorContext extends React.Component {
+export class LegacyEditorContext extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    if (fg('platform_editor_react18_phase2')) {
+      return /*#__PURE__*/React.createElement(LegacyEditorContextNew, this.props, this.props.children);
+    }
+    return /*#__PURE__*/React.createElement(LegacyEditorContextOld, this.props, this.props.children);
+  }
+}
+function LegacyEditorContextNew({
+  children,
+  editorActions
+}) {
+  return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+    value: {
+      editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
+    }
+  }, children);
+}
+export default class LegacyEditorContextOld extends React.Component {
   constructor(props) {
     super(props);
     this.editorActions = props.editorActions || new EditorActions();
@@ -17,17 +37,11 @@ export default class LegacyEditorContext extends React.Component {
     };
   }
   render() {
-    if (fg('platform_editor_remove_use_preset_context')) {
-      return /*#__PURE__*/React.createElement(EditorContext.Provider, {
-        value: this.getChildContext()
-      }, this.props.children);
-    } else {
-      return /*#__PURE__*/React.createElement(EditorContext.Provider, {
-        value: this.getChildContext()
-      }, /*#__PURE__*/React.createElement(PresetContextProvider, null, this.props.children));
-    }
+    return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+      value: this.getChildContext()
+    }, this.props.children);
   }
 }
-_defineProperty(LegacyEditorContext, "childContextTypes", {
+_defineProperty(LegacyEditorContextOld, "childContextTypes", {
   editorActions: PropTypes.object
 });

package/dist/es2019/ui/WithEditorActions/index.js

@@ -1,7 +1,41 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
+import { EditorContext } from '@atlaskit/editor-common/UNSAFE_do_not_use_editor_context';
+import { fg } from '@atlaskit/platform-feature-flags';
 export default class WithEditorActions extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    if (fg('platform_editor_react18_phase2')) {
+      return /*#__PURE__*/React.createElement(WithEditorActionsNew, this.props);
+    }
+    return /*#__PURE__*/React.createElement(WithEditorActionsOld, this.props);
+  }
+}
+function WithEditorActionsNew(props) {
+  const {
+    render
+  } = props;
+  const context = React.useContext(EditorContext);
+  return /*#__PURE__*/React.createElement(WithEditorActionsInner, {
+    render: render,
+    editorActions: context === null || context === void 0 ? void 0 : context.editorActions
+  });
+}
+class WithEditorActionsInner extends React.Component {
+  componentDidMount() {
+    this.props.editorActions._privateSubscribe(() => this.forceUpdate());
+  }
+  componentWillUnmount() {
+    this.props.editorActions._privateUnsubscribe(() => this.forceUpdate());
+  }
+  render() {
+    return this.props.render(this.props.editorActions);
+  }
+}
+class WithEditorActionsOld extends React.Component {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "onContextUpdate", () => {
@@ -19,6 +53,6 @@ export default class WithEditorActions extends React.Component {
     return this.props.render(this.context.editorActions);
   }
 }
-_defineProperty(WithEditorActions, "contextTypes", {
+_defineProperty(WithEditorActionsOld, "contextTypes", {
   editorActions: PropTypes.object.isRequired
 });

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "198.6.3";
+export const version = "198.6.5";

package/dist/esm/composable-editor/editor-internal.js

@@ -7,18 +7,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { Fragment, memo, useCallback, useState } from 'react';
+import { Fragment, memo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 import { usePortalProvider } from '@atlaskit/editor-common/portal';
-import { fg } from '@atlaskit/platform-feature-flags';
 import ErrorBoundary from '../create-editor/ErrorBoundary';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import ReactEditorView from '../create-editor/ReactEditorView';
 import { ContextAdapter } from '../nodeviews/context-adapter';
-import { usePresetContext, useSetPresetContext } from '../presets/context';
 import EditorContext from '../ui/EditorContext';
 import { IntlProviderIfMissingWrapper } from '../ui/IntlProviderIfMissingWrapper/IntlProviderIfMissingWrapper';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
@@ -139,39 +137,17 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
 });
 function ReactEditorViewContextWrapper(props) {
   var _media, _linking;
-  // deprecated, unable to be FF due to hook usage
-  var setInternalEditorAPI = useSetPresetContext();
-  var presetContextEditorAPI = usePresetContext();
-
-  // new way of storing the editorApi when FF platform_editor_remove_use_preset_context is enabled
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   var _useState = useState(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     editorAPI = _useState2[0],
     setEditorAPI = _useState2[1];
 
-  /**
-   * We use the context to retrieve the editorAPI
-   * externally for consumers via `usePreset`.
-   *
-   * However we also may need to retrieve this value internally via context
-   * so we should also set the value for the `EditorContext` that is used in
-   * `EditorInternal`.
-   */
-  var setPresetContextEditorAPI = useCallback(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function (api) {
-    if (fg('platform_editor_remove_use_preset_context')) {
-      setEditorAPI(api);
-    } else {
-      setInternalEditorAPI === null || setInternalEditorAPI === void 0 || setInternalEditorAPI(api);
-    }
-  }, [setInternalEditorAPI, setEditorAPI]);
-
   // TODO: Remove these when we deprecate these props from editor-props - smartLinks is unfortunately still used in some places, we can sidestep this problem if we move everyone across to ComposableEditor and deprecate Editor
   var UNSAFE_cards = props.editorProps.UNSAFE_cards;
   var smartLinks = props.editorProps.smartLinks;
   useProviders({
-    editorApi: fg('platform_editor_remove_use_preset_context') ? editorAPI : presetContextEditorAPI,
+    editorApi: editorAPI,
     contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
     mediaProvider: (_media = props.editorProps.media) === null || _media === void 0 ? void 0 : _media.provider,
     cardProvider: ((_linking = props.editorProps.linking) === null || _linking === void 0 || (_linking = _linking.smartLinks) === null || _linking === void 0 ? void 0 : _linking.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider,
@@ -181,6 +157,6 @@ function ReactEditorViewContextWrapper(props) {
   });
   return jsx(ReactEditorView, _extends({}, props, {
     editorAPI: editorAPI,
-    setEditorApi: setPresetContextEditorAPI
+    setEditorAPI: setEditorAPI
   }));
 }

package/dist/esm/composable-editor/hooks/useProviders.js

@@ -79,11 +79,9 @@ export var useProviders = function useProviders(_ref) {
     }
   }, [autoformattingProvider, editorApi]);
   useEffect(function () {
-    if (fg('platform_editor_td_provider_from_plugin_config')) {
-      if (taskDecisionProvider) {
-        var _editorApi$taskDecisi;
-        editorApi === null || editorApi === void 0 || (_editorApi$taskDecisi = editorApi.taskDecision) === null || _editorApi$taskDecisi === void 0 || _editorApi$taskDecisi.actions.setProvider(taskDecisionProvider);
-      }
+    if (taskDecisionProvider) {
+      var _editorApi$taskDecisi;
+      editorApi === null || editorApi === void 0 || (_editorApi$taskDecisi = editorApi.taskDecision) === null || _editorApi$taskDecisi === void 0 || _editorApi$taskDecisi.actions.setProvider(taskDecisionProvider);
     }
   }, [taskDecisionProvider, editorApi]);
 };

package/dist/esm/composable-editor/utils/handleProviders.js

@@ -23,9 +23,6 @@ export default function handleProviders(providerFactory, _ref, extensionProvider
     searchProvider = _ref.searchProvider;
   providerFactory.setProvider('emojiProvider', emojiProvider);
   providerFactory.setProvider('mentionProvider', mentionProvider);
-  if (!fg('platform_editor_td_provider_from_plugin_config')) {
-    providerFactory.setProvider('taskDecisionProvider', taskDecisionProvider);
-  }
   providerFactory.setProvider('contextIdentifierProvider', contextIdentifierProvider);
   providerFactory.setProvider('imageUploadProvider', imageUploadProvider);
   providerFactory.setProvider('collabEditProvider', collabEditProvider);

package/dist/esm/create-editor/ReactEditorView.js

@@ -28,7 +28,6 @@ import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemir
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
-import { EditorAPIContext } from '../presets/context';
 import { findChangedNodesFromTransaction } from '../utils/findChangedNodesFromTransaction';
 import { getNodesCount } from '../utils/getNodesCount';
 import { isFullPage } from '../utils/is-full-page';
@@ -87,7 +86,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
   _inherits(ReactEditorView, _React$Component);
   var _super = _createSuper(ReactEditorView);
   function ReactEditorView(props) {
-    var _this$props$editorPro5, _props$setEditorApi, _props$editorProps;
+    var _this$props$editorPro5, _props$setEditorAPI, _props$editorProps;
     var _this;
     _classCallCheck(this, ReactEditorView);
     _this = _super.call(this, props);
@@ -541,7 +540,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       getEditorView: _this.getEditorView
     });
     var _api = _this.pluginInjectionAPI.api();
-    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 || _props$setEditorApi.call(props, _api);
+    (_props$setEditorAPI = props.setEditorAPI) === null || _props$setEditorAPI === void 0 || _props$setEditorAPI.call(props, _api);
     _this.eventDispatcher = new EventDispatcher();
     _this.dispatch = createDispatch(_this.eventDispatcher);
     _this.errorReporter = createErrorReporter(props.editorProps.errorReporterHandler);
@@ -755,36 +754,10 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props$editorPro10,
-        _this3 = this;
+      var _this$props$editorPro10, _this$props$render, _this$props$render2, _this$props;
       var renderTracking = (_this$props$editorPro10 = this.props.editorProps.performanceTracking) === null || _this$props$editorPro10 === void 0 || (_this$props$editorPro10 = _this$props$editorPro10.renderTracking) === null || _this$props$editorPro10 === void 0 ? void 0 : _this$props$editorPro10.reactEditorView;
       var renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
       var useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
-      if (fg('platform_editor_remove_use_preset_context')) {
-        var _this$props$render, _this$props$render2, _this$props;
-        return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
-          value: {
-            editorRef: this.editorRef,
-            editorView: this.view,
-            popupsMountPoint: this.props.editorProps.popupsMountPoint
-          }
-        }, renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
-          componentProps: this.props,
-          action: ACTION.RE_RENDERED,
-          actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
-          handleAnalyticsEvent: this.handleAnalyticsEvent,
-          useShallow: useShallow
-        }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
-          editor: this.editor,
-          view: this.view,
-          config: this.config,
-          eventDispatcher: this.eventDispatcher,
-          transformer: this.contentTransformer,
-          dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
-          editorRef: this.editorRef,
-          editorAPI: this.props.editorAPI
-        })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
-      }
       return /*#__PURE__*/React.createElement(ReactEditorViewContext.Provider, {
         value: {
           editorRef: this.editorRef,
@@ -797,20 +770,16 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
         actionSubject: ACTION_SUBJECT.REACT_EDITOR_VIEW,
         handleAnalyticsEvent: this.handleAnalyticsEvent,
         useShallow: useShallow
-      }), this.props.render ? /*#__PURE__*/React.createElement(EditorAPIContext.Consumer, null, function (_ref4) {
-        var _this3$props$render, _this3$props$render2, _this3$props;
-        var editorApi = _ref4.editorApi;
-        return (_this3$props$render = (_this3$props$render2 = (_this3$props = _this3.props).render) === null || _this3$props$render2 === void 0 ? void 0 : _this3$props$render2.call(_this3$props, {
-          editor: _this3.editor,
-          view: _this3.view,
-          config: _this3.config,
-          eventDispatcher: _this3.eventDispatcher,
-          transformer: _this3.contentTransformer,
-          dispatchAnalyticsEvent: _this3.dispatchAnalyticsEvent,
-          editorRef: _this3.editorRef,
-          editorAPI: editorApi
-        })) !== null && _this3$props$render !== void 0 ? _this3$props$render : _this3.editor;
-      }) : this.editor);
+      }), this.props.render ? (_this$props$render = (_this$props$render2 = (_this$props = this.props).render) === null || _this$props$render2 === void 0 ? void 0 : _this$props$render2.call(_this$props, {
+        editor: this.editor,
+        view: this.view,
+        config: this.config,
+        eventDispatcher: this.eventDispatcher,
+        transformer: this.contentTransformer,
+        dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
+        editorRef: this.editorRef,
+        editorAPI: this.props.editorAPI
+      })) !== null && _this$props$render !== void 0 ? _this$props$render : this.editor : this.editor);
     }
   }]);
   return ReactEditorView;

package/dist/esm/ui/Appearance/Chromeless.js

@@ -17,7 +17,6 @@ import React, { Fragment } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { createEditorContentStyle } from '../ContentStyles';
 import PluginSlot from '../PluginSlot';
 import WithFlash from '../WithFlash';
@@ -104,7 +103,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
       , {
         className: "ak-editor-content-area",
         featureFlags: featureFlags,
-        viewMode: fg('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
+        viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
       }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
         editorView: editorView,
         editorActions: editorActions,

package/dist/esm/ui/Appearance/Comment/Comment.js

@@ -17,7 +17,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import messages from '../../../messages';
 import { ClickAreaBlock } from '../../Addon';
 import { createEditorContentStyle } from '../../ContentStyles';
@@ -213,7 +212,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
         'less-margin': width < akEditorMobileBreakoutPoint
       }),
       featureFlags: featureFlags,
-      viewMode: fg('platform_editor_remove_use_preset_context') ? editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode : undefined
+      viewMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
     }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
       editorView: editorView,
       editorActions: editorActions,

package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js

@@ -51,7 +51,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: "fabric-editor-popup-scroll-parent",
     featureFlags: props.featureFlags,
     ref: scrollContainerRef,
-    viewMode: fg('platform_editor_remove_use_preset_context') ? props === null || props === void 0 ? void 0 : props.viewMode : undefined
+    viewMode: props === null || props === void 0 ? void 0 : props.viewMode
   }, jsx(ClickAreaBlock, {
     editorView: props.editorView,
     editorDisabled: props.disabled

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

@@ -16,7 +16,6 @@ import { css, jsx, useTheme } from '@emotion/react';
 import { browser } from '@atlaskit/editor-common/browser';
 import { telepointerStyle } from '@atlaskit/editor-common/collab';
 import { EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { MentionSharedCssClassName } from '@atlaskit/editor-common/mention';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
 import { gapCursorStyles } from '@atlaskit/editor-common/selection';
@@ -29,7 +28,6 @@ import { akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSma
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useThemeObserver } from '@atlaskit/tokens';
 import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
-import { usePresetContext } from '../../presets/context';
 import { aiPanelStyles } from './ai-panels';
 import { codeBlockStyles } from './code-block';
 import { dateStyles } from './date';
@@ -91,18 +89,15 @@ export var createEditorContentStyle = function createEditorContentStyle(styles)
     var _useThemeObserver = useThemeObserver(),
       colorMode = _useThemeObserver.colorMode,
       typography = _useThemeObserver.typography;
-    var editorAPI = usePresetContext();
-    var _useSharedPluginState = useSharedPluginState(editorAPI, ['editorViewMode']),
-      editorViewModeState = _useSharedPluginState.editorViewModeState;
     var memoizedStyle = useMemo(function () {
       return contentStyles({
         theme: theme,
         colorMode: colorMode,
         featureFlags: featureFlags,
-        viewMode: fg('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
+        viewMode: props.viewMode,
         typographyTheme: typography
       });
-    }, [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode, typography]);
+    }, [theme, colorMode, featureFlags, props.viewMode, typography]);
     return (
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       jsx("div", {