@atlaskit/side-navigation 1.2.0 → 1.2.4

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 (63) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/dist/cjs/common/constants.js +1 -1
  3. package/dist/cjs/common/styles.js +17 -17
  4. package/dist/cjs/components/Footer/index.js +1 -3
  5. package/dist/cjs/components/Header/index.js +5 -5
  6. package/dist/cjs/components/Item/button-item.js +5 -2
  7. package/dist/cjs/components/Item/custom-item.js +5 -2
  8. package/dist/cjs/components/Item/go-back-item.js +4 -4
  9. package/dist/cjs/components/Item/link-item.js +5 -2
  10. package/dist/cjs/components/Item/skeleton-item.js +2 -1
  11. package/dist/cjs/components/NavigationContent/styles.js +7 -9
  12. package/dist/cjs/components/NestableNavigationContent/nesting-motion.js +2 -2
  13. package/dist/cjs/components/NestingItem/index.js +6 -6
  14. package/dist/cjs/components/NestingItem/styles.js +2 -2
  15. package/dist/cjs/components/Section/heading-item.js +2 -1
  16. package/dist/cjs/components/Section/section.js +2 -1
  17. package/dist/cjs/components/Section/skeleton-heading-item.js +2 -1
  18. package/dist/cjs/components/SideNavigation/index.js +2 -4
  19. package/dist/cjs/components/index.js +34 -34
  20. package/dist/cjs/index.js +38 -38
  21. package/dist/cjs/version.json +1 -1
  22. package/dist/es2019/common/styles.js +14 -13
  23. package/dist/es2019/components/Footer/index.js +1 -2
  24. package/dist/es2019/components/Header/index.js +2 -3
  25. package/dist/es2019/components/Item/button-item.js +2 -1
  26. package/dist/es2019/components/Item/custom-item.js +2 -1
  27. package/dist/es2019/components/Item/go-back-item.js +1 -2
  28. package/dist/es2019/components/Item/link-item.js +2 -1
  29. package/dist/es2019/components/Item/skeleton-item.js +2 -1
  30. package/dist/es2019/components/NavigationContent/styles.js +4 -5
  31. package/dist/es2019/components/NestingItem/index.js +1 -2
  32. package/dist/es2019/components/Section/heading-item.js +2 -1
  33. package/dist/es2019/components/Section/section.js +2 -1
  34. package/dist/es2019/components/Section/skeleton-heading-item.js +2 -1
  35. package/dist/es2019/components/SideNavigation/index.js +2 -3
  36. package/dist/es2019/version.json +1 -1
  37. package/dist/esm/common/styles.js +16 -15
  38. package/dist/esm/components/Footer/index.js +1 -2
  39. package/dist/esm/components/Header/index.js +4 -4
  40. package/dist/esm/components/Item/button-item.js +4 -2
  41. package/dist/esm/components/Item/custom-item.js +4 -2
  42. package/dist/esm/components/Item/go-back-item.js +3 -3
  43. package/dist/esm/components/Item/link-item.js +4 -2
  44. package/dist/esm/components/Item/skeleton-item.js +2 -1
  45. package/dist/esm/components/NavigationContent/styles.js +6 -7
  46. package/dist/esm/components/NestableNavigationContent/nesting-motion.js +2 -2
  47. package/dist/esm/components/NestingItem/index.js +5 -5
  48. package/dist/esm/components/NestingItem/styles.js +2 -2
  49. package/dist/esm/components/Section/heading-item.js +2 -1
  50. package/dist/esm/components/Section/section.js +2 -1
  51. package/dist/esm/components/Section/skeleton-heading-item.js +2 -1
  52. package/dist/esm/components/SideNavigation/index.js +2 -3
  53. package/dist/esm/version.json +1 -1
  54. package/dist/types/common/styles.d.ts +2 -0
  55. package/dist/types/components/Footer/index.d.ts +1 -0
  56. package/dist/types/components/Header/index.d.ts +1 -0
  57. package/dist/types/components/Item/custom-item.d.ts +1 -0
  58. package/dist/types/components/Item/skeleton-item.d.ts +1 -0
  59. package/dist/types/components/NavigationHeader/index.d.ts +1 -0
  60. package/dist/types/components/NestableNavigationContent/index.d.ts +2 -0
  61. package/dist/types/components/Section/heading-item.d.ts +1 -0
  62. package/dist/types/components/Section/skeleton-heading-item.d.ts +1 -0
  63. package/package.json +6 -6
@@ -5,106 +5,106 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- Object.defineProperty(exports, "SideNavigation", {
8
+ Object.defineProperty(exports, "ButtonItem", {
9
9
  enumerable: true,
10
10
  get: function get() {
11
- return _SideNavigation.default;
11
+ return _Item.ButtonItem;
12
12
  }
13
13
  });
14
- Object.defineProperty(exports, "Section", {
14
+ Object.defineProperty(exports, "CustomItem", {
15
15
  enumerable: true,
16
16
  get: function get() {
17
- return _Section.Section;
17
+ return _Item.CustomItem;
18
18
  }
19
19
  });
20
- Object.defineProperty(exports, "HeadingItem", {
20
+ Object.defineProperty(exports, "Footer", {
21
21
  enumerable: true,
22
22
  get: function get() {
23
- return _Section.HeadingItem;
23
+ return _Footer.default;
24
24
  }
25
25
  });
26
- Object.defineProperty(exports, "SkeletonHeadingItem", {
26
+ Object.defineProperty(exports, "GoBackItem", {
27
27
  enumerable: true,
28
28
  get: function get() {
29
- return _Section.SkeletonHeadingItem;
29
+ return _Item.GoBackItem;
30
30
  }
31
31
  });
32
- Object.defineProperty(exports, "NestingItem", {
32
+ Object.defineProperty(exports, "Header", {
33
33
  enumerable: true,
34
34
  get: function get() {
35
- return _NestingItem.default;
35
+ return _Header.default;
36
36
  }
37
37
  });
38
- Object.defineProperty(exports, "NavigationContent", {
38
+ Object.defineProperty(exports, "HeadingItem", {
39
39
  enumerable: true,
40
40
  get: function get() {
41
- return _NavigationContent.default;
41
+ return _Section.HeadingItem;
42
42
  }
43
43
  });
44
- Object.defineProperty(exports, "ButtonItem", {
44
+ Object.defineProperty(exports, "LinkItem", {
45
45
  enumerable: true,
46
46
  get: function get() {
47
- return _Item.ButtonItem;
47
+ return _Item.LinkItem;
48
48
  }
49
49
  });
50
- Object.defineProperty(exports, "GoBackItem", {
50
+ Object.defineProperty(exports, "LoadingItems", {
51
51
  enumerable: true,
52
52
  get: function get() {
53
- return _Item.GoBackItem;
53
+ return _LoadingItems.default;
54
54
  }
55
55
  });
56
- Object.defineProperty(exports, "LinkItem", {
56
+ Object.defineProperty(exports, "NavigationContent", {
57
57
  enumerable: true,
58
58
  get: function get() {
59
- return _Item.LinkItem;
59
+ return _NavigationContent.default;
60
60
  }
61
61
  });
62
- Object.defineProperty(exports, "CustomItem", {
62
+ Object.defineProperty(exports, "NavigationFooter", {
63
63
  enumerable: true,
64
64
  get: function get() {
65
- return _Item.CustomItem;
65
+ return _NavigationFooter.default;
66
66
  }
67
67
  });
68
- Object.defineProperty(exports, "SkeletonItem", {
68
+ Object.defineProperty(exports, "NavigationHeader", {
69
69
  enumerable: true,
70
70
  get: function get() {
71
- return _Item.SkeletonItem;
71
+ return _NavigationHeader.default;
72
72
  }
73
73
  });
74
- Object.defineProperty(exports, "Footer", {
74
+ Object.defineProperty(exports, "NestableNavigationContent", {
75
75
  enumerable: true,
76
76
  get: function get() {
77
- return _Footer.default;
77
+ return _NestableNavigationContent.default;
78
78
  }
79
79
  });
80
- Object.defineProperty(exports, "Header", {
80
+ Object.defineProperty(exports, "NestingItem", {
81
81
  enumerable: true,
82
82
  get: function get() {
83
- return _Header.default;
83
+ return _NestingItem.default;
84
84
  }
85
85
  });
86
- Object.defineProperty(exports, "NavigationHeader", {
86
+ Object.defineProperty(exports, "Section", {
87
87
  enumerable: true,
88
88
  get: function get() {
89
- return _NavigationHeader.default;
89
+ return _Section.Section;
90
90
  }
91
91
  });
92
- Object.defineProperty(exports, "NavigationFooter", {
92
+ Object.defineProperty(exports, "SideNavigation", {
93
93
  enumerable: true,
94
94
  get: function get() {
95
- return _NavigationFooter.default;
95
+ return _SideNavigation.default;
96
96
  }
97
97
  });
98
- Object.defineProperty(exports, "LoadingItems", {
98
+ Object.defineProperty(exports, "SkeletonHeadingItem", {
99
99
  enumerable: true,
100
100
  get: function get() {
101
- return _LoadingItems.default;
101
+ return _Section.SkeletonHeadingItem;
102
102
  }
103
103
  });
104
- Object.defineProperty(exports, "NestableNavigationContent", {
104
+ Object.defineProperty(exports, "SkeletonItem", {
105
105
  enumerable: true,
106
106
  get: function get() {
107
- return _NestableNavigationContent.default;
107
+ return _Item.SkeletonItem;
108
108
  }
109
109
  });
110
110
 
package/dist/cjs/index.js CHANGED
@@ -3,34 +3,34 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- Object.defineProperty(exports, "SideNavigation", {
6
+ Object.defineProperty(exports, "ButtonItem", {
7
7
  enumerable: true,
8
8
  get: function get() {
9
- return _components.SideNavigation;
9
+ return _components.ButtonItem;
10
10
  }
11
11
  });
12
- Object.defineProperty(exports, "Header", {
12
+ Object.defineProperty(exports, "CustomItem", {
13
13
  enumerable: true,
14
14
  get: function get() {
15
- return _components.Header;
15
+ return _components.CustomItem;
16
16
  }
17
17
  });
18
- Object.defineProperty(exports, "NavigationHeader", {
18
+ Object.defineProperty(exports, "Footer", {
19
19
  enumerable: true,
20
20
  get: function get() {
21
- return _components.NavigationHeader;
21
+ return _components.Footer;
22
22
  }
23
23
  });
24
- Object.defineProperty(exports, "NavigationContent", {
24
+ Object.defineProperty(exports, "GoBackItem", {
25
25
  enumerable: true,
26
26
  get: function get() {
27
- return _components.NavigationContent;
27
+ return _components.GoBackItem;
28
28
  }
29
29
  });
30
- Object.defineProperty(exports, "Section", {
30
+ Object.defineProperty(exports, "Header", {
31
31
  enumerable: true,
32
32
  get: function get() {
33
- return _components.Section;
33
+ return _components.Header;
34
34
  }
35
35
  });
36
36
  Object.defineProperty(exports, "HeadingItem", {
@@ -39,76 +39,70 @@ Object.defineProperty(exports, "HeadingItem", {
39
39
  return _components.HeadingItem;
40
40
  }
41
41
  });
42
- Object.defineProperty(exports, "SkeletonHeadingItem", {
43
- enumerable: true,
44
- get: function get() {
45
- return _components.SkeletonHeadingItem;
46
- }
47
- });
48
- Object.defineProperty(exports, "NestableNavigationContent", {
42
+ Object.defineProperty(exports, "LinkItem", {
49
43
  enumerable: true,
50
44
  get: function get() {
51
- return _components.NestableNavigationContent;
45
+ return _components.LinkItem;
52
46
  }
53
47
  });
54
- Object.defineProperty(exports, "NestingItem", {
48
+ Object.defineProperty(exports, "LoadingItems", {
55
49
  enumerable: true,
56
50
  get: function get() {
57
- return _components.NestingItem;
51
+ return _components.LoadingItems;
58
52
  }
59
53
  });
60
- Object.defineProperty(exports, "ButtonItem", {
54
+ Object.defineProperty(exports, "NavigationContent", {
61
55
  enumerable: true,
62
56
  get: function get() {
63
- return _components.ButtonItem;
57
+ return _components.NavigationContent;
64
58
  }
65
59
  });
66
- Object.defineProperty(exports, "LinkItem", {
60
+ Object.defineProperty(exports, "NavigationFooter", {
67
61
  enumerable: true,
68
62
  get: function get() {
69
- return _components.LinkItem;
63
+ return _components.NavigationFooter;
70
64
  }
71
65
  });
72
- Object.defineProperty(exports, "GoBackItem", {
66
+ Object.defineProperty(exports, "NavigationHeader", {
73
67
  enumerable: true,
74
68
  get: function get() {
75
- return _components.GoBackItem;
69
+ return _components.NavigationHeader;
76
70
  }
77
71
  });
78
- Object.defineProperty(exports, "CustomItem", {
72
+ Object.defineProperty(exports, "NestableNavigationContent", {
79
73
  enumerable: true,
80
74
  get: function get() {
81
- return _components.CustomItem;
75
+ return _components.NestableNavigationContent;
82
76
  }
83
77
  });
84
- Object.defineProperty(exports, "SkeletonItem", {
78
+ Object.defineProperty(exports, "NestingItem", {
85
79
  enumerable: true,
86
80
  get: function get() {
87
- return _components.SkeletonItem;
81
+ return _components.NestingItem;
88
82
  }
89
83
  });
90
- Object.defineProperty(exports, "Footer", {
84
+ Object.defineProperty(exports, "Section", {
91
85
  enumerable: true,
92
86
  get: function get() {
93
- return _components.Footer;
87
+ return _components.Section;
94
88
  }
95
89
  });
96
- Object.defineProperty(exports, "NavigationFooter", {
90
+ Object.defineProperty(exports, "SideNavigation", {
97
91
  enumerable: true,
98
92
  get: function get() {
99
- return _components.NavigationFooter;
93
+ return _components.SideNavigation;
100
94
  }
101
95
  });
102
- Object.defineProperty(exports, "LoadingItems", {
96
+ Object.defineProperty(exports, "SkeletonHeadingItem", {
103
97
  enumerable: true,
104
98
  get: function get() {
105
- return _components.LoadingItems;
99
+ return _components.SkeletonHeadingItem;
106
100
  }
107
101
  });
108
- Object.defineProperty(exports, "useShouldNestedElementRender", {
102
+ Object.defineProperty(exports, "SkeletonItem", {
109
103
  enumerable: true,
110
104
  get: function get() {
111
- return _context.useShouldNestedElementRender;
105
+ return _components.SkeletonItem;
112
106
  }
113
107
  });
114
108
  Object.defineProperty(exports, "VAR_SCROLL_INDICATOR_COLOR", {
@@ -123,6 +117,12 @@ Object.defineProperty(exports, "VAR_SEPARATOR_COLOR", {
123
117
  return _constants.VAR_SEPARATOR_COLOR;
124
118
  }
125
119
  });
120
+ Object.defineProperty(exports, "useShouldNestedElementRender", {
121
+ enumerable: true,
122
+ get: function get() {
123
+ return _context.useShouldNestedElementRender;
124
+ }
125
+ });
126
126
 
127
127
  var _components = require("./components");
128
128
 
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/side-navigation",
3
- "version": "1.2.0",
3
+ "version": "1.2.4",
4
4
  "sideEffects": false
5
5
  }
@@ -1,6 +1,5 @@
1
1
  import { B400, B50, N10, N30, N500 } from '@atlaskit/theme/colors';
2
2
  import { borderRadius as borderRadiusFn, gridSize as gridSizeFn } from '@atlaskit/theme/constants';
3
- import { token } from '@atlaskit/tokens';
4
3
  const gridSize = gridSizeFn();
5
4
  const borderRadius = borderRadiusFn();
6
5
  const itemIconSize = gridSize * 3;
@@ -10,6 +9,8 @@ export const ITEM_SIDE_PADDING = gridSize * 1.25;
10
9
  * Allows chaining of style functions on top of base style functions
11
10
  * @param baseStyle the base custom cssFn
12
11
  * @param newStyle a new cssFn to be applied after the base style
12
+ *
13
+ * @deprecated Please avoid using this prop as we intend to remove the prop completely in a future release. See DSP-2682 for more information.
13
14
  */
14
15
 
15
16
  export const overrideStyleFunction = (baseStyle, newStyle = () => ({})) => {
@@ -19,27 +20,27 @@ export const overrideStyleFunction = (baseStyle, newStyle = () => ({})) => {
19
20
  };
20
21
  const defaultStyles = {
21
22
  '&:hover': {
22
- color: token('color.text.mediumEmphasis', N500),
23
- backgroundColor: token('color.background.transparentNeutral.hover', N30)
23
+ color: `var(--ds-text-subtle, ${N500})`,
24
+ backgroundColor: `var(--ds-background-neutral-subtle-hovered, ${N30})`
24
25
  },
25
26
  '&:active': {
26
- color: token('color.text.mediumEmphasis', B400),
27
- backgroundColor: token('color.background.transparentNeutral.pressed', B50)
27
+ color: `var(--ds-text-subtle, ${B400})`,
28
+ backgroundColor: `var(--ds-background-neutral-subtle-pressed, ${B50})`
28
29
  }
29
30
  };
30
31
  const selectedStyles = {
31
- backgroundColor: token('color.background.selected.resting', N30),
32
- color: token('color.text.selected', B400),
32
+ backgroundColor: `var(--ds-background-brand, ${N30})`,
33
+ color: `var(--ds-text-brand, ${B400})`,
33
34
  ':visited': {
34
- color: token('color.text.selected', B400)
35
+ color: `var(--ds-text-brand, ${B400})`
35
36
  },
36
37
  '&:hover': {
37
- backgroundColor: token('color.background.selected.hover', N30),
38
- color: token('color.text.selected', N500)
38
+ backgroundColor: `var(--ds-background-brand-hovered, ${N30})`,
39
+ color: `var(--ds-text-brand, ${N500})`
39
40
  },
40
41
  '&:active': {
41
- backgroundColor: token('color.background.selected.pressed', B50),
42
- color: token('color.text.selected', B400)
42
+ backgroundColor: `var(--ds-background-brand-pressed, ${B50})`,
43
+ color: `var(--ds-text-brand, ${B400})`
43
44
  }
44
45
  };
45
46
  export const baseSideNavItemStyle = ({
@@ -54,7 +55,7 @@ export const baseSideNavItemStyle = ({
54
55
  // -- TODO: DELETE THESE COLOR OVERRIDES WHEN CLEANING UP FALLBACK THEMING --
55
56
  // Menu and side navigation are now color aligned so they do not need this!
56
57
  // See: https://product-fabric.atlassian.net/browse/DSP-1684
57
- backgroundColor: token('color.background.default', N10),
58
+ backgroundColor: `var(--ds-surface, ${N10})`,
58
59
  ...(!isDisabled && !isSelected && defaultStyles),
59
60
  ...(!isDisabled && isSelected && selectedStyles),
60
61
  // -- END TODO --------------------------------------------------------------
@@ -1,7 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import React from 'react';
3
3
  import { N500 } from '@atlaskit/theme/colors';
4
- import { token } from '@atlaskit/tokens';
5
4
  import { overrideStyleFunction } from '../../common/styles';
6
5
  import { CustomItem } from '../Item';
7
6
 
@@ -38,7 +37,7 @@ const Footer = props => {
38
37
  },
39
38
  'div&:active': {
40
39
  backgroundColor: 'transparent',
41
- color: token('color.text.mediumEmphasis', N500)
40
+ color: `var(--ds-text-subtle, ${N500})`
42
41
  }
43
42
  }), props.cssFn);
44
43
  return /*#__PURE__*/React.createElement(CustomItem, _extends({}, props, {
@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { forwardRef } from 'react';
3
3
  import { N500 } from '@atlaskit/theme/colors';
4
4
  import { headingSizes } from '@atlaskit/theme/typography';
5
- import { token } from '@atlaskit/tokens';
6
5
  import { overrideStyleFunction } from '../../common/styles';
7
6
  import { CustomItem } from '../Item';
8
7
 
@@ -17,7 +16,7 @@ const Header = /*#__PURE__*/forwardRef((props, ref) => {
17
16
  fontSize: headingSizes.h400.size,
18
17
  letterSpacing: '-0.003em',
19
18
  fontWeight: 600,
20
- color: token('color.text.highEmphasis', N500)
19
+ color: `var(--ds-text, ${N500})`
21
20
  },
22
21
  // Will look interactive if the `component` is anything other than a div.
23
22
  'div&:hover': {
@@ -26,7 +25,7 @@ const Header = /*#__PURE__*/forwardRef((props, ref) => {
26
25
  },
27
26
  'div&:active': {
28
27
  backgroundColor: 'transparent',
29
- color: token('color.text.highEmphasis', N500)
28
+ color: `var(--ds-text, ${N500})`
30
29
  }
31
30
  }), props.cssFn);
32
31
  return /*#__PURE__*/React.createElement(CustomItem, _extends({}, props, {
@@ -16,7 +16,8 @@ const ButtonItem = /*#__PURE__*/forwardRef( // Type needed on props to extract t
16
16
  return null;
17
17
  }
18
18
 
19
- const cssOverride = overrideStyleFunction(baseSideNavItemStyle, cssFn);
19
+ const cssOverride = overrideStyleFunction(baseSideNavItemStyle, cssFn); // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
20
+
20
21
  return /*#__PURE__*/React.createElement(Button, _extends({
21
22
  ref: ref,
22
23
  cssFn: cssOverride
@@ -21,7 +21,8 @@ const CustomItem = /*#__PURE__*/forwardRef( // Type needed on props to extract t
21
21
  return null;
22
22
  }
23
23
 
24
- const cssOverride = overrideStyleFunction(baseSideNavItemStyle, cssFn);
24
+ const cssOverride = overrideStyleFunction(baseSideNavItemStyle, cssFn); // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
25
+
25
26
  return /*#__PURE__*/React.createElement(Custom, _extends({
26
27
  ref: ref,
27
28
  cssFn: cssOverride
@@ -2,12 +2,11 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { forwardRef, useCallback, useState } from 'react';
3
3
  import LeftArrow from '@atlaskit/icon/glyph/arrow-left-circle';
4
4
  import { N10 } from '@atlaskit/theme/colors';
5
- import { token } from '@atlaskit/tokens';
6
5
  import ButtonItem from './button-item';
7
6
  const GoBackItem = /*#__PURE__*/forwardRef(({
8
7
  cssFn,
9
8
  iconBefore = /*#__PURE__*/React.createElement(LeftArrow, {
10
- secondaryColor: token('color.background.default', N10),
9
+ secondaryColor: `var(--ds-surface, ${N10})`,
11
10
  label: ""
12
11
  }),
13
12
  onClick,
@@ -16,7 +16,8 @@ const LinkItem = /*#__PURE__*/forwardRef( // Type needed on props to extract typ
16
16
  return null;
17
17
  }
18
18
 
19
- const cssOverride = overrideStyleFunction(baseSideNavItemStyle, cssFn);
19
+ const cssOverride = overrideStyleFunction(baseSideNavItemStyle, cssFn); // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
20
+
20
21
  return /*#__PURE__*/React.createElement(Link, _extends({
21
22
  ref: ref,
22
23
  cssFn: cssOverride
@@ -13,7 +13,8 @@ const SkeletonItem = props => {
13
13
  return null;
14
14
  }
15
15
 
16
- return /*#__PURE__*/React.createElement(SkelItem, _extends({
16
+ return /*#__PURE__*/React.createElement(SkelItem // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
17
+ , _extends({
17
18
  cssFn: () => ({
18
19
  paddingLeft: ITEM_SIDE_PADDING,
19
20
  paddingRight: ITEM_SIDE_PADDING,
@@ -1,7 +1,6 @@
1
1
  import { N10, N30 } from '@atlaskit/theme/colors';
2
2
  import { gridSize } from '@atlaskit/theme/constants';
3
3
  import { headingSizes } from '@atlaskit/theme/typography';
4
- import { token } from '@atlaskit/tokens';
5
4
  import { VAR_SCROLL_INDICATOR_COLOR, VAR_SEPARATOR_COLOR } from '../../common/constants';
6
5
  const scrollIndicatorMaskZIndex = 2;
7
6
  const scrollIndicatorZIndex = 1;
@@ -39,7 +38,7 @@ export const outerContainerCSS = opts => ({
39
38
  right: containerPadding + opts.scrollbarWidth,
40
39
  height: scrollIndicatorHeight,
41
40
  borderRadius: scrollIndicatorBorderRadius,
42
- backgroundColor: `var(${VAR_SEPARATOR_COLOR}, ${token('color.border.neutral', N30)})`,
41
+ backgroundColor: `var(${VAR_SEPARATOR_COLOR}, ${`var(--ds-border, ${N30})`})`,
43
42
  position: 'absolute',
44
43
  zIndex: scrollIndicatorZIndex
45
44
  },
@@ -54,7 +53,7 @@ export const outerContainerCSS = opts => ({
54
53
  right: containerPadding + opts.scrollbarWidth,
55
54
  bottom: 0,
56
55
  zIndex: scrollIndicatorZIndex,
57
- backgroundColor: `var(${VAR_SEPARATOR_COLOR}, ${token('color.border.neutral', N30)})`
56
+ backgroundColor: `var(${VAR_SEPARATOR_COLOR}, ${`var(--ds-border, ${N30})`})`
58
57
  }
59
58
  });
60
59
  /**
@@ -79,7 +78,7 @@ export const innerContainerCSS = opts => ({
79
78
  left: 0,
80
79
  right: 0,
81
80
  height: scrollIndicatorHeight,
82
- backgroundColor: `var(${VAR_SCROLL_INDICATOR_COLOR}, ${token('color.background.default', N10)})`,
81
+ backgroundColor: `var(${VAR_SCROLL_INDICATOR_COLOR}, ${`var(--ds-surface, ${N10})`})`,
83
82
  position: 'absolute',
84
83
  display: 'block',
85
84
  zIndex: scrollIndicatorMaskZIndex
@@ -97,7 +96,7 @@ export const innerContainerCSS = opts => ({
97
96
  marginTop: 'auto',
98
97
  position: 'relative',
99
98
  zIndex: scrollIndicatorMaskZIndex,
100
- backgroundColor: `var(${VAR_SCROLL_INDICATOR_COLOR}, ${token('color.background.default', N10)})`
99
+ backgroundColor: `var(${VAR_SCROLL_INDICATOR_COLOR}, ${`var(--ds-surface, ${N10})`})`
101
100
  }
102
101
  });
103
102
  export const containerCSS = opts => ({
@@ -6,7 +6,6 @@ import { jsx } from '@emotion/core';
6
6
  import RightArrow from '@atlaskit/icon/glyph/arrow-right-circle';
7
7
  import { N10 } from '@atlaskit/theme/colors';
8
8
  import { gridSize } from '@atlaskit/theme/constants';
9
- import { token } from '@atlaskit/tokens';
10
9
  import { overrideStyleFunction } from '../../common/styles';
11
10
  import { ButtonItem, CustomItem, NavigationContent } from '../index';
12
11
  import { ROOT_ID } from '../NestableNavigationContent';
@@ -104,7 +103,7 @@ const NestingItem = props => {
104
103
  "data-right-arrow": true
105
104
  }, jsx(RightArrow, {
106
105
  testId: testId && `${testId}--item--right-arrow`,
107
- secondaryColor: token('color.background.default', N10),
106
+ secondaryColor: `var(--ds-surface, ${N10})`,
108
107
  label: ""
109
108
  }))),
110
109
  onClick: onClickHandler,
@@ -13,7 +13,8 @@ const HeadingItem = props => {
13
13
  return null;
14
14
  }
15
15
 
16
- const cssFn = overrideStyleFunction(sectionHeaderStyle, props.cssFn);
16
+ const cssFn = overrideStyleFunction(sectionHeaderStyle, props.cssFn); // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
17
+
17
18
  return /*#__PURE__*/React.createElement(MenuHeadingItem, _extends({}, props, {
18
19
  cssFn: cssFn
19
20
  }));
@@ -14,7 +14,8 @@ const Section = /*#__PURE__*/forwardRef((props, ref) => {
14
14
  }
15
15
 
16
16
  return /*#__PURE__*/React.createElement(MenuSection, _extends({}, props, {
17
- ref: ref,
17
+ ref: ref // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
18
+ ,
18
19
  overrides: {
19
20
  HeadingItem: {
20
21
  cssFn: sectionHeaderStyle
@@ -13,7 +13,8 @@ const SkeletonHeadingItem = props => {
13
13
  return null;
14
14
  }
15
15
 
16
- return /*#__PURE__*/React.createElement(MenuSkeletonHeadingItem, _extends({
16
+ return /*#__PURE__*/React.createElement(MenuSkeletonHeadingItem // eslint-disable-next-line @atlaskit/design-system/no-deprecated-apis
17
+ , _extends({
17
18
  cssFn: () => ({
18
19
  paddingLeft: ITEM_SIDE_PADDING,
19
20
  paddingRight: ITEM_SIDE_PADDING
@@ -3,7 +3,6 @@ import { forwardRef } from 'react';
3
3
  import { jsx } from '@emotion/core';
4
4
  import { N10, N500 } from '@atlaskit/theme/colors';
5
5
  import { gridSize } from '@atlaskit/theme/constants';
6
- import { token } from '@atlaskit/tokens';
7
6
  const SideNavigation = /*#__PURE__*/forwardRef((props, ref) => {
8
7
  const {
9
8
  children,
@@ -17,9 +16,9 @@ const SideNavigation = /*#__PURE__*/forwardRef((props, ref) => {
17
16
  css: {
18
17
  width: '100%',
19
18
  height: '100%',
20
- color: token('color.text.mediumEmphasis', N500),
19
+ color: `var(--ds-text-subtle, ${N500})`,
21
20
  minWidth: gridSize() * 30,
22
- backgroundColor: token('color.background.default', N10),
21
+ backgroundColor: `var(--ds-surface, ${N10})`,
23
22
  position: 'relative',
24
23
  display: 'flex',
25
24
  flexDirection: 'column',
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/side-navigation",
3
- "version": "1.2.0",
3
+ "version": "1.2.4",
4
4
  "sideEffects": false
5
5
  }