@atlaskit/menu 2.12.1 → 2.12.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 +9 -0
- package/dist/cjs/internal/components/menu-item-primitive.js +5 -22
- package/dist/cjs/menu-item/heading-item.js +1 -16
- package/dist/es2019/internal/components/menu-item-primitive.js +5 -22
- package/dist/es2019/menu-item/heading-item.js +1 -16
- package/dist/esm/internal/components/menu-item-primitive.js +5 -22
- package/dist/esm/menu-item/heading-item.js +1 -16
- package/package.json +1 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/menu
|
|
2
2
|
|
|
3
|
+
## 2.12.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#129726](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129726)
|
|
8
|
+
[`778c15c1d279a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/778c15c1d279a) -
|
|
9
|
+
[ux] Removed feature flag `platform.design-system-team.menu-tokenised-typography-styles` resulting
|
|
10
|
+
in minor changes to typography and spacing.
|
|
11
|
+
|
|
3
12
|
## 2.12.1
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -9,7 +9,6 @@ var _react = require("react");
|
|
|
9
9
|
var _react2 = require("@emotion/react");
|
|
10
10
|
var _deprecationWarning = require("@atlaskit/ds-lib/deprecation-warning");
|
|
11
11
|
var _focusRing = _interopRequireDefault(require("@atlaskit/focus-ring"));
|
|
12
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
12
|
var _primitives = require("@atlaskit/primitives");
|
|
14
13
|
var _colors = require("@atlaskit/theme/colors");
|
|
15
14
|
var _menuContext = require("./menu-context");
|
|
@@ -37,9 +36,6 @@ var contentStyles = (0, _primitives.xcss)({
|
|
|
37
36
|
overflow: 'hidden',
|
|
38
37
|
textAlign: 'left'
|
|
39
38
|
});
|
|
40
|
-
var baseContentStyles = (0, _primitives.xcss)({
|
|
41
|
-
lineHeight: '16px'
|
|
42
|
-
});
|
|
43
39
|
var truncateStyles = (0, _react2.css)({
|
|
44
40
|
display: 'block',
|
|
45
41
|
overflow: 'hidden',
|
|
@@ -53,13 +49,7 @@ var wordBreakStyles = (0, _react2.css)({
|
|
|
53
49
|
wordBreak: 'break-word'
|
|
54
50
|
});
|
|
55
51
|
var descriptionStyles = (0, _react2.css)({
|
|
56
|
-
color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")")
|
|
57
|
-
});
|
|
58
|
-
var baseDescriptionStyles = (0, _react2.css)({
|
|
59
|
-
fontSize: '12px',
|
|
60
|
-
marginBlockStart: "var(--ds-space-050, 4px)"
|
|
61
|
-
});
|
|
62
|
-
var tokenizedDescriptionStyles = (0, _react2.css)({
|
|
52
|
+
color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")"),
|
|
63
53
|
font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
|
|
64
54
|
});
|
|
65
55
|
var disabledDescriptionStyles = (0, _react2.css)({
|
|
@@ -87,9 +77,6 @@ var primitiveStyles = (0, _react2.css)({
|
|
|
87
77
|
textDecoration: 'none'
|
|
88
78
|
}
|
|
89
79
|
});
|
|
90
|
-
var primitiveBaseStyles = (0, _react2.css)({
|
|
91
|
-
fontSize: '14px'
|
|
92
|
-
});
|
|
93
80
|
var spacingMapStyles = {
|
|
94
81
|
cozy: (0, _react2.css)({
|
|
95
82
|
// 8 * 2 (16) + icon (24) === 40
|
|
@@ -217,7 +204,7 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
|
|
|
217
204
|
return (0, _react2.jsx)(_focusRing.default, {
|
|
218
205
|
isInset: true
|
|
219
206
|
}, children({
|
|
220
|
-
className: cx([cn([positionRelativeStyles, primitiveStyles,
|
|
207
|
+
className: cx([cn([positionRelativeStyles, primitiveStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
|
|
221
208
|
children: (0, _react2.jsx)(_primitives.Inline, {
|
|
222
209
|
as: "span",
|
|
223
210
|
spread: "space-between",
|
|
@@ -232,18 +219,14 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
|
|
|
232
219
|
}, iconBefore), title && (0, _react2.jsx)(_primitives.Stack, {
|
|
233
220
|
alignBlock: "center",
|
|
234
221
|
grow: "fill",
|
|
235
|
-
xcss:
|
|
236
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
237
|
-
(0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? contentStyles : [contentStyles, baseContentStyles]
|
|
222
|
+
xcss: contentStyles
|
|
238
223
|
}, renderTitle('span', {
|
|
239
224
|
children: title,
|
|
240
|
-
className: cn(
|
|
225
|
+
className: cn(titleStyles, shouldTitleWrap ? wordBreakStyles : truncateStyles),
|
|
241
226
|
'data-item-title': true
|
|
242
227
|
}), description && (0, _react2.jsx)("span", {
|
|
243
228
|
"data-item-description": true,
|
|
244
|
-
css: [descriptionStyles,
|
|
245
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
246
|
-
(0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedDescriptionStyles : baseDescriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
|
|
229
|
+
css: [descriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
|
|
247
230
|
}, description)), iconAfter && (0, _react2.jsx)("span", {
|
|
248
231
|
"data-item-elem-after": true,
|
|
249
232
|
css: beforeAfterElementStyles,
|
|
@@ -11,33 +11,20 @@ var _react = require("react");
|
|
|
11
11
|
var _react2 = require("@emotion/react");
|
|
12
12
|
var _deprecationWarning = require("@atlaskit/ds-lib/deprecation-warning");
|
|
13
13
|
var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
|
|
14
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
14
|
var _colors = require("@atlaskit/theme/colors");
|
|
16
|
-
var _typography = require("@atlaskit/theme/typography");
|
|
17
15
|
var _excluded = ["children", "testId", "headingLevel", "id", "cssFn", "className"];
|
|
18
16
|
/**
|
|
19
17
|
* @jsxRuntime classic
|
|
20
18
|
* @jsx jsx
|
|
21
19
|
*/
|
|
22
20
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
23
|
-
var itemHeadingContentHeight = _typography.headingSizes.h100.lineHeight;
|
|
24
|
-
var itemHeadingFontSize = _typography.headingSizes.h100.size;
|
|
25
21
|
var headingStyles = (0, _react2.css)({
|
|
26
22
|
color: "var(--ds-text-subtle, ".concat(_colors.N300, ")"),
|
|
23
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
|
|
27
24
|
paddingBlock: "var(--ds-space-0, 0px)",
|
|
28
25
|
paddingInline: "var(--ds-space-200, 16px)",
|
|
29
26
|
textTransform: 'uppercase'
|
|
30
27
|
});
|
|
31
|
-
var baseHeadingStyles = (0, _react2.css)({
|
|
32
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
33
|
-
fontSize: itemHeadingFontSize,
|
|
34
|
-
fontWeight: "var(--ds-font-weight-bold, 700)",
|
|
35
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
36
|
-
lineHeight: itemHeadingContentHeight / itemHeadingFontSize
|
|
37
|
-
});
|
|
38
|
-
var tokenizedHeadingStyles = (0, _react2.css)({
|
|
39
|
-
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
|
|
40
|
-
});
|
|
41
28
|
|
|
42
29
|
/**
|
|
43
30
|
* __Heading item__
|
|
@@ -64,8 +51,6 @@ var HeadingItem = /*#__PURE__*/(0, _react.memo)(function (_ref) {
|
|
|
64
51
|
var UNSAFE_overrides = (0, _react2.css)(cssFn(undefined));
|
|
65
52
|
return (0, _react2.jsx)("div", (0, _extends2.default)({
|
|
66
53
|
css: [headingStyles,
|
|
67
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
68
|
-
(0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedHeadingStyles : baseHeadingStyles,
|
|
69
54
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
70
55
|
UNSAFE_overrides],
|
|
71
56
|
role: "heading",
|
|
@@ -8,7 +8,6 @@ import { useContext } from 'react';
|
|
|
8
8
|
import { ClassNames, css, jsx } from '@emotion/react';
|
|
9
9
|
import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
|
|
10
10
|
import FocusRing from '@atlaskit/focus-ring';
|
|
11
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
11
|
import { Inline, Stack, xcss } from '@atlaskit/primitives';
|
|
13
12
|
import { N20, N200, N30 } from '@atlaskit/theme/colors';
|
|
14
13
|
import { SELECTION_STYLE_CONTEXT_DO_NOT_USE, SpacingContext } from './menu-context';
|
|
@@ -26,9 +25,6 @@ const contentStyles = xcss({
|
|
|
26
25
|
overflow: 'hidden',
|
|
27
26
|
textAlign: 'left'
|
|
28
27
|
});
|
|
29
|
-
const baseContentStyles = xcss({
|
|
30
|
-
lineHeight: '16px'
|
|
31
|
-
});
|
|
32
28
|
const truncateStyles = css({
|
|
33
29
|
display: 'block',
|
|
34
30
|
overflow: 'hidden',
|
|
@@ -42,13 +38,7 @@ const wordBreakStyles = css({
|
|
|
42
38
|
wordBreak: 'break-word'
|
|
43
39
|
});
|
|
44
40
|
const descriptionStyles = css({
|
|
45
|
-
color: `var(--ds-text-subtlest, ${N200})
|
|
46
|
-
});
|
|
47
|
-
const baseDescriptionStyles = css({
|
|
48
|
-
fontSize: '12px',
|
|
49
|
-
marginBlockStart: "var(--ds-space-050, 4px)"
|
|
50
|
-
});
|
|
51
|
-
const tokenizedDescriptionStyles = css({
|
|
41
|
+
color: `var(--ds-text-subtlest, ${N200})`,
|
|
52
42
|
font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
|
|
53
43
|
});
|
|
54
44
|
const disabledDescriptionStyles = css({
|
|
@@ -76,9 +66,6 @@ const primitiveStyles = css({
|
|
|
76
66
|
textDecoration: 'none'
|
|
77
67
|
}
|
|
78
68
|
});
|
|
79
|
-
const primitiveBaseStyles = css({
|
|
80
|
-
fontSize: '14px'
|
|
81
|
-
});
|
|
82
69
|
const spacingMapStyles = {
|
|
83
70
|
cozy: css({
|
|
84
71
|
// 8 * 2 (16) + icon (24) === 40
|
|
@@ -204,7 +191,7 @@ const MenuItemPrimitive = ({
|
|
|
204
191
|
return jsx(FocusRing, {
|
|
205
192
|
isInset: true
|
|
206
193
|
}, children({
|
|
207
|
-
className: cx([cn([positionRelativeStyles, primitiveStyles,
|
|
194
|
+
className: cx([cn([positionRelativeStyles, primitiveStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
|
|
208
195
|
children: jsx(Inline, {
|
|
209
196
|
as: "span",
|
|
210
197
|
spread: "space-between",
|
|
@@ -219,18 +206,14 @@ const MenuItemPrimitive = ({
|
|
|
219
206
|
}, iconBefore), title && jsx(Stack, {
|
|
220
207
|
alignBlock: "center",
|
|
221
208
|
grow: "fill",
|
|
222
|
-
xcss:
|
|
223
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
224
|
-
fg('platform.design-system-team.menu-tokenised-typography-styles') ? contentStyles : [contentStyles, baseContentStyles]
|
|
209
|
+
xcss: contentStyles
|
|
225
210
|
}, renderTitle('span', {
|
|
226
211
|
children: title,
|
|
227
|
-
className: cn(
|
|
212
|
+
className: cn(titleStyles, shouldTitleWrap ? wordBreakStyles : truncateStyles),
|
|
228
213
|
'data-item-title': true
|
|
229
214
|
}), description && jsx("span", {
|
|
230
215
|
"data-item-description": true,
|
|
231
|
-
css: [descriptionStyles,
|
|
232
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
233
|
-
fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedDescriptionStyles : baseDescriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
|
|
216
|
+
css: [descriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
|
|
234
217
|
}, description)), iconAfter && jsx("span", {
|
|
235
218
|
"data-item-elem-after": true,
|
|
236
219
|
css: beforeAfterElementStyles,
|
|
@@ -9,27 +9,14 @@ import { memo } from 'react';
|
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
|
|
11
11
|
import noop from '@atlaskit/ds-lib/noop';
|
|
12
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
12
|
import { N300 } from '@atlaskit/theme/colors';
|
|
14
|
-
import { headingSizes } from '@atlaskit/theme/typography';
|
|
15
|
-
const itemHeadingContentHeight = headingSizes.h100.lineHeight;
|
|
16
|
-
const itemHeadingFontSize = headingSizes.h100.size;
|
|
17
13
|
const headingStyles = css({
|
|
18
14
|
color: `var(--ds-text-subtle, ${N300})`,
|
|
15
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
|
|
19
16
|
paddingBlock: "var(--ds-space-0, 0px)",
|
|
20
17
|
paddingInline: "var(--ds-space-200, 16px)",
|
|
21
18
|
textTransform: 'uppercase'
|
|
22
19
|
});
|
|
23
|
-
const baseHeadingStyles = css({
|
|
24
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
25
|
-
fontSize: itemHeadingFontSize,
|
|
26
|
-
fontWeight: "var(--ds-font-weight-bold, 700)",
|
|
27
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
28
|
-
lineHeight: itemHeadingContentHeight / itemHeadingFontSize
|
|
29
|
-
});
|
|
30
|
-
const tokenizedHeadingStyles = css({
|
|
31
|
-
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
|
|
32
|
-
});
|
|
33
20
|
|
|
34
21
|
/**
|
|
35
22
|
* __Heading item__
|
|
@@ -59,8 +46,6 @@ const HeadingItem = /*#__PURE__*/memo(({
|
|
|
59
46
|
const UNSAFE_overrides = css(cssFn(undefined));
|
|
60
47
|
return jsx("div", _extends({
|
|
61
48
|
css: [headingStyles,
|
|
62
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
63
|
-
fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedHeadingStyles : baseHeadingStyles,
|
|
64
49
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
65
50
|
UNSAFE_overrides],
|
|
66
51
|
role: "heading",
|
|
@@ -8,7 +8,6 @@ import { useContext } from 'react';
|
|
|
8
8
|
import { ClassNames, css, jsx } from '@emotion/react';
|
|
9
9
|
import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
|
|
10
10
|
import FocusRing from '@atlaskit/focus-ring';
|
|
11
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
11
|
import { Inline, Stack, xcss } from '@atlaskit/primitives';
|
|
13
12
|
import { N20, N200, N30 } from '@atlaskit/theme/colors';
|
|
14
13
|
import { SELECTION_STYLE_CONTEXT_DO_NOT_USE, SpacingContext } from './menu-context';
|
|
@@ -29,9 +28,6 @@ var contentStyles = xcss({
|
|
|
29
28
|
overflow: 'hidden',
|
|
30
29
|
textAlign: 'left'
|
|
31
30
|
});
|
|
32
|
-
var baseContentStyles = xcss({
|
|
33
|
-
lineHeight: '16px'
|
|
34
|
-
});
|
|
35
31
|
var truncateStyles = css({
|
|
36
32
|
display: 'block',
|
|
37
33
|
overflow: 'hidden',
|
|
@@ -45,13 +41,7 @@ var wordBreakStyles = css({
|
|
|
45
41
|
wordBreak: 'break-word'
|
|
46
42
|
});
|
|
47
43
|
var descriptionStyles = css({
|
|
48
|
-
color: "var(--ds-text-subtlest, ".concat(N200, ")")
|
|
49
|
-
});
|
|
50
|
-
var baseDescriptionStyles = css({
|
|
51
|
-
fontSize: '12px',
|
|
52
|
-
marginBlockStart: "var(--ds-space-050, 4px)"
|
|
53
|
-
});
|
|
54
|
-
var tokenizedDescriptionStyles = css({
|
|
44
|
+
color: "var(--ds-text-subtlest, ".concat(N200, ")"),
|
|
55
45
|
font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
|
|
56
46
|
});
|
|
57
47
|
var disabledDescriptionStyles = css({
|
|
@@ -79,9 +69,6 @@ var primitiveStyles = css({
|
|
|
79
69
|
textDecoration: 'none'
|
|
80
70
|
}
|
|
81
71
|
});
|
|
82
|
-
var primitiveBaseStyles = css({
|
|
83
|
-
fontSize: '14px'
|
|
84
|
-
});
|
|
85
72
|
var spacingMapStyles = {
|
|
86
73
|
cozy: css({
|
|
87
74
|
// 8 * 2 (16) + icon (24) === 40
|
|
@@ -209,7 +196,7 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
|
|
|
209
196
|
return jsx(FocusRing, {
|
|
210
197
|
isInset: true
|
|
211
198
|
}, children({
|
|
212
|
-
className: cx([cn([positionRelativeStyles, primitiveStyles,
|
|
199
|
+
className: cx([cn([positionRelativeStyles, primitiveStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
|
|
213
200
|
children: jsx(Inline, {
|
|
214
201
|
as: "span",
|
|
215
202
|
spread: "space-between",
|
|
@@ -224,18 +211,14 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
|
|
|
224
211
|
}, iconBefore), title && jsx(Stack, {
|
|
225
212
|
alignBlock: "center",
|
|
226
213
|
grow: "fill",
|
|
227
|
-
xcss:
|
|
228
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
229
|
-
fg('platform.design-system-team.menu-tokenised-typography-styles') ? contentStyles : [contentStyles, baseContentStyles]
|
|
214
|
+
xcss: contentStyles
|
|
230
215
|
}, renderTitle('span', {
|
|
231
216
|
children: title,
|
|
232
|
-
className: cn(
|
|
217
|
+
className: cn(titleStyles, shouldTitleWrap ? wordBreakStyles : truncateStyles),
|
|
233
218
|
'data-item-title': true
|
|
234
219
|
}), description && jsx("span", {
|
|
235
220
|
"data-item-description": true,
|
|
236
|
-
css: [descriptionStyles,
|
|
237
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
238
|
-
fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedDescriptionStyles : baseDescriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
|
|
221
|
+
css: [descriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
|
|
239
222
|
}, description)), iconAfter && jsx("span", {
|
|
240
223
|
"data-item-elem-after": true,
|
|
241
224
|
css: beforeAfterElementStyles,
|
|
@@ -11,27 +11,14 @@ import { memo } from 'react';
|
|
|
11
11
|
import { css, jsx } from '@emotion/react';
|
|
12
12
|
import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
|
|
13
13
|
import noop from '@atlaskit/ds-lib/noop';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
14
|
import { N300 } from '@atlaskit/theme/colors';
|
|
16
|
-
import { headingSizes } from '@atlaskit/theme/typography';
|
|
17
|
-
var itemHeadingContentHeight = headingSizes.h100.lineHeight;
|
|
18
|
-
var itemHeadingFontSize = headingSizes.h100.size;
|
|
19
15
|
var headingStyles = css({
|
|
20
16
|
color: "var(--ds-text-subtle, ".concat(N300, ")"),
|
|
17
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
|
|
21
18
|
paddingBlock: "var(--ds-space-0, 0px)",
|
|
22
19
|
paddingInline: "var(--ds-space-200, 16px)",
|
|
23
20
|
textTransform: 'uppercase'
|
|
24
21
|
});
|
|
25
|
-
var baseHeadingStyles = css({
|
|
26
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
27
|
-
fontSize: itemHeadingFontSize,
|
|
28
|
-
fontWeight: "var(--ds-font-weight-bold, 700)",
|
|
29
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
30
|
-
lineHeight: itemHeadingContentHeight / itemHeadingFontSize
|
|
31
|
-
});
|
|
32
|
-
var tokenizedHeadingStyles = css({
|
|
33
|
-
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
|
|
34
|
-
});
|
|
35
22
|
|
|
36
23
|
/**
|
|
37
24
|
* __Heading item__
|
|
@@ -58,8 +45,6 @@ var HeadingItem = /*#__PURE__*/memo(function (_ref) {
|
|
|
58
45
|
var UNSAFE_overrides = css(cssFn(undefined));
|
|
59
46
|
return jsx("div", _extends({
|
|
60
47
|
css: [headingStyles,
|
|
61
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
62
|
-
fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedHeadingStyles : baseHeadingStyles,
|
|
63
48
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
|
|
64
49
|
UNSAFE_overrides],
|
|
65
50
|
role: "heading",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/menu",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.2",
|
|
4
4
|
"description": "A list of options to help users navigate, or perform actions.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -124,9 +124,6 @@
|
|
|
124
124
|
"platform.design-system-team.section-1px-seperator-borders": {
|
|
125
125
|
"type": "boolean"
|
|
126
126
|
},
|
|
127
|
-
"platform.design-system-team.menu-tokenised-typography-styles": {
|
|
128
|
-
"type": "boolean"
|
|
129
|
-
},
|
|
130
127
|
"platform.wanjel.use-router-links-for-the-linkitem-component": {
|
|
131
128
|
"type": "boolean"
|
|
132
129
|
}
|