@atlaskit/editor-core 189.1.15 → 189.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-core
 
+## 189.3.0
+
+### Minor Changes
+
+- [#42535](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42535) [`39770b766f1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/39770b766f1) - [ux] MODES-3618 Use hideAvatarGroup instead of feature flag to determine whether avatar should be hidden
+
+## 189.2.0
+
+### Minor Changes
+
+- [#42452](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42452) [`bdbe13c80c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bdbe13c80c9) - ED-19900 Removing indentationButtonsInTheToolbar FF fallback from showIndentationButtons editor prop.
+
+### Patch Changes
+
+- [#42352](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42352) [`965649a4121`](https://bitbucket.org/atlassian/atlassian-frontend/commits/965649a4121) - Decouple find replace prop from the full page toolbar.
+- [#42604](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42604) [`182627d0f5e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/182627d0f5e) - Extracted panel plugin from editor-core as @atlaskit/editor-plugin-panel
+- Updated dependencies
+
 ## 189.1.15
 
 ### Patch Changes

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EditorInternal = EditorInternal;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -74,7 +75,7 @@ function EditorInternal(_ref) {
     onAnalyticsEvent: handleAnalyticsEvent,
     useAnalyticsContext: props.UNSAFE_useAnalyticsContext,
     render: function render(portalProviderAPI) {
-      return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_ReactEditorView.default, {
+      return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(ReactEditorViewContextWrapper, {
         editorProps: overriddenEditorProps,
         createAnalyticsEvent: createAnalyticsEvent,
         portalProviderAPI: portalProviderAPI,
@@ -124,7 +125,8 @@ function EditorInternal(_ref) {
             enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
             useStickyToolbar: props.useStickyToolbar,
             featureFlags: featureFlags,
-            pluginHooks: config.pluginHooks
+            pluginHooks: config.pluginHooks,
+            hideAvatarGroup: props.hideAvatarGroup
           }));
         }
       }), (0, _react2.jsx)(_portalProvider.PortalRenderer, {
@@ -132,4 +134,24 @@ function EditorInternal(_ref) {
       }));
     }
   }))))));
+}
+function ReactEditorViewContextWrapper(props) {
+  var setInternalEditorAPI = (0, _context.useSetPresetContext)();
+  var setExternalEditorAPI = props.setEditorApi;
+
+  /**
+   * We use the context to retrieve the editorAPI
+   * externally for consumers via `usePreset`.
+   *
+   * However we also may need to retrieve this value internally via context
+   * so we should also set the value for the `EditorContext` that is used in
+   * `EditorInternal`.
+   */
+  var setEditorAPI = (0, _react.useCallback)(function (api) {
+    setInternalEditorAPI === null || setInternalEditorAPI === void 0 || setInternalEditorAPI(api);
+    setExternalEditorAPI === null || setExternalEditorAPI === void 0 || setExternalEditorAPI(api);
+  }, [setInternalEditorAPI, setExternalEditorAPI]);
+  return (0, _react2.jsx)(_ReactEditorView.default, (0, _extends2.default)({}, props, {
+    setEditorApi: setEditorAPI
+  }));
 }

package/dist/cjs/create-editor/feature-flags-from-props.js

@@ -32,7 +32,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 function createFeatureFlagsFromProps(props) {
-  var _props$allowLayouts, _props$performanceTra, _props$allowExtension, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$featureFlags5, _props$featureFlags6, _props$featureFlags7, _props$featureFlags8, _props$featureFlags9, _props$featureFlags10, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$collabEdit, _props$collabEdit2, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22;
+  var _props$allowLayouts, _props$performanceTra, _props$allowExtension, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$featureFlags5, _props$featureFlags6, _props$featureFlags7, _props$featureFlags8, _props$featureFlags9, _props$featureFlags10, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$collabEdit, _props$collabEdit2, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20;
   var normalizedFeatureFlags = (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags);
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
@@ -54,13 +54,12 @@ function createFeatureFlagsFromProps(props) {
     twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags13 = props.featureFlags) === null || _props$featureFlags13 === void 0 ? void 0 : _props$featureFlags13.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags14 = props.featureFlags) !== null && _props$featureFlags14 !== void 0 && _props$featureFlags14.twoLineEditorToolbar) : false),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
     showHoverPreview: Boolean(typeof ((_props$featureFlags15 = props.featureFlags) === null || _props$featureFlags15 === void 0 ? void 0 : _props$featureFlags15.showHoverPreview) === 'boolean' ? !!((_props$featureFlags16 = props.featureFlags) !== null && _props$featureFlags16 !== void 0 && _props$featureFlags16.showHoverPreview) : false),
-    indentationButtonsInTheToolbar: typeof props.showIndentationButtons === 'boolean' ? props.showIndentationButtons : Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags17 = props.featureFlags) === null || _props$featureFlags17 === void 0 ? void 0 : _props$featureFlags17.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags18 = props.featureFlags) !== null && _props$featureFlags18 !== void 0 && _props$featureFlags18.indentationButtonsInTheToolbar) : false)),
-    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags19 = props.featureFlags) === null || _props$featureFlags19 === void 0 ? void 0 : _props$featureFlags19['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags17 = props.featureFlags) === null || _props$featureFlags17 === void 0 ? void 0 : _props$featureFlags17['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags),
     // Including fallback to props.featureFlags so that mobile feature flags
     // are included (they are not kebab cased)
-    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.restartNumberedLists) === true,
+    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.restartNumberedLists) === true,
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
-    preventPopupOverflow: Boolean(typeof ((_props$featureFlags21 = props.featureFlags) === null || _props$featureFlags21 === void 0 ? void 0 : _props$featureFlags21['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags22 = props.featureFlags) !== null && _props$featureFlags22 !== void 0 && _props$featureFlags22['prevent-popup-overflow']) : false)
+    preventPopupOverflow: Boolean(typeof ((_props$featureFlags19 = props.featureFlags) === null || _props$featureFlags19 === void 0 ? void 0 : _props$featureFlags19['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags20 = props.featureFlags) !== null && _props$featureFlags20 !== void 0 && _props$featureFlags20['prevent-popup-overflow']) : false)
   });
 }

package/dist/cjs/plugins/index.js

@@ -149,12 +149,6 @@ Object.defineProperty(exports, "mobileSelectionPlugin", {
     return _mobileSelection.default;
   }
 });
-Object.defineProperty(exports, "panelPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _panel.default;
-  }
-});
 Object.defineProperty(exports, "pastePlugin", {
   enumerable: true,
   get: function get() {
@@ -194,7 +188,6 @@ var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _toolbarListsIndentation = _interopRequireDefault(require("./toolbar-lists-indentation"));
 var _macro = _interopRequireDefault(require("./macro"));
 var _maxContentSize = _interopRequireDefault(require("./max-content-size"));
-var _panel = _interopRequireDefault(require("./panel"));
 var _paste = _interopRequireDefault(require("./paste"));
 var _tasksAndDecisions = _interopRequireDefault(require("./tasks-and-decisions"));
 var _breakout = _interopRequireDefault(require("./breakout"));

package/dist/cjs/presets/universal.js

@@ -8,6 +8,7 @@ exports.default = createUniversalPreset;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _plugins = require("../plugins");
+var _editorPluginPanel = require("@atlaskit/editor-plugin-panel");
 var _editorPluginTextColor = require("@atlaskit/editor-plugin-text-color");
 var _editorPluginHistory = require("@atlaskit/editor-plugin-history");
 var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
@@ -243,7 +244,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(_plugins.panelPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginPanel.panelPlugin, function (plugin, builder) {
     if (props.allowPanel) {
       var allowPanel = (0, _typeof2.default)(props.allowPanel) === 'object' ? props.allowPanel : {};
       return builder.add([plugin, {
@@ -356,7 +357,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     }
     return builder;
   }).add([_plugins.toolbarListsIndentationPlugin, {
-    showIndentationButtons: !!featureFlags.indentationButtonsInTheToolbar,
+    showIndentationButtons: !!props.showIndentationButtons,
     allowHeadingAndParagraphIndentation: !!props.allowIndentation
   }]).add([_plugins.insertBlockPlugin, {
     allowTables: !!props.allowTables,
@@ -367,14 +368,18 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]).maybeAdd(_plugins.beforePrimaryToolbarPlugin, function (plugin, builder) {
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') && hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
       }]);
     }
     return builder;
   }).maybeAdd(_plugins.avatarGroupPlugin, function (plugin, builder) {
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    if (!props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+      // Avatars are moved to Confluence codebase for Edit in Context
+      // When Edit in Context is enabled primaryToolbarComponents is undefined
+      // For more details please check
+      // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
       return builder.add([plugin, {
         collabEdit: props.collabEdit,
         takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
@@ -384,8 +389,8 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
   }).maybeAdd(_plugins.findReplacePlugin, function (plugin, builder) {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
-        takeFullWidth: !(0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
-        twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
+        takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+        twoLineEditorToolbar: !!props.primaryToolbarComponents && !!featureFlags.twoLineEditorToolbar
       }]);
     }
     return builder;

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

@@ -77,7 +77,8 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
     primaryToolbarComponents: props.primaryToolbarComponents,
     providerFactory: props.providerFactory,
     showKeyline: showKeyline,
-    featureFlags: props.featureFlags
+    featureFlags: props.featureFlags,
+    hideAvatarGroup: props.hideAvatarGroup
   }), (0, _react2.jsx)(_FullPageContentArea.FullPageContentArea, {
     ref: scrollContentContainerRef,
     appearance: props.appearance,

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

@@ -18,17 +18,21 @@ var _MainToolbar = require("./MainToolbar");
 var _ui2 = require("@atlaskit/editor-common/ui");
 var _messages = require("@atlaskit/editor-common/messages");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _context = require("../../../presets/context");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
 
 var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     shouldSplitToolbar = _useState2[0],
     setShouldSplitToolbar = _useState2[1];
+  var editorAPI = (0, _context.usePresetContext)();
+
+  // When primary toolbar components is undefined, do not show two line editor toolbar
+  var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
   var nonCustomToolbar = (0, _react2.jsx)("div", {
     css: _MainToolbar.nonCustomToolbarWrapperStyle
   }, props.beforeIcon && (0, _react2.jsx)("div", {
@@ -47,20 +51,25 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
     containerElement: props.containerElement,
     hasMinWidth: props.hasMinWidth,
-    twoLineEditorToolbar: !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar)
+    twoLineEditorToolbar: twoLineEditorToolbar
   }));
   var customToolbar = (0, _react2.jsx)("div", {
     css: _MainToolbar.customToolbarWrapperStyle
-  }, (_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
+  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
-  }) : null, (0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') || (props === null || props === void 0 || (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : (0, _react2.jsx)(_ui.default, {
+  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null :
+  // Avatars are moved to Confluence codebase for Edit in Context
+  // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
+  // For more details please check
+  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
+  (0, _react2.jsx)(_ui.default, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
     isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
     featureFlags: props.featureFlags || {}
-  }), (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.findReplace && (_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
+  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
@@ -70,8 +79,7 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     featureFlags: props.featureFlags
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   (0, _react.useEffect)(function () {
-    var _props$featureFlags7;
-    if ((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar) {
+    if (twoLineEditorToolbar) {
       var updateOnResize = function updateOnResize() {
         setShouldSplitToolbar(window.innerWidth <= _MainToolbar.MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -96,7 +104,6 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     event.stopPropagation();
   };
   return (0, _react2.jsx)(_ui2.ContextPanelConsumer, null, function (_ref) {
-    var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
     var contextPanelWidth = _ref.width;
     return (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
       editorView: props.editorView,
@@ -105,14 +112,14 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
       handleEscape: handleEscape,
       intl: props.intl
     }, (0, _react2.jsx)("div", {
-      css: (0, _MainToolbar.mainToolbarStyle)(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
+      css: (0, _MainToolbar.mainToolbarStyle)(props.showKeyline || contextPanelWidth > 0, twoLineEditorToolbar),
       "data-testid": "ak-editor-main-toolbar"
     }, (0, _react2.jsx)("div", {
-      css: (0, _MainToolbar.mainToolbarFirstChildStyle)(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
+      css: (0, _MainToolbar.mainToolbarFirstChildStyle)(twoLineEditorToolbar),
       role: "toolbar",
       "aria-label": props.intl.formatMessage(_messages.fullPageMessages.toolbarLabel)
     }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.jsx)("div", {
-      css: (0, _MainToolbar.mainToolbarSecondChildStyle)(!!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.twoLineEditorToolbar)),
+      css: (0, _MainToolbar.mainToolbarSecondChildStyle)(twoLineEditorToolbar),
       "data-testid": 'avatar-group-outside-plugin',
       role: "region",
       "aria-label": props.intl.formatMessage(_messages.fullPageMessages.pageActionsLabel)

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.1.15";
+var version = exports.version = "189.3.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -1,5 +1,6 @@
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { Fragment } from 'react';
+import { Fragment, useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
 import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 import { PortalProviderWithThemeProviders, PortalRenderer } from '@atlaskit/editor-common/portal-provider';
@@ -66,7 +67,7 @@ export function EditorInternal({
   }, jsx(ContextAdapter, null, jsx(PortalProviderWithThemeProviders, {
     onAnalyticsEvent: handleAnalyticsEvent,
     useAnalyticsContext: props.UNSAFE_useAnalyticsContext,
-    render: portalProviderAPI => jsx(Fragment, null, jsx(ReactEditorView, {
+    render: portalProviderAPI => jsx(Fragment, null, jsx(ReactEditorViewContextWrapper, {
       editorProps: overriddenEditorProps,
       createAnalyticsEvent: createAnalyticsEvent,
       portalProviderAPI: portalProviderAPI,
@@ -117,11 +118,34 @@ export function EditorInternal({
           enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
           useStickyToolbar: props.useStickyToolbar,
           featureFlags: featureFlags,
-          pluginHooks: config.pluginHooks
+          pluginHooks: config.pluginHooks,
+          hideAvatarGroup: props.hideAvatarGroup
         }));
       }
     }), jsx(PortalRenderer, {
       portalProviderAPI: portalProviderAPI
     }))
   }))))));
+}
+function ReactEditorViewContextWrapper(props) {
+  const setInternalEditorAPI = useSetPresetContext();
+  const {
+    setEditorApi: setExternalEditorAPI
+  } = props;
+
+  /**
+   * We use the context to retrieve the editorAPI
+   * externally for consumers via `usePreset`.
+   *
+   * However we also may need to retrieve this value internally via context
+   * so we should also set the value for the `EditorContext` that is used in
+   * `EditorInternal`.
+   */
+  const setEditorAPI = useCallback(api => {
+    setInternalEditorAPI === null || setInternalEditorAPI === void 0 ? void 0 : setInternalEditorAPI(api);
+    setExternalEditorAPI === null || setExternalEditorAPI === void 0 ? void 0 : setExternalEditorAPI(api);
+  }, [setInternalEditorAPI, setExternalEditorAPI]);
+  return jsx(ReactEditorView, _extends({}, props, {
+    setEditorApi: setEditorAPI
+  }));
 }

package/dist/es2019/create-editor/feature-flags-from-props.js

@@ -21,7 +21,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 export function createFeatureFlagsFromProps(props) {
-  var _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$allowExtension, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$featureFlags5, _props$featureFlags6, _props$featureFlags7, _props$featureFlags8, _props$featureFlags9, _props$featureFlags10, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$collabEdit, _props$collabEdit2, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22;
+  var _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$allowExtension, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$featureFlags5, _props$featureFlags6, _props$featureFlags7, _props$featureFlags8, _props$featureFlags9, _props$featureFlags10, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$collabEdit, _props$collabEdit2, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20;
   const normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   return {
     ...normalizedFeatureFlags,
@@ -44,13 +44,12 @@ export function createFeatureFlagsFromProps(props) {
     twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags13 = props.featureFlags) === null || _props$featureFlags13 === void 0 ? void 0 : _props$featureFlags13.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags14 = props.featureFlags) !== null && _props$featureFlags14 !== void 0 && _props$featureFlags14.twoLineEditorToolbar) : false),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
     showHoverPreview: Boolean(typeof ((_props$featureFlags15 = props.featureFlags) === null || _props$featureFlags15 === void 0 ? void 0 : _props$featureFlags15.showHoverPreview) === 'boolean' ? !!((_props$featureFlags16 = props.featureFlags) !== null && _props$featureFlags16 !== void 0 && _props$featureFlags16.showHoverPreview) : false),
-    indentationButtonsInTheToolbar: typeof props.showIndentationButtons === 'boolean' ? props.showIndentationButtons : Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags17 = props.featureFlags) === null || _props$featureFlags17 === void 0 ? void 0 : _props$featureFlags17.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags18 = props.featureFlags) !== null && _props$featureFlags18 !== void 0 && _props$featureFlags18.indentationButtonsInTheToolbar) : false)),
-    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags19 = props.featureFlags) === null || _props$featureFlags19 === void 0 ? void 0 : _props$featureFlags19['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags17 = props.featureFlags) === null || _props$featureFlags17 === void 0 ? void 0 : _props$featureFlags17['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags),
     // Including fallback to props.featureFlags so that mobile feature flags
     // are included (they are not kebab cased)
-    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.restartNumberedLists) === true,
+    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.restartNumberedLists) === true,
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
-    preventPopupOverflow: Boolean(typeof ((_props$featureFlags21 = props.featureFlags) === null || _props$featureFlags21 === void 0 ? void 0 : _props$featureFlags21['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags22 = props.featureFlags) !== null && _props$featureFlags22 !== void 0 && _props$featureFlags22['prevent-popup-overflow']) : false)
+    preventPopupOverflow: Boolean(typeof ((_props$featureFlags19 = props.featureFlags) === null || _props$featureFlags19 === void 0 ? void 0 : _props$featureFlags19['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags20 = props.featureFlags) !== null && _props$featureFlags20 !== void 0 && _props$featureFlags20['prevent-popup-overflow']) : false)
   };
 }

package/dist/es2019/plugins/index.js

@@ -7,7 +7,6 @@ export { default as jiraIssuePlugin } from './jira-issue';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
 export { default as macroPlugin } from './macro';
 export { default as maxContentSizePlugin } from './max-content-size';
-export { default as panelPlugin } from './panel';
 export { default as pastePlugin } from './paste';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';

package/dist/es2019/presets/universal.js

@@ -1,4 +1,5 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { panelPlugin } from '@atlaskit/editor-plugin-panel';
 import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
@@ -353,7 +354,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     }
     return builder;
   }).add([toolbarListsIndentationPlugin, {
-    showIndentationButtons: !!featureFlags.indentationButtonsInTheToolbar,
+    showIndentationButtons: !!props.showIndentationButtons,
     allowHeadingAndParagraphIndentation: !!props.allowIndentation
   }]).add([insertBlockPlugin, {
     allowTables: !!props.allowTables,
@@ -364,14 +365,18 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]).maybeAdd(beforePrimaryToolbarPlugin, (plugin, builder) => {
-    if (!getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
       }]);
     }
     return builder;
   }).maybeAdd(avatarGroupPlugin, (plugin, builder) => {
-    if (!getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    if (!props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+      // Avatars are moved to Confluence codebase for Edit in Context
+      // When Edit in Context is enabled primaryToolbarComponents is undefined
+      // For more details please check
+      // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
       return builder.add([plugin, {
         collabEdit: props.collabEdit,
         takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
@@ -381,8 +386,8 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }).maybeAdd(findReplacePlugin, (plugin, builder) => {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
-        takeFullWidth: !getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
-        twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
+        takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+        twoLineEditorToolbar: !!props.primaryToolbarComponents && !!featureFlags.twoLineEditorToolbar
       }]);
     }
     return builder;

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

@@ -58,7 +58,8 @@ export const FullPageEditor = props => {
     primaryToolbarComponents: props.primaryToolbarComponents,
     providerFactory: props.providerFactory,
     showKeyline: showKeyline,
-    featureFlags: props.featureFlags
+    featureFlags: props.featureFlags,
+    hideAvatarGroup: props.hideAvatarGroup
   }), jsx(FullPageContentArea, {
     ref: scrollContentContainerRef,
     appearance: props.appearance,

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

@@ -11,10 +11,14 @@ import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyl
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { usePresetContext } from '../../../presets/context';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
+  const editorAPI = usePresetContext();
+
+  // When primary toolbar components is undefined, do not show two line editor toolbar
+  const twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
   const nonCustomToolbar = jsx("div", {
     css: nonCustomToolbarWrapperStyle
   }, props.beforeIcon && jsx("div", {
@@ -33,20 +37,25 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
     containerElement: props.containerElement,
     hasMinWidth: props.hasMinWidth,
-    twoLineEditorToolbar: !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar)
+    twoLineEditorToolbar: twoLineEditorToolbar
   }));
   const customToolbar = jsx("div", {
     css: customToolbarWrapperStyle
-  }, (_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
+  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
-  }) : null, getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') || (props === null || props === void 0 ? void 0 : (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : jsx(AvatarsWithPluginState, {
+  }) : null, props.hideAvatarGroup || (props === null || props === void 0 ? void 0 : (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null :
+  // Avatars are moved to Confluence codebase for Edit in Context
+  // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
+  // For more details please check
+  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
+  jsx(AvatarsWithPluginState, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
     isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
     featureFlags: props.featureFlags || {}
-  }), (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.findReplace && (_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
+  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
@@ -56,8 +65,7 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     featureFlags: props.featureFlags
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   useEffect(() => {
-    var _props$featureFlags7;
-    if ((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar) {
+    if (twoLineEditorToolbar) {
       const updateOnResize = () => {
         setShouldSplitToolbar(window.innerWidth <= MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -81,27 +89,24 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   };
   return jsx(ContextPanelConsumer, null, ({
     width: contextPanelWidth
-  }) => {
-    var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
-    return jsx(ToolbarArrowKeyNavigationProvider, {
-      editorView: props.editorView,
-      childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
-      isShortcutToFocusToolbar: isShortcutToFocusToolbar,
-      handleEscape: handleEscape,
-      intl: props.intl
-    }, jsx("div", {
-      css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
-      "data-testid": "ak-editor-main-toolbar"
-    }, jsx("div", {
-      css: mainToolbarFirstChildStyle(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
-      role: "toolbar",
-      "aria-label": props.intl.formatMessage(messages.toolbarLabel)
-    }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx("div", {
-      css: mainToolbarSecondChildStyle(!!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.twoLineEditorToolbar)),
-      "data-testid": 'avatar-group-outside-plugin',
-      role: "region",
-      "aria-label": props.intl.formatMessage(messages.pageActionsLabel)
-    }, shouldSplitToolbar ? nonCustomToolbar : customToolbar)));
-  });
+  }) => jsx(ToolbarArrowKeyNavigationProvider, {
+    editorView: props.editorView,
+    childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
+    isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+    handleEscape: handleEscape,
+    intl: props.intl
+  }, jsx("div", {
+    css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, twoLineEditorToolbar),
+    "data-testid": "ak-editor-main-toolbar"
+  }, jsx("div", {
+    css: mainToolbarFirstChildStyle(twoLineEditorToolbar),
+    role: "toolbar",
+    "aria-label": props.intl.formatMessage(messages.toolbarLabel)
+  }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx("div", {
+    css: mainToolbarSecondChildStyle(twoLineEditorToolbar),
+    "data-testid": 'avatar-group-outside-plugin',
+    role: "region",
+    "aria-label": props.intl.formatMessage(messages.pageActionsLabel)
+  }, shouldSplitToolbar ? nonCustomToolbar : customToolbar))));
 });
 export const FullPageToolbar = injectIntl(EditorToolbar);

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.1.15";
+export const version = "189.3.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };