@atlaskit/editor-plugin-avatar-group 1.2.7 → 1.3.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/editor-plugin-avatar-group
2
2
 
3
+ ## 1.3.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#120426](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/120426)
8
+ [`1cb3869ab1a96`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1cb3869ab1a96) -
9
+ [ED-23436] Use editor primary toolbar plugin to structure the primary toolbar
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 1.2.8
16
+
17
+ ### Patch Changes
18
+
19
+ - Updated dependencies
20
+
3
21
  ## 1.2.7
4
22
 
5
23
  ### Patch Changes
@@ -13,29 +13,34 @@ var avatarGroupPlugin = exports.avatarGroupPlugin = function avatarGroupPlugin(_
13
13
  var props = _ref.config,
14
14
  api = _ref.api;
15
15
  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
16
+ var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
17
+ var _api$analytics;
18
+ var editorView = _ref2.editorView,
19
+ eventDispatcher = _ref2.eventDispatcher,
20
+ dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
21
+ return /*#__PURE__*/_react.default.createElement(_AvatarGroupPluginWrapper.default, {
22
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
23
+ editorView: editorView,
24
+ eventDispatcher: eventDispatcher,
25
+ collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
26
+ takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
27
+ featureFlags: featureFlags,
28
+ editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
29
+ editorAPI: api
30
+ });
31
+ };
16
32
  return {
17
33
  name: 'avatarGroup',
18
- primaryToolbarComponent: props.showAvatarGroup ? function (_ref2) {
19
- var _api$analytics;
20
- var editorView = _ref2.editorView,
21
- popupsMountPoint = _ref2.popupsMountPoint,
22
- popupsBoundariesElement = _ref2.popupsBoundariesElement,
23
- popupsScrollableElement = _ref2.popupsScrollableElement,
24
- disabled = _ref2.disabled,
25
- isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
26
- eventDispatcher = _ref2.eventDispatcher,
27
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
28
- return /*#__PURE__*/_react.default.createElement(_AvatarGroupPluginWrapper.default, {
29
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
30
- editorView: editorView,
31
- eventDispatcher: eventDispatcher,
32
- collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
33
- takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
34
- featureFlags: featureFlags,
35
- editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
36
- editorAPI: api
37
- });
38
- } : undefined,
34
+ usePluginHook: function usePluginHook() {
35
+ if (props.showAvatarGroup) {
36
+ var _api$core, _api$primaryToolbar;
37
+ api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.commands.registerComponent({
38
+ name: 'avatarGroup',
39
+ component: primaryToolbarComponent
40
+ }));
41
+ }
42
+ },
43
+ primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && props.showAvatarGroup ? primaryToolbarComponent : undefined,
39
44
  actions: {
40
45
  getToolbarItem: function getToolbarItem(_ref3) {
41
46
  var _api$featureFlags$sha, _api$featureFlags2, _api$analytics2;
@@ -7,30 +7,35 @@ export const avatarGroupPlugin = ({
7
7
  }) => {
8
8
  var _api$featureFlags;
9
9
  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
10
+ const primaryToolbarComponent = ({
11
+ editorView,
12
+ eventDispatcher,
13
+ dispatchAnalyticsEvent
14
+ }) => {
15
+ var _api$analytics;
16
+ return /*#__PURE__*/React.createElement(AvatarGroupPluginWrapper, {
17
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
18
+ editorView: editorView,
19
+ eventDispatcher: eventDispatcher,
20
+ collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
21
+ takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
22
+ featureFlags: featureFlags,
23
+ editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
24
+ editorAPI: api
25
+ });
26
+ };
10
27
  return {
11
28
  name: 'avatarGroup',
12
- primaryToolbarComponent: props.showAvatarGroup ? ({
13
- editorView,
14
- popupsMountPoint,
15
- popupsBoundariesElement,
16
- popupsScrollableElement,
17
- disabled,
18
- isToolbarReducedSpacing,
19
- eventDispatcher,
20
- dispatchAnalyticsEvent
21
- }) => {
22
- var _api$analytics;
23
- return /*#__PURE__*/React.createElement(AvatarGroupPluginWrapper, {
24
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
25
- editorView: editorView,
26
- eventDispatcher: eventDispatcher,
27
- collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
28
- takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
29
- featureFlags: featureFlags,
30
- editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
31
- editorAPI: api
32
- });
33
- } : undefined,
29
+ usePluginHook: () => {
30
+ if (props.showAvatarGroup) {
31
+ var _api$core, _api$primaryToolbar;
32
+ api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.commands.registerComponent({
33
+ name: 'avatarGroup',
34
+ component: primaryToolbarComponent
35
+ }));
36
+ }
37
+ },
38
+ primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && props.showAvatarGroup ? primaryToolbarComponent : undefined,
34
39
  actions: {
35
40
  getToolbarItem: ({
36
41
  editorView,
@@ -6,29 +6,34 @@ export var avatarGroupPlugin = function avatarGroupPlugin(_ref) {
6
6
  var props = _ref.config,
7
7
  api = _ref.api;
8
8
  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
9
+ var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
10
+ var _api$analytics;
11
+ var editorView = _ref2.editorView,
12
+ eventDispatcher = _ref2.eventDispatcher,
13
+ dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
14
+ return /*#__PURE__*/React.createElement(AvatarGroupPluginWrapper, {
15
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
16
+ editorView: editorView,
17
+ eventDispatcher: eventDispatcher,
18
+ collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
19
+ takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
20
+ featureFlags: featureFlags,
21
+ editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
22
+ editorAPI: api
23
+ });
24
+ };
9
25
  return {
10
26
  name: 'avatarGroup',
11
- primaryToolbarComponent: props.showAvatarGroup ? function (_ref2) {
12
- var _api$analytics;
13
- var editorView = _ref2.editorView,
14
- popupsMountPoint = _ref2.popupsMountPoint,
15
- popupsBoundariesElement = _ref2.popupsBoundariesElement,
16
- popupsScrollableElement = _ref2.popupsScrollableElement,
17
- disabled = _ref2.disabled,
18
- isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
19
- eventDispatcher = _ref2.eventDispatcher,
20
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
21
- return /*#__PURE__*/React.createElement(AvatarGroupPluginWrapper, {
22
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
23
- editorView: editorView,
24
- eventDispatcher: eventDispatcher,
25
- collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
26
- takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
27
- featureFlags: featureFlags,
28
- editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
29
- editorAPI: api
30
- });
31
- } : undefined,
27
+ usePluginHook: function usePluginHook() {
28
+ if (props.showAvatarGroup) {
29
+ var _api$core, _api$primaryToolbar;
30
+ api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.commands.registerComponent({
31
+ name: 'avatarGroup',
32
+ component: primaryToolbarComponent
33
+ }));
34
+ }
35
+ },
36
+ primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && props.showAvatarGroup ? primaryToolbarComponent : undefined,
32
37
  actions: {
33
38
  getToolbarItem: function getToolbarItem(_ref3) {
34
39
  var _api$featureFlags$sha, _api$featureFlags2, _api$analytics2;
@@ -4,6 +4,7 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
4
4
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
5
5
  import type { CollabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
6
6
  import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
7
+ import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
7
8
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
8
9
  type Config = {
9
10
  collabEdit?: CollabEditOptions;
@@ -15,7 +16,8 @@ export type AvatarGroupPlugin = NextEditorPlugin<'avatarGroup', {
15
16
  dependencies: [
16
17
  OptionalPlugin<FeatureFlagsPlugin>,
17
18
  OptionalPlugin<AnalyticsPlugin>,
18
- OptionalPlugin<CollabEditPlugin>
19
+ OptionalPlugin<CollabEditPlugin>,
20
+ OptionalPlugin<PrimaryToolbarPlugin>
19
21
  ];
20
22
  actions: {
21
23
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
@@ -85,7 +85,15 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
85
85
  }) => boolean;
86
86
  isRemoteReplaceDocumentTransaction: (tr: import("prosemirror-state").Transaction) => boolean;
87
87
  };
88
- }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>];
88
+ }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"primaryToolbar", {
89
+ sharedState: import("@atlaskit/editor-plugin-primary-toolbar").PrimaryToolbarPluginState | undefined;
90
+ commands: {
91
+ registerComponent: ({ name, component, }: {
92
+ name: import("@atlaskit/editor-plugin-primary-toolbar").ToolbarElementNames;
93
+ component: import("@atlaskit/editor-common/types").ToolbarUIComponentFactory;
94
+ }) => import("@atlaskit/editor-common/types").EditorCommand;
95
+ };
96
+ }, undefined>>];
89
97
  actions: {
90
98
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
91
99
  editorView: EditorView;
@@ -165,7 +173,15 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
165
173
  }) => boolean;
166
174
  isRemoteReplaceDocumentTransaction: (tr: import("prosemirror-state").Transaction) => boolean;
167
175
  };
168
- }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>];
176
+ }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"primaryToolbar", {
177
+ sharedState: import("@atlaskit/editor-plugin-primary-toolbar").PrimaryToolbarPluginState | undefined;
178
+ commands: {
179
+ registerComponent: ({ name, component, }: {
180
+ name: import("@atlaskit/editor-plugin-primary-toolbar").ToolbarElementNames;
181
+ component: import("@atlaskit/editor-common/types").ToolbarUIComponentFactory;
182
+ }) => import("@atlaskit/editor-common/types").EditorCommand;
183
+ };
184
+ }, undefined>>];
169
185
  actions: {
170
186
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
171
187
  editorView: EditorView;
@@ -68,7 +68,15 @@ declare const _default: import("memoize-one").MemoizedFn<(participant: CollabPar
68
68
  }) => boolean;
69
69
  isRemoteReplaceDocumentTransaction: (tr: import("prosemirror-state").Transaction) => boolean;
70
70
  };
71
- }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>];
71
+ }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"primaryToolbar", {
72
+ sharedState: import("@atlaskit/editor-plugin-primary-toolbar").PrimaryToolbarPluginState | undefined;
73
+ commands: {
74
+ registerComponent: ({ name, component, }: {
75
+ name: import("@atlaskit/editor-plugin-primary-toolbar").ToolbarElementNames;
76
+ component: import("@atlaskit/editor-common/types").ToolbarUIComponentFactory;
77
+ }) => import("@atlaskit/editor-common/types").EditorCommand;
78
+ };
79
+ }, undefined>>];
72
80
  actions: {
73
81
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
74
82
  editorView: import("prosemirror-view").EditorView;
@@ -4,6 +4,7 @@ import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/t
4
4
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
5
5
  import type { CollabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
6
6
  import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
7
+ import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
7
8
  import type { EditorView } from '@atlaskit/editor-prosemirror/view';
8
9
  type Config = {
9
10
  collabEdit?: CollabEditOptions;
@@ -15,7 +16,8 @@ export type AvatarGroupPlugin = NextEditorPlugin<'avatarGroup', {
15
16
  dependencies: [
16
17
  OptionalPlugin<FeatureFlagsPlugin>,
17
18
  OptionalPlugin<AnalyticsPlugin>,
18
- OptionalPlugin<CollabEditPlugin>
19
+ OptionalPlugin<CollabEditPlugin>,
20
+ OptionalPlugin<PrimaryToolbarPlugin>
19
21
  ];
20
22
  actions: {
21
23
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
@@ -97,7 +97,16 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
97
97
  }) => boolean;
98
98
  isRemoteReplaceDocumentTransaction: (tr: import("prosemirror-state").Transaction) => boolean;
99
99
  };
100
- }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>
100
+ }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>,
101
+ import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"primaryToolbar", {
102
+ sharedState: import("@atlaskit/editor-plugin-primary-toolbar").PrimaryToolbarPluginState | undefined;
103
+ commands: {
104
+ registerComponent: ({ name, component, }: {
105
+ name: import("@atlaskit/editor-plugin-primary-toolbar").ToolbarElementNames;
106
+ component: import("@atlaskit/editor-common/types").ToolbarUIComponentFactory;
107
+ }) => import("@atlaskit/editor-common/types").EditorCommand;
108
+ };
109
+ }, undefined>>
101
110
  ];
102
111
  actions: {
103
112
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
@@ -190,7 +199,16 @@ declare const _default: React.FC<import("react-intl-next").WithIntlProps<{
190
199
  }) => boolean;
191
200
  isRemoteReplaceDocumentTransaction: (tr: import("prosemirror-state").Transaction) => boolean;
192
201
  };
193
- }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>
202
+ }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>,
203
+ import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"primaryToolbar", {
204
+ sharedState: import("@atlaskit/editor-plugin-primary-toolbar").PrimaryToolbarPluginState | undefined;
205
+ commands: {
206
+ registerComponent: ({ name, component, }: {
207
+ name: import("@atlaskit/editor-plugin-primary-toolbar").ToolbarElementNames;
208
+ component: import("@atlaskit/editor-common/types").ToolbarUIComponentFactory;
209
+ }) => import("@atlaskit/editor-common/types").EditorCommand;
210
+ };
211
+ }, undefined>>
194
212
  ];
195
213
  actions: {
196
214
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
@@ -80,7 +80,16 @@ declare const _default: import("memoize-one").MemoizedFn<(participant: CollabPar
80
80
  }) => boolean;
81
81
  isRemoteReplaceDocumentTransaction: (tr: import("prosemirror-state").Transaction) => boolean;
82
82
  };
83
- }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>
83
+ }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>>,
84
+ import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"primaryToolbar", {
85
+ sharedState: import("@atlaskit/editor-plugin-primary-toolbar").PrimaryToolbarPluginState | undefined;
86
+ commands: {
87
+ registerComponent: ({ name, component, }: {
88
+ name: import("@atlaskit/editor-plugin-primary-toolbar").ToolbarElementNames;
89
+ component: import("@atlaskit/editor-common/types").ToolbarUIComponentFactory;
90
+ }) => import("@atlaskit/editor-common/types").EditorCommand;
91
+ };
92
+ }, undefined>>
84
93
  ];
85
94
  actions: {
86
95
  getToolbarItem: ({ editorView, inviteToEditHandler, isInviteToEditButtonSelected, inviteToEditComponent, }: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-avatar-group",
3
- "version": "1.2.7",
3
+ "version": "1.3.0",
4
4
  "description": "Avatar Group plugin for @atlaskit/editor-core.",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -38,15 +38,16 @@
38
38
  },
39
39
  "dependencies": {
40
40
  "@atlaskit/avatar-group": "^9.9.0",
41
- "@atlaskit/editor-common": "^84.0.0",
41
+ "@atlaskit/editor-common": "^85.1.0",
42
42
  "@atlaskit/editor-plugin-analytics": "^1.4.0",
43
43
  "@atlaskit/editor-plugin-collab-edit": "^1.8.0",
44
44
  "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
45
+ "@atlaskit/editor-plugin-primary-toolbar": "^1.2.0",
45
46
  "@atlaskit/editor-prosemirror": "4.0.1",
46
- "@atlaskit/editor-shared-styles": "^2.12.0",
47
- "@atlaskit/icon": "^22.5.0",
47
+ "@atlaskit/editor-shared-styles": "^2.13.0",
48
+ "@atlaskit/icon": "^22.6.0",
48
49
  "@atlaskit/theme": "^12.11.0",
49
- "@atlaskit/tokens": "^1.53.0",
50
+ "@atlaskit/tokens": "^1.54.0",
50
51
  "@babel/runtime": "^7.0.0",
51
52
  "@emotion/react": "^11.7.1",
52
53
  "memoize-one": "^6.0.0",