@atlaskit/menu 1.3.11 → 1.4.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.
Files changed (55) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/cjs/internal/components/menu-item-primitive.js +26 -25
  3. package/dist/cjs/internal/components/skeleton-shimmer.js +4 -4
  4. package/dist/cjs/menu-item/button-item.js +3 -3
  5. package/dist/cjs/menu-item/custom-item.js +4 -4
  6. package/dist/cjs/menu-item/heading-item.js +4 -4
  7. package/dist/cjs/menu-item/link-item.js +3 -3
  8. package/dist/cjs/menu-item/skeleton-heading-item.js +9 -11
  9. package/dist/cjs/menu-item/skeleton-item.js +10 -10
  10. package/dist/cjs/menu-section/menu-group.js +2 -2
  11. package/dist/cjs/menu-section/popup-menu-group.js +2 -2
  12. package/dist/cjs/menu-section/section.js +8 -8
  13. package/dist/cjs/version.json +1 -1
  14. package/dist/es2019/internal/components/menu-item-primitive.js +8 -7
  15. package/dist/es2019/internal/components/skeleton-shimmer.js +1 -1
  16. package/dist/es2019/menu-item/button-item.js +1 -1
  17. package/dist/es2019/menu-item/custom-item.js +1 -1
  18. package/dist/es2019/menu-item/heading-item.js +2 -2
  19. package/dist/es2019/menu-item/link-item.js +1 -1
  20. package/dist/es2019/menu-item/skeleton-heading-item.js +4 -5
  21. package/dist/es2019/menu-item/skeleton-item.js +2 -2
  22. package/dist/es2019/menu-section/menu-group.js +1 -1
  23. package/dist/es2019/menu-section/popup-menu-group.js +1 -1
  24. package/dist/es2019/menu-section/section.js +1 -1
  25. package/dist/es2019/version.json +1 -1
  26. package/dist/esm/internal/components/menu-item-primitive.js +8 -7
  27. package/dist/esm/internal/components/skeleton-shimmer.js +1 -1
  28. package/dist/esm/menu-item/button-item.js +1 -1
  29. package/dist/esm/menu-item/custom-item.js +1 -1
  30. package/dist/esm/menu-item/heading-item.js +2 -2
  31. package/dist/esm/menu-item/link-item.js +1 -1
  32. package/dist/esm/menu-item/skeleton-heading-item.js +4 -5
  33. package/dist/esm/menu-item/skeleton-item.js +2 -2
  34. package/dist/esm/menu-section/menu-group.js +1 -1
  35. package/dist/esm/menu-section/popup-menu-group.js +1 -1
  36. package/dist/esm/menu-section/section.js +1 -1
  37. package/dist/esm/version.json +1 -1
  38. package/dist/types/internal/components/menu-item-primitive.d.ts +2 -2
  39. package/dist/types/internal/components/skeleton-shimmer.d.ts +2 -1
  40. package/dist/types/menu-item/heading-item.d.ts +2 -1
  41. package/dist/types/menu-item/skeleton-heading-item.d.ts +2 -2
  42. package/dist/types/menu-item/skeleton-item.d.ts +2 -2
  43. package/dist/types/menu-section/menu-group.d.ts +3 -2
  44. package/dist/types/menu-section/popup-menu-group.d.ts +3 -2
  45. package/dist/types/types.d.ts +1 -1
  46. package/dist/types-ts4.0/internal/components/menu-item-primitive.d.ts +2 -2
  47. package/dist/types-ts4.0/internal/components/skeleton-shimmer.d.ts +2 -1
  48. package/dist/types-ts4.0/menu-item/heading-item.d.ts +2 -1
  49. package/dist/types-ts4.0/menu-item/skeleton-heading-item.d.ts +2 -2
  50. package/dist/types-ts4.0/menu-item/skeleton-item.d.ts +2 -2
  51. package/dist/types-ts4.0/menu-section/menu-group.d.ts +3 -2
  52. package/dist/types-ts4.0/menu-section/popup-menu-group.d.ts +3 -2
  53. package/dist/types-ts4.0/types.d.ts +1 -1
  54. package/package.json +9 -6
  55. package/report.api.md +107 -388
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/menu
2
2
 
3
+ ## 1.4.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`3acf8a89149`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3acf8a89149) - Updates `@emotion/core` to `@emotion/react`; v10 to v11. There is no expected behavior change.
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies
12
+
13
+ ## 1.3.12
14
+
15
+ ### Patch Changes
16
+
17
+ - [`9de88fa1e1e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9de88fa1e1e) - Internal changes to include spacing tokens in component implementations.
18
+
3
19
  ## 1.3.11
4
20
 
5
21
  ### Patch Changes
@@ -9,7 +9,7 @@ exports.default = void 0;
9
9
 
10
10
  var _react = require("react");
11
11
 
12
- var _core = require("@emotion/core");
12
+ var _react2 = require("@emotion/react");
13
13
 
14
14
  var _focusRing = _interopRequireDefault(require("@atlaskit/focus-ring"));
15
15
 
@@ -22,30 +22,30 @@ var _typography = require("@atlaskit/theme/typography");
22
22
  /** @jsx jsx */
23
23
  var defaultRender = function defaultRender(Component, props) {
24
24
  return (// eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
25
- (0, _core.jsx)(Component, props)
25
+ (0, _react2.jsx)(Component, props)
26
26
  );
27
27
  };
28
28
 
29
29
  var gridSize = (0, _constants.gridSize)();
30
30
  var fontSize = (0, _constants.fontSize)();
31
- var itemTopBottomPadding = gridSize;
32
- var itemSidePadding = gridSize * 2.5;
33
- var itemElemSpacing = gridSize * 1.5;
31
+ var itemTopBottomPadding = "var(--ds-scale-100, 8px)";
32
+ var itemSidePadding = "var(--ds-scale-250, 20px)";
33
+ var itemElemSpacing = "var(--ds-scale-150, 12px)";
34
34
  var itemDescriptionSpacing = gridSize * 0.375;
35
- var itemMinHeight = gridSize * 5;
36
- var beforeElementStyles = (0, _core.css)({
35
+ var itemMinHeight = "var(--ds-scale-500, 40px)";
36
+ var beforeElementStyles = (0, _react2.css)({
37
37
  display: 'flex',
38
38
  marginRight: itemElemSpacing,
39
39
  alignItems: 'center',
40
40
  flexShrink: 0
41
41
  });
42
- var afterElementStyles = (0, _core.css)({
42
+ var afterElementStyles = (0, _react2.css)({
43
43
  display: 'flex',
44
44
  marginLeft: itemElemSpacing,
45
45
  alignItems: 'center',
46
46
  flexShrink: 0
47
47
  });
48
- var contentStyles = (0, _core.css)({
48
+ var contentStyles = (0, _react2.css)({
49
49
  display: 'flex',
50
50
  justifyContent: 'center',
51
51
  flexDirection: 'column',
@@ -56,27 +56,28 @@ var contentStyles = (0, _core.css)({
56
56
  overflow: 'hidden',
57
57
  textAlign: 'left'
58
58
  });
59
- var truncateStyles = (0, _core.css)({
59
+ var truncateStyles = (0, _react2.css)({
60
60
  display: 'block',
61
61
  overflow: 'hidden',
62
62
  textOverflow: 'ellipsis',
63
63
  whiteSpace: 'nowrap'
64
64
  });
65
- var wordBreakStyles = (0, _core.css)({
65
+ var wordBreakStyles = (0, _react2.css)({
66
66
  wordBreak: 'break-word'
67
67
  });
68
- var descriptionStyles = (0, _core.css)({
68
+ var descriptionStyles = (0, _react2.css)({
69
69
  marginTop: itemDescriptionSpacing,
70
70
  color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")"),
71
71
  fontSize: _typography.headingSizes.h200.size
72
72
  });
73
- var primitiveStyles = (0, _core.css)({
73
+ var primitiveStyles = (0, _react2.css)({
74
74
  display: 'flex',
75
75
  boxSizing: 'border-box',
76
76
  width: '100%',
77
77
  minHeight: itemMinHeight,
78
- margin: 0,
79
- padding: "".concat(itemTopBottomPadding, "px ").concat(itemSidePadding, "px"),
78
+ // TODO Delete this comment after verifying spacing token -> previous value `0`
79
+ margin: "var(--ds-scale-0, 0px)",
80
+ padding: "".concat(itemTopBottomPadding, " ").concat(itemSidePadding),
80
81
  alignItems: 'center',
81
82
  border: 0,
82
83
  fontSize: fontSize,
@@ -90,10 +91,10 @@ var primitiveStyles = (0, _core.css)({
90
91
  textDecoration: 'none'
91
92
  }
92
93
  });
93
- var interactiveStyles = (0, _core.css)({
94
+ var interactiveStyles = (0, _react2.css)({
94
95
  cursor: 'pointer'
95
96
  });
96
- var unselectedStyles = (0, _core.css)({
97
+ var unselectedStyles = (0, _react2.css)({
97
98
  backgroundColor: 'transparent',
98
99
  color: 'currentColor',
99
100
  ':visited': {
@@ -109,14 +110,14 @@ var unselectedStyles = (0, _core.css)({
109
110
  color: 'currentColor'
110
111
  }
111
112
  });
112
- var disabledStyles = (0, _core.css)({
113
+ var disabledStyles = (0, _react2.css)({
113
114
  cursor: 'not-allowed',
114
115
  '&, :hover, :active': {
115
116
  backgroundColor: 'transparent',
116
117
  color: "var(--ds-text-disabled, ".concat(_colors.N200, ")")
117
118
  }
118
119
  });
119
- var selectedStyles = (0, _core.css)({
120
+ var selectedStyles = (0, _react2.css)({
120
121
  backgroundColor: "var(--ds-background-selected, ".concat(_colors.N20, ")"),
121
122
  // Fallback set as babel plugin inserts one otherwise
122
123
  color: "var(--ds-text-selected, currentColor)",
@@ -164,26 +165,26 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
164
165
  _ref$isSelected = _ref.isSelected,
165
166
  isSelected = _ref$isSelected === void 0 ? false : _ref$isSelected;
166
167
  var renderTitle = overrides && overrides.Title && overrides.Title.render || defaultRender;
167
- return (0, _core.jsx)(_core.ClassNames, null, function (_ref2) {
168
+ return (0, _react2.jsx)(_react2.ClassNames, null, function (_ref2) {
168
169
  var cn = _ref2.css,
169
170
  cx = _ref2.cx;
170
- return (0, _core.jsx)(_focusRing.default, {
171
+ return (0, _react2.jsx)(_focusRing.default, {
171
172
  isInset: true
172
173
  }, children({
173
174
  className: cx([cn([primitiveStyles, !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && selectedStyles, isDisabled ? disabledStyles : interactiveStyles]), className]),
174
- children: (0, _core.jsx)(_react.Fragment, null, iconBefore && (0, _core.jsx)("span", {
175
+ children: (0, _react2.jsx)(_react.Fragment, null, iconBefore && (0, _react2.jsx)("span", {
175
176
  "data-item-elem-before": true,
176
177
  css: beforeElementStyles
177
- }, iconBefore), title && (0, _core.jsx)("span", {
178
+ }, iconBefore), title && (0, _react2.jsx)("span", {
178
179
  css: contentStyles
179
180
  }, renderTitle('span', {
180
181
  children: title,
181
182
  className: cn(shouldTitleWrap ? wordBreakStyles : truncateStyles),
182
183
  'data-item-title': true
183
- }), description && (0, _core.jsx)("span", {
184
+ }), description && (0, _react2.jsx)("span", {
184
185
  "data-item-description": true,
185
186
  css: [descriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
186
- }, description)), iconAfter && (0, _core.jsx)("span", {
187
+ }, description)), iconAfter && (0, _react2.jsx)("span", {
187
188
  "data-item-elem-after": true,
188
189
  css: afterElementStyles
189
190
  }, iconAfter))
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- var _core = require("@emotion/core");
8
+ var _react = require("@emotion/react");
9
9
 
10
10
  var _colors = require("@atlaskit/theme/colors");
11
11
 
@@ -17,7 +17,7 @@ var _colors = require("@atlaskit/theme/colors");
17
17
  *
18
18
  * Please update both.
19
19
  */
20
- var shimmerKeyframes = (0, _core.keyframes)({
20
+ var shimmerKeyframes = (0, _react.keyframes)({
21
21
  from: {
22
22
  backgroundColor: "var(--ds-skeleton, ".concat(_colors.N20A, ")")
23
23
  },
@@ -32,7 +32,7 @@ var shimmerKeyframes = (0, _core.keyframes)({
32
32
  * Please update both.
33
33
  */
34
34
 
35
- var shimmerStyles = (0, _core.css)({
35
+ var shimmerStyles = (0, _react.css)({
36
36
  '::before, ::after': {
37
37
  animationDirection: 'alternate',
38
38
  animationDuration: '1.5s',
@@ -60,7 +60,7 @@ var SkeletonShimmer = function SkeletonShimmer(_ref) {
60
60
  var children = _ref.children,
61
61
  _ref$isShimmering = _ref.isShimmering,
62
62
  isShimmering = _ref$isShimmering === void 0 ? false : _ref$isShimmering;
63
- return (0, _core.jsx)(_core.ClassNames, null, function (_ref2) {
63
+ return (0, _react.jsx)(_react.ClassNames, null, function (_ref2) {
64
64
  var css = _ref2.css;
65
65
  return children({
66
66
  className: isShimmering ? css(shimmerStyles) : undefined
@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
13
13
 
14
14
  var _react = require("react");
15
15
 
16
- var _core = require("@emotion/core");
16
+ var _react2 = require("@emotion/react");
17
17
 
18
18
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
19
19
 
@@ -54,7 +54,7 @@ function (props, ref) {
54
54
  return null;
55
55
  }
56
56
 
57
- return (0, _core.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
57
+ return (0, _react2.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
58
58
  // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
59
59
  overrides: overrides,
60
60
  iconBefore: iconBefore,
@@ -73,7 +73,7 @@ function (props, ref) {
73
73
  }), function (_ref) {
74
74
  var children = _ref.children,
75
75
  className = _ref.className;
76
- return (0, _core.jsx)("button", (0, _extends2.default)({
76
+ return (0, _react2.jsx)("button", (0, _extends2.default)({
77
77
  "data-testid": testId
78
78
  }, rest, {
79
79
  className: className,
@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
13
13
 
14
14
  var _react = require("react");
15
15
 
16
- var _core = require("@emotion/core");
16
+ var _react2 = require("@emotion/react");
17
17
 
18
18
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
19
19
 
@@ -59,7 +59,7 @@ var CustomItem = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardR
59
59
  return null;
60
60
  }
61
61
 
62
- return (0, _core.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
62
+ return (0, _react2.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
63
63
  // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
64
64
  overrides: overrides,
65
65
  description: description,
@@ -71,14 +71,14 @@ var CustomItem = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardR
71
71
  shouldTitleWrap: shouldTitleWrap,
72
72
  shouldDescriptionWrap: shouldDescriptionWrap // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
73
73
  ,
74
- css: (0, _core.css)(cssFn({
74
+ css: (0, _react2.css)(cssFn({
75
75
  isDisabled: isDisabled,
76
76
  isSelected: isSelected
77
77
  }))
78
78
  }), function (_ref2) {
79
79
  var children = _ref2.children,
80
80
  className = _ref2.className;
81
- return (0, _core.jsx)(Component, (0, _extends2.default)({
81
+ return (0, _react2.jsx)(Component, (0, _extends2.default)({
82
82
  "data-testid": testId
83
83
  }, rest, {
84
84
  className: className,
@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
13
13
 
14
14
  var _react = require("react");
15
15
 
16
- var _core = require("@emotion/core");
16
+ var _react2 = require("@emotion/react");
17
17
 
18
18
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
19
19
 
@@ -28,7 +28,7 @@ var gridSize = (0, _constants.gridSize)();
28
28
  var itemSidePadding = gridSize * 2.5;
29
29
  var itemHeadingContentHeight = _typography.headingSizes.h100.lineHeight;
30
30
  var itemHeadingFontSize = _typography.headingSizes.h100.size;
31
- var headingStyles = (0, _core.css)({
31
+ var headingStyles = (0, _react2.css)({
32
32
  padding: "0 ".concat(itemSidePadding, "px"),
33
33
  color: "var(--ds-text-subtle, ".concat(_colors.N300, ")"),
34
34
  fontSize: itemHeadingFontSize,
@@ -52,9 +52,9 @@ var HeadingItem = /*#__PURE__*/(0, _react.memo)(function (_ref) {
52
52
  _ref$cssFn = _ref.cssFn,
53
53
  cssFn = _ref$cssFn === void 0 ? _noop.default : _ref$cssFn,
54
54
  rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
55
- return (0, _core.jsx)("div", (0, _extends2.default)({
55
+ return (0, _react2.jsx)("div", (0, _extends2.default)({
56
56
  css: [headingStyles, // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
57
- cssFn(undefined)],
57
+ (0, _react2.css)(cssFn(undefined))],
58
58
  "data-testid": testId,
59
59
  "data-ds--menu--heading-item": true,
60
60
  id: id
@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
13
13
 
14
14
  var _react = require("react");
15
15
 
16
- var _core = require("@emotion/core");
16
+ var _react2 = require("@emotion/react");
17
17
 
18
18
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
19
19
 
@@ -60,7 +60,7 @@ function (props, ref) {
60
60
  return null;
61
61
  }
62
62
 
63
- return (0, _core.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
63
+ return (0, _react2.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
64
64
  // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
65
65
  overrides: overrides,
66
66
  iconBefore: iconBefore,
@@ -79,7 +79,7 @@ function (props, ref) {
79
79
  }), function (_ref) {
80
80
  var children = _ref.children,
81
81
  className = _ref.className;
82
- return (0, _core.jsx)("a", (0, _extends2.default)({
82
+ return (0, _react2.jsx)("a", (0, _extends2.default)({
83
83
  "data-testid": testId
84
84
  }, rest, {
85
85
  className: className,
@@ -7,34 +7,32 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
- var _core = require("@emotion/core");
10
+ var _react = require("@emotion/react");
11
11
 
12
12
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
13
13
 
14
14
  var _colors = require("@atlaskit/theme/colors");
15
15
 
16
- var _constants = require("@atlaskit/theme/constants");
17
-
18
16
  var _skeletonShimmer = _interopRequireDefault(require("../internal/components/skeleton-shimmer"));
19
17
 
20
18
  /** @jsx jsx */
21
- var skeletonStyles = (0, _core.css)({
22
- padding: "0 ".concat((0, _constants.gridSize)() * 2.5, "px"),
19
+ var skeletonStyles = (0, _react.css)({
20
+ padding: "var(--ds-scale-0, 0px)".concat(" ", "var(--ds-scale-250, 20px)"),
23
21
  '::after': {
24
22
  display: 'block',
25
23
  width: '30%',
26
- height: (0, _constants.gridSize)(),
24
+ height: "var(--ds-scale-100, 8px)",
27
25
  backgroundColor: "var(--ds-skeleton, ".concat(_colors.N20A, ")"),
28
26
  borderRadius: 100,
29
27
  content: '""'
30
28
  }
31
29
  });
32
- var defaultWidthStyles = (0, _core.css)({
30
+ var defaultWidthStyles = (0, _react.css)({
33
31
  '::after': {
34
32
  width: '30%'
35
33
  }
36
34
  });
37
- var customWidthStyles = (0, _core.css)({
35
+ var customWidthStyles = (0, _react.css)({
38
36
  '::after': {
39
37
  width: 'var(--width)'
40
38
  }
@@ -55,17 +53,17 @@ var SkeletonHeadingItem = function SkeletonHeadingItem(_ref) {
55
53
  width = _ref.width,
56
54
  _ref$cssFn = _ref.cssFn,
57
55
  cssFn = _ref$cssFn === void 0 ? _noop.default : _ref$cssFn;
58
- return (0, _core.jsx)(_skeletonShimmer.default, {
56
+ return (0, _react.jsx)(_skeletonShimmer.default, {
59
57
  isShimmering: isShimmering
60
58
  }, function (_ref2) {
61
59
  var className = _ref2.className;
62
- return (0, _core.jsx)("div", {
60
+ return (0, _react.jsx)("div", {
63
61
  className: className,
64
62
  style: {
65
63
  '--width': width
66
64
  },
67
65
  css: [skeletonStyles, width ? customWidthStyles : defaultWidthStyles, // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
68
- cssFn(undefined)],
66
+ (0, _react.css)(cssFn(undefined))],
69
67
  "data-ds--menu--skeleton-heading-item": true,
70
68
  "data-testid": testId
71
69
  });
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
- var _core = require("@emotion/core");
10
+ var _react = require("@emotion/react");
11
11
 
12
12
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
13
13
 
@@ -29,7 +29,7 @@ var itemElemSkeletonOffset = (itemExpectedElemSize - skeletonItemElemSize) / 2;
29
29
  var skeletonTextBorderRadius = 100;
30
30
  var skeletonContentHeight = 9;
31
31
  var skeletonColor = "var(--ds-skeleton, ".concat(_colors.N20A, ")");
32
- var skeletonStyles = (0, _core.css)({
32
+ var skeletonStyles = (0, _react.css)({
33
33
  display: 'flex',
34
34
  minHeight: itemMinHeight,
35
35
  padding: "0 ".concat(itemPadding, "px"),
@@ -46,7 +46,7 @@ var skeletonStyles = (0, _core.css)({
46
46
  content: '""'
47
47
  }
48
48
  });
49
- var defaultWidthStyles = (0, _core.css)({
49
+ var defaultWidthStyles = (0, _react.css)({
50
50
  ':nth-of-type(1n)::after': {
51
51
  flexBasis: '70%'
52
52
  },
@@ -66,12 +66,12 @@ var defaultWidthStyles = (0, _core.css)({
66
66
  flexBasis: '77%'
67
67
  }
68
68
  });
69
- var customWidthStyles = (0, _core.css)({
69
+ var customWidthStyles = (0, _react.css)({
70
70
  '::after': {
71
71
  flexBasis: 'var(--width)'
72
72
  }
73
73
  });
74
- var beforeElementStyles = (0, _core.css)({
74
+ var beforeElementStyles = (0, _react.css)({
75
75
  '::before': {
76
76
  width: skeletonItemElemSize,
77
77
  height: skeletonItemElemSize,
@@ -82,12 +82,12 @@ var beforeElementStyles = (0, _core.css)({
82
82
  content: '""'
83
83
  }
84
84
  });
85
- var avatarStyles = (0, _core.css)({
85
+ var avatarStyles = (0, _react.css)({
86
86
  '::before': {
87
87
  borderRadius: '100%'
88
88
  }
89
89
  });
90
- var iconStyles = (0, _core.css)({
90
+ var iconStyles = (0, _react.css)({
91
91
  '::before': {
92
92
  borderRadius: borderRadius
93
93
  }
@@ -110,17 +110,17 @@ var SkeletonItem = function SkeletonItem(_ref) {
110
110
  width = _ref.width,
111
111
  _ref$cssFn = _ref.cssFn,
112
112
  cssFn = _ref$cssFn === void 0 ? _noop.default : _ref$cssFn;
113
- return (0, _core.jsx)(_skeletonShimmer.default, {
113
+ return (0, _react.jsx)(_skeletonShimmer.default, {
114
114
  isShimmering: isShimmering
115
115
  }, function (_ref2) {
116
116
  var className = _ref2.className;
117
- return (0, _core.jsx)("div", {
117
+ return (0, _react.jsx)("div", {
118
118
  className: className,
119
119
  style: {
120
120
  '--width': width
121
121
  },
122
122
  css: [skeletonStyles, (hasAvatar || hasIcon) && beforeElementStyles, hasAvatar && avatarStyles, hasIcon && iconStyles, width ? customWidthStyles : defaultWidthStyles, // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
123
- cssFn()],
123
+ (0, _react.css)(cssFn())],
124
124
  "data-testid": testId
125
125
  });
126
126
  });
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
13
 
14
- var _core = require("@emotion/core");
14
+ var _react = require("@emotion/react");
15
15
 
16
16
  var _dsExplorations = require("@atlaskit/ds-explorations");
17
17
 
@@ -34,7 +34,7 @@ var MenuGroup = function MenuGroup(_ref) {
34
34
  role = _ref.role,
35
35
  rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
36
36
  return (// @ts-ignore type of rest/children needs to be made stricter to fit in Box -- string shouldn't be allowed
37
- (0, _core.jsx)(_dsExplorations.UNSAFE_Box, (0, _extends2.default)({
37
+ (0, _react.jsx)(_dsExplorations.UNSAFE_Box, (0, _extends2.default)({
38
38
  UNSAFE_style: {
39
39
  minWidth: minWidth,
40
40
  maxWidth: maxWidth,
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
13
 
14
- var _core = require("@emotion/core");
14
+ var _react = require("@emotion/react");
15
15
 
16
16
  var _menuGroup = _interopRequireDefault(require("./menu-group"));
17
17
 
@@ -27,7 +27,7 @@ var PopupMenuGroup = function PopupMenuGroup(_ref) {
27
27
  minWidth = _ref$minWidth === void 0 ? 320 : _ref$minWidth,
28
28
  rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
29
29
  return (// eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
30
- (0, _core.jsx)(_menuGroup.default, (0, _extends2.default)({
30
+ (0, _react.jsx)(_menuGroup.default, (0, _extends2.default)({
31
31
  maxWidth: maxWidth,
32
32
  minWidth: minWidth
33
33
  }, rest))
@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
13
13
 
14
14
  var _react = require("react");
15
15
 
16
- var _core = require("@emotion/core");
16
+ var _react2 = require("@emotion/react");
17
17
 
18
18
  var _colors = require("@atlaskit/theme/colors");
19
19
 
@@ -38,7 +38,7 @@ var skeletonHeadingTopMargin = itemHeadingTopMargin + (itemHeadingContentHeight
38
38
  var skeletonHeadingBottomMargin = itemHeadingBottomMargin + skeletonHeadingMarginOffset;
39
39
  var sectionPaddingTopBottom = gridSize * 0.75;
40
40
  var VAR_SEPARATOR_COLOR = '--ds-menu-seperator-color';
41
- var sectionStyles = (0, _core.css)({
41
+ var sectionStyles = (0, _react2.css)({
42
42
  '&::before, &::after': {
43
43
  display: 'block',
44
44
  height: sectionPaddingTopBottom,
@@ -68,17 +68,17 @@ var sectionStyles = (0, _core.css)({
68
68
  outlineOffset: -1
69
69
  }
70
70
  });
71
- var scrollableStyles = (0, _core.css)({
71
+ var scrollableStyles = (0, _react2.css)({
72
72
  flexShrink: 1,
73
73
  overflow: 'auto'
74
74
  });
75
- var unscrollableStyles = (0, _core.css)({
75
+ var unscrollableStyles = (0, _react2.css)({
76
76
  flexShrink: 0
77
77
  });
78
- var separatorStyles = (0, _core.css)({
78
+ var separatorStyles = (0, _react2.css)({
79
79
  borderTop: "2px solid var(".concat(VAR_SEPARATOR_COLOR, ", ", "var(--ds-border, ".concat(_colors.N30A, ")"), ")")
80
80
  });
81
- var noSeparatorStyles = (0, _core.css)({
81
+ var noSeparatorStyles = (0, _react2.css)({
82
82
  // this is to ensure that adjacent sections without separators don't get additional margins.
83
83
  // eslint-disable-next-line @repo/internal/styles/no-nested-styles
84
84
  '[data-section] + &': {
@@ -103,13 +103,13 @@ var Section = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
103
103
  hasSeparator = _ref.hasSeparator,
104
104
  id = _ref.id,
105
105
  rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
106
- var childrenMarkup = title !== undefined ? (0, _core.jsx)(_react.Fragment, null, (0, _core.jsx)(_headingItem.default // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
106
+ var childrenMarkup = title !== undefined ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_headingItem.default // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
107
107
  , {
108
108
  cssFn: overrides && overrides.HeadingItem && overrides.HeadingItem.cssFn,
109
109
  testId: testId && "".concat(testId, "--heading"),
110
110
  "aria-hidden": true
111
111
  }, title), children) : children;
112
- return (0, _core.jsx)("div", (0, _extends2.default)({}, rest, {
112
+ return (0, _react2.jsx)("div", (0, _extends2.default)({}, rest, {
113
113
  id: id // NOTE: Firefox allows elements that have "overflow: auto" to gain focus (as if it had tab-index="0")
114
114
  // We have made a deliberate choice to leave this behaviour as is.
115
115
  ,
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/menu",
3
- "version": "1.3.11",
3
+ "version": "1.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,6 +1,6 @@
1
1
  /** @jsx jsx */
2
2
  import { Fragment } from 'react';
3
- import { ClassNames, css, jsx } from '@emotion/core';
3
+ import { ClassNames, css, jsx } from '@emotion/react';
4
4
  import FocusRing from '@atlaskit/focus-ring';
5
5
  import { N20, N200, N30 } from '@atlaskit/theme/colors';
6
6
  import { fontSize as fontSizeFn, gridSize as gridSizeFn } from '@atlaskit/theme/constants';
@@ -11,11 +11,11 @@ jsx(Component, props);
11
11
 
12
12
  const gridSize = gridSizeFn();
13
13
  const fontSize = fontSizeFn();
14
- const itemTopBottomPadding = gridSize;
15
- const itemSidePadding = gridSize * 2.5;
16
- const itemElemSpacing = gridSize * 1.5;
14
+ const itemTopBottomPadding = "var(--ds-scale-100, 8px)";
15
+ const itemSidePadding = "var(--ds-scale-250, 20px)";
16
+ const itemElemSpacing = "var(--ds-scale-150, 12px)";
17
17
  const itemDescriptionSpacing = gridSize * 0.375;
18
- const itemMinHeight = gridSize * 5;
18
+ const itemMinHeight = "var(--ds-scale-500, 40px)";
19
19
  const beforeElementStyles = css({
20
20
  display: 'flex',
21
21
  marginRight: itemElemSpacing,
@@ -58,8 +58,9 @@ const primitiveStyles = css({
58
58
  boxSizing: 'border-box',
59
59
  width: '100%',
60
60
  minHeight: itemMinHeight,
61
- margin: 0,
62
- padding: `${itemTopBottomPadding}px ${itemSidePadding}px`,
61
+ // TODO Delete this comment after verifying spacing token -> previous value `0`
62
+ margin: "var(--ds-scale-0, 0px)",
63
+ padding: `${itemTopBottomPadding} ${itemSidePadding}`,
63
64
  alignItems: 'center',
64
65
  border: 0,
65
66
  fontSize: fontSize,
@@ -1,5 +1,5 @@
1
1
  /** @jsx jsx */
2
- import { ClassNames, css, jsx, keyframes } from '@emotion/core';
2
+ import { ClassNames, css, jsx, keyframes } from '@emotion/react';
3
3
  import { N20A, N30A } from '@atlaskit/theme/colors';
4
4
 
5
5
  /**
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
 
3
3
  /** @jsx jsx */
4
4
  import { forwardRef, memo } from 'react';
5
- import { jsx } from '@emotion/core';
5
+ import { jsx } from '@emotion/react';
6
6
  import noop from '@atlaskit/ds-lib/noop';
7
7
  import MenuItemPrimitive from '../internal/components/menu-item-primitive';
8
8
 
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
 
3
3
  /** @jsx jsx */
4
4
  import { forwardRef, memo } from 'react';
5
- import { css, jsx } from '@emotion/core';
5
+ import { css, jsx } from '@emotion/react';
6
6
  import noop from '@atlaskit/ds-lib/noop';
7
7
  import MenuItemPrimitive from '../internal/components/menu-item-primitive';
8
8
 
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
 
3
3
  /** @jsx jsx */
4
4
  import { memo } from 'react';
5
- import { css, jsx } from '@emotion/core';
5
+ import { css, jsx } from '@emotion/react';
6
6
  import noop from '@atlaskit/ds-lib/noop';
7
7
  import { N300 } from '@atlaskit/theme/colors';
8
8
  import { gridSize as gridSizeFn } from '@atlaskit/theme/constants';
@@ -37,7 +37,7 @@ const HeadingItem = /*#__PURE__*/memo(({
37
37
  }) => {
38
38
  return jsx("div", _extends({
39
39
  css: [headingStyles, // eslint-disable-next-line @repo/internal/react/consistent-css-prop-usage
40
- cssFn(undefined)],
40
+ css(cssFn(undefined))],
41
41
  "data-testid": testId,
42
42
  "data-ds--menu--heading-item": true,
43
43
  id: id
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
 
3
3
  /** @jsx jsx */
4
4
  import { forwardRef, memo } from 'react';
5
- import { jsx } from '@emotion/core';
5
+ import { jsx } from '@emotion/react';
6
6
  import noop from '@atlaskit/ds-lib/noop';
7
7
  import MenuItemPrimitive from '../internal/components/menu-item-primitive';
8
8