@atlaskit/editor-core 216.6.6 → 216.7.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-core
 
+## 216.7.0
+
+### Minor Changes
+
+- [`ee5135bafb31d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ee5135bafb31d) -
+  [EDITOR-4495] clean up platform_editor_toolbar_aifc_patch_4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 216.6.7
+
+### Patch Changes
+
+- [`a7fd4015da337`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a7fd4015da337) -
+  phase out contextTypes for editor context
+- Updated dependencies
+
 ## 216.6.6
 
 ### Patch Changes

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

@@ -157,7 +157,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
       (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(isToolbarAIFCEnabled)
     }
   }, !isEditorToolbarHidden && (isToolbarAIFCEnabled ? (0, _react2.jsx)(_FullPageToolbarNext.FullPageToolbarNext, {
-    disabled: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? !!props.disabled : undefined,
+    disabled: !!props.disabled,
     toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,
     beforeIcon: props.primaryToolbarIconBefore,
     editorAPI: editorAPI,

package/dist/cjs/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -315,7 +315,7 @@ var blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktyp
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       lineHeight: 'calc(16 / 11)',
       color: "var(--ds-text-subtlest, #6B6E76)",
-      fontWeight: "var(--ds-font-weight-bold, 700)",
+      fontWeight: "var(--ds-font-weight-bold, 653)",
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
       marginTop: '1.455em',
       textTransform: 'none'

package/dist/cjs/ui/EditorContentContainer/styles/codeBidiWarningStyles.js

@@ -17,9 +17,9 @@ var codeBidiWarningStyles = exports.codeBidiWarningStyles = (0, _react.css)({
   '[data-prosemirror-node-name="code-bidi-warning"] [data-bidi-component="code-bidi-warning-decorator"]': {
     paddingInlineStart: "var(--ds-space-050, 4px)",
     paddingInlineEnd: "var(--ds-space-050, 4px)",
-    font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    font: "var(--ds-font-body, normal 400 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
     fontStyle: 'normal',
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
     paddingTop: '0.05rem',
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
@@ -54,7 +54,7 @@ var codeBidiWarningStyles = exports.codeBidiWarningStyles = (0, _react.css)({
     transform: 'translate(calc(-50% - 40px), calc(24px - 4px))',
     opacity: 0,
     whiteSpace: 'normal',
-    font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
     zIndex: 9999,
     // Exit animation timings
     // - Mark invisible after 0.475s

package/dist/cjs/ui/EditorContentContainer/styles/codeBlockStyles.js

@@ -61,7 +61,7 @@ var codeBlockStyles = exports.codeBlockStyles = (0, _react.css)({
     borderRadius: "var(--ds-radius-small, 3px)",
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
     margin: "".concat(blockNodesVerticalMargin, " 0 0 0"),
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
     minWidth: 48,
     cursor: 'pointer',

package/dist/cjs/ui/EditorContentContainer/styles/codeMarkStyles.js

@@ -20,7 +20,7 @@ var codeMarkStyles = exports.codeMarkStyles = (0, _react.css)({
     borderStyle: 'none',
     boxDecorationBreak: 'clone',
     color: "var(--ds-text, #292A2E)",
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: '0.875em',
     fontWeight: "var(--ds-font-weight-regular, 400)",

package/dist/cjs/ui/EditorContentContainer/styles/expandStyles.js

@@ -272,7 +272,7 @@ var expandStylesMixin_fg_platform_visual_refresh_icons = exports.expandStylesMix
   '.ak-editor-expand__title-input': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 1,
-    fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
+    fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
   }
 });
 

package/dist/cjs/ui/EditorContentContainer/styles/statusStyles.js

@@ -66,8 +66,8 @@ var statusStyles = exports.statusStyles = (0, _react.css)({
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: '11px',
     fontStyle: 'normal',
-    fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-    fontWeight: "var(--ds-font-weight-bold, 700)",
+    fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    fontWeight: "var(--ds-font-weight-bold, 653)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: '16px',
     overflow: 'hidden',

package/dist/cjs/ui/EditorContentContainer/styles/telepointerStyles.js

@@ -169,7 +169,7 @@ var telepointerStyle = exports.telepointerStyle = (0, _react.css)({
         whiteSpace: 'pre',
         top: -14,
         left: 0,
-        font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+        font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
         paddingLeft: "var(--ds-space-050, 4px)",
         paddingRight: "var(--ds-space-050, 4px)",
         borderRadius: "0 ".concat("var(--ds-radius-xsmall, 2px)", " ", "var(--ds-radius-xsmall, 2px)", " 0")

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useEditorContext = exports.default = exports.LegacyEditorContext = void 0;
+exports.useEditorContext = exports.default = exports.LegacyEditorContextOld = 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"));
@@ -14,6 +14,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _actions = _interopRequireDefault(require("../../actions"));
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -25,38 +26,32 @@ var useEditorContext = exports.useEditorContext = function useEditorContext() {
 // eslint-disable-next-line @repo/internal/react/no-class-components, react/prefer-stateless-function
 var LegacyEditorContext = exports.LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
   function LegacyEditorContext(props) {
+    var _this;
     (0, _classCallCheck2.default)(this, LegacyEditorContext);
-    return _callSuper(this, LegacyEditorContext, [props]);
+    _this = _callSuper(this, LegacyEditorContext, [props]);
+    _this.editorActions = props.editorActions || new _actions.default();
+    return _this;
   }
   (0, _inherits2.default)(LegacyEditorContext, _React$Component);
   return (0, _createClass2.default)(LegacyEditorContext, [{
     key: "render",
     value: function render() {
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-      return /*#__PURE__*/_react.default.createElement(LegacyEditorContextNew, this.props, this.props.children);
+      return /*#__PURE__*/_react.default.createElement(_UNSAFE_do_not_use_editor_context.EditorContext.Provider, {
+        value: {
+          editorActions: this.editorActions
+        }
+      }, this.props.children);
     }
   }]);
-}(_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);
-}
-
-// Ignored via go/ees005
+}(_react.default.Component); // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
-var LegacyEditorContextOld = exports.default = /*#__PURE__*/function (_React$Component2) {
+var LegacyEditorContextOld = exports.LegacyEditorContextOld = /*#__PURE__*/function (_React$Component2) {
   function LegacyEditorContextOld(props) {
-    var _this;
+    var _this2;
     (0, _classCallCheck2.default)(this, LegacyEditorContextOld);
-    _this = _callSuper(this, LegacyEditorContextOld, [props]);
-    _this.editorActions = props.editorActions || new _actions.default();
-    return _this;
+    _this2 = _callSuper(this, LegacyEditorContextOld, [props]);
+    _this2.editorActions = props.editorActions || new _actions.default();
+    return _this2;
   }
   (0, _inherits2.default)(LegacyEditorContextOld, _React$Component2);
   return (0, _createClass2.default)(LegacyEditorContextOld, [{
@@ -77,4 +72,11 @@ var LegacyEditorContextOld = exports.default = /*#__PURE__*/function (_React$Com
 }(_react.default.Component);
 (0, _defineProperty2.default)(LegacyEditorContextOld, "childContextTypes", {
   editorActions: _propTypes.default.object
-});
+});
+var _default = exports.default = function _default(props) {
+  return (0, _expValEquals.expValEquals)('platform_editor_context_context_types_migration', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(LegacyEditorContext, {
+    editorActions: props.editorActions
+  }, props.children) : /*#__PURE__*/_react.default.createElement(LegacyEditorContextOld, {
+    editorActions: props.editorActions
+  }, props.children);
+};

package/dist/cjs/ui/Toolbar/Toolbar.js

@@ -85,7 +85,7 @@ var ToolbarNext = exports.ToolbarNext = function ToolbarNext(_ref) {
   return /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
     editorAppearance: editorAppearance,
-    editorViewMode: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit' : editorViewMode,
+    editorViewMode: editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit',
     editorToolbarDockingPreference: editorToolbarDockingPreference,
     isOffline: isOffline
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarUIProvider, {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.WithHelpTriggerOld = exports.WithHelpTriggerNew = exports.WithHelpTrigger = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -15,20 +15,22 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _eventDispatcher = require("@atlaskit/editor-common/event-dispatcher");
+var _UNSAFE_do_not_use_editor_context = require("@atlaskit/editor-common/UNSAFE_do_not_use_editor_context");
 var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
 var _helpDialog = require("@atlaskit/editor-plugins/help-dialog");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
-var WithHelpTrigger = exports.default = /*#__PURE__*/function (_React$Component) {
-  function WithHelpTrigger() {
+var WithHelpTriggerOld = exports.WithHelpTriggerOld = /*#__PURE__*/function (_React$Component) {
+  function WithHelpTriggerOld() {
     var _this;
-    (0, _classCallCheck2.default)(this, WithHelpTrigger);
+    (0, _classCallCheck2.default)(this, WithHelpTriggerOld);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, WithHelpTrigger, [].concat(args));
+    _this = _callSuper(this, WithHelpTriggerOld, [].concat(args));
     (0, _defineProperty2.default)(_this, "openHelp", function () {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -55,14 +57,66 @@ var WithHelpTrigger = exports.default = /*#__PURE__*/function (_React$Component)
     });
     return _this;
   }
-  (0, _inherits2.default)(WithHelpTrigger, _React$Component);
-  return (0, _createClass2.default)(WithHelpTrigger, [{
+  (0, _inherits2.default)(WithHelpTriggerOld, _React$Component);
+  return (0, _createClass2.default)(WithHelpTriggerOld, [{
     key: "render",
     value: function render() {
       return this.props.render(this.openHelp);
     }
   }]);
-}(_react.default.Component);
-(0, _defineProperty2.default)(WithHelpTrigger, "contextTypes", {
+}(_react.default.Component); // Ignored via go/ees005
+// eslint-disable-next-line @repo/internal/react/no-class-components
+(0, _defineProperty2.default)(WithHelpTriggerOld, "contextTypes", {
   editorActions: _propTypes.default.object.isRequired
-});
+});
+var WithHelpTriggerNew = exports.WithHelpTriggerNew = /*#__PURE__*/function (_React$Component2) {
+  function WithHelpTriggerNew() {
+    var _this2;
+    (0, _classCallCheck2.default)(this, WithHelpTriggerNew);
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    _this2 = _callSuper(this, WithHelpTriggerNew, [].concat(args));
+    (0, _defineProperty2.default)(_this2, "openHelp", function () {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      var _ref2 = _this2.context,
+        editorActions = _ref2.editorActions;
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      var dispatch = (0, _eventDispatcher.createDispatch)(editorActions.eventDispatcher);
+      dispatch(_analytics2.analyticsEventKey, {
+        payload: {
+          action: _analytics.ACTION.CLICKED,
+          actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.BUTTON_HELP,
+          attributes: {
+            inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+          },
+          eventType: _analytics.EVENT_TYPE.UI
+        }
+      });
+      var editorView = editorActions._privateGetEditorView();
+      if (editorView) {
+        (0, _helpDialog.deprecatedOpenHelpCommand)(editorView.state.tr, editorView.dispatch);
+      }
+    });
+    return _this2;
+  }
+  (0, _inherits2.default)(WithHelpTriggerNew, _React$Component2);
+  return (0, _createClass2.default)(WithHelpTriggerNew, [{
+    key: "render",
+    value: function render() {
+      return this.props.render(this.openHelp);
+    }
+  }]);
+}(_react.default.Component);
+(0, _defineProperty2.default)(WithHelpTriggerNew, "contextType", _UNSAFE_do_not_use_editor_context.EditorContext);
+var WithHelpTrigger = exports.WithHelpTrigger = function WithHelpTrigger(props) {
+  return (0, _expValEquals.expValEquals)('platform_editor_context_context_types_migration', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(WithHelpTriggerNew, {
+    render: props.render
+  }) : /*#__PURE__*/_react.default.createElement(WithHelpTriggerOld, {
+    render: props.render
+  });
+};
+var _default = exports.default = WithHelpTrigger;

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 = "216.6.5";
+var version = exports.version = "216.6.7";

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

@@ -142,7 +142,7 @@ export const FullPageEditor = props => {
       FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(isToolbarAIFCEnabled)
     }
   }, !isEditorToolbarHidden && (isToolbarAIFCEnabled ? jsx(FullPageToolbarNext, {
-    disabled: expValEquals('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? !!props.disabled : undefined,
+    disabled: !!props.disabled,
     toolbarDockingPosition: (_toolbarDockingPositi = toolbarDockingPosition) !== null && _toolbarDockingPositi !== void 0 ? _toolbarDockingPositi : toolbarDocking,
     beforeIcon: props.primaryToolbarIconBefore,
     editorAPI: editorAPI,

package/dist/es2019/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -306,7 +306,7 @@ export const blocktypeStyles_without_fg_platform_editor_typography_ugc = css({
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       lineHeight: 'calc(16 / 11)',
       color: "var(--ds-text-subtlest, #6B6E76)",
-      fontWeight: "var(--ds-font-weight-bold, 700)",
+      fontWeight: "var(--ds-font-weight-bold, 653)",
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
       marginTop: '1.455em',
       textTransform: 'none'

package/dist/es2019/ui/EditorContentContainer/styles/codeBidiWarningStyles.js

@@ -10,9 +10,9 @@ export const codeBidiWarningStyles = css({
   '[data-prosemirror-node-name="code-bidi-warning"] [data-bidi-component="code-bidi-warning-decorator"]': {
     paddingInlineStart: "var(--ds-space-050, 4px)",
     paddingInlineEnd: "var(--ds-space-050, 4px)",
-    font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    font: "var(--ds-font-body, normal 400 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
     fontStyle: 'normal',
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
     paddingTop: '0.05rem',
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
@@ -47,7 +47,7 @@ export const codeBidiWarningStyles = css({
     transform: 'translate(calc(-50% - 40px), calc(24px - 4px))',
     opacity: 0,
     whiteSpace: 'normal',
-    font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
     zIndex: 9999,
     // Exit animation timings
     // - Mark invisible after 0.475s

package/dist/es2019/ui/EditorContentContainer/styles/codeBlockStyles.js

@@ -58,7 +58,7 @@ export const codeBlockStyles = css({
       borderRadius: "var(--ds-radius-small, 3px)",
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
       margin: `${blockNodesVerticalMargin} 0 0 0`,
-      fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+      fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
       minWidth: 48,
       cursor: 'pointer',

package/dist/es2019/ui/EditorContentContainer/styles/codeMarkStyles.js

@@ -13,7 +13,7 @@ export const codeMarkStyles = css({
     borderStyle: 'none',
     boxDecorationBreak: 'clone',
     color: "var(--ds-text, #292A2E)",
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: '0.875em',
     fontWeight: "var(--ds-font-weight-regular, 400)",

package/dist/es2019/ui/EditorContentContainer/styles/expandStyles.js

@@ -265,7 +265,7 @@ export const expandStylesMixin_fg_platform_visual_refresh_icons = css({
   '.ak-editor-expand__title-input': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 1,
-    fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
+    fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
   }
 });
 

package/dist/es2019/ui/EditorContentContainer/styles/statusStyles.js

@@ -59,8 +59,8 @@ export const statusStyles = css({
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: '11px',
     fontStyle: 'normal',
-    fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-    fontWeight: "var(--ds-font-weight-bold, 700)",
+    fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    fontWeight: "var(--ds-font-weight-bold, 653)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: '16px',
     overflow: 'hidden',

package/dist/es2019/ui/EditorContentContainer/styles/telepointerStyles.js

@@ -162,7 +162,7 @@ export const telepointerStyle = css({
         whiteSpace: 'pre',
         top: -14,
         left: 0,
-        font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+        font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
         paddingLeft: "var(--ds-space-050, 4px)",
         paddingRight: "var(--ds-space-050, 4px)",
         borderRadius: `0 ${"var(--ds-radius-xsmall, 2px)"} ${"var(--ds-radius-xsmall, 2px)"} 0`

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

@@ -2,6 +2,7 @@ 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import EditorActions from '../../actions';
 export const useEditorContext = () => React.useContext(EditorContext);
 
@@ -10,27 +11,20 @@ export const useEditorContext = () => React.useContext(EditorContext);
 export class LegacyEditorContext extends React.Component {
   constructor(props) {
     super(props);
+    this.editorActions = props.editorActions || new EditorActions();
   }
   render() {
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return /*#__PURE__*/React.createElement(LegacyEditorContextNew, this.props, this.props.children);
+    return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+      value: {
+        editorActions: this.editorActions
+      }
+    }, this.props.children);
   }
 }
-function LegacyEditorContextNew({
-  children,
-  editorActions
-}) {
-  return /*#__PURE__*/React.createElement(EditorContext.Provider, {
-    value: {
-      editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
-    }
-  }, children);
-}
 
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
-export default class LegacyEditorContextOld extends React.Component {
+export class LegacyEditorContextOld extends React.Component {
   constructor(props) {
     super(props);
     this.editorActions = props.editorActions || new EditorActions();
@@ -48,4 +42,9 @@ export default class LegacyEditorContextOld extends React.Component {
 }
 _defineProperty(LegacyEditorContextOld, "childContextTypes", {
   editorActions: PropTypes.object
-});
+});
+export default (props => expValEquals('platform_editor_context_context_types_migration', 'isEnabled', true) ? /*#__PURE__*/React.createElement(LegacyEditorContext, {
+  editorActions: props.editorActions
+}, props.children) : /*#__PURE__*/React.createElement(LegacyEditorContextOld, {
+  editorActions: props.editorActions
+}, props.children));

package/dist/es2019/ui/Toolbar/Toolbar.js

@@ -79,7 +79,7 @@ export const ToolbarNext = ({
   return /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
     editorAppearance: editorAppearance,
-    editorViewMode: expValEquals('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit' : editorViewMode,
+    editorViewMode: editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit',
     editorToolbarDockingPreference: editorToolbarDockingPreference,
     isOffline: isOffline
   }, /*#__PURE__*/React.createElement(EditorToolbarUIProvider, {

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

@@ -3,11 +3,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { createDispatch } from '@atlaskit/editor-common/event-dispatcher';
+import { EditorContext } from '@atlaskit/editor-common/UNSAFE_do_not_use_editor_context';
 import { analyticsEventKey } from '@atlaskit/editor-common/utils/analytics';
 import { deprecatedOpenHelpCommand } from '@atlaskit/editor-plugins/help-dialog';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
-export default class WithHelpTrigger extends React.Component {
+export class WithHelpTriggerOld extends React.Component {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "openHelp", () => {
@@ -40,6 +42,49 @@ export default class WithHelpTrigger extends React.Component {
     return this.props.render(this.openHelp);
   }
 }
-_defineProperty(WithHelpTrigger, "contextTypes", {
+
+// Ignored via go/ees005
+// eslint-disable-next-line @repo/internal/react/no-class-components
+_defineProperty(WithHelpTriggerOld, "contextTypes", {
   editorActions: PropTypes.object.isRequired
-});
+});
+export class WithHelpTriggerNew extends React.Component {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "openHelp", () => {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const {
+        editorActions
+      } = this.context;
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const dispatch = createDispatch(editorActions.eventDispatcher);
+      dispatch(analyticsEventKey, {
+        payload: {
+          action: ACTION.CLICKED,
+          actionSubject: ACTION_SUBJECT.BUTTON,
+          actionSubjectId: ACTION_SUBJECT_ID.BUTTON_HELP,
+          attributes: {
+            inputMethod: INPUT_METHOD.TOOLBAR
+          },
+          eventType: EVENT_TYPE.UI
+        }
+      });
+      const editorView = editorActions._privateGetEditorView();
+      if (editorView) {
+        deprecatedOpenHelpCommand(editorView.state.tr, editorView.dispatch);
+      }
+    });
+  }
+  render() {
+    return this.props.render(this.openHelp);
+  }
+}
+_defineProperty(WithHelpTriggerNew, "contextType", EditorContext);
+export const WithHelpTrigger = props => expValEquals('platform_editor_context_context_types_migration', 'isEnabled', true) ? /*#__PURE__*/React.createElement(WithHelpTriggerNew, {
+  render: props.render
+}) : /*#__PURE__*/React.createElement(WithHelpTriggerOld, {
+  render: props.render
+});
+export default WithHelpTrigger;

package/dist/es2019/version-wrapper.js

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

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

@@ -147,7 +147,7 @@ export var FullPageEditor = function FullPageEditor(props) {
       FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(isToolbarAIFCEnabled)
     }
   }, !isEditorToolbarHidden && (isToolbarAIFCEnabled ? jsx(FullPageToolbarNext, {
-    disabled: expValEquals('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? !!props.disabled : undefined,
+    disabled: !!props.disabled,
     toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,
     beforeIcon: props.primaryToolbarIconBefore,
     editorAPI: editorAPI,

package/dist/esm/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -307,7 +307,7 @@ export var blocktypeStyles_without_fg_platform_editor_typography_ugc = css({
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       lineHeight: 'calc(16 / 11)',
       color: "var(--ds-text-subtlest, #6B6E76)",
-      fontWeight: "var(--ds-font-weight-bold, 700)",
+      fontWeight: "var(--ds-font-weight-bold, 653)",
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
       marginTop: '1.455em',
       textTransform: 'none'

package/dist/esm/ui/EditorContentContainer/styles/codeBidiWarningStyles.js

@@ -10,9 +10,9 @@ export var codeBidiWarningStyles = css({
   '[data-prosemirror-node-name="code-bidi-warning"] [data-bidi-component="code-bidi-warning-decorator"]': {
     paddingInlineStart: "var(--ds-space-050, 4px)",
     paddingInlineEnd: "var(--ds-space-050, 4px)",
-    font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    font: "var(--ds-font-body, normal 400 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
     fontStyle: 'normal',
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
     paddingTop: '0.05rem',
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
@@ -47,7 +47,7 @@ export var codeBidiWarningStyles = css({
     transform: 'translate(calc(-50% - 40px), calc(24px - 4px))',
     opacity: 0,
     whiteSpace: 'normal',
-    font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
     zIndex: 9999,
     // Exit animation timings
     // - Mark invisible after 0.475s

package/dist/esm/ui/EditorContentContainer/styles/codeBlockStyles.js

@@ -53,7 +53,7 @@ export var codeBlockStyles = css({
     borderRadius: "var(--ds-radius-small, 3px)",
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
     margin: "".concat(blockNodesVerticalMargin, " 0 0 0"),
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-unsafe-values
     minWidth: 48,
     cursor: 'pointer',

package/dist/esm/ui/EditorContentContainer/styles/codeMarkStyles.js

@@ -13,7 +13,7 @@ export var codeMarkStyles = css({
     borderStyle: 'none',
     boxDecorationBreak: 'clone',
     color: "var(--ds-text, #292A2E)",
-    fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
+    fontFamily: "var(--ds-font-family-code, \"Atlassian Mono\", ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: '0.875em',
     fontWeight: "var(--ds-font-weight-regular, 400)",

package/dist/esm/ui/EditorContentContainer/styles/expandStyles.js

@@ -265,7 +265,7 @@ export var expandStylesMixin_fg_platform_visual_refresh_icons = css({
   '.ak-editor-expand__title-input': {
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 1,
-    fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
+    fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
   }
 });
 

package/dist/esm/ui/EditorContentContainer/styles/statusStyles.js

@@ -59,8 +59,8 @@ export var statusStyles = css({
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     fontSize: '11px',
     fontStyle: 'normal',
-    fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-    fontWeight: "var(--ds-font-weight-bold, 700)",
+    fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+    fontWeight: "var(--ds-font-weight-bold, 653)",
     // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: '16px',
     overflow: 'hidden',

package/dist/esm/ui/EditorContentContainer/styles/telepointerStyles.js

@@ -162,7 +162,7 @@ export var telepointerStyle = css({
         whiteSpace: 'pre',
         top: -14,
         left: 0,
-        font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+        font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
         paddingLeft: "var(--ds-space-050, 4px)",
         paddingRight: "var(--ds-space-050, 4px)",
         borderRadius: "0 ".concat("var(--ds-radius-xsmall, 2px)", " ", "var(--ds-radius-xsmall, 2px)", " 0")

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

@@ -9,6 +9,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EditorContext } from '@atlaskit/editor-common/UNSAFE_do_not_use_editor_context';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import EditorActions from '../../actions';
 export var useEditorContext = function useEditorContext() {
   return React.useContext(EditorContext);
@@ -18,38 +19,34 @@ export var useEditorContext = function useEditorContext() {
 // eslint-disable-next-line @repo/internal/react/no-class-components, react/prefer-stateless-function
 export var LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
   function LegacyEditorContext(props) {
+    var _this;
     _classCallCheck(this, LegacyEditorContext);
-    return _callSuper(this, LegacyEditorContext, [props]);
+    _this = _callSuper(this, LegacyEditorContext, [props]);
+    _this.editorActions = props.editorActions || new EditorActions();
+    return _this;
   }
   _inherits(LegacyEditorContext, _React$Component);
   return _createClass(LegacyEditorContext, [{
     key: "render",
     value: function render() {
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/jsx-props-no-spreading
-      return /*#__PURE__*/React.createElement(LegacyEditorContextNew, this.props, this.props.children);
+      return /*#__PURE__*/React.createElement(EditorContext.Provider, {
+        value: {
+          editorActions: this.editorActions
+        }
+      }, this.props.children);
     }
   }]);
 }(React.Component);
-function LegacyEditorContextNew(_ref) {
-  var children = _ref.children,
-    editorActions = _ref.editorActions;
-  return /*#__PURE__*/React.createElement(EditorContext.Provider, {
-    value: {
-      editorActions: editorActions !== null && editorActions !== void 0 ? editorActions : new EditorActions()
-    }
-  }, children);
-}
 
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
-var LegacyEditorContextOld = /*#__PURE__*/function (_React$Component2) {
+export var LegacyEditorContextOld = /*#__PURE__*/function (_React$Component2) {
   function LegacyEditorContextOld(props) {
-    var _this;
+    var _this2;
     _classCallCheck(this, LegacyEditorContextOld);
-    _this = _callSuper(this, LegacyEditorContextOld, [props]);
-    _this.editorActions = props.editorActions || new EditorActions();
-    return _this;
+    _this2 = _callSuper(this, LegacyEditorContextOld, [props]);
+    _this2.editorActions = props.editorActions || new EditorActions();
+    return _this2;
   }
   _inherits(LegacyEditorContextOld, _React$Component2);
   return _createClass(LegacyEditorContextOld, [{
@@ -71,4 +68,10 @@ var LegacyEditorContextOld = /*#__PURE__*/function (_React$Component2) {
 _defineProperty(LegacyEditorContextOld, "childContextTypes", {
   editorActions: PropTypes.object
 });
-export { LegacyEditorContextOld as default };
+export default (function (props) {
+  return expValEquals('platform_editor_context_context_types_migration', 'isEnabled', true) ? /*#__PURE__*/React.createElement(LegacyEditorContext, {
+    editorActions: props.editorActions
+  }, props.children) : /*#__PURE__*/React.createElement(LegacyEditorContextOld, {
+    editorActions: props.editorActions
+  }, props.children);
+});

package/dist/esm/ui/Toolbar/Toolbar.js

@@ -79,7 +79,7 @@ export var ToolbarNext = function ToolbarNext(_ref) {
   return /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
     editorAppearance: editorAppearance,
-    editorViewMode: expValEquals('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit' : editorViewMode,
+    editorViewMode: editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit',
     editorToolbarDockingPreference: editorToolbarDockingPreference,
     isOffline: isOffline
   }, /*#__PURE__*/React.createElement(EditorToolbarUIProvider, {

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

@@ -10,18 +10,20 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { createDispatch } from '@atlaskit/editor-common/event-dispatcher';
+import { EditorContext } from '@atlaskit/editor-common/UNSAFE_do_not_use_editor_context';
 import { analyticsEventKey } from '@atlaskit/editor-common/utils/analytics';
 import { deprecatedOpenHelpCommand } from '@atlaskit/editor-plugins/help-dialog';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
-var WithHelpTrigger = /*#__PURE__*/function (_React$Component) {
-  function WithHelpTrigger() {
+export var WithHelpTriggerOld = /*#__PURE__*/function (_React$Component) {
+  function WithHelpTriggerOld() {
     var _this;
-    _classCallCheck(this, WithHelpTrigger);
+    _classCallCheck(this, WithHelpTriggerOld);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, WithHelpTrigger, [].concat(args));
+    _this = _callSuper(this, WithHelpTriggerOld, [].concat(args));
     _defineProperty(_this, "openHelp", function () {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -48,15 +50,68 @@ var WithHelpTrigger = /*#__PURE__*/function (_React$Component) {
     });
     return _this;
   }
-  _inherits(WithHelpTrigger, _React$Component);
-  return _createClass(WithHelpTrigger, [{
+  _inherits(WithHelpTriggerOld, _React$Component);
+  return _createClass(WithHelpTriggerOld, [{
     key: "render",
     value: function render() {
       return this.props.render(this.openHelp);
     }
   }]);
 }(React.Component);
-_defineProperty(WithHelpTrigger, "contextTypes", {
+
+// Ignored via go/ees005
+// eslint-disable-next-line @repo/internal/react/no-class-components
+_defineProperty(WithHelpTriggerOld, "contextTypes", {
   editorActions: PropTypes.object.isRequired
 });
-export { WithHelpTrigger as default };
+export var WithHelpTriggerNew = /*#__PURE__*/function (_React$Component2) {
+  function WithHelpTriggerNew() {
+    var _this2;
+    _classCallCheck(this, WithHelpTriggerNew);
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    _this2 = _callSuper(this, WithHelpTriggerNew, [].concat(args));
+    _defineProperty(_this2, "openHelp", function () {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      var _ref2 = _this2.context,
+        editorActions = _ref2.editorActions;
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      var dispatch = createDispatch(editorActions.eventDispatcher);
+      dispatch(analyticsEventKey, {
+        payload: {
+          action: ACTION.CLICKED,
+          actionSubject: ACTION_SUBJECT.BUTTON,
+          actionSubjectId: ACTION_SUBJECT_ID.BUTTON_HELP,
+          attributes: {
+            inputMethod: INPUT_METHOD.TOOLBAR
+          },
+          eventType: EVENT_TYPE.UI
+        }
+      });
+      var editorView = editorActions._privateGetEditorView();
+      if (editorView) {
+        deprecatedOpenHelpCommand(editorView.state.tr, editorView.dispatch);
+      }
+    });
+    return _this2;
+  }
+  _inherits(WithHelpTriggerNew, _React$Component2);
+  return _createClass(WithHelpTriggerNew, [{
+    key: "render",
+    value: function render() {
+      return this.props.render(this.openHelp);
+    }
+  }]);
+}(React.Component);
+_defineProperty(WithHelpTriggerNew, "contextType", EditorContext);
+export var WithHelpTrigger = function WithHelpTrigger(props) {
+  return expValEquals('platform_editor_context_context_types_migration', 'isEnabled', true) ? /*#__PURE__*/React.createElement(WithHelpTriggerNew, {
+    render: props.render
+  }) : /*#__PURE__*/React.createElement(WithHelpTriggerOld, {
+    render: props.render
+  });
+};
+export default WithHelpTrigger;

package/dist/esm/version-wrapper.js

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

package/dist/types/ui/Appearance/FullPage/FullPageToolbarNext.d.ts

@@ -11,7 +11,7 @@ import type { PrimaryToolbarComponents } from '../../../types';
 type FullPageToolbarNextProps = {
     beforeIcon?: React.ReactNode;
     customPrimaryToolbarComponents?: PrimaryToolbarComponents;
-    disabled?: boolean;
+    disabled: boolean;
     editorAPI?: PublicPluginAPI<[ToolbarPlugin]>;
     editorView?: EditorView;
     popupsBoundariesElement?: HTMLElement;

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

@@ -8,9 +8,10 @@ export type EditorContextProps = React.PropsWithChildren<EditorContextInternal>;
 export declare const useEditorContext: () => EditorContextProps;
 export declare class LegacyEditorContext extends React.Component<EditorContextProps, Object> {
     constructor(props: EditorContextProps);
+    private editorActions;
     render(): React.JSX.Element;
 }
-export default class LegacyEditorContextOld extends React.Component<EditorContextProps, Object> {
+export declare class LegacyEditorContextOld extends React.Component<EditorContextProps, Object> {
     static childContextTypes: {
         editorActions: PropTypes.Requireable<object>;
     };
@@ -21,4 +22,5 @@ export default class LegacyEditorContextOld extends React.Component<EditorContex
     };
     render(): React.JSX.Element;
 }
-export {};
+declare const _default: (props: EditorContextProps) => React.JSX.Element;
+export default _default;

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

@@ -4,7 +4,7 @@ import type EditorActions from '../../actions';
 interface WithHelpTriggerProps {
     render: (openHelp: () => void) => React.ReactNode;
 }
-export default class WithHelpTrigger extends React.Component<WithHelpTriggerProps> {
+export declare class WithHelpTriggerOld extends React.Component<WithHelpTriggerProps> {
     static contextTypes: {
         editorActions: PropTypes.Validator<object>;
     };
@@ -14,4 +14,13 @@ export default class WithHelpTrigger extends React.Component<WithHelpTriggerProp
     openHelp: () => void;
     render(): React.ReactNode;
 }
-export {};
+export declare class WithHelpTriggerNew extends React.Component<WithHelpTriggerProps> {
+    static contextType: React.Context<{}>;
+    context: {
+        editorActions: EditorActions;
+    };
+    openHelp: () => void;
+    render(): React.ReactNode;
+}
+export declare const WithHelpTrigger: (props: WithHelpTriggerProps) => React.JSX.Element;
+export default WithHelpTrigger;

package/dist/types-ts4.5/ui/Appearance/FullPage/FullPageToolbarNext.d.ts

@@ -11,7 +11,7 @@ import type { PrimaryToolbarComponents } from '../../../types';
 type FullPageToolbarNextProps = {
     beforeIcon?: React.ReactNode;
     customPrimaryToolbarComponents?: PrimaryToolbarComponents;
-    disabled?: boolean;
+    disabled: boolean;
     editorAPI?: PublicPluginAPI<[
         ToolbarPlugin
     ]>;

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

@@ -8,9 +8,10 @@ export type EditorContextProps = React.PropsWithChildren<EditorContextInternal>;
 export declare const useEditorContext: () => EditorContextProps;
 export declare class LegacyEditorContext extends React.Component<EditorContextProps, Object> {
     constructor(props: EditorContextProps);
+    private editorActions;
     render(): React.JSX.Element;
 }
-export default class LegacyEditorContextOld extends React.Component<EditorContextProps, Object> {
+export declare class LegacyEditorContextOld extends React.Component<EditorContextProps, Object> {
     static childContextTypes: {
         editorActions: PropTypes.Requireable<object>;
     };
@@ -21,4 +22,5 @@ export default class LegacyEditorContextOld extends React.Component<EditorContex
     };
     render(): React.JSX.Element;
 }
-export {};
+declare const _default: (props: EditorContextProps) => React.JSX.Element;
+export default _default;

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

@@ -4,7 +4,7 @@ import type EditorActions from '../../actions';
 interface WithHelpTriggerProps {
     render: (openHelp: () => void) => React.ReactNode;
 }
-export default class WithHelpTrigger extends React.Component<WithHelpTriggerProps> {
+export declare class WithHelpTriggerOld extends React.Component<WithHelpTriggerProps> {
     static contextTypes: {
         editorActions: PropTypes.Validator<object>;
     };
@@ -14,4 +14,13 @@ export default class WithHelpTrigger extends React.Component<WithHelpTriggerProp
     openHelp: () => void;
     render(): React.ReactNode;
 }
-export {};
+export declare class WithHelpTriggerNew extends React.Component<WithHelpTriggerProps> {
+    static contextType: React.Context<{}>;
+    context: {
+        editorActions: EditorActions;
+    };
+    openHelp: () => void;
+    render(): React.ReactNode;
+}
+export declare const WithHelpTrigger: (props: WithHelpTriggerProps) => React.JSX.Element;
+export default WithHelpTrigger;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.6.6",
+	"version": "216.7.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^4.17.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.23.0",
+		"@atlaskit/tmp-editor-statsig": "^16.25.0",
 		"@atlaskit/tokens": "^10.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -357,6 +357,9 @@
 		},
 		"platform_editor_a11y_find_replace_focus_ring": {
 			"type": "boolean"
+		},
+		"platform_editor_context_context_types_migration": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {