@atlaskit/editor-plugin-text-color 1.10.0 → 1.10.2

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 +15 -0
  2. package/dist/cjs/ui/ToolbarTextColor/index.js +12 -1
  3. package/dist/es2019/ui/ToolbarTextColor/index.js +13 -2
  4. package/dist/esm/ui/ToolbarTextColor/index.js +13 -2
  5. package/package.json +6 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-text-color
2
2
 
3
+ ## 1.10.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#125353](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125353)
8
+ [`77847728bf617`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/77847728bf617) -
9
+ Migrate icons in Editor primary toolbar
10
+ - Updated dependencies
11
+
12
+ ## 1.10.1
13
+
14
+ ### Patch Changes
15
+
16
+ - Updated dependencies
17
+
3
18
  ## 1.10.0
4
19
 
5
20
  ### Minor Changes
package/dist/cjs/ui/ToolbarTextColor/index.js CHANGED
@@ -24,6 +24,8 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
24
24
  var _editorPalette = require("@atlaskit/editor-palette");
25
25
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
26
26
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
27
+ var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
28
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
27
29
  var _changeColor = require("../../commands/change-color");
28
30
  var _icon = require("./icon");
29
31
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -210,7 +212,16 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
210
212
  selectedColor: selectedColor,
211
213
  disabled: pluginState.disabled,
212
214
  icon: (0, _react2.jsx)(_icon.EditorTextColorIcon, null)
213
- }), (0, _react2.jsx)("span", {
215
+ }), (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ?
216
+ //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
217
+ (0, _react2.jsx)("span", {
218
+ css: _styles.expandIconContainerStyle
219
+ }, (0, _react2.jsx)(_chevronDown2.default, {
220
+ label: "",
221
+ color: "currentColor"
222
+ })) :
223
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
224
+ (0, _react2.jsx)("span", {
214
225
  css: _styles.expandIconWrapperStyle
215
226
  }, (0, _react2.jsx)(_chevronDown.default, {
216
227
  label: ""
package/dist/es2019/ui/ToolbarTextColor/index.js CHANGED
@@ -11,12 +11,14 @@ import { injectIntl } from 'react-intl-next';
11
11
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
12
12
  import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
13
13
  import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
14
- import { expandIconWrapperStyle, separatorStyles, triggerWrapperStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
14
+ import { expandIconContainerStyle, expandIconWrapperStyle, separatorStyles, triggerWrapperStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
15
15
  import { ColorPalette, getSelectedRowAndColumnFromPalette, textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
16
16
  import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
17
17
  import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
18
18
  import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
19
19
  import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
20
+ import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
21
+ import { fg } from '@atlaskit/platform-feature-flags';
20
22
  import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
21
23
  import { EditorTextColorIcon } from './icon';
22
24
  const EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
@@ -191,7 +193,16 @@ export class ToolbarTextColor extends React.Component {
191
193
  selectedColor: selectedColor,
192
194
  disabled: pluginState.disabled,
193
195
  icon: jsx(EditorTextColorIcon, null)
194
- }), jsx("span", {
196
+ }), fg('platform_editor_migration_icon_and_typography') ?
197
+ //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
198
+ jsx("span", {
199
+ css: expandIconContainerStyle
200
+ }, jsx(ChevronDownIcon, {
201
+ label: "",
202
+ color: "currentColor"
203
+ })) :
204
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
205
+ jsx("span", {
195
206
  css: expandIconWrapperStyle
196
207
  }, jsx(ExpandIcon, {
197
208
  label: ""
package/dist/esm/ui/ToolbarTextColor/index.js CHANGED
@@ -21,12 +21,14 @@ import { injectIntl } from 'react-intl-next';
21
21
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
22
22
  import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
23
23
  import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
24
- import { expandIconWrapperStyle, separatorStyles, triggerWrapperStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
24
+ import { expandIconContainerStyle, expandIconWrapperStyle, separatorStyles, triggerWrapperStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
25
25
  import { ColorPalette, getSelectedRowAndColumnFromPalette, textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
26
26
  import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
27
27
  import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
28
28
  import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
29
29
  import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
30
+ import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
31
+ import { fg } from '@atlaskit/platform-feature-flags';
30
32
  import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
31
33
  import { EditorTextColorIcon } from './icon';
32
34
  var EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
@@ -206,7 +208,16 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
206
208
  selectedColor: selectedColor,
207
209
  disabled: pluginState.disabled,
208
210
  icon: jsx(EditorTextColorIcon, null)
209
- }), jsx("span", {
211
+ }), fg('platform_editor_migration_icon_and_typography') ?
212
+ //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
213
+ jsx("span", {
214
+ css: expandIconContainerStyle
215
+ }, jsx(ChevronDownIcon, {
216
+ label: "",
217
+ color: "currentColor"
218
+ })) :
219
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
220
+ jsx("span", {
210
221
  css: expandIconWrapperStyle
211
222
  }, jsx(ExpandIcon, {
212
223
  label: ""
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-text-color",
3
- "version": "1.10.0",
3
+ "version": "1.10.2",
4
4
  "description": "Text color plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -34,14 +34,14 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@atlaskit/adf-schema": "^40.3.0",
37
- "@atlaskit/editor-common": "^86.8.0",
37
+ "@atlaskit/editor-common": "^87.1.0",
38
38
  "@atlaskit/editor-palette": "1.6.0",
39
39
  "@atlaskit/editor-plugin-analytics": "^1.6.0",
40
40
  "@atlaskit/editor-plugin-primary-toolbar": "^1.3.0",
41
41
  "@atlaskit/editor-prosemirror": "5.0.1",
42
42
  "@atlaskit/editor-shared-styles": "^2.13.0",
43
43
  "@atlaskit/editor-tables": "^2.8.0",
44
- "@atlaskit/icon": "^22.7.0",
44
+ "@atlaskit/icon": "^22.8.0",
45
45
  "@atlaskit/platform-feature-flags": "^0.3.0",
46
46
  "@atlaskit/theme": "^12.11.0",
47
47
  "@atlaskit/tokens": "^1.56.0",
@@ -97,6 +97,9 @@
97
97
  "platform-feature-flags": {
98
98
  "editor_use_removeMark": {
99
99
  "type": "boolean"
100
+ },
101
+ "platform_editor_migration_icon_and_typography": {
102
+ "type": "boolean"
100
103
  }
101
104
  }
102
105
  }