@atlaskit/editor-core 191.0.3 → 191.0.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-core
 
+## 191.0.4
+
+### Patch Changes
+
+- [#66110](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66110) [`eb05333c3a59`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eb05333c3a59) - Extract before primary toolbar plugin from editor-core
+- [#66119](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66119) [`3f87176f284d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f87176f284d) - [ED-21806] Refactoring plugin to match NextEditorPlugin standard
+- Updated dependencies
+
 ## 191.0.3
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -55,6 +55,9 @@
         {
             "path": "../../editor-plugin-base/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../editor-plugin-before-primary-toolbar/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../editor-plugin-better-type-history/afm-cc/tsconfig.json"
         },

package/dist/cjs/plugins/avatar-group/ui/avatars-with-plugin-state.js

@@ -20,29 +20,23 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
     featureFlags = props.featureFlags,
     editorAnalyticsAPI = props.editorAnalyticsAPI,
     editorAPI = props.editorAPI;
-  var render = _react.default.useCallback(function (_ref) {
-    var data = _ref.data;
-    if (!data) {
-      return null;
-    }
-    return /*#__PURE__*/_react.default.createElement(_avatars.Avatars, {
-      sessionId: data.sessionId,
-      participants: data.activeParticipants,
-      editorView: editorView,
-      featureFlags: featureFlags,
-      editorAnalyticsAPI: editorAnalyticsAPI,
-      editorAPI: editorAPI
-    }, /*#__PURE__*/_react.default.createElement(_inviteToEdit.InviteToEditButton, {
-      title: title,
-      selected: selected,
-      onClick: onClick,
-      Component: Component
-    }));
-  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI, editorAPI]);
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['collabEdit']),
     collabEditState = _useSharedPluginState.collabEditState;
-  return render({
-    data: collabEditState
-  });
+  if (!collabEditState) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_avatars.Avatars, {
+    sessionId: collabEditState.sessionId,
+    participants: collabEditState.activeParticipants,
+    editorView: editorView,
+    featureFlags: featureFlags,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    editorAPI: editorAPI
+  }, /*#__PURE__*/_react.default.createElement(_inviteToEdit.InviteToEditButton, {
+    title: title,
+    selected: selected,
+    onClick: onClick,
+    Component: Component
+  }));
 };
 var _default = exports.default = (0, _reactIntlNext.injectIntl)(AvatarsWithPluginState);

package/dist/cjs/plugins/avatar-group/ui/colored-avatar-item.js

@@ -11,7 +11,7 @@ var _colors = require("@atlaskit/theme/colors");
 
 var ColoredAvatarItem = exports.ColoredAvatarItem = function ColoredAvatarItem(props) {
   var _props$api;
-  var color = (_props$api = props.api) === null || _props$api === void 0 || (_props$api = _props$api.collabEdit) === null || _props$api === void 0 ? void 0 : _props$api.actions.getAvatarColor(props.sessionId).color.solid;
+  var color = (_props$api = props.api) === null || _props$api === void 0 || (_props$api = _props$api.collabEdit) === null || _props$api === void 0 || (_props$api = _props$api.actions) === null || _props$api === void 0 ? void 0 : _props$api.getAvatarColor(props.sessionId).color.solid;
   var avatar = props.name.substr(0, 1).toUpperCase();
   return (0, _react.jsx)("div", {
     css: (0, _styles.badge)(color || _colors.R100),

package/dist/cjs/plugins/index.js

@@ -10,12 +10,6 @@ Object.defineProperty(exports, "avatarGroupPlugin", {
     return _avatarGroup.default;
   }
 });
-Object.defineProperty(exports, "beforePrimaryToolbarPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _beforePrimaryToolbar.default;
-  }
-});
 Object.defineProperty(exports, "findReplacePlugin", {
   enumerable: true,
   get: function get() {
@@ -30,5 +24,4 @@ Object.defineProperty(exports, "jiraIssuePlugin", {
 });
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));
-var _avatarGroup = _interopRequireDefault(require("./avatar-group"));
-var _beforePrimaryToolbar = _interopRequireDefault(require("./before-primaryToolbar"));
+var _avatarGroup = _interopRequireDefault(require("./avatar-group"));

package/dist/cjs/presets/universal.js

@@ -51,6 +51,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorPluginCollabEdit = require("@atlaskit/editor-plugin-collab-edit");
 var _plugins = require("../plugins");
 var _editorPluginExtension = require("@atlaskit/editor-plugin-extension");
+var _editorPluginBeforePrimaryToolbar = require("@atlaskit/editor-plugin-before-primary-toolbar");
 var _editorPluginFeedbackDialog = require("@atlaskit/editor-plugin-feedback-dialog");
 var _utils = require("@atlaskit/editor-common/utils");
 var _isFullPage = require("../utils/is-full-page");
@@ -377,7 +378,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     nativeStatusSupported: !statusMenuDisabled,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
-  }]).maybeAdd(_plugins.beforePrimaryToolbarPlugin, function (plugin, builder) {
+  }]).maybeAdd(_editorPluginBeforePrimaryToolbar.beforePrimaryToolbarPlugin, function (plugin, builder) {
     if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BeforePrimaryToolbarWrapper = void 0;
+var _react = require("@emotion/react");
+/** @jsx jsx */
+
+var beforePrimaryToolbarPluginWrapperStyles = (0, _react.css)({
+  display: 'flex',
+  marginRight: "var(--ds-space-100, 8px)",
+  flexGrow: 1,
+  justifyContent: 'flex-end',
+  alignItems: 'center'
+});
+// Duplicate of the wrapper from `editor-plugin-before-primary-toolbar` used
+// only in `FullPageToolbar` to decouple the plugin from the main toolbar
+var BeforePrimaryToolbarWrapper = exports.BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
+  return (0, _react.jsx)("div", {
+    css: beforePrimaryToolbarPluginWrapperStyles,
+    "data-testid": 'before-primary-toolbar-components-plugin'
+  }, props.beforePrimaryToolbarComponents);
+};

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

@@ -11,19 +11,19 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _ui = _interopRequireDefault(require("../../../plugins/avatar-group/ui"));
-var _BeforePrimaryToolbarWrapper = require("../../../plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper");
 var _Toolbar = _interopRequireDefault(require("../../Toolbar"));
 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 _context = require("../../../presets/context");
+var _BeforeWrapper = require("./BeforeWrapper");
 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$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -54,8 +54,8 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
   }));
   var customToolbar = (0, _react2.jsx)("div", {
     css: _MainToolbar.customToolbarWrapperStyle
-  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
-    beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
+  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforeWrapper.BeforePrimaryToolbarWrapper, {
+    beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
   }) : 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

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

package/dist/es2019/plugins/avatar-group/ui/avatars-with-plugin-state.js

@@ -15,31 +15,24 @@ const AvatarsWithPluginState = props => {
     editorAnalyticsAPI,
     editorAPI
   } = props;
-  const render = React.useCallback(({
-    data
-  }) => {
-    if (!data) {
-      return null;
-    }
-    return /*#__PURE__*/React.createElement(Avatars, {
-      sessionId: data.sessionId,
-      participants: data.activeParticipants,
-      editorView: editorView,
-      featureFlags: featureFlags,
-      editorAnalyticsAPI: editorAnalyticsAPI,
-      editorAPI: editorAPI
-    }, /*#__PURE__*/React.createElement(InviteToEditButton, {
-      title: title,
-      selected: selected,
-      onClick: onClick,
-      Component: Component
-    }));
-  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI, editorAPI]);
   const {
     collabEditState
   } = useSharedPluginState(editorAPI, ['collabEdit']);
-  return render({
-    data: collabEditState
-  });
+  if (!collabEditState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Avatars, {
+    sessionId: collabEditState.sessionId,
+    participants: collabEditState.activeParticipants,
+    editorView: editorView,
+    featureFlags: featureFlags,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    editorAPI: editorAPI
+  }, /*#__PURE__*/React.createElement(InviteToEditButton, {
+    title: title,
+    selected: selected,
+    onClick: onClick,
+    Component: Component
+  }));
 };
 export default injectIntl(AvatarsWithPluginState);

package/dist/es2019/plugins/avatar-group/ui/colored-avatar-item.js

@@ -3,8 +3,8 @@ import { jsx } from '@emotion/react';
 import { badge } from './styles';
 import { R100 } from '@atlaskit/theme/colors';
 export const ColoredAvatarItem = props => {
-  var _props$api, _props$api$collabEdit;
-  const color = (_props$api = props.api) === null || _props$api === void 0 ? void 0 : (_props$api$collabEdit = _props$api.collabEdit) === null || _props$api$collabEdit === void 0 ? void 0 : _props$api$collabEdit.actions.getAvatarColor(props.sessionId).color.solid;
+  var _props$api, _props$api$collabEdit, _props$api$collabEdit2;
+  const color = (_props$api = props.api) === null || _props$api === void 0 ? void 0 : (_props$api$collabEdit = _props$api.collabEdit) === null || _props$api$collabEdit === void 0 ? void 0 : (_props$api$collabEdit2 = _props$api$collabEdit.actions) === null || _props$api$collabEdit2 === void 0 ? void 0 : _props$api$collabEdit2.getAvatarColor(props.sessionId).color.solid;
   const avatar = props.name.substr(0, 1).toUpperCase();
   return jsx("div", {
     css: badge(color || R100),

package/dist/es2019/plugins/index.js

@@ -1,4 +1,3 @@
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as findReplacePlugin } from './find-replace';
-export { default as avatarGroupPlugin } from './avatar-group';
-export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';
+export { default as avatarGroupPlugin } from './avatar-group';

package/dist/es2019/presets/universal.js

@@ -39,8 +39,9 @@ import { dataConsumerPlugin } from '@atlaskit/editor-plugin-data-consumer';
 import { annotationPlugin } from '@atlaskit/editor-plugin-annotation';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { collabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
-import { avatarGroupPlugin, beforePrimaryToolbarPlugin, findReplacePlugin, jiraIssuePlugin } from '../plugins';
+import { avatarGroupPlugin, findReplacePlugin, jiraIssuePlugin } from '../plugins';
 import { extensionPlugin } from '@atlaskit/editor-plugin-extension';
+import { beforePrimaryToolbarPlugin } from '@atlaskit/editor-plugin-before-primary-toolbar';
 import { feedbackDialogPlugin } from '@atlaskit/editor-plugin-feedback-dialog';
 import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';

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

@@ -0,0 +1,15 @@
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
+const beforePrimaryToolbarPluginWrapperStyles = css({
+  display: 'flex',
+  marginRight: "var(--ds-space-100, 8px)",
+  flexGrow: 1,
+  justifyContent: 'flex-end',
+  alignItems: 'center'
+});
+// Duplicate of the wrapper from `editor-plugin-before-primary-toolbar` used
+// only in `FullPageToolbar` to decouple the plugin from the main toolbar
+export const BeforePrimaryToolbarWrapper = props => jsx("div", {
+  css: beforePrimaryToolbarPluginWrapperStyles,
+  "data-testid": 'before-primary-toolbar-components-plugin'
+}, props.beforePrimaryToolbarComponents);

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

@@ -4,15 +4,15 @@ import React, { useState, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import AvatarsWithPluginState from '../../../plugins/avatar-group/ui';
-import { BeforePrimaryToolbarWrapper } from '../../../plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper';
 import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 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 { usePresetContext } from '../../../presets/context';
+import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
   const editorAPI = usePresetContext();
 
@@ -41,7 +41,7 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   const customToolbar = jsx("div", {
     css: customToolbarWrapperStyle
   }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
-    beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
+    beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
   }) : 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

package/dist/es2019/version-wrapper.js

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

package/dist/esm/plugins/avatar-group/ui/avatars-with-plugin-state.js

@@ -13,29 +13,23 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
     featureFlags = props.featureFlags,
     editorAnalyticsAPI = props.editorAnalyticsAPI,
     editorAPI = props.editorAPI;
-  var render = React.useCallback(function (_ref) {
-    var data = _ref.data;
-    if (!data) {
-      return null;
-    }
-    return /*#__PURE__*/React.createElement(Avatars, {
-      sessionId: data.sessionId,
-      participants: data.activeParticipants,
-      editorView: editorView,
-      featureFlags: featureFlags,
-      editorAnalyticsAPI: editorAnalyticsAPI,
-      editorAPI: editorAPI
-    }, /*#__PURE__*/React.createElement(InviteToEditButton, {
-      title: title,
-      selected: selected,
-      onClick: onClick,
-      Component: Component
-    }));
-  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI, editorAPI]);
   var _useSharedPluginState = useSharedPluginState(editorAPI, ['collabEdit']),
     collabEditState = _useSharedPluginState.collabEditState;
-  return render({
-    data: collabEditState
-  });
+  if (!collabEditState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Avatars, {
+    sessionId: collabEditState.sessionId,
+    participants: collabEditState.activeParticipants,
+    editorView: editorView,
+    featureFlags: featureFlags,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    editorAPI: editorAPI
+  }, /*#__PURE__*/React.createElement(InviteToEditButton, {
+    title: title,
+    selected: selected,
+    onClick: onClick,
+    Component: Component
+  }));
 };
 export default injectIntl(AvatarsWithPluginState);

package/dist/esm/plugins/avatar-group/ui/colored-avatar-item.js

@@ -4,7 +4,7 @@ import { badge } from './styles';
 import { R100 } from '@atlaskit/theme/colors';
 export var ColoredAvatarItem = function ColoredAvatarItem(props) {
   var _props$api;
-  var color = (_props$api = props.api) === null || _props$api === void 0 || (_props$api = _props$api.collabEdit) === null || _props$api === void 0 ? void 0 : _props$api.actions.getAvatarColor(props.sessionId).color.solid;
+  var color = (_props$api = props.api) === null || _props$api === void 0 || (_props$api = _props$api.collabEdit) === null || _props$api === void 0 || (_props$api = _props$api.actions) === null || _props$api === void 0 ? void 0 : _props$api.getAvatarColor(props.sessionId).color.solid;
   var avatar = props.name.substr(0, 1).toUpperCase();
   return jsx("div", {
     css: badge(color || R100),

package/dist/esm/plugins/index.js

@@ -1,4 +1,3 @@
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as findReplacePlugin } from './find-replace';
-export { default as avatarGroupPlugin } from './avatar-group';
-export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';
+export { default as avatarGroupPlugin } from './avatar-group';

package/dist/esm/presets/universal.js

@@ -43,8 +43,9 @@ import { dataConsumerPlugin } from '@atlaskit/editor-plugin-data-consumer';
 import { annotationPlugin } from '@atlaskit/editor-plugin-annotation';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { collabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
-import { avatarGroupPlugin, beforePrimaryToolbarPlugin, findReplacePlugin, jiraIssuePlugin } from '../plugins';
+import { avatarGroupPlugin, findReplacePlugin, jiraIssuePlugin } from '../plugins';
 import { extensionPlugin } from '@atlaskit/editor-plugin-extension';
+import { beforePrimaryToolbarPlugin } from '@atlaskit/editor-plugin-before-primary-toolbar';
 import { feedbackDialogPlugin } from '@atlaskit/editor-plugin-feedback-dialog';
 import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';

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

@@ -0,0 +1,17 @@
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
+var beforePrimaryToolbarPluginWrapperStyles = css({
+  display: 'flex',
+  marginRight: "var(--ds-space-100, 8px)",
+  flexGrow: 1,
+  justifyContent: 'flex-end',
+  alignItems: 'center'
+});
+// Duplicate of the wrapper from `editor-plugin-before-primary-toolbar` used
+// only in `FullPageToolbar` to decouple the plugin from the main toolbar
+export var BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
+  return jsx("div", {
+    css: beforePrimaryToolbarPluginWrapperStyles,
+    "data-testid": 'before-primary-toolbar-components-plugin'
+  }, props.beforePrimaryToolbarComponents);
+};

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

@@ -5,15 +5,15 @@ import React, { useState, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import AvatarsWithPluginState from '../../../plugins/avatar-group/ui';
-import { BeforePrimaryToolbarWrapper } from '../../../plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper';
 import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 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 { usePresetContext } from '../../../presets/context';
+import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
 export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -45,7 +45,7 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
   var customToolbar = jsx("div", {
     css: customToolbarWrapperStyle
   }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
-    beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
+    beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
   }) : 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

package/dist/esm/version-wrapper.js

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

package/dist/types/plugins/avatar-group/ui/avatars-with-plugin-state.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { CollabInviteToEditProps } from '@atlaskit/editor-common/collab';
 import type { EventDispatcher } from '../../../event-dispatcher';
-import type { CollabInviteToEditProps, CollabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
+import type { CollabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
 import type { FeatureFlags, OptionalPlugin, PublicPluginAPI } from '@atlaskit/editor-common/types';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 export type AvatarsWithPluginStateProps = {
@@ -35,10 +36,7 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
             }, FeatureFlags>>];
             actions: EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            activeParticipants: import("@atlaskit/editor-plugin-collab-edit").ReadOnlyParticipants | undefined;
-            sessionId: string | undefined;
-        } | undefined;
+        sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
         actions: {
             getAvatarColor: (str: string) => {
                 index: number;
@@ -70,10 +68,7 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
                 }, FeatureFlags>>];
                 actions: EditorAnalyticsAPI;
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-            sharedState: {
-                activeParticipants: import("@atlaskit/editor-plugin-collab-edit").ReadOnlyParticipants | undefined;
-                sessionId: string | undefined;
-            } | undefined;
+            sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
             actions: {
                 getAvatarColor: (str: string) => {
                     index: number;

package/dist/types/plugins/avatar-group/ui/invite-to-edit.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import React from 'react';
-import type { InviteToEditComponentProps } from '@atlaskit/editor-plugin-collab-edit';
+import type { InviteToEditComponentProps } from '@atlaskit/editor-common/collab';
 export interface InviteToEditButtonProps {
     onClick?: React.MouseEventHandler;
     selected?: boolean;

package/dist/types/plugins/avatar-group/ui/to-avatar.d.ts

@@ -19,10 +19,7 @@ declare const _default: import("memoize-one").MemoizedFn<(participant: CollabPar
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-    sharedState: {
-        activeParticipants: import("@atlaskit/editor-plugin-collab-edit").ReadOnlyParticipants | undefined;
-        sessionId: string | undefined;
-    } | undefined;
+    sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
     actions: {
         getAvatarColor: (str: string) => {
             index: number;

package/dist/types/plugins/index.d.ts

@@ -1,4 +1,3 @@
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as findReplacePlugin } from './find-replace';
 export { default as avatarGroupPlugin } from './avatar-group';
-export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';

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

@@ -0,0 +1,8 @@
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import { ReactElement } from 'react';
+type ReactComponents = ReactElement<any> | ReactElement<any>[];
+export declare const BeforePrimaryToolbarWrapper: (props: {
+    beforePrimaryToolbarComponents: ReactComponents | undefined;
+}) => jsx.JSX.Element;
+export {};

package/dist/types-ts4.5/plugins/avatar-group/ui/avatars-with-plugin-state.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { CollabInviteToEditProps } from '@atlaskit/editor-common/collab';
 import type { EventDispatcher } from '../../../event-dispatcher';
-import type { CollabInviteToEditProps, CollabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
+import type { CollabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
 import type { FeatureFlags, OptionalPlugin, PublicPluginAPI } from '@atlaskit/editor-common/types';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 export type AvatarsWithPluginStateProps = {
@@ -43,10 +44,7 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
                     actions: EditorAnalyticsAPI;
                 }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
             ];
-            sharedState: {
-                activeParticipants: import("@atlaskit/editor-plugin-collab-edit").ReadOnlyParticipants | undefined;
-                sessionId: string | undefined;
-            } | undefined;
+            sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
             actions: {
                 getAvatarColor: (str: string) => {
                     index: number;
@@ -85,10 +83,7 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
                         actions: EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    activeParticipants: import("@atlaskit/editor-plugin-collab-edit").ReadOnlyParticipants | undefined;
-                    sessionId: string | undefined;
-                } | undefined;
+                sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
                 actions: {
                     getAvatarColor: (str: string) => {
                         index: number;

package/dist/types-ts4.5/plugins/avatar-group/ui/invite-to-edit.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import React from 'react';
-import type { InviteToEditComponentProps } from '@atlaskit/editor-plugin-collab-edit';
+import type { InviteToEditComponentProps } from '@atlaskit/editor-common/collab';
 export interface InviteToEditButtonProps {
     onClick?: React.MouseEventHandler;
     selected?: boolean;

package/dist/types-ts4.5/plugins/avatar-group/ui/to-avatar.d.ts

@@ -25,10 +25,7 @@ declare const _default: import("memoize-one").MemoizedFn<(participant: CollabPar
                 actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
         ];
-        sharedState: {
-            activeParticipants: import("@atlaskit/editor-plugin-collab-edit").ReadOnlyParticipants | undefined;
-            sessionId: string | undefined;
-        } | undefined;
+        sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
         actions: {
             getAvatarColor: (str: string) => {
                 index: number;

package/dist/types-ts4.5/plugins/index.d.ts

@@ -1,4 +1,3 @@
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as findReplacePlugin } from './find-replace';
 export { default as avatarGroupPlugin } from './avatar-group';
-export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';

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

@@ -0,0 +1,8 @@
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import { ReactElement } from 'react';
+type ReactComponents = ReactElement<any> | ReactElement<any>[];
+export declare const BeforePrimaryToolbarWrapper: (props: {
+    beforePrimaryToolbarComponents: ReactComponents | undefined;
+}) => jsx.JSX.Element;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "191.0.3",
+  "version": "191.0.4",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -54,6 +54,7 @@
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-annotation": "^0.1.0",
     "@atlaskit/editor-plugin-base": "^0.3.0",
+    "@atlaskit/editor-plugin-before-primary-toolbar": "^0.1.0",
     "@atlaskit/editor-plugin-better-type-history": "^0.1.0",
     "@atlaskit/editor-plugin-block-type": "^3.0.0",
     "@atlaskit/editor-plugin-border": "^0.1.0",
@@ -122,7 +123,7 @@
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.0.0",
-    "@atlaskit/logo": "^13.14.0",
+    "@atlaskit/logo": "^13.15.0",
     "@atlaskit/media-card": "^77.6.0",
     "@atlaskit/mention": "^22.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -366,6 +367,14 @@
     "platform.editor.ordered-list-inserting-nodes_bh0vo": {
       "type": "boolean",
       "referenceOnly": "true"
+    },
+    "platform.editor.allow-action-in-list": {
+      "type": "boolean",
+      "referenceOnly": "true"
+    },
+    "platform.editor.allow-extended-panel": {
+      "type": "boolean",
+      "referenceOnly": "true"
     }
   }
 }

package/dist/cjs/plugins/before-primaryToolbar/index.js

@@ -1,21 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _BeforePrimaryToolbarWrapper = require("./ui/BeforePrimaryToolbarWrapper");
-var beforePrimaryToolbar = function beforePrimaryToolbar(_ref) {
-  var props = _ref.config;
-  return {
-    name: 'beforePrimaryToolbar',
-    primaryToolbarComponent: function primaryToolbarComponent() {
-      return /*#__PURE__*/_react.default.createElement(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
-        beforePrimaryToolbarComponents: props === null || props === void 0 ? void 0 : props.beforePrimaryToolbarComponents
-      });
-    }
-  };
-};
-var _default = exports.default = beforePrimaryToolbar;

package/dist/cjs/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -1,18 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BeforePrimaryToolbarWrapper = void 0;
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-var _react = require("@emotion/react");
-var _templateObject;
-/** @jsx jsx */
-var beforePrimaryToolbarPluginWrapper = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  margin-right: ", ";\n  flex-grow: 1;\n  justify-content: flex-end;\n  align-items: center;\n"])), "var(--ds-space-100, 8px)");
-var BeforePrimaryToolbarWrapper = exports.BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
-  return (0, _react.jsx)("div", {
-    css: beforePrimaryToolbarPluginWrapper,
-    "data-testid": 'before-primary-toolbar-components-plugin'
-  }, props.beforePrimaryToolbarComponents);
-};

package/dist/es2019/plugins/before-primaryToolbar/index.js

@@ -1,13 +0,0 @@
-import React from 'react';
-import { BeforePrimaryToolbarWrapper } from './ui/BeforePrimaryToolbarWrapper';
-const beforePrimaryToolbar = ({
-  config: props
-}) => ({
-  name: 'beforePrimaryToolbar',
-  primaryToolbarComponent() {
-    return /*#__PURE__*/React.createElement(BeforePrimaryToolbarWrapper, {
-      beforePrimaryToolbarComponents: props === null || props === void 0 ? void 0 : props.beforePrimaryToolbarComponents
-    });
-  }
-});
-export default beforePrimaryToolbar;

package/dist/es2019/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -1,13 +0,0 @@
-/** @jsx jsx */
-import { css, jsx } from '@emotion/react';
-const beforePrimaryToolbarPluginWrapper = css`
-  display: flex;
-  margin-right: ${"var(--ds-space-100, 8px)"};
-  flex-grow: 1;
-  justify-content: flex-end;
-  align-items: center;
-`;
-export const BeforePrimaryToolbarWrapper = props => jsx("div", {
-  css: beforePrimaryToolbarPluginWrapper,
-  "data-testid": 'before-primary-toolbar-components-plugin'
-}, props.beforePrimaryToolbarComponents);

package/dist/esm/plugins/before-primaryToolbar/index.js

@@ -1,14 +0,0 @@
-import React from 'react';
-import { BeforePrimaryToolbarWrapper } from './ui/BeforePrimaryToolbarWrapper';
-var beforePrimaryToolbar = function beforePrimaryToolbar(_ref) {
-  var props = _ref.config;
-  return {
-    name: 'beforePrimaryToolbar',
-    primaryToolbarComponent: function primaryToolbarComponent() {
-      return /*#__PURE__*/React.createElement(BeforePrimaryToolbarWrapper, {
-        beforePrimaryToolbarComponents: props === null || props === void 0 ? void 0 : props.beforePrimaryToolbarComponents
-      });
-    }
-  };
-};
-export default beforePrimaryToolbar;

package/dist/esm/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -1,11 +0,0 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
-/** @jsx jsx */
-import { css, jsx } from '@emotion/react';
-var beforePrimaryToolbarPluginWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  margin-right: ", ";\n  flex-grow: 1;\n  justify-content: flex-end;\n  align-items: center;\n"])), "var(--ds-space-100, 8px)");
-export var BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
-  return jsx("div", {
-    css: beforePrimaryToolbarPluginWrapper,
-    "data-testid": 'before-primary-toolbar-components-plugin'
-  }, props.beforePrimaryToolbarComponents);
-};

package/dist/types/plugins/before-primaryToolbar/index.d.ts

@@ -1,8 +0,0 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-type Config = {
-    beforePrimaryToolbarComponents?: any;
-};
-declare const beforePrimaryToolbar: NextEditorPlugin<'beforePrimaryToolbar', {
-    pluginConfiguration: Config;
-}>;
-export default beforePrimaryToolbar;

package/dist/types/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.d.ts

@@ -1,5 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-export declare const BeforePrimaryToolbarWrapper: (props: {
-    beforePrimaryToolbarComponents: any;
-}) => jsx.JSX.Element;

package/dist/types-ts4.5/plugins/before-primaryToolbar/index.d.ts

@@ -1,8 +0,0 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-type Config = {
-    beforePrimaryToolbarComponents?: any;
-};
-declare const beforePrimaryToolbar: NextEditorPlugin<'beforePrimaryToolbar', {
-    pluginConfiguration: Config;
-}>;
-export default beforePrimaryToolbar;

package/dist/types-ts4.5/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.d.ts

@@ -1,5 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-export declare const BeforePrimaryToolbarWrapper: (props: {
-    beforePrimaryToolbarComponents: any;
-}) => jsx.JSX.Element;