@atlaskit/editor-plugin-text-color 22.0.2 → 22.0.4

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 (17) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/cjs/ui/ColorAccessibilityMenuItem.compiled.css +1 -6
  3. package/dist/cjs/ui/ColorAccessibilityMenuItem.js +4 -6
  4. package/dist/cjs/ui/RemoveColorMenuItem.js +4 -36
  5. package/dist/cjs/ui/TextColorMenuItem.js +2 -2
  6. package/dist/cjs/ui/TextMenuSection.js +2 -3
  7. package/dist/es2019/ui/ColorAccessibilityMenuItem.compiled.css +1 -6
  8. package/dist/es2019/ui/ColorAccessibilityMenuItem.js +4 -6
  9. package/dist/es2019/ui/RemoveColorMenuItem.js +4 -36
  10. package/dist/es2019/ui/TextColorMenuItem.js +2 -2
  11. package/dist/es2019/ui/TextMenuSection.js +2 -3
  12. package/dist/esm/ui/ColorAccessibilityMenuItem.compiled.css +1 -6
  13. package/dist/esm/ui/ColorAccessibilityMenuItem.js +4 -6
  14. package/dist/esm/ui/RemoveColorMenuItem.js +4 -36
  15. package/dist/esm/ui/TextColorMenuItem.js +2 -2
  16. package/dist/esm/ui/TextMenuSection.js +2 -3
  17. package/package.json +2 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-plugin-text-color
2
2
 
3
+ ## 22.0.4
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 22.0.3
10
+
11
+ ### Patch Changes
12
+
13
+ - [`a13383c3c99b2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a13383c3c99b2) -
14
+ [FFCLEANUP-192944] clean up code references to patch gates
15
+ `platform_editor_lovability_text_bg_color_patch_1` and
16
+ `platform_editor_lovability_text_bg_color_patch_2`.
17
+ - Updated dependencies
18
+
3
19
  ## 22.0.2
4
20
 
5
21
  ### Patch Changes
package/dist/cjs/ui/ColorAccessibilityMenuItem.compiled.css CHANGED
@@ -1,13 +1,8 @@
1
- ._19itglyw{border:none}._19bvu2gc{padding-left:var(--ds-space-100,8px)}
2
- ._19bvze3t{padding-left:var(--ds-space-0,0)}
3
- ._19pku2gc{margin-top:var(--ds-space-100,8px)}
1
+ ._19itglyw{border:none}._19bvze3t{padding-left:var(--ds-space-0,0)}
4
2
  ._19pkze3t{margin-top:var(--ds-space-0,0)}
5
3
  ._1bah1yb4{justify-content:space-between}
6
4
  ._1e0c1txw{display:flex}
7
5
  ._4cvr1h6o{align-items:center}
8
- ._ca0q1b66{padding-top:var(--ds-space-050,4px)}
9
6
  ._ca0qze3t{padding-top:var(--ds-space-0,0)}
10
- ._n3td1b66{padding-bottom:var(--ds-space-050,4px)}
11
7
  ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}
12
- ._u5f31b66{padding-right:var(--ds-space-050,4px)}
13
8
  ._u5f3ze3t{padding-right:var(--ds-space-0,0)}
package/dist/cjs/ui/ColorAccessibilityMenuItem.js CHANGED
@@ -22,7 +22,6 @@ var _editorPalette = require("@atlaskit/editor-palette");
22
22
  var _state = require("@atlaskit/editor-prosemirror/state");
23
23
  var _accessibility = _interopRequireDefault(require("@atlaskit/icon/core/accessibility"));
24
24
  var _questionCircle = _interopRequireDefault(require("@atlaskit/icon/core/question-circle"));
25
- var _fg = require("@atlaskit/platform-feature-flags/fg");
26
25
  var _compiled = require("@atlaskit/primitives/compiled");
27
26
  var _getTokenValue = require("@atlaskit/tokens/get-token-value");
28
27
  var _colorContrast = require("../pm-plugins/utils/color-contrast");
@@ -307,8 +306,7 @@ var AccessibilityStatus = function AccessibilityStatus(_ref) {
307
306
  }
308
307
  };
309
308
  var styles = {
310
- container: "_19itglyw _19pku2gc _ca0q1b66 _n3td1b66 _19bvu2gc _u5f31b66 _1e0c1txw _4cvr1h6o _1bah1yb4",
311
- containerPatch: "_19pkze3t _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t"
309
+ container: "_19itglyw _19pkze3t _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t _1e0c1txw _4cvr1h6o _1bah1yb4"
312
310
  };
313
311
  var ColorAccessibilityMenuItem = exports.ColorAccessibilityMenuItem = function ColorAccessibilityMenuItem(_ref2) {
314
312
  var api = _ref2.api;
@@ -322,7 +320,7 @@ var ColorAccessibilityMenuItem = exports.ColorAccessibilityMenuItem = function C
322
320
  editorView = _useEditorToolbar.editorView;
323
321
  var editorState = editorView === null || editorView === void 0 ? void 0 : editorView.state;
324
322
  var accessibilityStatus = _react.default.useMemo(function () {
325
- return editorState && (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1') ? getAccessibilityStatusForCurrentSelection(editorState, defaultColor, highlightColor, textColor) : getAccessibilityStatusFromColorPair(defaultColor, getResolvedBackgroundFromHighlight(highlightColor), textColor);
323
+ return editorState ? getAccessibilityStatusForCurrentSelection(editorState, defaultColor, highlightColor, textColor) : getAccessibilityStatusFromColorPair(defaultColor, getResolvedBackgroundFromHighlight(highlightColor), textColor);
326
324
  }, [defaultColor, editorState, highlightColor, textColor]);
327
325
  if (accessibilityStatus === null) {
328
326
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
@@ -337,14 +335,14 @@ var ColorAccessibilityMenuItem = exports.ColorAccessibilityMenuItem = function C
337
335
  }
338
336
  };
339
337
  return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
340
- xcss: (0, _css.cx)(styles.container, (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1') && styles.containerPatch)
338
+ xcss: (0, _css.cx)(styles.container)
341
339
  }, /*#__PURE__*/_react.default.createElement(_compiled.Inline, {
342
340
  alignBlock: "center",
343
341
  space: "space.050"
344
342
  }, /*#__PURE__*/_react.default.createElement(_accessibility.default, {
345
343
  label: "",
346
344
  size: "medium",
347
- color: (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1') ? "var(--ds-icon-subtle, #505258)" : undefined
345
+ color: "var(--ds-icon-subtle, #505258)"
348
346
  }), /*#__PURE__*/_react.default.createElement(_compiled.Text, {
349
347
  as: "span",
350
348
  size: "small",
package/dist/cjs/ui/RemoveColorMenuItem.js CHANGED
@@ -17,7 +17,6 @@ var _toolbar = require("@atlaskit/editor-common/toolbar");
17
17
  var _uiColor = require("@atlaskit/editor-common/ui-color");
18
18
  var _editorToolbar = require("@atlaskit/editor-toolbar");
19
19
  var _colourNone = _interopRequireDefault(require("@atlaskit/icon-lab/core/colour-none"));
20
- var _fg = require("@atlaskit/platform-feature-flags/fg");
21
20
  var _compiled = require("@atlaskit/primitives/compiled");
22
21
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
23
22
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -45,7 +44,7 @@ var RemoveColorMenuItem = exports.RemoveColorMenuItem = function RemoveColorMenu
45
44
  api.core.actions.execute(function (_ref2) {
46
45
  var _api$highlight;
47
46
  var tr = _ref2.tr;
48
- if (!(0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) || !(0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_2')) {
47
+ if (!(0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
49
48
  api.textColor.commands.changeColor(defaultColor, (0, _toolbar.getInputMethodFromParentKeys)(parents))({
50
49
  tr: tr
51
50
  });
@@ -63,39 +62,8 @@ var RemoveColorMenuItem = exports.RemoveColorMenuItem = function RemoveColorMenu
63
62
  }
64
63
  };
65
64
  if ((0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
66
- if ((0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_2')) {
67
- return /*#__PURE__*/React.createElement("div", {
68
- className: (0, _runtime.ax)([styles.removeColorButton, styles.removeColorButtonPatch])
69
- }, /*#__PURE__*/React.createElement(_button.default, {
70
- shouldFitContainer: true,
71
- appearance: "subtle",
72
- onClick: onClick
73
- }, /*#__PURE__*/React.createElement("span", {
74
- className: (0, _runtime.ax)([styles.iconContainer])
75
- }, /*#__PURE__*/React.createElement(_colourNone.default, {
76
- size: "medium",
77
- label: ""
78
- }), /*#__PURE__*/React.createElement(_compiled.Text, {
79
- color: "color.text.subtle"
80
- }, formatMessage(_messages.highlightMessages.removeHighlight)))));
81
- } else if ((0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1')) {
82
- return /*#__PURE__*/React.createElement("div", {
83
- className: (0, _runtime.ax)([styles.removeColorButton, styles.removeColorButtonPatch])
84
- }, /*#__PURE__*/React.createElement(_button.default, {
85
- shouldFitContainer: true,
86
- appearance: "subtle",
87
- onClick: onClick
88
- }, /*#__PURE__*/React.createElement("span", {
89
- className: (0, _runtime.ax)([styles.iconContainer])
90
- }, /*#__PURE__*/React.createElement(_colourNone.default, {
91
- size: "medium",
92
- label: ""
93
- }), /*#__PURE__*/React.createElement(_compiled.Text, {
94
- color: "color.text.subtle"
95
- }, formatMessage(_messages.highlightMessages.clearColors)))));
96
- }
97
65
  return /*#__PURE__*/React.createElement("div", {
98
- className: (0, _runtime.ax)([styles.removeColorButton])
66
+ className: (0, _runtime.ax)([styles.removeColorButton, styles.removeColorButtonPatch])
99
67
  }, /*#__PURE__*/React.createElement(_button.default, {
100
68
  shouldFitContainer: true,
101
69
  appearance: "subtle",
@@ -106,8 +74,8 @@ var RemoveColorMenuItem = exports.RemoveColorMenuItem = function RemoveColorMenu
106
74
  size: "medium",
107
75
  label: ""
108
76
  }), /*#__PURE__*/React.createElement(_compiled.Text, {
109
- weight: "medium"
110
- }, formatMessage(_messages.highlightMessages.clearColors)))));
77
+ color: "color.text.subtle"
78
+ }, formatMessage(_messages.highlightMessages.removeHighlight)))));
111
79
  }
112
80
  return /*#__PURE__*/React.createElement("div", {
113
81
  className: (0, _runtime.ax)([styles.removeColorButton])
package/dist/cjs/ui/TextColorMenuItem.js CHANGED
@@ -63,7 +63,7 @@ function TextColorMenuItem(_ref) {
63
63
  var colorPalette = /*#__PURE__*/_react.default.createElement(_editorToolbar.ColorPalette, {
64
64
  ariaLabelledBy: labelId,
65
65
  cols: isNewColorPaletteEnabled ? TEXT_COLOR_PICKER_COLUMNS : undefined,
66
- gap: isNewColorPaletteEnabled && (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1') ? 'space.0' : undefined
66
+ gap: isNewColorPaletteEnabled ? 'space.0' : undefined
67
67
  // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
68
68
  ,
69
69
  onClick: function onClick(color, _, event) {
@@ -87,7 +87,7 @@ function TextColorMenuItem(_ref) {
87
87
  // The label names the palette's radio group; a heading inside a menu is skipped and has no stable level here
88
88
  ,
89
89
  as: (0, _fg.fg)('platform_editor_a11y_color_palette_radiogroup') ? 'div' : undefined
90
- }, formatMessage(_messages.textColorMessages.textColorTooltip)), isNewColorPaletteEnabled && (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1') ? /*#__PURE__*/_react.default.createElement(_compiled.Bleed, {
90
+ }, formatMessage(_messages.textColorMessages.textColorTooltip)), isNewColorPaletteEnabled ? /*#__PURE__*/_react.default.createElement(_compiled.Bleed, {
91
91
  inline: "space.025"
92
92
  }, colorPalette) : colorPalette);
93
93
  }
package/dist/cjs/ui/TextMenuSection.js CHANGED
@@ -11,7 +11,6 @@ var _runtime = require("@compiled/react/runtime");
11
11
  var _react = _interopRequireDefault(require("react"));
12
12
  var _toolbar = require("@atlaskit/editor-common/toolbar");
13
13
  var _editorToolbar = require("@atlaskit/editor-toolbar");
14
- var _fg = require("@atlaskit/platform-feature-flags/fg");
15
14
  var _compiled = require("@atlaskit/primitives/compiled");
16
15
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
17
16
  var styles = {
@@ -25,14 +24,14 @@ var TextMenuSection = exports.TextMenuSection = function TextMenuSection(_ref) {
25
24
  return parent.key === _toolbar.TEXT_COLLAPSED_MENU.key;
26
25
  });
27
26
  var onMouseDown = function onMouseDown(event) {
28
- if ((0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) && (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1')) {
27
+ if ((0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
29
28
  event.stopPropagation();
30
29
  }
31
30
  };
32
31
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
33
32
  hasSeparator: hasSeparator
34
33
  }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
35
- xcss: (0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) && (0, _fg.fg)('platform_editor_lovability_text_bg_color_patch_1') ? styles.menu : styles.menuOld,
34
+ xcss: (0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? styles.menu : styles.menuOld,
36
35
  onMouseDown: onMouseDown
37
36
  }, children));
38
37
  };
package/dist/es2019/ui/ColorAccessibilityMenuItem.compiled.css CHANGED
@@ -1,13 +1,8 @@
1
- ._19itglyw{border:none}._19bvu2gc{padding-left:var(--ds-space-100,8px)}
2
- ._19bvze3t{padding-left:var(--ds-space-0,0)}
3
- ._19pku2gc{margin-top:var(--ds-space-100,8px)}
1
+ ._19itglyw{border:none}._19bvze3t{padding-left:var(--ds-space-0,0)}
4
2
  ._19pkze3t{margin-top:var(--ds-space-0,0)}
5
3
  ._1bah1yb4{justify-content:space-between}
6
4
  ._1e0c1txw{display:flex}
7
5
  ._4cvr1h6o{align-items:center}
8
- ._ca0q1b66{padding-top:var(--ds-space-050,4px)}
9
6
  ._ca0qze3t{padding-top:var(--ds-space-0,0)}
10
- ._n3td1b66{padding-bottom:var(--ds-space-050,4px)}
11
7
  ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}
12
- ._u5f31b66{padding-right:var(--ds-space-050,4px)}
13
8
  ._u5f3ze3t{padding-right:var(--ds-space-0,0)}
package/dist/es2019/ui/ColorAccessibilityMenuItem.js CHANGED
@@ -15,7 +15,6 @@ import { hexToEditorBackgroundPaletteColor, hexToEditorTextBackgroundPaletteColo
15
15
  import { TextSelection } from '@atlaskit/editor-prosemirror/state';
16
16
  import AccessibilityIcon from '@atlaskit/icon/core/accessibility';
17
17
  import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
18
- import { fg } from '@atlaskit/platform-feature-flags/fg';
19
18
  import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
20
19
  import { getTokenValue } from '@atlaskit/tokens/get-token-value';
21
20
  import { getContrastRatio as calcContrastRatio } from '../pm-plugins/utils/color-contrast';
@@ -279,8 +278,7 @@ const AccessibilityStatus = ({
279
278
  }
280
279
  };
281
280
  const styles = {
282
- container: "_19itglyw _19pku2gc _ca0q1b66 _n3td1b66 _19bvu2gc _u5f31b66 _1e0c1txw _4cvr1h6o _1bah1yb4",
283
- containerPatch: "_19pkze3t _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t"
281
+ container: "_19itglyw _19pkze3t _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t _1e0c1txw _4cvr1h6o _1bah1yb4"
284
282
  };
285
283
  export const ColorAccessibilityMenuItem = ({
286
284
  api
@@ -297,7 +295,7 @@ export const ColorAccessibilityMenuItem = ({
297
295
  editorView
298
296
  } = useEditorToolbar();
299
297
  const editorState = editorView === null || editorView === void 0 ? void 0 : editorView.state;
300
- const accessibilityStatus = React.useMemo(() => editorState && fg('platform_editor_lovability_text_bg_color_patch_1') ? getAccessibilityStatusForCurrentSelection(editorState, defaultColor, highlightColor, textColor) : getAccessibilityStatusFromColorPair(defaultColor, getResolvedBackgroundFromHighlight(highlightColor), textColor), [defaultColor, editorState, highlightColor, textColor]);
298
+ const accessibilityStatus = React.useMemo(() => editorState ? getAccessibilityStatusForCurrentSelection(editorState, defaultColor, highlightColor, textColor) : getAccessibilityStatusFromColorPair(defaultColor, getResolvedBackgroundFromHighlight(highlightColor), textColor), [defaultColor, editorState, highlightColor, textColor]);
301
299
  if (accessibilityStatus === null) {
302
300
  return /*#__PURE__*/React.createElement(React.Fragment, null);
303
301
  }
@@ -311,14 +309,14 @@ export const ColorAccessibilityMenuItem = ({
311
309
  }
312
310
  };
313
311
  return /*#__PURE__*/React.createElement(Box, {
314
- xcss: cx(styles.container, fg('platform_editor_lovability_text_bg_color_patch_1') && styles.containerPatch)
312
+ xcss: cx(styles.container)
315
313
  }, /*#__PURE__*/React.createElement(Inline, {
316
314
  alignBlock: "center",
317
315
  space: "space.050"
318
316
  }, /*#__PURE__*/React.createElement(AccessibilityIcon, {
319
317
  label: "",
320
318
  size: "medium",
321
- color: fg('platform_editor_lovability_text_bg_color_patch_1') ? "var(--ds-icon-subtle, #505258)" : undefined
319
+ color: "var(--ds-icon-subtle, #505258)"
322
320
  }), /*#__PURE__*/React.createElement(Text, {
323
321
  as: "span",
324
322
  size: "small",
package/dist/es2019/ui/RemoveColorMenuItem.js CHANGED
@@ -9,7 +9,6 @@ import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
9
9
  import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
10
10
  import { useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
11
11
  import ColourNoneIcon from '@atlaskit/icon-lab/core/colour-none';
12
- import { fg } from '@atlaskit/platform-feature-flags/fg';
13
12
  import { Text } from '@atlaskit/primitives/compiled';
14
13
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
15
14
  const styles = {
@@ -39,7 +38,7 @@ export const RemoveColorMenuItem = ({
39
38
  tr
40
39
  }) => {
41
40
  var _api$highlight;
42
- if (!expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) || !fg('platform_editor_lovability_text_bg_color_patch_2')) {
41
+ if (!expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
43
42
  api.textColor.commands.changeColor(defaultColor, getInputMethodFromParentKeys(parents))({
44
43
  tr
45
44
  });
@@ -57,39 +56,8 @@ export const RemoveColorMenuItem = ({
57
56
  }
58
57
  };
59
58
  if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
60
- if (fg('platform_editor_lovability_text_bg_color_patch_2')) {
61
- return /*#__PURE__*/React.createElement("div", {
62
- className: ax([styles.removeColorButton, styles.removeColorButtonPatch])
63
- }, /*#__PURE__*/React.createElement(Button, {
64
- shouldFitContainer: true,
65
- appearance: "subtle",
66
- onClick: onClick
67
- }, /*#__PURE__*/React.createElement("span", {
68
- className: ax([styles.iconContainer])
69
- }, /*#__PURE__*/React.createElement(ColourNoneIcon, {
70
- size: "medium",
71
- label: ""
72
- }), /*#__PURE__*/React.createElement(Text, {
73
- color: "color.text.subtle"
74
- }, formatMessage(messages.removeHighlight)))));
75
- } else if (fg('platform_editor_lovability_text_bg_color_patch_1')) {
76
- return /*#__PURE__*/React.createElement("div", {
77
- className: ax([styles.removeColorButton, styles.removeColorButtonPatch])
78
- }, /*#__PURE__*/React.createElement(Button, {
79
- shouldFitContainer: true,
80
- appearance: "subtle",
81
- onClick: onClick
82
- }, /*#__PURE__*/React.createElement("span", {
83
- className: ax([styles.iconContainer])
84
- }, /*#__PURE__*/React.createElement(ColourNoneIcon, {
85
- size: "medium",
86
- label: ""
87
- }), /*#__PURE__*/React.createElement(Text, {
88
- color: "color.text.subtle"
89
- }, formatMessage(messages.clearColors)))));
90
- }
91
59
  return /*#__PURE__*/React.createElement("div", {
92
- className: ax([styles.removeColorButton])
60
+ className: ax([styles.removeColorButton, styles.removeColorButtonPatch])
93
61
  }, /*#__PURE__*/React.createElement(Button, {
94
62
  shouldFitContainer: true,
95
63
  appearance: "subtle",
@@ -100,8 +68,8 @@ export const RemoveColorMenuItem = ({
100
68
  size: "medium",
101
69
  label: ""
102
70
  }), /*#__PURE__*/React.createElement(Text, {
103
- weight: "medium"
104
- }, formatMessage(messages.clearColors)))));
71
+ color: "color.text.subtle"
72
+ }, formatMessage(messages.removeHighlight)))));
105
73
  }
106
74
  return /*#__PURE__*/React.createElement("div", {
107
75
  className: ax([styles.removeColorButton])
package/dist/es2019/ui/TextColorMenuItem.js CHANGED
@@ -58,7 +58,7 @@ export function TextColorMenuItem({
58
58
  const colorPalette = /*#__PURE__*/React.createElement(ColorPalette, {
59
59
  ariaLabelledBy: labelId,
60
60
  cols: isNewColorPaletteEnabled ? TEXT_COLOR_PICKER_COLUMNS : undefined,
61
- gap: isNewColorPaletteEnabled && fg('platform_editor_lovability_text_bg_color_patch_1') ? 'space.0' : undefined
61
+ gap: isNewColorPaletteEnabled ? 'space.0' : undefined
62
62
  // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
63
63
  ,
64
64
  onClick: (color, _, event) => {
@@ -82,7 +82,7 @@ export function TextColorMenuItem({
82
82
  // The label names the palette's radio group; a heading inside a menu is skipped and has no stable level here
83
83
  ,
84
84
  as: fg('platform_editor_a11y_color_palette_radiogroup') ? 'div' : undefined
85
- }, formatMessage(messages.textColorTooltip)), isNewColorPaletteEnabled && fg('platform_editor_lovability_text_bg_color_patch_1') ? /*#__PURE__*/React.createElement(Bleed, {
85
+ }, formatMessage(messages.textColorTooltip)), isNewColorPaletteEnabled ? /*#__PURE__*/React.createElement(Bleed, {
86
86
  inline: "space.025"
87
87
  }, colorPalette) : colorPalette);
88
88
  }
package/dist/es2019/ui/TextMenuSection.js CHANGED
@@ -4,7 +4,6 @@ import { ax, ix } from "@compiled/react/runtime";
4
4
  import React from 'react';
5
5
  import { TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
6
6
  import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
7
- import { fg } from '@atlaskit/platform-feature-flags/fg';
8
7
  import { Box } from '@atlaskit/primitives/compiled';
9
8
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
9
  const styles = {
@@ -17,14 +16,14 @@ export const TextMenuSection = ({
17
16
  }) => {
18
17
  const hasSeparator = parents.some(parent => parent.key === TEXT_COLLAPSED_MENU.key);
19
18
  const onMouseDown = event => {
20
- if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) && fg('platform_editor_lovability_text_bg_color_patch_1')) {
19
+ if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
21
20
  event.stopPropagation();
22
21
  }
23
22
  };
24
23
  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
25
24
  hasSeparator: hasSeparator
26
25
  }, /*#__PURE__*/React.createElement(Box, {
27
- xcss: expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) && fg('platform_editor_lovability_text_bg_color_patch_1') ? styles.menu : styles.menuOld,
26
+ xcss: expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? styles.menu : styles.menuOld,
28
27
  onMouseDown: onMouseDown
29
28
  }, children));
30
29
  };
package/dist/esm/ui/ColorAccessibilityMenuItem.compiled.css CHANGED
@@ -1,13 +1,8 @@
1
- ._19itglyw{border:none}._19bvu2gc{padding-left:var(--ds-space-100,8px)}
2
- ._19bvze3t{padding-left:var(--ds-space-0,0)}
3
- ._19pku2gc{margin-top:var(--ds-space-100,8px)}
1
+ ._19itglyw{border:none}._19bvze3t{padding-left:var(--ds-space-0,0)}
4
2
  ._19pkze3t{margin-top:var(--ds-space-0,0)}
5
3
  ._1bah1yb4{justify-content:space-between}
6
4
  ._1e0c1txw{display:flex}
7
5
  ._4cvr1h6o{align-items:center}
8
- ._ca0q1b66{padding-top:var(--ds-space-050,4px)}
9
6
  ._ca0qze3t{padding-top:var(--ds-space-0,0)}
10
- ._n3td1b66{padding-bottom:var(--ds-space-050,4px)}
11
7
  ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}
12
- ._u5f31b66{padding-right:var(--ds-space-050,4px)}
13
8
  ._u5f3ze3t{padding-right:var(--ds-space-0,0)}
package/dist/esm/ui/ColorAccessibilityMenuItem.js CHANGED
@@ -18,7 +18,6 @@ import { hexToEditorBackgroundPaletteColor, hexToEditorTextBackgroundPaletteColo
18
18
  import { TextSelection } from '@atlaskit/editor-prosemirror/state';
19
19
  import AccessibilityIcon from '@atlaskit/icon/core/accessibility';
20
20
  import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
21
- import { fg } from '@atlaskit/platform-feature-flags/fg';
22
21
  import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
23
22
  import { getTokenValue } from '@atlaskit/tokens/get-token-value';
24
23
  import { getContrastRatio as calcContrastRatio } from '../pm-plugins/utils/color-contrast';
@@ -300,8 +299,7 @@ var AccessibilityStatus = function AccessibilityStatus(_ref) {
300
299
  }
301
300
  };
302
301
  var styles = {
303
- container: "_19itglyw _19pku2gc _ca0q1b66 _n3td1b66 _19bvu2gc _u5f31b66 _1e0c1txw _4cvr1h6o _1bah1yb4",
304
- containerPatch: "_19pkze3t _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t"
302
+ container: "_19itglyw _19pkze3t _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t _1e0c1txw _4cvr1h6o _1bah1yb4"
305
303
  };
306
304
  export var ColorAccessibilityMenuItem = function ColorAccessibilityMenuItem(_ref2) {
307
305
  var api = _ref2.api;
@@ -315,7 +313,7 @@ export var ColorAccessibilityMenuItem = function ColorAccessibilityMenuItem(_ref
315
313
  editorView = _useEditorToolbar.editorView;
316
314
  var editorState = editorView === null || editorView === void 0 ? void 0 : editorView.state;
317
315
  var accessibilityStatus = React.useMemo(function () {
318
- return editorState && fg('platform_editor_lovability_text_bg_color_patch_1') ? getAccessibilityStatusForCurrentSelection(editorState, defaultColor, highlightColor, textColor) : getAccessibilityStatusFromColorPair(defaultColor, getResolvedBackgroundFromHighlight(highlightColor), textColor);
316
+ return editorState ? getAccessibilityStatusForCurrentSelection(editorState, defaultColor, highlightColor, textColor) : getAccessibilityStatusFromColorPair(defaultColor, getResolvedBackgroundFromHighlight(highlightColor), textColor);
319
317
  }, [defaultColor, editorState, highlightColor, textColor]);
320
318
  if (accessibilityStatus === null) {
321
319
  return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -330,14 +328,14 @@ export var ColorAccessibilityMenuItem = function ColorAccessibilityMenuItem(_ref
330
328
  }
331
329
  };
332
330
  return /*#__PURE__*/React.createElement(Box, {
333
- xcss: cx(styles.container, fg('platform_editor_lovability_text_bg_color_patch_1') && styles.containerPatch)
331
+ xcss: cx(styles.container)
334
332
  }, /*#__PURE__*/React.createElement(Inline, {
335
333
  alignBlock: "center",
336
334
  space: "space.050"
337
335
  }, /*#__PURE__*/React.createElement(AccessibilityIcon, {
338
336
  label: "",
339
337
  size: "medium",
340
- color: fg('platform_editor_lovability_text_bg_color_patch_1') ? "var(--ds-icon-subtle, #505258)" : undefined
338
+ color: "var(--ds-icon-subtle, #505258)"
341
339
  }), /*#__PURE__*/React.createElement(Text, {
342
340
  as: "span",
343
341
  size: "small",
package/dist/esm/ui/RemoveColorMenuItem.js CHANGED
@@ -9,7 +9,6 @@ import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
9
9
  import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
10
10
  import { useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
11
11
  import ColourNoneIcon from '@atlaskit/icon-lab/core/colour-none';
12
- import { fg } from '@atlaskit/platform-feature-flags/fg';
13
12
  import { Text } from '@atlaskit/primitives/compiled';
14
13
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
15
14
  var styles = {
@@ -36,7 +35,7 @@ export var RemoveColorMenuItem = function RemoveColorMenuItem(_ref) {
36
35
  api.core.actions.execute(function (_ref2) {
37
36
  var _api$highlight;
38
37
  var tr = _ref2.tr;
39
- if (!expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) || !fg('platform_editor_lovability_text_bg_color_patch_2')) {
38
+ if (!expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
40
39
  api.textColor.commands.changeColor(defaultColor, getInputMethodFromParentKeys(parents))({
41
40
  tr: tr
42
41
  });
@@ -54,39 +53,8 @@ export var RemoveColorMenuItem = function RemoveColorMenuItem(_ref) {
54
53
  }
55
54
  };
56
55
  if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
57
- if (fg('platform_editor_lovability_text_bg_color_patch_2')) {
58
- return /*#__PURE__*/React.createElement("div", {
59
- className: ax([styles.removeColorButton, styles.removeColorButtonPatch])
60
- }, /*#__PURE__*/React.createElement(Button, {
61
- shouldFitContainer: true,
62
- appearance: "subtle",
63
- onClick: onClick
64
- }, /*#__PURE__*/React.createElement("span", {
65
- className: ax([styles.iconContainer])
66
- }, /*#__PURE__*/React.createElement(ColourNoneIcon, {
67
- size: "medium",
68
- label: ""
69
- }), /*#__PURE__*/React.createElement(Text, {
70
- color: "color.text.subtle"
71
- }, formatMessage(messages.removeHighlight)))));
72
- } else if (fg('platform_editor_lovability_text_bg_color_patch_1')) {
73
- return /*#__PURE__*/React.createElement("div", {
74
- className: ax([styles.removeColorButton, styles.removeColorButtonPatch])
75
- }, /*#__PURE__*/React.createElement(Button, {
76
- shouldFitContainer: true,
77
- appearance: "subtle",
78
- onClick: onClick
79
- }, /*#__PURE__*/React.createElement("span", {
80
- className: ax([styles.iconContainer])
81
- }, /*#__PURE__*/React.createElement(ColourNoneIcon, {
82
- size: "medium",
83
- label: ""
84
- }), /*#__PURE__*/React.createElement(Text, {
85
- color: "color.text.subtle"
86
- }, formatMessage(messages.clearColors)))));
87
- }
88
56
  return /*#__PURE__*/React.createElement("div", {
89
- className: ax([styles.removeColorButton])
57
+ className: ax([styles.removeColorButton, styles.removeColorButtonPatch])
90
58
  }, /*#__PURE__*/React.createElement(Button, {
91
59
  shouldFitContainer: true,
92
60
  appearance: "subtle",
@@ -97,8 +65,8 @@ export var RemoveColorMenuItem = function RemoveColorMenuItem(_ref) {
97
65
  size: "medium",
98
66
  label: ""
99
67
  }), /*#__PURE__*/React.createElement(Text, {
100
- weight: "medium"
101
- }, formatMessage(messages.clearColors)))));
68
+ color: "color.text.subtle"
69
+ }, formatMessage(messages.removeHighlight)))));
102
70
  }
103
71
  return /*#__PURE__*/React.createElement("div", {
104
72
  className: ax([styles.removeColorButton])
package/dist/esm/ui/TextColorMenuItem.js CHANGED
@@ -54,7 +54,7 @@ export function TextColorMenuItem(_ref) {
54
54
  var colorPalette = /*#__PURE__*/React.createElement(ColorPalette, {
55
55
  ariaLabelledBy: labelId,
56
56
  cols: isNewColorPaletteEnabled ? TEXT_COLOR_PICKER_COLUMNS : undefined,
57
- gap: isNewColorPaletteEnabled && fg('platform_editor_lovability_text_bg_color_patch_1') ? 'space.0' : undefined
57
+ gap: isNewColorPaletteEnabled ? 'space.0' : undefined
58
58
  // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
59
59
  ,
60
60
  onClick: function onClick(color, _, event) {
@@ -78,7 +78,7 @@ export function TextColorMenuItem(_ref) {
78
78
  // The label names the palette's radio group; a heading inside a menu is skipped and has no stable level here
79
79
  ,
80
80
  as: fg('platform_editor_a11y_color_palette_radiogroup') ? 'div' : undefined
81
- }, formatMessage(messages.textColorTooltip)), isNewColorPaletteEnabled && fg('platform_editor_lovability_text_bg_color_patch_1') ? /*#__PURE__*/React.createElement(Bleed, {
81
+ }, formatMessage(messages.textColorTooltip)), isNewColorPaletteEnabled ? /*#__PURE__*/React.createElement(Bleed, {
82
82
  inline: "space.025"
83
83
  }, colorPalette) : colorPalette);
84
84
  }
package/dist/esm/ui/TextMenuSection.js CHANGED
@@ -4,7 +4,6 @@ import { ax, ix } from "@compiled/react/runtime";
4
4
  import React from 'react';
5
5
  import { TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
6
6
  import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
7
- import { fg } from '@atlaskit/platform-feature-flags/fg';
8
7
  import { Box } from '@atlaskit/primitives/compiled';
9
8
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
9
  var styles = {
@@ -18,14 +17,14 @@ export var TextMenuSection = function TextMenuSection(_ref) {
18
17
  return parent.key === TEXT_COLLAPSED_MENU.key;
19
18
  });
20
19
  var onMouseDown = function onMouseDown(event) {
21
- if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) && fg('platform_editor_lovability_text_bg_color_patch_1')) {
20
+ if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {
22
21
  event.stopPropagation();
23
22
  }
24
23
  };
25
24
  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
26
25
  hasSeparator: hasSeparator
27
26
  }, /*#__PURE__*/React.createElement(Box, {
28
- xcss: expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) && fg('platform_editor_lovability_text_bg_color_patch_1') ? styles.menu : styles.menuOld,
27
+ xcss: expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? styles.menu : styles.menuOld,
29
28
  onMouseDown: onMouseDown
30
29
  }, children));
31
30
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-text-color",
3
- "version": "22.0.2",
3
+ "version": "22.0.4",
4
4
  "description": "Text color plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -47,7 +47,7 @@
47
47
  "@atlaskit/platform-feature-flags": "^2.2.0",
48
48
  "@atlaskit/platform-feature-flags-react": "^1.2.0",
49
49
  "@atlaskit/primitives": "^22.5.0",
50
- "@atlaskit/tmp-editor-statsig": "^211.0.0",
50
+ "@atlaskit/tmp-editor-statsig": "^212.0.0",
51
51
  "@atlaskit/tokens": "^20.1.0",
52
52
  "@babel/runtime": "^7.0.0",
53
53
  "@emotion/react": "^11.7.1"
@@ -70,12 +70,6 @@
70
70
  "platform-feature-flags": {
71
71
  "platform_editor_a11y_color_palette_radiogroup": {
72
72
  "type": "boolean"
73
- },
74
- "platform_editor_lovability_text_bg_color_patch_1": {
75
- "type": "boolean"
76
- },
77
- "platform_editor_lovability_text_bg_color_patch_2": {
78
- "type": "boolean"
79
73
  }
80
74
  }
81
75
  }