@atlaskit/editor-plugin-highlight 1.4.2 → 1.5.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 (10) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/plugin.js +25 -18
  3. package/dist/cjs/ui/ToolbarHighlightColor.js +1 -3
  4. package/dist/es2019/plugin.js +24 -17
  5. package/dist/es2019/ui/ToolbarHighlightColor.js +2 -4
  6. package/dist/esm/plugin.js +25 -18
  7. package/dist/esm/ui/ToolbarHighlightColor.js +2 -4
  8. package/dist/types/plugin.d.ts +3 -1
  9. package/dist/types-ts4.5/plugin.d.ts +3 -1
  10. package/package.json +5 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 1.5.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#101406](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/101406)
8
+ [`6daffd65aec4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6daffd65aec4) -
9
+ [ED-23298] Extract primary toolbar components to editor plugin to allow for custom ordering
10
+
11
+ ### Patch Changes
12
+
13
+ - [#102478](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102478)
14
+ [`3378951608b0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3378951608b0) -
15
+ [ED-23332] Update adf-schema package to 36.10.1
16
+ - Updated dependencies
17
+
3
18
  ## 1.4.2
4
19
 
5
20
  ### Patch Changes
package/dist/cjs/plugin.js CHANGED
@@ -14,6 +14,23 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
14
14
  var _api$analytics;
15
15
  var api = _ref.api;
16
16
  var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
17
+ var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
18
+ var popupsMountPoint = _ref2.popupsMountPoint,
19
+ popupsBoundariesElement = _ref2.popupsBoundariesElement,
20
+ popupsScrollableElement = _ref2.popupsScrollableElement,
21
+ disabled = _ref2.disabled,
22
+ isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
23
+ dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
24
+ return /*#__PURE__*/_react.default.createElement(_ToolbarHighlightColor.ToolbarHighlightColorWithIntl, {
25
+ popupsMountPoint: popupsMountPoint,
26
+ popupsBoundariesElement: popupsBoundariesElement,
27
+ popupsScrollableElement: popupsScrollableElement,
28
+ disabled: disabled,
29
+ isToolbarReducedSpacing: isToolbarReducedSpacing,
30
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
31
+ pluginInjectionApi: api
32
+ });
33
+ };
17
34
  return {
18
35
  name: 'highlight',
19
36
  commands: {
@@ -41,23 +58,13 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
41
58
  }
42
59
  return _pmPlugin.highlightPluginKey.getState(editorState);
43
60
  },
44
- primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
45
- var editorView = _ref2.editorView,
46
- popupsMountPoint = _ref2.popupsMountPoint,
47
- popupsBoundariesElement = _ref2.popupsBoundariesElement,
48
- popupsScrollableElement = _ref2.popupsScrollableElement,
49
- disabled = _ref2.disabled,
50
- isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
51
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
52
- return /*#__PURE__*/_react.default.createElement(_ToolbarHighlightColor.ToolbarHighlightColorWithIntl, {
53
- popupsMountPoint: popupsMountPoint,
54
- popupsBoundariesElement: popupsBoundariesElement,
55
- popupsScrollableElement: popupsScrollableElement,
56
- disabled: disabled,
57
- isToolbarReducedSpacing: isToolbarReducedSpacing,
58
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
59
- pluginInjectionApi: api
60
- });
61
- }
61
+ usePluginHook: function usePluginHook() {
62
+ var _api$core, _api$primaryToolbar;
63
+ 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({
64
+ name: 'highlight',
65
+ component: primaryToolbarComponent
66
+ }));
67
+ },
68
+ primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
62
69
  };
63
70
  };
package/dist/cjs/ui/ToolbarHighlightColor.js CHANGED
@@ -158,8 +158,6 @@ var ToolbarHighlightColor = function ToolbarHighlightColor(_ref) {
158
158
  palette: _uiColor.highlightColorPalette,
159
159
  hexToPaletteColor: _editorPalette.hexToEditorTextBackgroundPaletteColor
160
160
  }
161
- }))), (0, _react2.jsx)("span", {
162
- css: _styles.separatorStyles
163
- }));
161
+ }))));
164
162
  };
165
163
  var ToolbarHighlightColorWithIntl = exports.ToolbarHighlightColorWithIntl = (0, _reactIntlNext.injectIntl)(ToolbarHighlightColor);
package/dist/es2019/plugin.js CHANGED
@@ -8,6 +8,22 @@ export const highlightPlugin = ({
8
8
  }) => {
9
9
  var _api$analytics;
10
10
  const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
11
+ const primaryToolbarComponent = ({
12
+ popupsMountPoint,
13
+ popupsBoundariesElement,
14
+ popupsScrollableElement,
15
+ disabled,
16
+ isToolbarReducedSpacing,
17
+ dispatchAnalyticsEvent
18
+ }) => /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
19
+ popupsMountPoint: popupsMountPoint,
20
+ popupsBoundariesElement: popupsBoundariesElement,
21
+ popupsScrollableElement: popupsScrollableElement,
22
+ disabled: disabled,
23
+ isToolbarReducedSpacing: isToolbarReducedSpacing,
24
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
25
+ pluginInjectionApi: api
26
+ });
11
27
  return {
12
28
  name: 'highlight',
13
29
  commands: {
@@ -31,22 +47,13 @@ export const highlightPlugin = ({
31
47
  }
32
48
  return highlightPluginKey.getState(editorState);
33
49
  },
34
- primaryToolbarComponent: ({
35
- editorView,
36
- popupsMountPoint,
37
- popupsBoundariesElement,
38
- popupsScrollableElement,
39
- disabled,
40
- isToolbarReducedSpacing,
41
- dispatchAnalyticsEvent
42
- }) => /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
43
- popupsMountPoint: popupsMountPoint,
44
- popupsBoundariesElement: popupsBoundariesElement,
45
- popupsScrollableElement: popupsScrollableElement,
46
- disabled: disabled,
47
- isToolbarReducedSpacing: isToolbarReducedSpacing,
48
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
49
- pluginInjectionApi: api
50
- })
50
+ usePluginHook: () => {
51
+ var _api$core, _api$primaryToolbar;
52
+ 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({
53
+ name: 'highlight',
54
+ component: primaryToolbarComponent
55
+ }));
56
+ },
57
+ primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
51
58
  };
52
59
  };
package/dist/es2019/ui/ToolbarHighlightColor.js CHANGED
@@ -5,7 +5,7 @@ import { injectIntl } from 'react-intl-next';
5
5
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
6
6
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
7
7
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
8
- import { expandIconWrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
8
+ import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
9
9
  import { ColorPalette, getSelectedRowAndColumnFromPalette, highlightColorPalette, REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
10
10
  import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
11
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
@@ -141,8 +141,6 @@ const ToolbarHighlightColor = ({
141
141
  palette: highlightColorPalette,
142
142
  hexToPaletteColor: hexToEditorTextBackgroundPaletteColor
143
143
  }
144
- }))), jsx("span", {
145
- css: separatorStyles
146
- }));
144
+ }))));
147
145
  };
148
146
  export const ToolbarHighlightColorWithIntl = injectIntl(ToolbarHighlightColor);
package/dist/esm/plugin.js CHANGED
@@ -7,6 +7,23 @@ export var highlightPlugin = function highlightPlugin(_ref) {
7
7
  var _api$analytics;
8
8
  var api = _ref.api;
9
9
  var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
10
+ var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
11
+ var popupsMountPoint = _ref2.popupsMountPoint,
12
+ popupsBoundariesElement = _ref2.popupsBoundariesElement,
13
+ popupsScrollableElement = _ref2.popupsScrollableElement,
14
+ disabled = _ref2.disabled,
15
+ isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
16
+ dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
17
+ return /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
18
+ popupsMountPoint: popupsMountPoint,
19
+ popupsBoundariesElement: popupsBoundariesElement,
20
+ popupsScrollableElement: popupsScrollableElement,
21
+ disabled: disabled,
22
+ isToolbarReducedSpacing: isToolbarReducedSpacing,
23
+ dispatchAnalyticsEvent: dispatchAnalyticsEvent,
24
+ pluginInjectionApi: api
25
+ });
26
+ };
10
27
  return {
11
28
  name: 'highlight',
12
29
  commands: {
@@ -34,23 +51,13 @@ export var highlightPlugin = function highlightPlugin(_ref) {
34
51
  }
35
52
  return highlightPluginKey.getState(editorState);
36
53
  },
37
- primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
38
- var editorView = _ref2.editorView,
39
- popupsMountPoint = _ref2.popupsMountPoint,
40
- popupsBoundariesElement = _ref2.popupsBoundariesElement,
41
- popupsScrollableElement = _ref2.popupsScrollableElement,
42
- disabled = _ref2.disabled,
43
- isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
44
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
45
- return /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
46
- popupsMountPoint: popupsMountPoint,
47
- popupsBoundariesElement: popupsBoundariesElement,
48
- popupsScrollableElement: popupsScrollableElement,
49
- disabled: disabled,
50
- isToolbarReducedSpacing: isToolbarReducedSpacing,
51
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
52
- pluginInjectionApi: api
53
- });
54
- }
54
+ usePluginHook: function usePluginHook() {
55
+ var _api$core, _api$primaryToolbar;
56
+ 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({
57
+ name: 'highlight',
58
+ component: primaryToolbarComponent
59
+ }));
60
+ },
61
+ primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
55
62
  };
56
63
  };
package/dist/esm/ui/ToolbarHighlightColor.js CHANGED
@@ -6,7 +6,7 @@ import { injectIntl } from 'react-intl-next';
6
6
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
7
7
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
8
8
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
9
- import { expandIconWrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
9
+ import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
10
10
  import { ColorPalette, getSelectedRowAndColumnFromPalette, highlightColorPalette, REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
11
11
  import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
12
12
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
@@ -147,8 +147,6 @@ var ToolbarHighlightColor = function ToolbarHighlightColor(_ref) {
147
147
  palette: highlightColorPalette,
148
148
  hexToPaletteColor: hexToEditorTextBackgroundPaletteColor
149
149
  }
150
- }))), jsx("span", {
151
- css: separatorStyles
152
- }));
150
+ }))));
153
151
  };
154
152
  export var ToolbarHighlightColorWithIntl = injectIntl(ToolbarHighlightColor);
package/dist/types/plugin.d.ts CHANGED
@@ -1,11 +1,13 @@
1
1
  import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
2
2
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
3
+ import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
3
4
  import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
4
5
  import type { HighlightPluginState } from './pm-plugin';
5
6
  export type HighlightPlugin = NextEditorPlugin<'highlight', {
6
7
  dependencies: [
7
8
  OptionalPlugin<AnalyticsPlugin>,
8
- OptionalPlugin<TextFormattingPlugin>
9
+ OptionalPlugin<TextFormattingPlugin>,
10
+ OptionalPlugin<PrimaryToolbarPlugin>
9
11
  ];
10
12
  sharedState: HighlightPluginState | undefined;
11
13
  }>;
package/dist/types-ts4.5/plugin.d.ts CHANGED
@@ -1,11 +1,13 @@
1
1
  import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
2
2
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
3
+ import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
3
4
  import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
4
5
  import type { HighlightPluginState } from './pm-plugin';
5
6
  export type HighlightPlugin = NextEditorPlugin<'highlight', {
6
7
  dependencies: [
7
8
  OptionalPlugin<AnalyticsPlugin>,
8
- OptionalPlugin<TextFormattingPlugin>
9
+ OptionalPlugin<TextFormattingPlugin>,
10
+ OptionalPlugin<PrimaryToolbarPlugin>
9
11
  ];
10
12
  sharedState: HighlightPluginState | undefined;
11
13
  }>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "1.4.2",
3
+ "version": "1.5.0",
4
4
  "description": "Highlight plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -38,11 +38,12 @@
38
38
  ".": "./src/index.ts"
39
39
  },
40
40
  "dependencies": {
41
- "@atlaskit/adf-schema": "^36.8.0",
42
- "@atlaskit/editor-common": "^80.5.0",
41
+ "@atlaskit/adf-schema": "^36.10.7",
42
+ "@atlaskit/editor-common": "^81.0.0",
43
43
  "@atlaskit/editor-palette": "1.6.0",
44
44
  "@atlaskit/editor-plugin-analytics": "^1.2.0",
45
- "@atlaskit/editor-plugin-text-formatting": "^1.6.0",
45
+ "@atlaskit/editor-plugin-primary-toolbar": "^1.1.0",
46
+ "@atlaskit/editor-plugin-text-formatting": "^1.7.0",
46
47
  "@atlaskit/editor-prosemirror": "4.0.1",
47
48
  "@atlaskit/editor-shared-styles": "^2.11.0",
48
49
  "@atlaskit/icon": "^22.3.0",