@atlaskit/editor-plugin-highlight 1.16.1 → 1.16.3

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 +18 -0
  2. package/dist/cjs/ui/PrimaryToolbarHighlightColor.js +26 -1
  3. package/dist/es2019/ui/PrimaryToolbarHighlightColor.js +27 -2
  4. package/dist/esm/ui/PrimaryToolbarHighlightColor.js +27 -2
  5. package/package.json +7 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 1.16.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#138118](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138118)
8
+ [`5e4d9eb1aefe4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e4d9eb1aefe4) -
9
+ NOISSUE: Upgrades editor React peer dependencies to v18
10
+ - Updated dependencies
11
+
12
+ ## 1.16.2
13
+
14
+ ### Patch Changes
15
+
16
+ - [#136367](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136367)
17
+ [`4d9450a7e1283`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d9450a7e1283) -
18
+ [ux] Update new icons (text color, highlight, text style) with design change
19
+ - Updated dependencies
20
+
3
21
  ## 1.16.1
4
22
 
5
23
  ### Patch Changes
package/dist/cjs/ui/PrimaryToolbarHighlightColor.js CHANGED
@@ -10,12 +10,15 @@ var _react2 = require("@emotion/react");
10
10
  var _reactIntlNext = require("react-intl-next");
11
11
  var _analytics = require("@atlaskit/editor-common/analytics");
12
12
  var _hooks = require("@atlaskit/editor-common/hooks");
13
+ var _icons = require("@atlaskit/editor-common/icons");
13
14
  var _keymaps = require("@atlaskit/editor-common/keymaps");
14
15
  var _messages = require("@atlaskit/editor-common/messages");
15
16
  var _styles = require("@atlaskit/editor-common/styles");
16
17
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
17
18
  var _editorPalette = require("@atlaskit/editor-palette");
19
+ var _editEditFilled = _interopRequireDefault(require("@atlaskit/icon/core/migration/edit--edit-filled"));
18
20
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
21
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
19
22
  var _primitives = require("@atlaskit/primitives");
20
23
  var _commands = require("../commands");
21
24
  var _EditorHighlightIcon = require("./shared/EditorHighlightIcon");
@@ -94,7 +97,29 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
94
97
  onClick: handleClick,
95
98
  onKeyDown: handleKeyDown,
96
99
  ref: toolbarItemRef,
97
- iconBefore: (0, _react2.jsx)(_primitives.Flex, null, (0, _react2.jsx)(_EditorHighlightIcon.EditorHighlightIcon, {
100
+ iconBefore:
101
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
102
+ (0, _platformFeatureFlags.fg)('platform.design-system-team.enable-new-icons') ?
103
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
104
+ (0, _react2.jsx)("div", {
105
+ css: _styles.triggerWrapperStylesWithPadding
106
+ }, (0, _react2.jsx)(_icons.DynamicStrokeIconDecoration, {
107
+ selectedColor: activeColorToken,
108
+ disabled: highlightState.disabled,
109
+ icon: (0, _react2.jsx)(_editEditFilled.default, {
110
+ label: "",
111
+ color: "currentColor",
112
+ spacing: "spacious"
113
+ })
114
+ }),
115
+ //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
+ (0, _react2.jsx)("span", {
117
+ css: _styles.expandIconContainerStyle
118
+ }, (0, _react2.jsx)(_chevronDown.default, {
119
+ label: "",
120
+ color: "currentColor",
121
+ LEGACY_margin: "0 0 0 -8px"
122
+ }))) : (0, _react2.jsx)(_primitives.Flex, null, (0, _react2.jsx)(_EditorHighlightIcon.EditorHighlightIcon, {
98
123
  selectedColor: activeColorToken,
99
124
  disabled: highlightState.disabled
100
125
  }), (0, _react2.jsx)("span", {
package/dist/es2019/ui/PrimaryToolbarHighlightColor.js CHANGED
@@ -9,12 +9,15 @@ import { jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
11
11
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
12
+ import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
12
13
  import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
13
14
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
14
- import { expandIconContainerStyle } from '@atlaskit/editor-common/styles';
15
+ import { expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
15
16
  import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
16
17
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
18
+ import EditFilledIcon from '@atlaskit/icon/core/migration/edit--edit-filled';
17
19
  import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
20
+ import { fg } from '@atlaskit/platform-feature-flags';
18
21
  import { Flex } from '@atlaskit/primitives';
19
22
  import { setPalette } from '../commands';
20
23
  import { EditorHighlightIcon } from './shared/EditorHighlightIcon';
@@ -93,7 +96,29 @@ const PrimaryToolbarHighlightColor = ({
93
96
  onClick: handleClick,
94
97
  onKeyDown: handleKeyDown,
95
98
  ref: toolbarItemRef,
96
- iconBefore: jsx(Flex, null, jsx(EditorHighlightIcon, {
99
+ iconBefore:
100
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
101
+ fg('platform.design-system-team.enable-new-icons') ?
102
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
103
+ jsx("div", {
104
+ css: triggerWrapperStylesWithPadding
105
+ }, jsx(DynamicStrokeIconDecoration, {
106
+ selectedColor: activeColorToken,
107
+ disabled: highlightState.disabled,
108
+ icon: jsx(EditFilledIcon, {
109
+ label: "",
110
+ color: "currentColor",
111
+ spacing: "spacious"
112
+ })
113
+ }),
114
+ //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
115
+ jsx("span", {
116
+ css: expandIconContainerStyle
117
+ }, jsx(ChevronDownIcon, {
118
+ label: "",
119
+ color: "currentColor",
120
+ LEGACY_margin: "0 0 0 -8px"
121
+ }))) : jsx(Flex, null, jsx(EditorHighlightIcon, {
97
122
  selectedColor: activeColorToken,
98
123
  disabled: highlightState.disabled
99
124
  }), jsx("span", {
package/dist/esm/ui/PrimaryToolbarHighlightColor.js CHANGED
@@ -9,12 +9,15 @@ import { jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
11
11
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
12
+ import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
12
13
  import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
13
14
  import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
14
- import { expandIconContainerStyle } from '@atlaskit/editor-common/styles';
15
+ import { expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
15
16
  import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
16
17
  import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
18
+ import EditFilledIcon from '@atlaskit/icon/core/migration/edit--edit-filled';
17
19
  import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
20
+ import { fg } from '@atlaskit/platform-feature-flags';
18
21
  import { Flex } from '@atlaskit/primitives';
19
22
  import { setPalette } from '../commands';
20
23
  import { EditorHighlightIcon } from './shared/EditorHighlightIcon';
@@ -86,7 +89,29 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
86
89
  onClick: handleClick,
87
90
  onKeyDown: handleKeyDown,
88
91
  ref: toolbarItemRef,
89
- iconBefore: jsx(Flex, null, jsx(EditorHighlightIcon, {
92
+ iconBefore:
93
+ // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-registration
94
+ fg('platform.design-system-team.enable-new-icons') ?
95
+ // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
96
+ jsx("div", {
97
+ css: triggerWrapperStylesWithPadding
98
+ }, jsx(DynamicStrokeIconDecoration, {
99
+ selectedColor: activeColorToken,
100
+ disabled: highlightState.disabled,
101
+ icon: jsx(EditFilledIcon, {
102
+ label: "",
103
+ color: "currentColor",
104
+ spacing: "spacious"
105
+ })
106
+ }),
107
+ //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
108
+ jsx("span", {
109
+ css: expandIconContainerStyle
110
+ }, jsx(ChevronDownIcon, {
111
+ label: "",
112
+ color: "currentColor",
113
+ LEGACY_margin: "0 0 0 -8px"
114
+ }))) : jsx(Flex, null, jsx(EditorHighlightIcon, {
90
115
  selectedColor: activeColorToken,
91
116
  disabled: highlightState.disabled
92
117
  }), jsx("span", {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "1.16.1",
3
+ "version": "1.16.3",
4
4
  "description": "Highlight plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -9,13 +9,11 @@
9
9
  },
10
10
  "atlassian": {
11
11
  "team": "Editor: Core Experiences",
12
- "inPublicMirror": false,
13
- "releaseModel": "continuous",
14
12
  "website": {
15
13
  "name": "EditorPluginHighlight",
16
14
  "category": "Components"
17
15
  },
18
- "runReact18": false
16
+ "runReact18": true
19
17
  },
20
18
  "repository": "https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo",
21
19
  "main": "dist/cjs/index.js",
@@ -39,7 +37,7 @@
39
37
  },
40
38
  "dependencies": {
41
39
  "@atlaskit/adf-schema": "^40.9.0",
42
- "@atlaskit/editor-common": "^88.2.0",
40
+ "@atlaskit/editor-common": "^88.12.0",
43
41
  "@atlaskit/editor-palette": "1.6.0",
44
42
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
45
43
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
@@ -47,14 +45,15 @@
47
45
  "@atlaskit/editor-prosemirror": "5.0.1",
48
46
  "@atlaskit/editor-shared-styles": "^2.13.0",
49
47
  "@atlaskit/editor-tables": "^2.8.0",
50
- "@atlaskit/icon": "^22.15.0",
51
- "@atlaskit/primitives": "^12.0.0",
48
+ "@atlaskit/icon": "^22.16.0",
49
+ "@atlaskit/platform-feature-flags": "^0.3.0",
50
+ "@atlaskit/primitives": "^12.1.0",
52
51
  "@atlaskit/tokens": "^1.59.0",
53
52
  "@babel/runtime": "^7.0.0",
54
53
  "@emotion/react": "^11.7.1"
55
54
  },
56
55
  "peerDependencies": {
57
- "react": "^16.8.0",
56
+ "react": "^16.8.0 || ^17.0.0 || ~18.2.0",
58
57
  "react-intl-next": "npm:react-intl@^5.18.1"
59
58
  },
60
59
  "devDependencies": {