@atlaskit/editor-core 198.6.2 → 198.6.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @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
+
+- [#151938](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151938)
+  [`91b5768ef0c7c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/91b5768ef0c7c) -
+  [ux] ED-25203 refactor image previewer outside of floating toolbar
+- [#152019](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152019)
+  [`5f7f23dd0c612`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5f7f23dd0c612) -
+  [ux] ED-25082: Added editor custom font tokens and use them for normal texts and paragraph texts"
+- Updated dependencies
+
 ## 198.6.2
 
 ### Patch Changes

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

@@ -88,7 +88,7 @@ var akEditorBreakpointForSmallDevice = "1266px";
 var contentStyles = function contentStyles(props) {
   return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: 52px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t", "\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t", "\n\n\t", "\n\t", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n\t", "\n\t", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t// For FullPage only when inside a table\n\t// Related code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\t// In the \"editorContentAreaContainerStyle\" function\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n\t.hyperlink-open-link {\n\t\tmin-width: 24px;\n\t\tsvg {\n\t\t\tmax-width: 18px;\n\t\t}\n\t}\n"])), _editorSharedStyles.akEditorGutterPadding, _editorSharedStyles.akEditorDefaultLayoutWidth, _editorSharedStyles.akEditorFullWidthLayoutWidth, _editorSharedStyles.akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, _editorSharedStyles.akEditorCalculatedWideLayoutWidth, (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('editor_request_to_edit_task') ? null : (0, _react2.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), "var(--ds-border-focused, #8cf)", (0, _platformFeatureFlags.fg)('platform_editor_mark_boundary_cursor') ? (0, _react2.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\t\t\t\tdisplay: none;\n\t\t\t\t}\n\t\t\t"]))) : null, _styles5.placeholderTextStyles, placeholderStyles, (0, _codeBlock.codeBlockStyles)(), (0, _styles2.blocktypeStyles)(), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), listsStyles, ruleStyles(), _media.mediaStyles, (0, _layout.layoutStyles)(props.viewMode), _collab.telepointerStyle, _selection.gapCursorStyles, (0, _panel2.panelStyles)(), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _extension.extensionStyles, (0, _expand.expandStyles)(), _styles3.findReplaceStyles, _styles4.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(), (0, _styles.smartCardStyles)(), _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, (0, _aiPanels.aiPanelStyles)(props.colorMode), fixBlockControlStylesSSR(), _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), _styles.whitespaceSharedStyles, (0, _styles.paragraphSharedStyles)(props.typographyTheme), _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('editor_request_to_edit_task') ? null : (0, _react2.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), "var(--ds-border-focused, #8cf)", (0, _platformFeatureFlags.fg)('platform_editor_mark_boundary_cursor') ? (0, _react2.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\t\t\t\tdisplay: none;\n\t\t\t\t}\n\t\t\t"]))) : null, _styles5.placeholderTextStyles, placeholderStyles, (0, _codeBlock.codeBlockStyles)(), (0, _styles2.blocktypeStyles)(props.typographyTheme), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), listsStyles, ruleStyles(), _media.mediaStyles, (0, _layout.layoutStyles)(props.viewMode), _collab.telepointerStyle, _selection.gapCursorStyles, (0, _panel2.panelStyles)(), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _extension.extensionStyles, (0, _expand.expandStyles)(), _styles3.findReplaceStyles, _styles4.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(), (0, _styles.smartCardStyles)(), _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, (0, _aiPanels.aiPanelStyles)(props.colorMode), fixBlockControlStylesSSR(), _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -97,7 +97,8 @@ var createEditorContentStyle = exports.createEditorContentStyle = function creat
       featureFlags = props.featureFlags;
     var theme = (0, _react2.useTheme)();
     var _useThemeObserver = (0, _tokens.useThemeObserver)(),
-      colorMode = _useThemeObserver.colorMode;
+      colorMode = _useThemeObserver.colorMode,
+      typography = _useThemeObserver.typography;
     var editorAPI = (0, _context.usePresetContext)();
     var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['editorViewMode']),
       editorViewModeState = _useSharedPluginState.editorViewModeState;
@@ -106,9 +107,10 @@ var createEditorContentStyle = exports.createEditorContentStyle = function creat
         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: (0, _platformFeatureFlags.fg)('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
+        typographyTheme: typography
       });
-    }, [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode]);
+    }, [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, 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,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.2";
+var version = exports.version = "198.6.4";

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

@@ -222,7 +222,7 @@ const contentStyles = props => css`
   theme: props.theme
 })}px;
 		${whitespaceSharedStyles};
-		${paragraphSharedStyles};
+		${paragraphSharedStyles(props.typographyTheme)};
 		${listsSharedStyles};
 		${indentationSharedStyles};
 		${shadowSharedStyle};
@@ -265,7 +265,7 @@ const contentStyles = props => css`
 	${placeholderStyles}
   ${codeBlockStyles()}
 
-  ${blocktypeStyles()}
+  ${blocktypeStyles(props.typographyTheme)}
   ${codeMarkSharedStyles()}
   ${textColorStyles}
   ${backgroundColorStyles()}
@@ -373,7 +373,8 @@ export const createEditorContentStyle = styles => {
     } = props;
     const theme = useTheme();
     const {
-      colorMode
+      colorMode,
+      typography
     } = useThemeObserver();
     const editorAPI = usePresetContext();
     const {
@@ -383,8 +384,9 @@ export const createEditorContentStyle = styles => {
       theme,
       colorMode,
       featureFlags,
-      viewMode: fg('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode
-    }), [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode]);
+      viewMode: fg('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
+      typographyTheme: typography
+    }), [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, 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,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.2";
+export const version = "198.6.4";

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

@@ -80,7 +80,7 @@ var akEditorBreakpointForSmallDevice = "1266px";
 var contentStyles = function contentStyles(props) {
   return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: 52px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t", "\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t", "\n\n\t", "\n\t", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n\t", "\n\t", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t// For FullPage only when inside a table\n\t// Related code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\t// In the \"editorContentAreaContainerStyle\" function\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n\t.hyperlink-open-link {\n\t\tmin-width: 24px;\n\t\tsvg {\n\t\t\tmax-width: 18px;\n\t\t}\n\t}\n"])), akEditorGutterPadding, akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, akEditorCalculatedWideLayoutWidth, editorFontSize({
     theme: props.theme
-  }), whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, fg('editor_request_to_edit_task') ? null : css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), "var(--ds-border-focused, #8cf)", fg('platform_editor_mark_boundary_cursor') ? css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\t\t\t\tdisplay: none;\n\t\t\t\t}\n\t\t\t"]))) : null, placeholderTextStyles, placeholderStyles, codeBlockStyles(), blocktypeStyles(), codeMarkSharedStyles(), textColorStyles, backgroundColorStyles(), listsStyles, ruleStyles(), mediaStyles, layoutStyles(props.viewMode), telepointerStyle, gapCursorStyles, panelStyles(), mentionsStyles, emojiStyles, tasksAndDecisionsStyles, gridStyles, linkStyles, blockMarksSharedStyles, dateSharedStyle, extensionStyles, expandStyles(), findReplaceStyles, textHighlightStyle, taskDecisionStyles, statusStyles, annotationSharedStyles(), smartCardStyles(), smartCardSharedStyles, dateStyles, embedCardStyles, unsupportedStyles, resizerStyles, aiPanelStyles(props.colorMode), fixBlockControlStylesSSR(), MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), whitespaceSharedStyles, paragraphSharedStyles(props.typographyTheme), listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, fg('editor_request_to_edit_task') ? null : css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), "var(--ds-border-focused, #8cf)", fg('platform_editor_mark_boundary_cursor') ? css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\t\t\t\tdisplay: none;\n\t\t\t\t}\n\t\t\t"]))) : null, placeholderTextStyles, placeholderStyles, codeBlockStyles(), blocktypeStyles(props.typographyTheme), codeMarkSharedStyles(), textColorStyles, backgroundColorStyles(), listsStyles, ruleStyles(), mediaStyles, layoutStyles(props.viewMode), telepointerStyle, gapCursorStyles, panelStyles(), mentionsStyles, emojiStyles, tasksAndDecisionsStyles, gridStyles, linkStyles, blockMarksSharedStyles, dateSharedStyle, extensionStyles, expandStyles(), findReplaceStyles, textHighlightStyle, taskDecisionStyles, statusStyles, annotationSharedStyles(), smartCardStyles(), smartCardSharedStyles, dateStyles, embedCardStyles, unsupportedStyles, resizerStyles, aiPanelStyles(props.colorMode), fixBlockControlStylesSSR(), MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 export var createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -89,7 +89,8 @@ export var createEditorContentStyle = function createEditorContentStyle(styles)
       featureFlags = props.featureFlags;
     var theme = useTheme();
     var _useThemeObserver = useThemeObserver(),
-      colorMode = _useThemeObserver.colorMode;
+      colorMode = _useThemeObserver.colorMode,
+      typography = _useThemeObserver.typography;
     var editorAPI = usePresetContext();
     var _useSharedPluginState = useSharedPluginState(editorAPI, ['editorViewMode']),
       editorViewModeState = _useSharedPluginState.editorViewModeState;
@@ -98,9 +99,10 @@ export var createEditorContentStyle = function createEditorContentStyle(styles)
         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: fg('platform_editor_remove_use_preset_context') ? props.viewMode : editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
+        typographyTheme: typography
       });
-    }, [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode]);
+    }, [theme, colorMode, featureFlags, editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode, props.viewMode, typography]);
     return (
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       jsx("div", {

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 };