@atlaskit/editor-plugin-highlight 1.19.1 → 1.19.3

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,20 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 1.19.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#172933](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172933)
8
+ [`8323af2381d00`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8323af2381d00) -
9
+ [ux] Arranges items in the Selection toolbar under the Contextual toolbar experiment flag
10
+ - Updated dependencies
11
+
12
+ ## 1.19.2
13
+
14
+ ### Patch Changes
15
+
16
+ - Updated dependencies
17
+
3
18
  ## 1.19.1
4
19
 
5
20
  ### Patch Changes
@@ -90,10 +90,12 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
90
90
  },
91
91
  fallback: []
92
92
  };
93
+ var rank = (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) ? 5 : -9;
93
94
  return {
94
- rank: -9,
95
+ rank: rank,
95
96
  isToolbarAbove: true,
96
- items: [toolbarCustom]
97
+ items: [toolbarCustom],
98
+ pluginName: 'highlight'
97
99
  };
98
100
  }
99
101
  },
@@ -89,7 +89,7 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
89
89
  activeColor: highlightState.activeColor,
90
90
  trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton, {
91
91
  buttonId: _uiMenu.TOOLBAR_BUTTON.BACKGROUND_COLOR,
92
- spacing: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) ? 'none' : 'compact',
92
+ spacing: 'compact',
93
93
  disabled: highlightState.disabled,
94
94
  selected: isDropdownOpen,
95
95
  "aria-label": title,
@@ -75,10 +75,12 @@ export const highlightPlugin = ({
75
75
  }),
76
76
  fallback: []
77
77
  };
78
+ const rank = editorExperiment('contextual_formatting_toolbar', true) ? 5 : -9;
78
79
  return {
79
- rank: -9,
80
+ rank,
80
81
  isToolbarAbove: true,
81
- items: [toolbarCustom]
82
+ items: [toolbarCustom],
83
+ pluginName: 'highlight'
82
84
  };
83
85
  }
84
86
  },
@@ -82,7 +82,7 @@ const FloatingToolbarHighlightColor = ({
82
82
  activeColor: highlightState.activeColor,
83
83
  trigger: jsx(ToolbarButton, {
84
84
  buttonId: TOOLBAR_BUTTON.BACKGROUND_COLOR,
85
- spacing: editorExperiment('contextual_formatting_toolbar', true) ? 'none' : 'compact',
85
+ spacing: 'compact',
86
86
  disabled: highlightState.disabled,
87
87
  selected: isDropdownOpen,
88
88
  "aria-label": title,
@@ -83,10 +83,12 @@ export var highlightPlugin = function highlightPlugin(_ref) {
83
83
  },
84
84
  fallback: []
85
85
  };
86
+ var rank = editorExperiment('contextual_formatting_toolbar', true) ? 5 : -9;
86
87
  return {
87
- rank: -9,
88
+ rank: rank,
88
89
  isToolbarAbove: true,
89
- items: [toolbarCustom]
90
+ items: [toolbarCustom],
91
+ pluginName: 'highlight'
90
92
  };
91
93
  }
92
94
  },
@@ -81,7 +81,7 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
81
81
  activeColor: highlightState.activeColor,
82
82
  trigger: jsx(ToolbarButton, {
83
83
  buttonId: TOOLBAR_BUTTON.BACKGROUND_COLOR,
84
- spacing: editorExperiment('contextual_formatting_toolbar', true) ? 'none' : 'compact',
84
+ spacing: 'compact',
85
85
  disabled: highlightState.disabled,
86
86
  selected: isDropdownOpen,
87
87
  "aria-label": title,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "1.19.1",
3
+ "version": "1.19.3",
4
4
  "description": "Highlight plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -37,7 +37,7 @@
37
37
  },
38
38
  "dependencies": {
39
39
  "@atlaskit/adf-schema": "^46.1.0",
40
- "@atlaskit/editor-common": "^95.10.0",
40
+ "@atlaskit/editor-common": "^96.1.0",
41
41
  "@atlaskit/editor-palette": "1.6.3",
42
42
  "@atlaskit/editor-plugin-analytics": "^1.10.0",
43
43
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",