@atlaskit/editor-plugin-highlight 1.22.0 → 2.0.1

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,31 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 2.0.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#120931](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120931)
8
+ [`624b97c021fea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/624b97c021fea) -
9
+ [ux] ED-26676 revert to existing primary toolbar components
10
+
11
+ ## 2.0.0
12
+
13
+ ### Major Changes
14
+
15
+ - [#117363](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117363)
16
+ [`10a0f7f6c2027`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10a0f7f6c2027) -
17
+ This package's `peerDependencies` have been adjusted for `react` and/or `react-dom` to reflect the
18
+ status of only supporting React 18 going forward. No explicit breaking change to React support has
19
+ been made in this release, but this is to signify going forward, breaking changes for React 16 or
20
+ React 17 may come via non-major semver releases.
21
+
22
+ Please refer this community post for more details:
23
+ https://community.developer.atlassian.com/t/rfc-78-dropping-support-for-react-16-and-rendering-in-a-react-18-concurrent-root-in-jira-and-confluence/87026
24
+
25
+ ### Patch Changes
26
+
27
+ - Updated dependencies
28
+
3
29
  ## 1.22.0
4
30
 
5
31
  ### Minor Changes
@@ -24,16 +24,7 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
24
24
  popupsScrollableElement = _ref2.popupsScrollableElement,
25
25
  disabled = _ref2.disabled,
26
26
  isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
27
- editorView = _ref2.editorView,
28
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
29
- if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
30
- exposure: true
31
- })) {
32
- return /*#__PURE__*/_react.default.createElement(_FloatingToolbarHighlightColor.FloatingToolbarHighlightColorWithIntl, {
33
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
34
- pluginInjectionApi: api
35
- });
36
- }
27
+ editorView = _ref2.editorView;
37
28
  return /*#__PURE__*/_react.default.createElement(_PrimaryToolbarHighlightColor.PrimaryToolbarHighlightColorWithIntl, {
38
29
  popupsMountPoint: popupsMountPoint,
39
30
  popupsBoundariesElement: popupsBoundariesElement,
@@ -92,7 +92,7 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
92
92
  , {
93
93
  css: _styles.disableBlueBorderStyles,
94
94
  buttonId: _uiMenu.TOOLBAR_BUTTON.BACKGROUND_COLOR,
95
- spacing: 'compact',
95
+ spacing: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? 'default' : 'compact',
96
96
  disabled: highlightState.disabled,
97
97
  selected: isDropdownOpen,
98
98
  "aria-label": title,
@@ -18,17 +18,8 @@ export const highlightPlugin = ({
18
18
  popupsScrollableElement,
19
19
  disabled,
20
20
  isToolbarReducedSpacing,
21
- editorView,
22
- dispatchAnalyticsEvent
21
+ editorView
23
22
  }) => {
24
- if (editorExperiment('platform_editor_controls', 'variant1', {
25
- exposure: true
26
- })) {
27
- return /*#__PURE__*/React.createElement(FloatingToolbarHighlightColor, {
28
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
29
- pluginInjectionApi: api
30
- });
31
- }
32
23
  return /*#__PURE__*/React.createElement(PrimaryToolbarHighlightColor, {
33
24
  popupsMountPoint: popupsMountPoint,
34
25
  popupsBoundariesElement: popupsBoundariesElement,
@@ -85,7 +85,7 @@ const FloatingToolbarHighlightColor = ({
85
85
  , {
86
86
  css: disableBlueBorderStyles,
87
87
  buttonId: TOOLBAR_BUTTON.BACKGROUND_COLOR,
88
- spacing: 'compact',
88
+ spacing: editorExperiment('platform_editor_controls', 'variant1') ? 'default' : 'compact',
89
89
  disabled: highlightState.disabled,
90
90
  selected: isDropdownOpen,
91
91
  "aria-label": title,
@@ -17,16 +17,7 @@ export var highlightPlugin = function highlightPlugin(_ref) {
17
17
  popupsScrollableElement = _ref2.popupsScrollableElement,
18
18
  disabled = _ref2.disabled,
19
19
  isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
20
- editorView = _ref2.editorView,
21
- dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
22
- if (editorExperiment('platform_editor_controls', 'variant1', {
23
- exposure: true
24
- })) {
25
- return /*#__PURE__*/React.createElement(FloatingToolbarHighlightColor, {
26
- dispatchAnalyticsEvent: dispatchAnalyticsEvent,
27
- pluginInjectionApi: api
28
- });
29
- }
20
+ editorView = _ref2.editorView;
30
21
  return /*#__PURE__*/React.createElement(PrimaryToolbarHighlightColor, {
31
22
  popupsMountPoint: popupsMountPoint,
32
23
  popupsBoundariesElement: popupsBoundariesElement,
@@ -84,7 +84,7 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
84
84
  , {
85
85
  css: disableBlueBorderStyles,
86
86
  buttonId: TOOLBAR_BUTTON.BACKGROUND_COLOR,
87
- spacing: 'compact',
87
+ spacing: editorExperiment('platform_editor_controls', 'variant1') ? 'default' : 'compact',
88
88
  disabled: highlightState.disabled,
89
89
  selected: isDropdownOpen,
90
90
  "aria-label": title,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "1.22.0",
3
+ "version": "2.0.1",
4
4
  "description": "Highlight plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -37,25 +37,25 @@
37
37
  },
38
38
  "dependencies": {
39
39
  "@atlaskit/adf-schema": "^47.2.1",
40
- "@atlaskit/editor-common": "^99.18.0",
41
- "@atlaskit/editor-palette": "1.7.0",
42
- "@atlaskit/editor-plugin-analytics": "^1.12.0",
43
- "@atlaskit/editor-plugin-primary-toolbar": "^2.3.0",
44
- "@atlaskit/editor-plugin-selection-toolbar": "^1.9.0",
45
- "@atlaskit/editor-plugin-text-formatting": "^1.20.0",
40
+ "@atlaskit/editor-common": "^100.4.0",
41
+ "@atlaskit/editor-palette": "2.0.0",
42
+ "@atlaskit/editor-plugin-analytics": "^2.0.0",
43
+ "@atlaskit/editor-plugin-primary-toolbar": "^3.0.0",
44
+ "@atlaskit/editor-plugin-selection-toolbar": "^2.0.0",
45
+ "@atlaskit/editor-plugin-text-formatting": "^2.0.0",
46
46
  "@atlaskit/editor-prosemirror": "7.0.0",
47
- "@atlaskit/editor-shared-styles": "^3.3.0",
47
+ "@atlaskit/editor-shared-styles": "^3.4.0",
48
48
  "@atlaskit/editor-tables": "^2.9.0",
49
- "@atlaskit/icon": "^23.11.0",
49
+ "@atlaskit/icon": "^24.1.0",
50
50
  "@atlaskit/platform-feature-flags": "^1.1.0",
51
- "@atlaskit/primitives": "^13.6.0",
52
- "@atlaskit/tmp-editor-statsig": "^2.47.0",
53
- "@atlaskit/tokens": "^3.3.0",
51
+ "@atlaskit/primitives": "^14.1.0",
52
+ "@atlaskit/tmp-editor-statsig": "^3.3.0",
53
+ "@atlaskit/tokens": "^4.3.0",
54
54
  "@babel/runtime": "^7.0.0",
55
55
  "@emotion/react": "^11.7.1"
56
56
  },
57
57
  "peerDependencies": {
58
- "react": "^16.8.0 || ^17.0.0 || ~18.2.0",
58
+ "react": "^18.2.0",
59
59
  "react-intl-next": "npm:react-intl@^5.18.1"
60
60
  },
61
61
  "devDependencies": {