@atlaskit/editor-plugin-highlight 1.16.5 → 1.17.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 (5) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/PrimaryToolbarHighlightColor.js +8 -10
  3. package/dist/es2019/ui/PrimaryToolbarHighlightColor.js +9 -11
  4. package/dist/esm/ui/PrimaryToolbarHighlightColor.js +9 -11
  5. package/package.json +5 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 1.17.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#140915](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140915)
8
+ [`eaccad51157d6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eaccad51157d6) -
9
+ [ux] Migrate new icons including color, highlight and task on Editor primary toolbar
10
+
3
11
  ## 1.16.5
4
12
 
5
13
  ### Patch Changes
package/dist/cjs/ui/PrimaryToolbarHighlightColor.js CHANGED
@@ -16,8 +16,9 @@ var _messages = require("@atlaskit/editor-common/messages");
16
16
  var _styles = require("@atlaskit/editor-common/styles");
17
17
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
18
18
  var _editorPalette = require("@atlaskit/editor-palette");
19
- var _editEditFilled = _interopRequireDefault(require("@atlaskit/icon/core/migration/edit--edit-filled"));
20
- var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
19
+ var _highlight = _interopRequireDefault(require("@atlaskit/icon-lab/core/highlight"));
20
+ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
21
+ var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/chevron-down"));
21
22
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
22
23
  var _primitives = require("@atlaskit/primitives");
23
24
  var _commands = require("../commands");
@@ -106,7 +107,7 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
106
107
  }, (0, _react2.jsx)(_icons.DynamicStrokeIconDecoration, {
107
108
  selectedColor: activeColorToken,
108
109
  disabled: highlightState.disabled,
109
- icon: (0, _react2.jsx)(_editEditFilled.default, {
110
+ icon: (0, _react2.jsx)(_highlight.default, {
110
111
  label: "",
111
112
  color: "currentColor",
112
113
  spacing: "spacious"
@@ -115,20 +116,17 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
115
116
  //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
116
117
  (0, _react2.jsx)("span", {
117
118
  css: _styles.expandIconContainerStyle
118
- }, (0, _react2.jsx)(_chevronDown.default, {
119
+ }, (0, _react2.jsx)(_chevronDown2.default, {
119
120
  label: "",
120
- color: "currentColor",
121
- LEGACY_margin: "0 0 0 -8px"
121
+ color: "currentColor"
122
122
  }))) : (0, _react2.jsx)(_primitives.Flex, null, (0, _react2.jsx)(_EditorHighlightIcon.EditorHighlightIcon, {
123
123
  selectedColor: activeColorToken,
124
124
  disabled: highlightState.disabled
125
125
  }), (0, _react2.jsx)("span", {
126
126
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
127
- css: _styles.expandIconContainerStyle
127
+ css: _styles.expandIconWrapperStyle
128
128
  }, (0, _react2.jsx)(_chevronDown.default, {
129
- label: "",
130
- color: "currentColor",
131
- LEGACY_margin: "0 0 0 -8px"
129
+ label: ""
132
130
  })))
133
131
  }),
134
132
  onColorChange: function onColorChange(color) {
package/dist/es2019/ui/PrimaryToolbarHighlightColor.js CHANGED
@@ -12,11 +12,12 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
12
12
  import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
13
13
  import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
14
14
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
15
- import { expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
15
+ import { expandIconContainerStyle, expandIconWrapperStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
16
16
  import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
17
17
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
18
- import EditFilledIcon from '@atlaskit/icon/core/migration/edit--edit-filled';
19
- import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
18
+ import HighlightIcon from '@atlaskit/icon-lab/core/highlight';
19
+ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
20
+ import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
20
21
  import { fg } from '@atlaskit/platform-feature-flags';
21
22
  import { Flex } from '@atlaskit/primitives';
22
23
  import { setPalette } from '../commands';
@@ -105,7 +106,7 @@ const PrimaryToolbarHighlightColor = ({
105
106
  }, jsx(DynamicStrokeIconDecoration, {
106
107
  selectedColor: activeColorToken,
107
108
  disabled: highlightState.disabled,
108
- icon: jsx(EditFilledIcon, {
109
+ icon: jsx(HighlightIcon, {
109
110
  label: "",
110
111
  color: "currentColor",
111
112
  spacing: "spacious"
@@ -116,18 +117,15 @@ const PrimaryToolbarHighlightColor = ({
116
117
  css: expandIconContainerStyle
117
118
  }, jsx(ChevronDownIcon, {
118
119
  label: "",
119
- color: "currentColor",
120
- LEGACY_margin: "0 0 0 -8px"
120
+ color: "currentColor"
121
121
  }))) : jsx(Flex, null, jsx(EditorHighlightIcon, {
122
122
  selectedColor: activeColorToken,
123
123
  disabled: highlightState.disabled
124
124
  }), jsx("span", {
125
125
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
126
- css: expandIconContainerStyle
127
- }, jsx(ChevronDownIcon, {
128
- label: "",
129
- color: "currentColor",
130
- LEGACY_margin: "0 0 0 -8px"
126
+ css: expandIconWrapperStyle
127
+ }, jsx(ExpandIcon, {
128
+ label: ""
131
129
  })))
132
130
  }),
133
131
  onColorChange: color => handleColorChange({
package/dist/esm/ui/PrimaryToolbarHighlightColor.js CHANGED
@@ -12,11 +12,12 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
12
12
  import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
13
13
  import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
14
14
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
15
- import { expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
15
+ import { expandIconContainerStyle, expandIconWrapperStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
16
16
  import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
17
17
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
18
- import EditFilledIcon from '@atlaskit/icon/core/migration/edit--edit-filled';
19
- import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
18
+ import HighlightIcon from '@atlaskit/icon-lab/core/highlight';
19
+ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
20
+ import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
20
21
  import { fg } from '@atlaskit/platform-feature-flags';
21
22
  import { Flex } from '@atlaskit/primitives';
22
23
  import { setPalette } from '../commands';
@@ -98,7 +99,7 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
98
99
  }, jsx(DynamicStrokeIconDecoration, {
99
100
  selectedColor: activeColorToken,
100
101
  disabled: highlightState.disabled,
101
- icon: jsx(EditFilledIcon, {
102
+ icon: jsx(HighlightIcon, {
102
103
  label: "",
103
104
  color: "currentColor",
104
105
  spacing: "spacious"
@@ -109,18 +110,15 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
109
110
  css: expandIconContainerStyle
110
111
  }, jsx(ChevronDownIcon, {
111
112
  label: "",
112
- color: "currentColor",
113
- LEGACY_margin: "0 0 0 -8px"
113
+ color: "currentColor"
114
114
  }))) : jsx(Flex, null, jsx(EditorHighlightIcon, {
115
115
  selectedColor: activeColorToken,
116
116
  disabled: highlightState.disabled
117
117
  }), jsx("span", {
118
118
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
119
- css: expandIconContainerStyle
120
- }, jsx(ChevronDownIcon, {
121
- label: "",
122
- color: "currentColor",
123
- LEGACY_margin: "0 0 0 -8px"
119
+ css: expandIconWrapperStyle
120
+ }, jsx(ExpandIcon, {
121
+ label: ""
124
122
  })))
125
123
  }),
126
124
  onColorChange: function onColorChange(color) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "1.16.5",
3
+ "version": "1.17.0",
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": "^40.9.0",
40
- "@atlaskit/editor-common": "^89.0.0",
40
+ "@atlaskit/editor-common": "^89.2.0",
41
41
  "@atlaskit/editor-palette": "1.6.0",
42
42
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
43
43
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
@@ -45,10 +45,11 @@
45
45
  "@atlaskit/editor-prosemirror": "6.0.0",
46
46
  "@atlaskit/editor-shared-styles": "^2.13.0",
47
47
  "@atlaskit/editor-tables": "^2.8.0",
48
- "@atlaskit/icon": "^22.16.0",
48
+ "@atlaskit/icon": "^22.18.0",
49
+ "@atlaskit/icon-lab": "^0.2.0",
49
50
  "@atlaskit/platform-feature-flags": "^0.3.0",
50
51
  "@atlaskit/primitives": "^12.1.0",
51
- "@atlaskit/tokens": "^1.59.0",
52
+ "@atlaskit/tokens": "^1.60.0",
52
53
  "@babel/runtime": "^7.0.0",
53
54
  "@emotion/react": "^11.7.1"
54
55
  },