@atlaskit/editor-core 189.2.0 → 189.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

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

@@ -125,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, {

package/dist/cjs/presets/universal.js

@@ -368,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)
@@ -385,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,19 +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;
+  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", {
@@ -49,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 || {}
-  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.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,
@@ -72,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$featureFlags6;
-    if ((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar) {
+    if (twoLineEditorToolbar) {
       var updateOnResize = function updateOnResize() {
         setShouldSplitToolbar(window.innerWidth <= _MainToolbar.MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -98,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$featureFlags7, _props$featureFlags8, _props$featureFlags9;
     var contextPanelWidth = _ref.width;
     return (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
       editorView: props.editorView,
@@ -107,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$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.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$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.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$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.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.2.0";
+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

@@ -118,7 +118,8 @@ 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, {

package/dist/es2019/presets/universal.js

@@ -365,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)
@@ -382,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,12 +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;
+  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", {
@@ -35,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 || {}
-  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
+  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
@@ -58,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$featureFlags6;
-    if ((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar) {
+    if (twoLineEditorToolbar) {
       const updateOnResize = () => {
         setShouldSplitToolbar(window.innerWidth <= MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -83,27 +89,24 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   };
   return jsx(ContextPanelConsumer, null, ({
     width: contextPanelWidth
-  }) => {
-    var _props$featureFlags7, _props$featureFlags8, _props$featureFlags9;
-    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$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar)),
-      "data-testid": "ak-editor-main-toolbar"
-    }, jsx("div", {
-      css: mainToolbarFirstChildStyle(!!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
-      role: "toolbar",
-      "aria-label": props.intl.formatMessage(messages.toolbarLabel)
-    }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx("div", {
-      css: mainToolbarSecondChildStyle(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.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.2.0";
+export const version = "189.3.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -119,7 +119,8 @@ export 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
           }));
         }
       }), jsx(PortalRenderer, {

package/dist/esm/presets/universal.js

@@ -361,14 +361,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, function (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, function (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)
@@ -378,8 +382,8 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }).maybeAdd(findReplacePlugin, function (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/esm/ui/Appearance/FullPage/FullPage.js

@@ -66,7 +66,8 @@ export var FullPageEditor = function 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/esm/ui/Appearance/FullPage/FullPageToolbar.js

@@ -12,15 +12,17 @@ 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 var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     shouldSplitToolbar = _useState2[0],
     setShouldSplitToolbar = _useState2[1];
   var editorAPI = 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 = jsx("div", {
     css: nonCustomToolbarWrapperStyle
   }, props.beforeIcon && jsx("div", {
@@ -39,20 +41,25 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (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
   }));
   var 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 || (_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 || (_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 || {}
-  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
+  }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
@@ -62,8 +69,7 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     featureFlags: props.featureFlags
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   useEffect(function () {
-    var _props$featureFlags6;
-    if ((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar) {
+    if (twoLineEditorToolbar) {
       var updateOnResize = function updateOnResize() {
         setShouldSplitToolbar(window.innerWidth <= MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -88,7 +94,6 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     event.stopPropagation();
   };
   return jsx(ContextPanelConsumer, null, function (_ref) {
-    var _props$featureFlags7, _props$featureFlags8, _props$featureFlags9;
     var contextPanelWidth = _ref.width;
     return jsx(ToolbarArrowKeyNavigationProvider, {
       editorView: props.editorView,
@@ -97,14 +102,14 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
       handleEscape: handleEscape,
       intl: props.intl
     }, jsx("div", {
-      css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar)),
+      css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, twoLineEditorToolbar),
       "data-testid": "ak-editor-main-toolbar"
     }, jsx("div", {
-      css: mainToolbarFirstChildStyle(!!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
+      css: mainToolbarFirstChildStyle(twoLineEditorToolbar),
       role: "toolbar",
       "aria-label": props.intl.formatMessage(messages.toolbarLabel)
     }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx("div", {
-      css: mainToolbarSecondChildStyle(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
+      css: mainToolbarSecondChildStyle(twoLineEditorToolbar),
       "data-testid": 'avatar-group-outside-plugin',
       role: "region",
       "aria-label": props.intl.formatMessage(messages.pageActionsLabel)

package/dist/esm/version-wrapper.js

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

package/dist/types/types/editor-appearance-component.d.ts

@@ -47,4 +47,5 @@ export interface EditorAppearanceComponentProps {
     featureFlags: FeatureFlags;
     useStickyToolbar?: UseStickyToolbarType;
     innerRef?: RefObject<HTMLDivElement>;
+    hideAvatarGroup?: boolean;
 }

package/dist/types/types/editor-props.d.ts

@@ -149,6 +149,7 @@ export interface EditorSharedPropsWithPlugins {
      *  Configure and extend editor linking behaviour
      */
     linking?: LinkingOptions;
+    hideAvatarGroup?: boolean;
 }
 export interface EditorProps extends EditorBaseProps, EditorPluginFeatureProps, EditorSharedPropsWithPlugins, EditorProviderProps {
     /**

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

@@ -30,7 +30,8 @@ export interface FullPageToolbarProps {
     containerElement: HTMLElement | null;
     beforeIcon?: ReactElement;
     hasMinWidth?: boolean;
-    featureFlags?: FeatureFlags;
+    featureFlags: FeatureFlags;
+    hideAvatarGroup?: boolean;
 }
 export declare const EditorToolbar: React.MemoExoticComponent<(props: FullPageToolbarProps & WrappedComponentProps) => jsx.JSX.Element>;
 export declare const FullPageToolbar: React.FC<import("react-intl-next").WithIntlProps<FullPageToolbarProps & WrappedComponentProps<"intl">>> & {

package/dist/types-ts4.5/types/editor-appearance-component.d.ts

@@ -47,4 +47,5 @@ export interface EditorAppearanceComponentProps {
     featureFlags: FeatureFlags;
     useStickyToolbar?: UseStickyToolbarType;
     innerRef?: RefObject<HTMLDivElement>;
+    hideAvatarGroup?: boolean;
 }

package/dist/types-ts4.5/types/editor-props.d.ts

@@ -149,6 +149,7 @@ export interface EditorSharedPropsWithPlugins {
      *  Configure and extend editor linking behaviour
      */
     linking?: LinkingOptions;
+    hideAvatarGroup?: boolean;
 }
 export interface EditorProps extends EditorBaseProps, EditorPluginFeatureProps, EditorSharedPropsWithPlugins, EditorProviderProps {
     /**

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

@@ -30,7 +30,8 @@ export interface FullPageToolbarProps {
     containerElement: HTMLElement | null;
     beforeIcon?: ReactElement;
     hasMinWidth?: boolean;
-    featureFlags?: FeatureFlags;
+    featureFlags: FeatureFlags;
+    hideAvatarGroup?: boolean;
 }
 export declare const EditorToolbar: React.MemoExoticComponent<(props: FullPageToolbarProps & WrappedComponentProps) => jsx.JSX.Element>;
 export declare const FullPageToolbar: React.FC<import("react-intl-next").WithIntlProps<FullPageToolbarProps & WrappedComponentProps<"intl">>> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.2.0",
+  "version": "189.3.0",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -237,9 +237,6 @@
     "platform.editor.custom-table-width": {
       "type": "boolean"
     },
-    "platform.confluence.frontend.editor.no.platform.avatar.group": {
-      "type": "boolean"
-    },
     "platform.linking-platform.editor.fix-link-insert-analytics": {
       "type": "boolean"
     },

package/report.api.md

@@ -541,6 +541,8 @@ interface EditorSharedPropsWithPlugins {
   allowUndoRedoButtons?: boolean;
   // (undocumented)
   collabEdit?: CollabEditOptions;
+  // (undocumented)
+  hideAvatarGroup?: boolean;
   linking?: LinkingOptions;
   // (undocumented)
   media?: MediaOptions;

package/tmp/api-report-tmp.d.ts

@@ -496,6 +496,8 @@ interface EditorSharedPropsWithPlugins {
     allowUndoRedoButtons?: boolean;
     // (undocumented)
     collabEdit?: CollabEditOptions;
+    // (undocumented)
+    hideAvatarGroup?: boolean;
     linking?: LinkingOptions;
     // (undocumented)
     media?: MediaOptions;