@atlaskit/editor-plugin-text-color 1.14.0 → 1.14.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 +17 -0
  2. package/dist/cjs/ui/ToolbarTextColor/index.js +19 -5
  3. package/dist/es2019/ui/ToolbarTextColor/index.js +21 -7
  4. package/dist/esm/ui/ToolbarTextColor/index.js +21 -7
  5. package/package.json +4 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-plugin-text-color
2
2
 
3
+ ## 1.14.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#136367](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136367)
8
+ [`4d9450a7e1283`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d9450a7e1283) -
9
+ [ux] Update new icons (text color, highlight, text style) with design change
10
+ - Updated dependencies
11
+
12
+ ## 1.14.1
13
+
14
+ ### Patch Changes
15
+
16
+ - [#134213](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134213)
17
+ [`93bd7032842ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/93bd7032842ec) -
18
+ [ux] [ED-24636] Bump ADF Schema package
19
+
3
20
  ## 1.14.0
4
21
 
5
22
  ### Minor Changes
package/dist/cjs/ui/ToolbarTextColor/index.js CHANGED
@@ -23,7 +23,9 @@ var _uiColor = require("@atlaskit/editor-common/ui-color");
23
23
  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
+ var _textStyle = _interopRequireDefault(require("@atlaskit/icon/core/text-style"));
26
27
  var _chevronDown = _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; }
@@ -202,11 +204,23 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
202
204
  onClick: this.toggleOpen,
203
205
  onKeyDown: this.onKeyDown,
204
206
  ref: this.toolbarItemRef,
205
- iconBefore:
206
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
207
- (0, _react2.jsx)("div", {
208
- css: _styles.triggerWrapperStyles
209
- }, (0, _react2.jsx)(_icons.SteppedRainbowIconDecoration, {
207
+ iconBefore: (0, _react2.jsx)("div", {
208
+ css:
209
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
210
+ (0, _platformFeatureFlags.fg)('platform.design-system-team.enable-new-icons') ?
211
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
212
+ _styles.triggerWrapperStylesWithPadding :
213
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
214
+ _styles.triggerWrapperStyles
215
+ }, (0, _platformFeatureFlags.fg)('platform.design-system-team.enable-new-icons') ? (0, _react2.jsx)(_icons.DynamicStrokeIconDecoration, {
216
+ selectedColor: selectedColor,
217
+ disabled: pluginState.disabled,
218
+ icon: (0, _react2.jsx)(_textStyle.default, {
219
+ label: "",
220
+ color: "currentColor",
221
+ spacing: "spacious"
222
+ })
223
+ }) : (0, _react2.jsx)(_icons.SteppedRainbowIconDecoration, {
210
224
  selectedColor: selectedColor,
211
225
  disabled: pluginState.disabled,
212
226
  icon: (0, _react2.jsx)(_icon.EditorTextColorIcon, null)
package/dist/es2019/ui/ToolbarTextColor/index.js CHANGED
@@ -9,14 +9,16 @@ import React from 'react';
9
9
  import { jsx } from '@emotion/react';
10
10
  import { injectIntl } from 'react-intl-next';
11
11
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
12
- import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
12
+ import { DynamicStrokeIconDecoration, SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
13
13
  import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
14
- import { expandIconContainerStyle, separatorStyles, triggerWrapperStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
14
+ import { expandIconContainerStyle, separatorStyles, triggerWrapperStyles, triggerWrapperStylesWithPadding, 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
+ import TextStyleIcon from '@atlaskit/icon/core/text-style';
19
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';
@@ -183,11 +185,23 @@ export class ToolbarTextColor extends React.Component {
183
185
  onClick: this.toggleOpen,
184
186
  onKeyDown: this.onKeyDown,
185
187
  ref: this.toolbarItemRef,
186
- iconBefore:
187
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
188
- jsx("div", {
189
- css: triggerWrapperStyles
190
- }, jsx(SteppedRainbowIconDecoration, {
188
+ iconBefore: jsx("div", {
189
+ css:
190
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
191
+ fg('platform.design-system-team.enable-new-icons') ?
192
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
193
+ triggerWrapperStylesWithPadding :
194
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
195
+ triggerWrapperStyles
196
+ }, fg('platform.design-system-team.enable-new-icons') ? jsx(DynamicStrokeIconDecoration, {
197
+ selectedColor: selectedColor,
198
+ disabled: pluginState.disabled,
199
+ icon: jsx(TextStyleIcon, {
200
+ label: "",
201
+ color: "currentColor",
202
+ spacing: "spacious"
203
+ })
204
+ }) : jsx(SteppedRainbowIconDecoration, {
191
205
  selectedColor: selectedColor,
192
206
  disabled: pluginState.disabled,
193
207
  icon: jsx(EditorTextColorIcon, null)
package/dist/esm/ui/ToolbarTextColor/index.js CHANGED
@@ -19,14 +19,16 @@ import React from 'react';
19
19
  import { jsx } from '@emotion/react';
20
20
  import { injectIntl } from 'react-intl-next';
21
21
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
22
- import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
22
+ import { DynamicStrokeIconDecoration, SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
23
23
  import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
24
- import { expandIconContainerStyle, separatorStyles, triggerWrapperStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
24
+ import { expandIconContainerStyle, separatorStyles, triggerWrapperStyles, triggerWrapperStylesWithPadding, 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
+ import TextStyleIcon from '@atlaskit/icon/core/text-style';
29
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';
@@ -198,11 +200,23 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
198
200
  onClick: this.toggleOpen,
199
201
  onKeyDown: this.onKeyDown,
200
202
  ref: this.toolbarItemRef,
201
- iconBefore:
202
- // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
203
- jsx("div", {
204
- css: triggerWrapperStyles
205
- }, jsx(SteppedRainbowIconDecoration, {
203
+ iconBefore: jsx("div", {
204
+ css:
205
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
206
+ fg('platform.design-system-team.enable-new-icons') ?
207
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
208
+ triggerWrapperStylesWithPadding :
209
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
210
+ triggerWrapperStyles
211
+ }, fg('platform.design-system-team.enable-new-icons') ? jsx(DynamicStrokeIconDecoration, {
212
+ selectedColor: selectedColor,
213
+ disabled: pluginState.disabled,
214
+ icon: jsx(TextStyleIcon, {
215
+ label: "",
216
+ color: "currentColor",
217
+ spacing: "spacious"
218
+ })
219
+ }) : jsx(SteppedRainbowIconDecoration, {
206
220
  selectedColor: selectedColor,
207
221
  disabled: pluginState.disabled,
208
222
  icon: jsx(EditorTextColorIcon, null)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-text-color",
3
- "version": "1.14.0",
3
+ "version": "1.14.2",
4
4
  "description": "Text color plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -10,8 +10,6 @@
10
10
  "atlassian": {
11
11
  "team": "Editor: Lego",
12
12
  "singleton": true,
13
- "inPublicMirror": false,
14
- "releaseModel": "continuous",
15
13
  "runReact18": false
16
14
  },
17
15
  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
@@ -33,15 +31,15 @@
33
31
  ".": "./src/index.ts"
34
32
  },
35
33
  "dependencies": {
36
- "@atlaskit/adf-schema": "^40.8.1",
37
- "@atlaskit/editor-common": "^88.1.0",
34
+ "@atlaskit/adf-schema": "^40.9.0",
35
+ "@atlaskit/editor-common": "^88.8.0",
38
36
  "@atlaskit/editor-palette": "1.6.0",
39
37
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
40
38
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
41
39
  "@atlaskit/editor-prosemirror": "5.0.1",
42
40
  "@atlaskit/editor-shared-styles": "^2.13.0",
43
41
  "@atlaskit/editor-tables": "^2.8.0",
44
- "@atlaskit/icon": "^22.14.0",
42
+ "@atlaskit/icon": "^22.15.0",
45
43
  "@atlaskit/platform-feature-flags": "^0.3.0",
46
44
  "@atlaskit/theme": "^13.0.0",
47
45
  "@atlaskit/tokens": "^1.59.0",