@atlaskit/editor-core 198.6.3 → 198.6.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-core
 
+## 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/ui/EditorContext/index.js

@@ -4,35 +4,70 @@ 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;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context')) {
+    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);
+  } else {
+    return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
+      value: {
+        editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new _actions.default()
+      }
+    }, /*#__PURE__*/_react.default.createElement(_context.PresetContextProvider, null, 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 {
@@ -43,18 +78,18 @@ 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, {
+        return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
           value: this.getChildContext()
         }, this.props.children);
       } else {
-        return /*#__PURE__*/_react.default.createElement(EditorContext.Provider, {
+        return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
           value: this.getChildContext()
         }, /*#__PURE__*/_react.default.createElement(_context.PresetContextProvider, null, 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.4";

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

@@ -1,12 +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';
 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
+}) {
+  if (fg('platform_editor_remove_use_preset_context')) {
+    return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+      value: {
+        editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
+      }
+    }, children);
+  } else {
+    return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+      value: {
+        editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
+      }
+    }, /*#__PURE__*/React.createElement(PresetContextProvider, null, children));
+  }
+}
+export default class LegacyEditorContextOld extends React.Component {
   constructor(props) {
     super(props);
     this.editorActions = props.editorActions || new EditorActions();
@@ -28,6 +57,6 @@ export default class LegacyEditorContext extends React.Component {
     }
   }
 }
-_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.4";

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

@@ -1,31 +1,66 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 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';
-var EditorContext = /*#__PURE__*/React.createContext({});
 export var useEditorContext = function useEditorContext() {
   return React.useContext(EditorContext);
 };
-var LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
+export var LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
   _inherits(LegacyEditorContext, _React$Component);
   var _super = _createSuper(LegacyEditorContext);
   function LegacyEditorContext(props) {
-    var _this;
     _classCallCheck(this, LegacyEditorContext);
-    _this = _super.call(this, props);
+    return _super.call(this, props);
+  }
+  _createClass(LegacyEditorContext, [{
+    key: "render",
+    value: function 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);
+    }
+  }]);
+  return LegacyEditorContext;
+}(React.Component);
+function LegacyEditorContextNew(_ref) {
+  var children = _ref.children,
+    editorActions = _ref.editorActions;
+  if (fg('platform_editor_remove_use_preset_context')) {
+    return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+      value: {
+        editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
+      }
+    }, children);
+  } else {
+    return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+      value: {
+        editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
+      }
+    }, /*#__PURE__*/React.createElement(PresetContextProvider, null, children));
+  }
+}
+var LegacyEditorContextOld = /*#__PURE__*/function (_React$Component2) {
+  _inherits(LegacyEditorContextOld, _React$Component2);
+  var _super2 = _createSuper(LegacyEditorContextOld);
+  function LegacyEditorContextOld(props) {
+    var _this;
+    _classCallCheck(this, LegacyEditorContextOld);
+    _this = _super2.call(this, props);
     _this.editorActions = props.editorActions || new EditorActions();
     return _this;
   }
-  _createClass(LegacyEditorContext, [{
+  _createClass(LegacyEditorContextOld, [{
     key: "getChildContext",
     value: function getChildContext() {
       return {
@@ -46,9 +81,9 @@ var LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
       }
     }
   }]);
-  return LegacyEditorContext;
+  return LegacyEditorContextOld;
 }(React.Component);
-_defineProperty(LegacyEditorContext, "childContextTypes", {
+_defineProperty(LegacyEditorContextOld, "childContextTypes", {
   editorActions: PropTypes.object
 });
-export { LegacyEditorContext as default };
+export { LegacyEditorContextOld as default };

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

@@ -1,31 +1,91 @@
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 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';
 var WithEditorActions = /*#__PURE__*/function (_React$Component) {
   _inherits(WithEditorActions, _React$Component);
   var _super = _createSuper(WithEditorActions);
-  function WithEditorActions() {
-    var _this;
+  function WithEditorActions(props) {
     _classCallCheck(this, WithEditorActions);
+    return _super.call(this, props);
+  }
+  _createClass(WithEditorActions, [{
+    key: "render",
+    value: function render() {
+      if (fg('platform_editor_react18_phase2')) {
+        return /*#__PURE__*/React.createElement(WithEditorActionsNew, this.props);
+      }
+      return /*#__PURE__*/React.createElement(WithEditorActionsOld, this.props);
+    }
+  }]);
+  return WithEditorActions;
+}(React.Component);
+export { WithEditorActions as default };
+function WithEditorActionsNew(props) {
+  var render = props.render;
+  var context = React.useContext(EditorContext);
+  return /*#__PURE__*/React.createElement(WithEditorActionsInner, {
+    render: render,
+    editorActions: context === null || context === void 0 ? void 0 : context.editorActions
+  });
+}
+var WithEditorActionsInner = /*#__PURE__*/function (_React$Component2) {
+  _inherits(WithEditorActionsInner, _React$Component2);
+  var _super2 = _createSuper(WithEditorActionsInner);
+  function WithEditorActionsInner() {
+    _classCallCheck(this, WithEditorActionsInner);
+    return _super2.apply(this, arguments);
+  }
+  _createClass(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.Component);
+var WithEditorActionsOld = /*#__PURE__*/function (_React$Component3) {
+  _inherits(WithEditorActionsOld, _React$Component3);
+  var _super3 = _createSuper(WithEditorActionsOld);
+  function WithEditorActionsOld() {
+    var _this3;
+    _classCallCheck(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));
-    _defineProperty(_assertThisInitialized(_this), "onContextUpdate", function () {
+    _this3 = _super3.call.apply(_super3, [this].concat(args));
+    _defineProperty(_assertThisInitialized(_this3), "onContextUpdate", function () {
       // Re-render actions when editorActions changes...
-      _this.forceUpdate();
+      _this3.forceUpdate();
     });
-    return _this;
+    return _this3;
   }
-  _createClass(WithEditorActions, [{
+  _createClass(WithEditorActionsOld, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       this.context.editorActions._privateSubscribe(this.onContextUpdate);
@@ -41,9 +101,8 @@ var WithEditorActions = /*#__PURE__*/function (_React$Component) {
       return this.props.render(this.context.editorActions);
     }
   }]);
-  return WithEditorActions;
+  return WithEditorActionsOld;
 }(React.Component);
-_defineProperty(WithEditorActions, "contextTypes", {
+_defineProperty(WithEditorActionsOld, "contextTypes", {
   editorActions: PropTypes.object.isRequired
-});
-export { WithEditorActions as default };
+});

package/dist/esm/version-wrapper.js

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

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

@@ -1,11 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import EditorActions from '../../actions';
-export type EditorContextProps = React.PropsWithChildren<{
+type EditorContextInternal = {
     editorActions?: EditorActions;
-}>;
+};
+export type EditorContextProps = React.PropsWithChildren<EditorContextInternal>;
 export declare const useEditorContext: () => EditorContextProps;
-export default class LegacyEditorContext extends React.Component<EditorContextProps, {}> {
+export declare class LegacyEditorContext extends React.Component<EditorContextProps, {}> {
+    constructor(props: EditorContextProps);
+    render(): JSX.Element;
+}
+export default class LegacyEditorContextOld extends React.Component<EditorContextProps, {}> {
     static childContextTypes: {
         editorActions: PropTypes.Requireable<object>;
     };
@@ -16,3 +21,4 @@ export default class LegacyEditorContext extends React.Component<EditorContextPr
     };
     render(): JSX.Element;
 }
+export {};

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

@@ -1,18 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type EditorActions from '../../actions';
 export interface WithEditorActionsProps {
     render(actions: EditorActions): React.ReactElement | null;
 }
-export default class WithEditorActions extends React.Component<WithEditorActionsProps> {
-    static contextTypes: {
-        editorActions: PropTypes.Validator<object>;
-    };
-    context: {
-        editorActions: EditorActions;
-    };
-    componentDidMount(): void;
-    componentWillUnmount(): void;
-    private onContextUpdate;
-    render(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
+export default class WithEditorActions extends React.Component<WithEditorActionsProps, {}> {
+    constructor(props: WithEditorActionsProps);
+    render(): JSX.Element;
 }

package/dist/types-ts4.5/ui/EditorContext/index.d.ts

@@ -1,11 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import EditorActions from '../../actions';
-export type EditorContextProps = React.PropsWithChildren<{
+type EditorContextInternal = {
     editorActions?: EditorActions;
-}>;
+};
+export type EditorContextProps = React.PropsWithChildren<EditorContextInternal>;
 export declare const useEditorContext: () => EditorContextProps;
-export default class LegacyEditorContext extends React.Component<EditorContextProps, {}> {
+export declare class LegacyEditorContext extends React.Component<EditorContextProps, {}> {
+    constructor(props: EditorContextProps);
+    render(): JSX.Element;
+}
+export default class LegacyEditorContextOld extends React.Component<EditorContextProps, {}> {
     static childContextTypes: {
         editorActions: PropTypes.Requireable<object>;
     };
@@ -16,3 +21,4 @@ export default class LegacyEditorContext extends React.Component<EditorContextPr
     };
     render(): JSX.Element;
 }
+export {};

package/dist/types-ts4.5/ui/WithEditorActions/index.d.ts

@@ -1,18 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type EditorActions from '../../actions';
 export interface WithEditorActionsProps {
     render(actions: EditorActions): React.ReactElement | null;
 }
-export default class WithEditorActions extends React.Component<WithEditorActionsProps> {
-    static contextTypes: {
-        editorActions: PropTypes.Validator<object>;
-    };
-    context: {
-        editorActions: EditorActions;
-    };
-    componentDidMount(): void;
-    componentWillUnmount(): void;
-    private onContextUpdate;
-    render(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
+export default class WithEditorActions extends React.Component<WithEditorActionsProps, {}> {
+    constructor(props: WithEditorActionsProps);
+    render(): JSX.Element;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "198.6.3",
+	"version": "198.6.4",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -103,7 +103,7 @@
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/adf-schema-json": "^1.22.0",
 		"@atlassian/feature-flags-test-utils": "*",
-		"@atlassian/search-provider": "2.4.147",
+		"@atlassian/search-provider": "2.4.148",
 		"@emotion/jest": "^11.8.0",
 		"@storybook/addon-knobs": "^5.3.18",
 		"@testing-library/react": "^12.1.5",
@@ -267,6 +267,10 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_react18_phase2": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_react18_extension_component": {
 			"type": "boolean"
 		},
@@ -289,10 +293,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_react18_phase2": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform_editor_element_dnd_nested_fix_patch_2": {
 			"type": "boolean",
 			"referenceOnly": true