@atlaskit/editor-plugin-text-color 1.13.0 → 1.14.0
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,23 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-text-color
|
|
2
2
|
|
|
3
|
+
## 1.14.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#133191](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133191)
|
|
8
|
+
[`78a1927084934`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/78a1927084934) -
|
|
9
|
+
[ux] Remove icon migration feature gate and migrate new icons on primary toolbar
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 1.13.1
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 1.13.0
|
|
4
22
|
|
|
5
23
|
### Minor Changes
|
|
@@ -23,9 +23,7 @@ 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 _chevronDown = _interopRequireDefault(require("@atlaskit/icon/
|
|
27
|
-
var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
|
|
28
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
26
|
+
var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
|
|
29
27
|
var _changeColor = require("../../commands/change-color");
|
|
30
28
|
var _icon = require("./icon");
|
|
31
29
|
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; }
|
|
@@ -212,19 +210,14 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
|
|
|
212
210
|
selectedColor: selectedColor,
|
|
213
211
|
disabled: pluginState.disabled,
|
|
214
212
|
icon: (0, _react2.jsx)(_icon.EditorTextColorIcon, null)
|
|
215
|
-
}),
|
|
213
|
+
}),
|
|
216
214
|
//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
215
|
(0, _react2.jsx)("span", {
|
|
218
216
|
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", {
|
|
225
|
-
css: _styles.expandIconWrapperStyle
|
|
226
217
|
}, (0, _react2.jsx)(_chevronDown.default, {
|
|
227
|
-
label: ""
|
|
218
|
+
label: "",
|
|
219
|
+
color: "currentColor",
|
|
220
|
+
LEGACY_margin: "0 0 0 -8px"
|
|
228
221
|
})))
|
|
229
222
|
})
|
|
230
223
|
}, (0, _react2.jsx)("div", {
|
|
@@ -11,14 +11,12 @@ 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 { expandIconContainerStyle,
|
|
14
|
+
import { expandIconContainerStyle, 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
|
-
import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
|
|
20
19
|
import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
|
|
21
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
22
20
|
import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
|
|
23
21
|
import { EditorTextColorIcon } from './icon';
|
|
24
22
|
const EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
|
|
@@ -193,19 +191,14 @@ export class ToolbarTextColor extends React.Component {
|
|
|
193
191
|
selectedColor: selectedColor,
|
|
194
192
|
disabled: pluginState.disabled,
|
|
195
193
|
icon: jsx(EditorTextColorIcon, null)
|
|
196
|
-
}),
|
|
194
|
+
}),
|
|
197
195
|
//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
196
|
jsx("span", {
|
|
199
197
|
css: expandIconContainerStyle
|
|
200
198
|
}, jsx(ChevronDownIcon, {
|
|
201
199
|
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", {
|
|
206
|
-
css: expandIconWrapperStyle
|
|
207
|
-
}, jsx(ExpandIcon, {
|
|
208
|
-
label: ""
|
|
200
|
+
color: "currentColor",
|
|
201
|
+
LEGACY_margin: "0 0 0 -8px"
|
|
209
202
|
})))
|
|
210
203
|
})
|
|
211
204
|
}, jsx("div", {
|
|
@@ -21,14 +21,12 @@ 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 { expandIconContainerStyle,
|
|
24
|
+
import { expandIconContainerStyle, 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
|
-
import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
|
|
30
29
|
import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
|
|
31
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
32
30
|
import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
|
|
33
31
|
import { EditorTextColorIcon } from './icon';
|
|
34
32
|
var EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
|
|
@@ -208,19 +206,14 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
|
|
|
208
206
|
selectedColor: selectedColor,
|
|
209
207
|
disabled: pluginState.disabled,
|
|
210
208
|
icon: jsx(EditorTextColorIcon, null)
|
|
211
|
-
}),
|
|
209
|
+
}),
|
|
212
210
|
//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
211
|
jsx("span", {
|
|
214
212
|
css: expandIconContainerStyle
|
|
215
213
|
}, jsx(ChevronDownIcon, {
|
|
216
214
|
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", {
|
|
221
|
-
css: expandIconWrapperStyle
|
|
222
|
-
}, jsx(ExpandIcon, {
|
|
223
|
-
label: ""
|
|
215
|
+
color: "currentColor",
|
|
216
|
+
LEGACY_margin: "0 0 0 -8px"
|
|
224
217
|
})))
|
|
225
218
|
})
|
|
226
219
|
}, jsx("div", {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-text-color",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.14.0",
|
|
4
4
|
"description": "Text color plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -34,17 +34,17 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@atlaskit/adf-schema": "^40.8.1",
|
|
37
|
-
"@atlaskit/editor-common": "^
|
|
37
|
+
"@atlaskit/editor-common": "^88.1.0",
|
|
38
38
|
"@atlaskit/editor-palette": "1.6.0",
|
|
39
|
-
"@atlaskit/editor-plugin-analytics": "^1.
|
|
39
|
+
"@atlaskit/editor-plugin-analytics": "^1.8.0",
|
|
40
40
|
"@atlaskit/editor-plugin-primary-toolbar": "^2.0.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.
|
|
44
|
+
"@atlaskit/icon": "^22.14.0",
|
|
45
45
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
46
46
|
"@atlaskit/theme": "^13.0.0",
|
|
47
|
-
"@atlaskit/tokens": "^1.
|
|
47
|
+
"@atlaskit/tokens": "^1.59.0",
|
|
48
48
|
"@babel/runtime": "^7.0.0",
|
|
49
49
|
"@emotion/react": "^11.7.1"
|
|
50
50
|
},
|
|
@@ -97,9 +97,6 @@
|
|
|
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"
|
|
103
100
|
}
|
|
104
101
|
}
|
|
105
102
|
}
|