@atlaskit/editor-core 195.8.2 → 195.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/composable-editor/editor-internal.js +2 -1
  3. package/dist/cjs/presets/universal.js +8 -2
  4. package/dist/cjs/ui/Appearance/FullPage/BeforeWrapper.js +0 -1
  5. package/dist/cjs/ui/Appearance/FullPage/FullPage.js +1 -1
  6. package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js +2 -3
  7. package/dist/cjs/version-wrapper.js +1 -1
  8. package/dist/es2019/composable-editor/editor-internal.js +2 -1
  9. package/dist/es2019/presets/universal.js +8 -2
  10. package/dist/es2019/ui/Appearance/FullPage/BeforeWrapper.js +0 -1
  11. package/dist/es2019/ui/Appearance/FullPage/FullPage.js +1 -1
  12. package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js +2 -3
  13. package/dist/es2019/version-wrapper.js +1 -1
  14. package/dist/esm/composable-editor/editor-internal.js +2 -1
  15. package/dist/esm/presets/universal.js +8 -2
  16. package/dist/esm/ui/Appearance/FullPage/BeforeWrapper.js +0 -1
  17. package/dist/esm/ui/Appearance/FullPage/FullPage.js +1 -1
  18. package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js +2 -3
  19. package/dist/esm/version-wrapper.js +1 -1
  20. package/dist/types/create-editor/create-universal-preset.d.ts +1 -3
  21. package/dist/types/presets/universal.d.ts +1 -3
  22. package/dist/types/presets/useUniversalPreset.d.ts +1 -3
  23. package/dist/types/types/editor-props.d.ts +4 -0
  24. package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +1 -3
  25. package/dist/types-ts4.5/presets/universal.d.ts +1 -3
  26. package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +1 -3
  27. package/dist/types-ts4.5/types/editor-props.d.ts +4 -0
  28. package/package.json +9 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 195.9.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#134135](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134135)
8
+ [`aff992988cf17`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/aff992988cf17) -
9
+ Deprecated hideAvatarGroup prop
10
+
11
+ ### Patch Changes
12
+
13
+ - [#134213](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134213)
14
+ [`93bd7032842ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/93bd7032842ec) -
15
+ [ux] [ED-24636] Bump ADF Schema package
16
+
3
17
  ## 195.8.2
4
18
 
5
19
  ### Patch Changes
@@ -13,6 +13,7 @@ var _react2 = require("@emotion/react");
13
13
  var _analytics = require("@atlaskit/editor-common/analytics");
14
14
  var _portal = require("@atlaskit/editor-common/portal");
15
15
  var _ui = require("@atlaskit/editor-common/ui");
16
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
17
  var _createEditor = require("../create-editor");
17
18
  var _ErrorBoundary = _interopRequireDefault(require("../create-editor/ErrorBoundary"));
18
19
  var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props");
@@ -141,7 +142,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
141
142
  useStickyToolbar: props.useStickyToolbar,
142
143
  featureFlags: featureFlags,
143
144
  pluginHooks: config.pluginHooks,
144
- hideAvatarGroup: props.hideAvatarGroup
145
+ hideAvatarGroup: (0, _platformFeatureFlags.fg)('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
145
146
  }));
146
147
  }
147
148
  }), (0, _react2.jsx)(PortalRenderer, null))))))));
@@ -225,9 +225,15 @@ function createUniversalPresetInternal(_ref) {
225
225
  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
226
226
  collabEdit: props.collabEdit,
227
227
  takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
228
- showAvatarGroup: !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
228
+ showAvatarGroup:
229
+ // Cleanup: `platform_editor_remove_hide_avatar_group_prop`
230
+ // Remove `!props.hideAvatarGroup`
231
+ !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
229
232
  }]).maybeAdd([_findReplace.findReplacePlugin, {
230
- takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
233
+ takeFullWidth:
234
+ // Cleanup: `platform_editor_remove_hide_avatar_group_prop`
235
+ // Remove `!props.hideAvatarGroup`
236
+ !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
231
237
  twoLineEditorToolbar: !!props.primaryToolbarComponents && !!featureFlags.twoLineEditorToolbar
232
238
  }], Boolean(props.allowFindReplace)).maybeAdd(_border.borderPlugin, Boolean(props.allowBorderMark || props.UNSAFE_allowBorderMark)).maybeAdd(_fragment.fragmentPlugin, Boolean(props.allowFragmentMark)).add(_pasteOptionsToolbar.pasteOptionsToolbarPlugin).add([_codeBidiWarning.codeBidiWarningPlugin, {
233
239
  appearance: appearance
@@ -14,7 +14,6 @@ var _react = require("@emotion/react");
14
14
 
15
15
  var beforePrimaryToolbarPluginWrapperStyles = (0, _react.css)({
16
16
  display: 'flex',
17
- marginRight: "var(--ds-space-100, 8px)",
18
17
  flexGrow: 1,
19
18
  justifyContent: 'flex-end',
20
19
  alignItems: 'center'
@@ -106,7 +106,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
106
106
  providerFactory: props.providerFactory,
107
107
  showKeyline: showKeyline,
108
108
  featureFlags: props.featureFlags,
109
- hideAvatarGroup: props.hideAvatarGroup
109
+ hideAvatarGroup: (0, _platformFeatureFlags.fg)('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
110
110
  }), (0, _react2.jsx)(_FullPageContentArea.FullPageContentArea, {
111
111
  editorAPI: editorAPI,
112
112
  ref: scrollContentContainerRef,
@@ -64,16 +64,15 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
64
64
  css: _MainToolbar.customToolbarWrapperStyle
65
65
  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforeWrapper.BeforePrimaryToolbarWrapper, {
66
66
  beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
67
- }) : 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
67
+ }) : null, !(0, _platformFeatureFlags.fg)('platform_editor_remove_hide_avatar_group_prop') ? 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
68
68
  // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
69
69
  // For more details please check
70
70
  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
71
71
  editorAPI === null || editorAPI === void 0 || (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
72
- editorView: props.editorView,
73
72
  inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
74
73
  inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
75
74
  isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
76
- }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
75
+ }) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
77
76
  popupsBoundariesElement: props.popupsBoundariesElement,
78
77
  popupsMountPoint: props.popupsMountPoint,
79
78
  popupsScrollableElement: props.popupsScrollableElement,
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "195.8.2";
8
+ var version = exports.version = "195.9.0";
@@ -10,6 +10,7 @@ import { css, jsx } from '@emotion/react';
10
10
  import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
11
11
  import { usePortalProvider } from '@atlaskit/editor-common/portal';
12
12
  import { BaseTheme, IntlProviderIfMissingWrapper, WidthProvider } from '@atlaskit/editor-common/ui';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
13
14
  import { getUiComponent } from '../create-editor';
14
15
  import ErrorBoundary from '../create-editor/ErrorBoundary';
15
16
  import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
@@ -133,7 +134,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
133
134
  useStickyToolbar: props.useStickyToolbar,
134
135
  featureFlags: featureFlags,
135
136
  pluginHooks: config.pluginHooks,
136
- hideAvatarGroup: props.hideAvatarGroup
137
+ hideAvatarGroup: fg('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
137
138
  }));
138
139
  }
139
140
  }), jsx(PortalRenderer, null))))))));
@@ -224,9 +224,15 @@ export default function createUniversalPresetInternal({
224
224
  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
225
225
  collabEdit: props.collabEdit,
226
226
  takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
227
- showAvatarGroup: !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
227
+ showAvatarGroup:
228
+ // Cleanup: `platform_editor_remove_hide_avatar_group_prop`
229
+ // Remove `!props.hideAvatarGroup`
230
+ !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
228
231
  }]).maybeAdd([findReplacePlugin, {
229
- takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
232
+ takeFullWidth:
233
+ // Cleanup: `platform_editor_remove_hide_avatar_group_prop`
234
+ // Remove `!props.hideAvatarGroup`
235
+ !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
230
236
  twoLineEditorToolbar: !!props.primaryToolbarComponents && !!featureFlags.twoLineEditorToolbar
231
237
  }], Boolean(props.allowFindReplace)).maybeAdd(borderPlugin, Boolean(props.allowBorderMark || props.UNSAFE_allowBorderMark)).maybeAdd(fragmentPlugin, Boolean(props.allowFragmentMark)).add(pasteOptionsToolbarPlugin).add([codeBidiWarningPlugin, {
232
238
  appearance
@@ -7,7 +7,6 @@
7
7
  import { css, jsx } from '@emotion/react';
8
8
  const beforePrimaryToolbarPluginWrapperStyles = css({
9
9
  display: 'flex',
10
- marginRight: "var(--ds-space-100, 8px)",
11
10
  flexGrow: 1,
12
11
  justifyContent: 'flex-end',
13
12
  alignItems: 'center'
@@ -88,7 +88,7 @@ export const FullPageEditor = props => {
88
88
  providerFactory: props.providerFactory,
89
89
  showKeyline: showKeyline,
90
90
  featureFlags: props.featureFlags,
91
- hideAvatarGroup: props.hideAvatarGroup
91
+ hideAvatarGroup: fg('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
92
92
  }), jsx(FullPageContentArea, {
93
93
  editorAPI: editorAPI,
94
94
  ref: scrollContentContainerRef,
@@ -52,16 +52,15 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
52
52
  css: customToolbarWrapperStyle
53
53
  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
54
54
  beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
55
- }) : 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
55
+ }) : null, !fg('platform_editor_remove_hide_avatar_group_prop') ? 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
56
56
  // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
57
57
  // For more details please check
58
58
  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
59
59
  editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
60
- editorView: props.editorView,
61
60
  inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
62
61
  inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
63
62
  isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
64
- }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
63
+ }) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
65
64
  popupsBoundariesElement: props.popupsBoundariesElement,
66
65
  popupsMountPoint: props.popupsMountPoint,
67
66
  popupsScrollableElement: props.popupsScrollableElement,
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "195.8.2";
2
+ export const version = "195.9.0";
@@ -14,6 +14,7 @@ import { css, jsx } from '@emotion/react';
14
14
  import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
15
15
  import { usePortalProvider } from '@atlaskit/editor-common/portal';
16
16
  import { BaseTheme, IntlProviderIfMissingWrapper, WidthProvider } from '@atlaskit/editor-common/ui';
17
+ import { fg } from '@atlaskit/platform-feature-flags';
17
18
  import { getUiComponent } from '../create-editor';
18
19
  import ErrorBoundary from '../create-editor/ErrorBoundary';
19
20
  import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
@@ -137,7 +138,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
137
138
  useStickyToolbar: props.useStickyToolbar,
138
139
  featureFlags: featureFlags,
139
140
  pluginHooks: config.pluginHooks,
140
- hideAvatarGroup: props.hideAvatarGroup
141
+ hideAvatarGroup: fg('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
141
142
  }));
142
143
  }
143
144
  }), jsx(PortalRenderer, null))))))));
@@ -218,9 +218,15 @@ export default function createUniversalPresetInternal(_ref) {
218
218
  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
219
219
  collabEdit: props.collabEdit,
220
220
  takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
221
- showAvatarGroup: !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
221
+ showAvatarGroup:
222
+ // Cleanup: `platform_editor_remove_hide_avatar_group_prop`
223
+ // Remove `!props.hideAvatarGroup`
224
+ !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
222
225
  }]).maybeAdd([findReplacePlugin, {
223
- takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
226
+ takeFullWidth:
227
+ // Cleanup: `platform_editor_remove_hide_avatar_group_prop`
228
+ // Remove `!props.hideAvatarGroup`
229
+ !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
224
230
  twoLineEditorToolbar: !!props.primaryToolbarComponents && !!featureFlags.twoLineEditorToolbar
225
231
  }], Boolean(props.allowFindReplace)).maybeAdd(borderPlugin, Boolean(props.allowBorderMark || props.UNSAFE_allowBorderMark)).maybeAdd(fragmentPlugin, Boolean(props.allowFragmentMark)).add(pasteOptionsToolbarPlugin).add([codeBidiWarningPlugin, {
226
232
  appearance: appearance
@@ -7,7 +7,6 @@
7
7
  import { css, jsx } from '@emotion/react';
8
8
  var beforePrimaryToolbarPluginWrapperStyles = css({
9
9
  display: 'flex',
10
- marginRight: "var(--ds-space-100, 8px)",
11
10
  flexGrow: 1,
12
11
  justifyContent: 'flex-end',
13
12
  alignItems: 'center'
@@ -95,7 +95,7 @@ export var FullPageEditor = function FullPageEditor(props) {
95
95
  providerFactory: props.providerFactory,
96
96
  showKeyline: showKeyline,
97
97
  featureFlags: props.featureFlags,
98
- hideAvatarGroup: props.hideAvatarGroup
98
+ hideAvatarGroup: fg('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
99
99
  }), jsx(FullPageContentArea, {
100
100
  editorAPI: editorAPI,
101
101
  ref: scrollContentContainerRef,
@@ -54,16 +54,15 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
54
54
  css: customToolbarWrapperStyle
55
55
  }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
56
56
  beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
57
- }) : 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
57
+ }) : null, !fg('platform_editor_remove_hide_avatar_group_prop') ? 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
58
58
  // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
59
59
  // For more details please check
60
60
  // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
61
61
  editorAPI === null || editorAPI === void 0 || (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
62
- editorView: props.editorView,
63
62
  inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
64
63
  inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
65
64
  isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
66
- }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
65
+ }) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
67
66
  popupsBoundariesElement: props.popupsBoundariesElement,
68
67
  popupsMountPoint: props.popupsMountPoint,
69
68
  popupsScrollableElement: props.popupsScrollableElement,
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "195.8.2";
2
+ export var version = "195.9.0";
@@ -901,9 +901,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
901
901
  };
902
902
  }, undefined>>];
903
903
  actions: {
904
- getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
905
- editorView: import("prosemirror-view").EditorView;
906
- } & import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
904
+ getToolbarItem: ({ inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
907
905
  };
908
906
  }, {
909
907
  collabEdit?: import("@atlaskit/editor-common/collab").CollabEditOptions | undefined;
@@ -940,9 +940,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
940
940
  };
941
941
  }, undefined>>];
942
942
  actions: {
943
- getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
944
- editorView: import("prosemirror-view").EditorView;
945
- } & import("@atlaskit/editor-common/collab").CollabInviteToEditProps) => JSX.Element | null;
943
+ getToolbarItem: ({ inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: import("@atlaskit/editor-common/collab").CollabInviteToEditProps) => JSX.Element | null;
946
944
  };
947
945
  }, {
948
946
  collabEdit?: import("@atlaskit/editor-common/collab").CollabEditOptions | undefined;
@@ -901,9 +901,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
901
901
  };
902
902
  }, undefined>>];
903
903
  actions: {
904
- getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
905
- editorView: import("prosemirror-view").EditorView;
906
- } & import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
904
+ getToolbarItem: ({ inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
907
905
  };
908
906
  }, {
909
907
  collabEdit?: import("@atlaskit/editor-common/collab").CollabEditOptions | undefined;
@@ -148,6 +148,10 @@ export interface EditorSharedPropsWithPlugins {
148
148
  collabEdit?: CollabEditOptions;
149
149
  primaryToolbarComponents?: PrimaryToolbarComponents;
150
150
  allowUndoRedoButtons?: boolean;
151
+ /**
152
+ * @deprecated
153
+ * This prop is no longer in use and will be removed soon.
154
+ */
151
155
  hideAvatarGroup?: boolean;
152
156
  }
153
157
  export interface EditorProps extends EditorBaseProps, EditorPluginFeatureProps, EditorSharedPropsWithPlugins, EditorProviderProps {
@@ -1177,9 +1177,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
1177
1177
  }, undefined>>
1178
1178
  ];
1179
1179
  actions: {
1180
- getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
1181
- editorView: import("prosemirror-view").EditorView;
1182
- } & import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
1180
+ getToolbarItem: ({ inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
1183
1181
  };
1184
1182
  }, {
1185
1183
  collabEdit?: import("@atlaskit/editor-common/collab").CollabEditOptions | undefined;
@@ -1216,9 +1216,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
1216
1216
  }, undefined>>
1217
1217
  ];
1218
1218
  actions: {
1219
- getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
1220
- editorView: import("prosemirror-view").EditorView;
1221
- } & import("@atlaskit/editor-common/collab").CollabInviteToEditProps) => JSX.Element | null;
1219
+ getToolbarItem: ({ inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: import("@atlaskit/editor-common/collab").CollabInviteToEditProps) => JSX.Element | null;
1222
1220
  };
1223
1221
  }, {
1224
1222
  collabEdit?: import("@atlaskit/editor-common/collab").CollabEditOptions | undefined;
@@ -1177,9 +1177,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
1177
1177
  }, undefined>>
1178
1178
  ];
1179
1179
  actions: {
1180
- getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
1181
- editorView: import("prosemirror-view").EditorView;
1182
- } & import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
1180
+ getToolbarItem: ({ inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: import("@atlaskit/editor-plugin-collab-edit").CollabInviteToEditProps) => JSX.Element | null;
1183
1181
  };
1184
1182
  }, {
1185
1183
  collabEdit?: import("@atlaskit/editor-common/collab").CollabEditOptions | undefined;
@@ -148,6 +148,10 @@ export interface EditorSharedPropsWithPlugins {
148
148
  collabEdit?: CollabEditOptions;
149
149
  primaryToolbarComponents?: PrimaryToolbarComponents;
150
150
  allowUndoRedoButtons?: boolean;
151
+ /**
152
+ * @deprecated
153
+ * This prop is no longer in use and will be removed soon.
154
+ */
151
155
  hideAvatarGroup?: boolean;
152
156
  }
153
157
  export interface EditorProps extends EditorBaseProps, EditorPluginFeatureProps, EditorSharedPropsWithPlugins, EditorProviderProps {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "195.8.2",
3
+ "version": "195.9.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -40,12 +40,12 @@
40
40
  },
41
41
  "dependencies": {
42
42
  "@atlaskit/activity-provider": "^2.4.0",
43
- "@atlaskit/adf-schema": "^40.8.1",
43
+ "@atlaskit/adf-schema": "^40.9.0",
44
44
  "@atlaskit/analytics-namespaced-context": "^6.11.0",
45
45
  "@atlaskit/analytics-next": "^10.1.0",
46
46
  "@atlaskit/analytics-next-stable-react-context": "1.0.1",
47
47
  "@atlaskit/button": "^20.1.0",
48
- "@atlaskit/editor-common": "^88.1.0",
48
+ "@atlaskit/editor-common": "^88.2.0",
49
49
  "@atlaskit/editor-plugins": "^4.2.0",
50
50
  "@atlaskit/editor-prosemirror": "5.0.1",
51
51
  "@atlaskit/editor-shared-styles": "^2.13.0",
@@ -85,9 +85,9 @@
85
85
  "@af/visual-regression": "*",
86
86
  "@atlaskit/adf-utils": "^19.8.0",
87
87
  "@atlaskit/analytics-listeners": "^8.11.0",
88
- "@atlaskit/collab-provider": "9.37.3",
88
+ "@atlaskit/collab-provider": "9.37.4",
89
89
  "@atlaskit/editor-json-transformer": "^8.18.0",
90
- "@atlaskit/editor-plugin-annotation": "1.19.2",
90
+ "@atlaskit/editor-plugin-annotation": "1.19.3",
91
91
  "@atlaskit/editor-plugin-card": "^2.13.0",
92
92
  "@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
93
93
  "@atlaskit/editor-plugin-list": "^3.8.0",
@@ -108,7 +108,7 @@
108
108
  "@atlaskit/visual-regression": "*",
109
109
  "@atlassian/adf-schema-json": "^1.22.0",
110
110
  "@atlassian/feature-flags-test-utils": "*",
111
- "@atlassian/search-provider": "2.4.114",
111
+ "@atlassian/search-provider": "2.4.115",
112
112
  "@emotion/jest": "^11.8.0",
113
113
  "@storybook/addon-knobs": "^5.3.18",
114
114
  "@testing-library/react": "^12.1.5",
@@ -277,6 +277,9 @@
277
277
  },
278
278
  "platform_editor_toolbar_ssr": {
279
279
  "type": "boolean"
280
+ },
281
+ "platform_editor_remove_hide_avatar_group_prop": {
282
+ "type": "boolean"
280
283
  }
281
284
  },
282
285
  "stricter": {