@atlaskit/editor-core 198.6.3 → 198.6.5

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-core
 
+## 198.6.5
+
+### Patch Changes
+
+- [#152480](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152480)
+  [`831fe131ac081`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/831fe131ac081) -
+  Remove FF platform_editor_td_provider_from_plugin_config
+- [#152510](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152510)
+  [`dcf9edde7ac7b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dcf9edde7ac7b) -
+  bump adf-schema to 42.0.1
+- [#152434](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152434)
+  [`446eacc8ed3b5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/446eacc8ed3b5) -
+  Cleanup FF platform_editor_remove_use_preset_context
+- Updated dependencies
+
+## 198.6.4
+
+### Patch Changes
+
+- [#151676](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151676)
+  [`ed6d01983b0da`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ed6d01983b0da) -
+  ED-25183: Remediate WithEditorActions, WithPluginState & LegacyEditorContext context type
+
 ## 198.6.3
 
 ### Patch Changes

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

@@ -12,12 +12,10 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _portal = require("@atlaskit/editor-common/portal");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ErrorBoundary = _interopRequireDefault(require("../create-editor/ErrorBoundary"));
 var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props");
 var _ReactEditorView = _interopRequireDefault(require("../create-editor/ReactEditorView"));
 var _contextAdapter = require("../nodeviews/context-adapter");
-var _context = require("../presets/context");
 var _EditorContext = _interopRequireDefault(require("../ui/EditorContext"));
 var _IntlProviderIfMissingWrapper = require("../ui/IntlProviderIfMissingWrapper/IntlProviderIfMissingWrapper");
 var _RenderTracking = require("../utils/performance/components/RenderTracking");
@@ -143,39 +141,17 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
 });
 function ReactEditorViewContextWrapper(props) {
   var _media, _linking;
-  // deprecated, unable to be FF due to hook usage
-  var setInternalEditorAPI = (0, _context.useSetPresetContext)();
-  var presetContextEditorAPI = (0, _context.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 = (0, _react.useState)(undefined),
     _useState2 = (0, _slicedToArray2.default)(_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 = (0, _react.useCallback)(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function (api) {
-    if ((0, _platformFeatureFlags.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;
   (0, _useProviders.useProviders)({
-    editorApi: (0, _platformFeatureFlags.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,
@@ -185,6 +161,6 @@ function ReactEditorViewContextWrapper(props) {
   });
   return (0, _react2.jsx)(_ReactEditorView.default, (0, _extends2.default)({}, props, {
     editorAPI: editorAPI,
-    setEditorApi: setPresetContextEditorAPI
+    setEditorAPI: setEditorAPI
   }));
 }

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

@@ -86,11 +86,9 @@ var useProviders = exports.useProviders = function useProviders(_ref) {
     }
   }, [autoformattingProvider, editorApi]);
   (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.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/cjs/composable-editor/utils/handleProviders.js

@@ -28,9 +28,6 @@ function handleProviders(providerFactory, _ref, extensionProvider, quickInsertPr
     searchProvider = _ref.searchProvider;
   providerFactory.setProvider('emojiProvider', emojiProvider);
   providerFactory.setProvider('mentionProvider', mentionProvider);
-  if (!(0, _platformFeatureFlags.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/cjs/create-editor/ReactEditorView.js

@@ -31,7 +31,6 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _eventDispatcher = require("../event-dispatcher");
-var _context = require("../presets/context");
 var _findChangedNodesFromTransaction = require("../utils/findChangedNodesFromTransaction");
 var _getNodesCount = require("../utils/getNodesCount");
 var _isFullPage = require("../utils/is-full-page");
@@ -94,7 +93,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
   (0, _inherits2.default)(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;
     (0, _classCallCheck2.default)(this, ReactEditorView);
     _this = _super.call(this, props);
@@ -548,7 +547,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
       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.EventDispatcher();
     _this.dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
     _this.errorReporter = (0, _createEditor.createErrorReporter)(props.editorProps.errorReporterHandler);
@@ -762,36 +761,10 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
   }, {
     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 ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
-        var _this$props$render, _this$props$render2, _this$props;
-        return /*#__PURE__*/_react.default.createElement(_ReactEditorViewContext.default.Provider, {
-          value: {
-            editorRef: this.editorRef,
-            editorView: this.view,
-            popupsMountPoint: this.props.editorProps.popupsMountPoint
-          }
-        }, renderTrackingEnabled && /*#__PURE__*/_react.default.createElement(_RenderTracking.RenderTracking, {
-          componentProps: this.props,
-          action: _analytics.ACTION.RE_RENDERED,
-          actionSubject: _analytics.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.default.createElement(_ReactEditorViewContext.default.Provider, {
         value: {
           editorRef: this.editorRef,
@@ -804,20 +777,16 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
         actionSubject: _analytics.ACTION_SUBJECT.REACT_EDITOR_VIEW,
         handleAnalyticsEvent: this.handleAnalyticsEvent,
         useShallow: useShallow
-      }), this.props.render ? /*#__PURE__*/_react.default.createElement(_context.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/cjs/ui/Appearance/Chromeless.js

@@ -17,7 +17,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ContentStyles = require("../ContentStyles");
 var _PluginSlot = _interopRequireDefault(require("../PluginSlot"));
 var _WithFlash = _interopRequireDefault(require("../WithFlash"));
@@ -111,7 +110,7 @@ var Editor = exports.default = /*#__PURE__*/function (_React$Component) {
       , {
         className: "ak-editor-content-area",
         featureFlags: featureFlags,
-        viewMode: (0, _platformFeatureFlags.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, (0, _react2.jsx)(_PluginSlot.default, {
         editorView: editorView,
         editorActions: editorActions,

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

@@ -19,7 +19,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _commonStyles = require("@atlaskit/editor-plugins/table/ui/common-styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _messages = _interopRequireDefault(require("../../../messages"));
 var _Addon = require("../../Addon");
 var _ContentStyles = require("../../ContentStyles");
@@ -224,7 +223,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
         'less-margin': width < _editorSharedStyles.akEditorMobileBreakoutPoint
       }),
       featureFlags: featureFlags,
-      viewMode: (0, _platformFeatureFlags.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, (0, _react2.jsx)(_PluginSlot.default, {
       editorView: editorView,
       editorActions: editorActions,

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

@@ -61,7 +61,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     className: "fabric-editor-popup-scroll-parent",
     featureFlags: props.featureFlags,
     ref: scrollContainerRef,
-    viewMode: (0, _platformFeatureFlags.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
   }, (0, _react2.jsx)(_Addon.ClickAreaBlock, {
     editorView: props.editorView,
     editorDisabled: props.disabled

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

@@ -12,7 +12,6 @@ var _react2 = require("@emotion/react");
 var _browser = require("@atlaskit/editor-common/browser");
 var _collab = require("@atlaskit/editor-common/collab");
 var _emoji = require("@atlaskit/editor-common/emoji");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _mention = require("@atlaskit/editor-common/mention");
 var _panel = require("@atlaskit/editor-common/panel");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -25,7 +24,6 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _tokens = require("@atlaskit/tokens");
 var _getInlineNodeViewProducer = require("../../nodeviews/getInlineNodeViewProducer.styles");
-var _context = require("../../presets/context");
 var _aiPanels = require("./ai-panels");
 var _codeBlock = require("./code-block");
 var _date = require("./date");
@@ -99,18 +97,15 @@ var createEditorContentStyle = exports.createEditorContentStyle = function creat
     var _useThemeObserver = (0, _tokens.useThemeObserver)(),
       colorMode = _useThemeObserver.colorMode,
       typography = _useThemeObserver.typography;
-    var editorAPI = (0, _context.usePresetContext)();
-    var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['editorViewMode']),
-      editorViewModeState = _useSharedPluginState.editorViewModeState;
     var memoizedStyle = (0, _react.useMemo)(function () {
       return contentStyles({
         theme: theme,
         colorMode: colorMode,
         featureFlags: featureFlags,
-        viewMode: (0, _platformFeatureFlags.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
       (0, _react2.jsx)("div", {

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

@@ -4,35 +4,61 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useEditorContext = exports.default = void 0;
+exports.useEditorContext = exports.default = exports.LegacyEditorContext = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _UNSAFE_do_not_use_editor_context = require("@atlaskit/editor-common/UNSAFE_do_not_use_editor_context");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = _interopRequireDefault(require("../../actions"));
-var _context = require("../../presets/context");
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-var EditorContext = /*#__PURE__*/_react.default.createContext({});
 var useEditorContext = exports.useEditorContext = function useEditorContext() {
-  return _react.default.useContext(EditorContext);
+  return _react.default.useContext(_UNSAFE_do_not_use_editor_context.EditorContext);
 };
-var LegacyEditorContext = exports.default = /*#__PURE__*/function (_React$Component) {
+var LegacyEditorContext = exports.LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(LegacyEditorContext, _React$Component);
   var _super = _createSuper(LegacyEditorContext);
   function LegacyEditorContext(props) {
-    var _this;
     (0, _classCallCheck2.default)(this, LegacyEditorContext);
-    _this = _super.call(this, props);
+    return _super.call(this, props);
+  }
+  (0, _createClass2.default)(LegacyEditorContext, [{
+    key: "render",
+    value: function render() {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2')) {
+        return /*#__PURE__*/_react.default.createElement(LegacyEditorContextNew, this.props, this.props.children);
+      }
+      return /*#__PURE__*/_react.default.createElement(LegacyEditorContextOld, this.props, this.props.children);
+    }
+  }]);
+  return LegacyEditorContext;
+}(_react.default.Component);
+function LegacyEditorContextNew(_ref) {
+  var children = _ref.children,
+    editorActions = _ref.editorActions;
+  return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
+    value: {
+      editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new _actions.default()
+    }
+  }, children);
+}
+var LegacyEditorContextOld = exports.default = /*#__PURE__*/function (_React$Component2) {
+  (0, _inherits2.default)(LegacyEditorContextOld, _React$Component2);
+  var _super2 = _createSuper(LegacyEditorContextOld);
+  function LegacyEditorContextOld(props) {
+    var _this;
+    (0, _classCallCheck2.default)(this, LegacyEditorContextOld);
+    _this = _super2.call(this, props);
     _this.editorActions = props.editorActions || new _actions.default();
     return _this;
   }
-  (0, _createClass2.default)(LegacyEditorContext, [{
+  (0, _createClass2.default)(LegacyEditorContextOld, [{
     key: "getChildContext",
     value: function getChildContext() {
       return {
@@ -42,19 +68,13 @@ var LegacyEditorContext = exports.default = /*#__PURE__*/function (_React$Compon
   }, {
     key: "render",
     value: function render() {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
-        return /*#__PURE__*/_react.default.createElement(EditorContext.Provider, {
-          value: this.getChildContext()
-        }, this.props.children);
-      } else {
-        return /*#__PURE__*/_react.default.createElement(EditorContext.Provider, {
-          value: this.getChildContext()
-        }, /*#__PURE__*/_react.default.createElement(_context.PresetContextProvider, null, this.props.children));
-      }
+      return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
+        value: this.getChildContext()
+      }, this.props.children);
     }
   }]);
-  return LegacyEditorContext;
+  return LegacyEditorContextOld;
 }(_react.default.Component);
-(0, _defineProperty2.default)(LegacyEditorContext, "childContextTypes", {
+(0, _defineProperty2.default)(LegacyEditorContextOld, "childContextTypes", {
   editorActions: _propTypes.default.object
 });

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

@@ -5,34 +5,93 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _UNSAFE_do_not_use_editor_context = require("@atlaskit/editor-common/UNSAFE_do_not_use_editor_context");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var WithEditorActions = exports.default = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(WithEditorActions, _React$Component);
   var _super = _createSuper(WithEditorActions);
-  function WithEditorActions() {
-    var _this;
+  function WithEditorActions(props) {
     (0, _classCallCheck2.default)(this, WithEditorActions);
+    return _super.call(this, props);
+  }
+  (0, _createClass2.default)(WithEditorActions, [{
+    key: "render",
+    value: function render() {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2')) {
+        return /*#__PURE__*/_react.default.createElement(WithEditorActionsNew, this.props);
+      }
+      return /*#__PURE__*/_react.default.createElement(WithEditorActionsOld, this.props);
+    }
+  }]);
+  return WithEditorActions;
+}(_react.default.Component);
+function WithEditorActionsNew(props) {
+  var render = props.render;
+  var context = _react.default.useContext(_UNSAFE_do_not_use_editor_context.EditorContext);
+  return /*#__PURE__*/_react.default.createElement(WithEditorActionsInner, {
+    render: render,
+    editorActions: context === null || context === void 0 ? void 0 : context.editorActions
+  });
+}
+var WithEditorActionsInner = /*#__PURE__*/function (_React$Component2) {
+  (0, _inherits2.default)(WithEditorActionsInner, _React$Component2);
+  var _super2 = _createSuper(WithEditorActionsInner);
+  function WithEditorActionsInner() {
+    (0, _classCallCheck2.default)(this, WithEditorActionsInner);
+    return _super2.apply(this, arguments);
+  }
+  (0, _createClass2.default)(WithEditorActionsInner, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var _this = this;
+      this.props.editorActions._privateSubscribe(function () {
+        return _this.forceUpdate();
+      });
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      var _this2 = this;
+      this.props.editorActions._privateUnsubscribe(function () {
+        return _this2.forceUpdate();
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return this.props.render(this.props.editorActions);
+    }
+  }]);
+  return WithEditorActionsInner;
+}(_react.default.Component);
+var WithEditorActionsOld = /*#__PURE__*/function (_React$Component3) {
+  (0, _inherits2.default)(WithEditorActionsOld, _React$Component3);
+  var _super3 = _createSuper(WithEditorActionsOld);
+  function WithEditorActionsOld() {
+    var _this3;
+    (0, _classCallCheck2.default)(this, WithEditorActionsOld);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onContextUpdate", function () {
+    _this3 = _super3.call.apply(_super3, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this3), "onContextUpdate", function () {
       // Re-render actions when editorActions changes...
-      _this.forceUpdate();
+      _this3.forceUpdate();
     });
-    return _this;
+    return _this3;
   }
-  (0, _createClass2.default)(WithEditorActions, [{
+  (0, _createClass2.default)(WithEditorActionsOld, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       this.context.editorActions._privateSubscribe(this.onContextUpdate);
@@ -48,8 +107,8 @@ var WithEditorActions = exports.default = /*#__PURE__*/function (_React$Componen
       return this.props.render(this.context.editorActions);
     }
   }]);
-  return WithEditorActions;
+  return WithEditorActionsOld;
 }(_react.default.Component);
-(0, _defineProperty2.default)(WithEditorActions, "contextTypes", {
+(0, _defineProperty2.default)(WithEditorActionsOld, "contextTypes", {
   editorActions: _propTypes.default.object.isRequired
 });

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "198.6.3";
+var version = exports.version = "198.6.5";

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

@@ -3,18 +3,16 @@ import _extends from "@babel/runtime/helpers/extends";
  * @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';
@@ -135,36 +133,14 @@ export const EditorInternal = /*#__PURE__*/memo(({
 });
 function ReactEditorViewContextWrapper(props) {
   var _media, _linking, _linking$smartLinks;
-  // deprecated, unable to be FF due to hook usage
-  const setInternalEditorAPI = useSetPresetContext();
-  const presetContextEditorAPI = usePresetContext();
-
-  // new way of storing the editorApi when FF platform_editor_remove_use_preset_context is enabled
-  const [editorAPI, setEditorAPI] = useState(undefined);
-
-  /**
-   * 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`.
-   */
-  const setPresetContextEditorAPI = useCallback(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  api => {
-    if (fg('platform_editor_remove_use_preset_context')) {
-      setEditorAPI(api);
-    } else {
-      setInternalEditorAPI === null || setInternalEditorAPI === void 0 ? void 0 : setInternalEditorAPI(api);
-    }
-  }, [setInternalEditorAPI, setEditorAPI]);
+  const [editorAPI, setEditorAPI] = useState(undefined);
 
   // 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
   const UNSAFE_cards = props.editorProps.UNSAFE_cards;
   const 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 ? void 0 : (_linking$smartLinks = _linking.smartLinks) === null || _linking$smartLinks === void 0 ? void 0 : _linking$smartLinks.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider,
@@ -174,6 +150,6 @@ function ReactEditorViewContextWrapper(props) {
   });
   return jsx(ReactEditorView, _extends({}, props, {
     editorAPI: editorAPI,
-    setEditorApi: setPresetContextEditorAPI
+    setEditorAPI: setEditorAPI
   }));
 }

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

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

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

@@ -24,9 +24,6 @@ export default function handleProviders(providerFactory, {
 }, extensionProvider, quickInsertProvider) {
   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);