@atlaskit/editor-plugin-highlight 7.3.0 → 7.3.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 7.3.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [`25c388e0f807a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/25c388e0f807a) -
8
+ EDITOR-4684 Clean up platform_editor_add_orange_highlight_color experiment - orange highlight
9
+ color is now permanently enabled
10
+ - Updated dependencies
11
+
12
+ ## 7.3.1
13
+
14
+ ### Patch Changes
15
+
16
+ - Updated dependencies
17
+
3
18
  ## 7.3.0
4
19
 
5
20
  ### Minor Changes
@@ -28,15 +28,10 @@ function keymapPlugin(_ref) {
28
28
  }), list);
29
29
  }
30
30
  var analyticsApi = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
31
- var color = (0, _expValEquals.expValEquals)('platform_editor_add_orange_highlight_color', 'cohort', 'test') ? _uiColor.highlightColorPaletteNext.find(function (_ref2) {
31
+ var color = _uiColor.highlightColorPalette.find(function (_ref2) {
32
32
  var label = _ref2.label;
33
33
  return label === 'Yellow';
34
- }) : _uiColor.highlightColorPalette.find(function (_ref3) {
35
- var label = _ref3.label;
36
- return label === 'Yellow';
37
- }) || {
38
- value: '#fedec8'
39
- };
34
+ });
40
35
  if (color) {
41
36
  (0, _keymaps.bindKeymapWithCommand)(
42
37
  // Ignored via go/ees005
@@ -71,7 +71,7 @@ function HighlightColorMenuItem(_ref2) {
71
71
  var isSelected = function isSelected(color) {
72
72
  return color.value === activeColor;
73
73
  };
74
- return _uiColor.highlightColorPaletteNext.filter(function (color) {
74
+ return _uiColor.highlightColorPalette.filter(function (color) {
75
75
  return color.value !== _uiColor.REMOVE_HIGHLIGHT_COLOR;
76
76
  }).map(function (color) {
77
77
  return _objectSpread(_objectSpread({}, color), {}, {
@@ -5,15 +5,11 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.PaletteDropdown = void 0;
8
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
8
  var _react = _interopRequireDefault(require("react"));
10
9
  var _uiColor = require("@atlaskit/editor-common/ui-color");
11
10
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
12
11
  var _editorPalette = require("@atlaskit/editor-palette");
13
12
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
14
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
15
- 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; }
16
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
17
13
  var HIGHLIGHT_COLOR_PICKER_COLUMNS = 8;
18
14
  var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props) {
19
15
  var popupsMountPoint = props.popupsMountPoint,
@@ -26,26 +22,11 @@ var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props)
26
22
  isOpenedByKeyboard = props.isOpenedByKeyboard,
27
23
  handleClickOutside = props.handleClickOutside,
28
24
  handleEscapeKeydown = props.handleEscapeKeydown;
29
- var isOrangeHighlightEnabled = (0, _expValEquals.expValEquals)('platform_editor_add_orange_highlight_color', 'cohort', 'test');
30
25
 
31
26
  // pixels, used to determine where to horizontally position the dropdown when space is limited
32
27
  // this should reflect the width of the dropdown when fully populated with colors, including translations due to layering
33
- var fitWidth = isOrangeHighlightEnabled ? 274 : 242;
34
- var colorPalette;
35
- if (isOrangeHighlightEnabled) {
36
- colorPalette = _uiColor.highlightColorPaletteNext;
37
- } else {
38
- colorPalette = _uiColor.highlightColorPalette.map(function (item) {
39
- if (item.label === 'Orange') {
40
- return _objectSpread(_objectSpread({}, item), {}, {
41
- label: 'Yellow',
42
- message: _uiColor.colorPaletteMessages.yellow
43
- });
44
- }
45
- return item;
46
- });
47
- }
48
- var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(colorPalette, activeColor, isOrangeHighlightEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined),
28
+ var fitWidth = 274;
29
+ var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(_uiColor.highlightColorPalette, activeColor, HIGHLIGHT_COLOR_PICKER_COLUMNS),
49
30
  selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
50
31
  selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
51
32
  return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownContainer, {
@@ -69,11 +50,11 @@ var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props)
69
50
  }, /*#__PURE__*/_react.default.createElement("div", {
70
51
  "data-testid": "highlight-color-palette"
71
52
  }, /*#__PURE__*/_react.default.createElement(_uiColor.ColorPalette, {
72
- cols: isOrangeHighlightEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined,
53
+ cols: HIGHLIGHT_COLOR_PICKER_COLUMNS,
73
54
  onClick: onColorChange,
74
55
  selectedColor: activeColor,
75
56
  paletteOptions: {
76
- palette: colorPalette,
57
+ palette: _uiColor.highlightColorPalette,
77
58
  hexToPaletteColor: _editorPalette.hexToEditorTextBackgroundPaletteColor
78
59
  }
79
60
  })));
@@ -1,7 +1,7 @@
1
1
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
2
  import { bindKeymapWithCommand, keymap, toggleHighlightPalette, applyYellowHighlight } from '@atlaskit/editor-common/keymaps';
3
3
  import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
4
- import { highlightColorPalette, highlightColorPaletteNext } from '@atlaskit/editor-common/ui-color';
4
+ import { highlightColorPalette } from '@atlaskit/editor-common/ui-color';
5
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
6
6
  import { changeColor } from '../editor-commands/change-color';
7
7
  import { togglePalette } from '../editor-commands/palette';
@@ -23,13 +23,9 @@ export function keymapPlugin({
23
23
  }), list);
24
24
  }
25
25
  const analyticsApi = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
26
- const color = expValEquals('platform_editor_add_orange_highlight_color', 'cohort', 'test') ? highlightColorPaletteNext.find(({
26
+ const color = highlightColorPalette.find(({
27
27
  label
28
- }) => label === 'Yellow') : highlightColorPalette.find(({
29
- label
30
- }) => label === 'Yellow') || {
31
- value: '#fedec8'
32
- };
28
+ }) => label === 'Yellow');
33
29
  if (color) {
34
30
  bindKeymapWithCommand(
35
31
  // Ignored via go/ees005
@@ -6,7 +6,7 @@ import { useCallback, useMemo } from 'react';
6
6
  import { useIntl } from 'react-intl-next';
7
7
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
8
8
  import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
9
- import { REMOVE_HIGHLIGHT_COLOR, highlightColorPaletteNext } from '@atlaskit/editor-common/ui-color';
9
+ import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color';
10
10
  import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
11
11
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
12
12
  import { ColorPalette, useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
@@ -60,7 +60,7 @@ export function HighlightColorMenuItem({
60
60
  }, [api, closeMenu, parents]);
61
61
  const colorPalette = useMemo(() => {
62
62
  const isSelected = color => color.value === activeColor;
63
- return highlightColorPaletteNext.filter(color => color.value !== REMOVE_HIGHLIGHT_COLOR).map(color => ({
63
+ return highlightColorPalette.filter(color => color.value !== REMOVE_HIGHLIGHT_COLOR).map(color => ({
64
64
  ...color,
65
65
  decorator: /*#__PURE__*/React.createElement(TextColorIconDecorator, {
66
66
  label: color.label,
@@ -1,9 +1,8 @@
1
1
  import React from 'react';
2
- import { ColorPalette, colorPaletteMessages, getSelectedRowAndColumnFromPalette, highlightColorPalette, highlightColorPaletteNext } from '@atlaskit/editor-common/ui-color';
2
+ import { ColorPalette, getSelectedRowAndColumnFromPalette, highlightColorPalette } from '@atlaskit/editor-common/ui-color';
3
3
  import { ArrowKeyNavigationType, DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
4
4
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
5
5
  import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
6
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
6
  const HIGHLIGHT_COLOR_PICKER_COLUMNS = 8;
8
7
  export const PaletteDropdown = props => {
9
8
  const {
@@ -18,30 +17,14 @@ export const PaletteDropdown = props => {
18
17
  handleClickOutside,
19
18
  handleEscapeKeydown
20
19
  } = props;
21
- const isOrangeHighlightEnabled = expValEquals('platform_editor_add_orange_highlight_color', 'cohort', 'test');
22
20
 
23
21
  // pixels, used to determine where to horizontally position the dropdown when space is limited
24
22
  // this should reflect the width of the dropdown when fully populated with colors, including translations due to layering
25
- const fitWidth = isOrangeHighlightEnabled ? 274 : 242;
26
- let colorPalette;
27
- if (isOrangeHighlightEnabled) {
28
- colorPalette = highlightColorPaletteNext;
29
- } else {
30
- colorPalette = highlightColorPalette.map(item => {
31
- if (item.label === 'Orange') {
32
- return {
33
- ...item,
34
- label: 'Yellow',
35
- message: colorPaletteMessages.yellow
36
- };
37
- }
38
- return item;
39
- });
40
- }
23
+ const fitWidth = 274;
41
24
  const {
42
25
  selectedRowIndex,
43
26
  selectedColumnIndex
44
- } = getSelectedRowAndColumnFromPalette(colorPalette, activeColor, isOrangeHighlightEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined);
27
+ } = getSelectedRowAndColumnFromPalette(highlightColorPalette, activeColor, HIGHLIGHT_COLOR_PICKER_COLUMNS);
45
28
  return /*#__PURE__*/React.createElement(Dropdown, {
46
29
  mountTo: popupsMountPoint,
47
30
  boundariesElement: popupsBoundariesElement,
@@ -63,11 +46,11 @@ export const PaletteDropdown = props => {
63
46
  }, /*#__PURE__*/React.createElement("div", {
64
47
  "data-testid": "highlight-color-palette"
65
48
  }, /*#__PURE__*/React.createElement(ColorPalette, {
66
- cols: isOrangeHighlightEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined,
49
+ cols: HIGHLIGHT_COLOR_PICKER_COLUMNS,
67
50
  onClick: onColorChange,
68
51
  selectedColor: activeColor,
69
52
  paletteOptions: {
70
- palette: colorPalette,
53
+ palette: highlightColorPalette,
71
54
  hexToPaletteColor: hexToEditorTextBackgroundPaletteColor
72
55
  }
73
56
  })));
@@ -1,7 +1,7 @@
1
1
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
2
  import { bindKeymapWithCommand, keymap, toggleHighlightPalette, applyYellowHighlight } from '@atlaskit/editor-common/keymaps';
3
3
  import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
4
- import { highlightColorPalette, highlightColorPaletteNext } from '@atlaskit/editor-common/ui-color';
4
+ import { highlightColorPalette } from '@atlaskit/editor-common/ui-color';
5
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
6
6
  import { changeColor } from '../editor-commands/change-color';
7
7
  import { togglePalette } from '../editor-commands/palette';
@@ -22,15 +22,10 @@ export function keymapPlugin(_ref) {
22
22
  }), list);
23
23
  }
24
24
  var analyticsApi = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
25
- var color = expValEquals('platform_editor_add_orange_highlight_color', 'cohort', 'test') ? highlightColorPaletteNext.find(function (_ref2) {
25
+ var color = highlightColorPalette.find(function (_ref2) {
26
26
  var label = _ref2.label;
27
27
  return label === 'Yellow';
28
- }) : highlightColorPalette.find(function (_ref3) {
29
- var label = _ref3.label;
30
- return label === 'Yellow';
31
- }) || {
32
- value: '#fedec8'
33
- };
28
+ });
34
29
  if (color) {
35
30
  bindKeymapWithCommand(
36
31
  // Ignored via go/ees005
@@ -9,7 +9,7 @@ import { useCallback, useMemo } from 'react';
9
9
  import { useIntl } from 'react-intl-next';
10
10
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
11
11
  import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
12
- import { REMOVE_HIGHLIGHT_COLOR, highlightColorPaletteNext } from '@atlaskit/editor-common/ui-color';
12
+ import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color';
13
13
  import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
14
14
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
15
15
  import { ColorPalette, useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
@@ -62,7 +62,7 @@ export function HighlightColorMenuItem(_ref2) {
62
62
  var isSelected = function isSelected(color) {
63
63
  return color.value === activeColor;
64
64
  };
65
- return highlightColorPaletteNext.filter(function (color) {
65
+ return highlightColorPalette.filter(function (color) {
66
66
  return color.value !== REMOVE_HIGHLIGHT_COLOR;
67
67
  }).map(function (color) {
68
68
  return _objectSpread(_objectSpread({}, color), {}, {
@@ -1,12 +1,8 @@
1
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
1
  import React from 'react';
5
- import { ColorPalette, colorPaletteMessages, getSelectedRowAndColumnFromPalette, highlightColorPalette, highlightColorPaletteNext } from '@atlaskit/editor-common/ui-color';
2
+ import { ColorPalette, getSelectedRowAndColumnFromPalette, highlightColorPalette } from '@atlaskit/editor-common/ui-color';
6
3
  import { ArrowKeyNavigationType, DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
7
4
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
8
5
  import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
9
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
6
  var HIGHLIGHT_COLOR_PICKER_COLUMNS = 8;
11
7
  export var PaletteDropdown = function PaletteDropdown(props) {
12
8
  var popupsMountPoint = props.popupsMountPoint,
@@ -19,26 +15,11 @@ export var PaletteDropdown = function PaletteDropdown(props) {
19
15
  isOpenedByKeyboard = props.isOpenedByKeyboard,
20
16
  handleClickOutside = props.handleClickOutside,
21
17
  handleEscapeKeydown = props.handleEscapeKeydown;
22
- var isOrangeHighlightEnabled = expValEquals('platform_editor_add_orange_highlight_color', 'cohort', 'test');
23
18
 
24
19
  // pixels, used to determine where to horizontally position the dropdown when space is limited
25
20
  // this should reflect the width of the dropdown when fully populated with colors, including translations due to layering
26
- var fitWidth = isOrangeHighlightEnabled ? 274 : 242;
27
- var colorPalette;
28
- if (isOrangeHighlightEnabled) {
29
- colorPalette = highlightColorPaletteNext;
30
- } else {
31
- colorPalette = highlightColorPalette.map(function (item) {
32
- if (item.label === 'Orange') {
33
- return _objectSpread(_objectSpread({}, item), {}, {
34
- label: 'Yellow',
35
- message: colorPaletteMessages.yellow
36
- });
37
- }
38
- return item;
39
- });
40
- }
41
- var _getSelectedRowAndCol = getSelectedRowAndColumnFromPalette(colorPalette, activeColor, isOrangeHighlightEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined),
21
+ var fitWidth = 274;
22
+ var _getSelectedRowAndCol = getSelectedRowAndColumnFromPalette(highlightColorPalette, activeColor, HIGHLIGHT_COLOR_PICKER_COLUMNS),
42
23
  selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
43
24
  selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
44
25
  return /*#__PURE__*/React.createElement(Dropdown, {
@@ -62,11 +43,11 @@ export var PaletteDropdown = function PaletteDropdown(props) {
62
43
  }, /*#__PURE__*/React.createElement("div", {
63
44
  "data-testid": "highlight-color-palette"
64
45
  }, /*#__PURE__*/React.createElement(ColorPalette, {
65
- cols: isOrangeHighlightEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined,
46
+ cols: HIGHLIGHT_COLOR_PICKER_COLUMNS,
66
47
  onClick: onColorChange,
67
48
  selectedColor: activeColor,
68
49
  paletteOptions: {
69
- palette: colorPalette,
50
+ palette: highlightColorPalette,
70
51
  hexToPaletteColor: hexToEditorTextBackgroundPaletteColor
71
52
  }
72
53
  })));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "7.3.0",
3
+ "version": "7.3.2",
4
4
  "description": "Highlight plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -37,25 +37,25 @@
37
37
  "@atlaskit/editor-palette": "^2.1.0",
38
38
  "@atlaskit/editor-plugin-analytics": "^7.0.0",
39
39
  "@atlaskit/editor-plugin-primary-toolbar": "^8.0.0",
40
- "@atlaskit/editor-plugin-selection-toolbar": "^8.0.0",
40
+ "@atlaskit/editor-plugin-selection-toolbar": "^8.1.0",
41
41
  "@atlaskit/editor-plugin-text-formatting": "^7.2.0",
42
- "@atlaskit/editor-plugin-toolbar": "^4.0.0",
42
+ "@atlaskit/editor-plugin-toolbar": "^4.1.0",
43
43
  "@atlaskit/editor-prosemirror": "^7.2.0",
44
44
  "@atlaskit/editor-shared-styles": "^3.10.0",
45
45
  "@atlaskit/editor-tables": "^2.9.0",
46
46
  "@atlaskit/editor-toolbar": "^0.19.0",
47
47
  "@atlaskit/editor-toolbar-model": "^0.3.0",
48
48
  "@atlaskit/heading": "^5.2.0",
49
- "@atlaskit/icon": "^29.4.0",
49
+ "@atlaskit/icon": "^30.0.0",
50
50
  "@atlaskit/platform-feature-flags": "^1.1.0",
51
51
  "@atlaskit/primitives": "^17.1.0",
52
- "@atlaskit/tmp-editor-statsig": "^16.25.0",
53
- "@atlaskit/tokens": "^10.0.0",
52
+ "@atlaskit/tmp-editor-statsig": "^17.0.0",
53
+ "@atlaskit/tokens": "^10.1.0",
54
54
  "@babel/runtime": "^7.0.0",
55
55
  "@emotion/react": "^11.7.1"
56
56
  },
57
57
  "peerDependencies": {
58
- "@atlaskit/editor-common": "^111.8.0",
58
+ "@atlaskit/editor-common": "^111.9.0",
59
59
  "react": "^18.2.0",
60
60
  "react-intl-next": "npm:react-intl@^5.18.1"
61
61
  },