@atlaskit/page-layout 1.0.7 → 1.1.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,15 @@
1
1
  # @atlaskit/page-layout
2
2
 
3
+ ## 1.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`567a96da90e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/567a96da90e) - [ux] Instrumented page-layout with the new theming package, `@atlaskit/tokens`. New tokens will be visible only in applications configured to use the new Tokens API (currently in alpha).These changes are intended to be interoperable with the legacy theme implementation. Legacy dark mode users should expect no visual or breaking changes.
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies
12
+
3
13
  ## 1.0.7
4
14
 
5
15
  ### Patch Changes
@@ -2,6 +2,8 @@
2
2
 
3
3
  import { css, jsx } from '@emotion/core';
4
4
 
5
+ import { token } from '@atlaskit/tokens';
6
+
5
7
  import {
6
8
  Content,
7
9
  LeftSidebar,
@@ -33,7 +35,7 @@ const Wrapper = ({
33
35
  boxSizing: 'border-box',
34
36
  overflowY: 'auto',
35
37
  overflowX: noHorizontalScrollbar ? 'hidden' : 'auto',
36
- backgroundColor: 'white',
38
+ backgroundColor: token('color.background.neutral.subtle', 'white'),
37
39
  }}
38
40
  >
39
41
  {children}
@@ -61,7 +63,7 @@ const BasicGrid = () => {
61
63
  </div>
62
64
  </LeftSidebar>
63
65
  <Main>
64
- <Wrapper noOutline borderColor="black">
66
+ <Wrapper noOutline borderColor={token('color.border', 'black')}>
65
67
  <h3 css={{ textAlign: 'center' }}>Main</h3>
66
68
  </Wrapper>
67
69
  </Main>
@@ -1,11 +1,15 @@
1
1
  import React from 'react';
2
2
 
3
3
  import { Create } from '@atlaskit/atlassian-navigation';
4
+ import { token } from '@atlaskit/tokens';
4
5
 
5
6
  const StyledTooltip = () => (
6
7
  <span>
7
8
  Create
8
- <span style={{ color: 'orange' }}> [c]</span>
9
+ <span style={{ color: token('color.text.accent.orange', 'orange') }}>
10
+ {' '}
11
+ [c]
12
+ </span>
9
13
  </span>
10
14
  );
11
15
 
@@ -6,6 +6,7 @@ import { jsx } from '@emotion/core';
6
6
  import { CustomItemComponentProps } from '@atlaskit/menu';
7
7
  import { Footer } from '@atlaskit/side-navigation';
8
8
  import { B400, N200 } from '@atlaskit/theme/colors';
9
+ import { token } from '@atlaskit/tokens';
9
10
 
10
11
  const Container: React.FC<CustomItemComponentProps> = (props) => {
11
12
  return <div {...props} />;
@@ -16,9 +17,9 @@ const Container: React.FC<CustomItemComponentProps> = (props) => {
16
17
  const ExampleFooter = () => {
17
18
  const linkCSS = {
18
19
  fontSize: 12,
19
- color: N200,
20
+ color: token('color.text.subtle', N200),
20
21
  '&:hover': {
21
- color: B400,
22
+ color: token('color.background.brand.hovered', B400),
22
23
  textDecoration: 'none',
23
24
  cursor: 'pointer',
24
25
  },
@@ -29,11 +29,11 @@ var resizeControlCSS = function resizeControlCSS(setIsGrabAreaFocused, isLeftSid
29
29
  position: 'absolute',
30
30
  outline: 'none'
31
31
  }, (0, _defineProperty2.default)(_ref, "[".concat(_constants.GRAB_AREA_SELECTOR, "]:enabled"), (_$concat = {}, (0, _defineProperty2.default)(_$concat, "&:hover [".concat(_constants.GRAB_AREA_LINE_SELECTOR, "]"), {
32
- backgroundColor: _colors.B100
32
+ backgroundColor: "var(--ds-background-brand-bold-hovered, ".concat(_colors.B100, ")")
33
33
  }), (0, _defineProperty2.default)(_$concat, "&:active [".concat(_constants.GRAB_AREA_LINE_SELECTOR, "] , &:focus [").concat(_constants.GRAB_AREA_LINE_SELECTOR, "]"), {
34
- backgroundColor: _colors.B200
34
+ backgroundColor: "var(--ds-background-brand-bold-pressed, ".concat(_colors.B200, ")")
35
35
  }), (0, _defineProperty2.default)(_$concat, "&:hover [".concat(_constants.RESIZE_BUTTON_SELECTOR, "]:not(:focus):not(:hover)"), {
36
- color: _colors.B100
36
+ backgroundColor: "var(--ds-background-brand-bold-hovered, ".concat(_colors.B100, ")")
37
37
  }), (0, _defineProperty2.default)(_$concat, "&:hover [".concat(_constants.RESIZE_BUTTON_SELECTOR, "]"), {
38
38
  opacity: 1
39
39
  }), _$concat)), (0, _defineProperty2.default)(_ref, "[".concat(_constants.RESIZE_BUTTON_SELECTOR, "]"), {
@@ -45,15 +45,17 @@ exports.resizeControlCSS = resizeControlCSS;
45
45
 
46
46
  var resizeIconButtonCSS = function resizeIconButtonCSS(isCollapsed) {
47
47
  return _objectSpread(_objectSpread({
48
- backgroundColor: _colors.N0,
48
+ backgroundColor: "var(--ds-surface-overlay, ".concat(_colors.N0, ")"),
49
49
  position: 'absolute',
50
50
  top: 32,
51
51
  left: 0,
52
52
  transform: 'translateX(-50%)',
53
53
  border: 0,
54
54
  borderRadius: '50%',
55
+ // TODO https://product-fabric.atlassian.net/browse/DSP-3392
56
+ // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
55
57
  boxShadow: "0 0 0 1px ".concat(_colors.N30A, ", 0 2px 4px 1px ").concat(_colors.N30A),
56
- color: _colors.N200,
58
+ color: "var(--ds-text-subtle, ".concat(_colors.N200, ")"),
57
59
  cursor: 'pointer',
58
60
  height: 24,
59
61
  opacity: 0,
@@ -62,18 +64,18 @@ var resizeIconButtonCSS = function resizeIconButtonCSS(isCollapsed) {
62
64
  transition: "\n background-color ".concat(_motion.smallDurationMs, "ms linear,\n color ").concat(_motion.smallDurationMs, "ms linear,\n opacity ").concat(_motion.mediumDurationMs, "ms ").concat(_motion.easeOut, "\n "),
63
65
  width: 24,
64
66
  ':hover': {
65
- backgroundColor: _colors.B100,
66
- color: _colors.N0,
67
+ backgroundColor: "var(--ds-background-brand-hovered, ".concat(_colors.B100, ")"),
68
+ color: "var(--ds-text-inverse, ".concat(_colors.N0, ")"),
67
69
  opacity: 1
68
70
  },
69
71
  ':active': {
70
- backgroundColor: _colors.B200,
71
- color: _colors.N0,
72
+ backgroundColor: "var(--ds-background-brand-pressed, ".concat(_colors.B200, ")"),
73
+ color: "var(--ds-text-inverse, ".concat(_colors.N0, ")"),
72
74
  opacity: 1
73
75
  },
74
76
  ':focus': {
75
- backgroundColor: _colors.B200,
76
- color: _colors.N0,
77
+ backgroundColor: "var(--ds-background-brand-pressed, ".concat(_colors.B200, ")"),
78
+ color: "var(--ds-text-inverse, ".concat(_colors.N0, ")"),
77
79
  opacity: 1
78
80
  }
79
81
  }, !isCollapsed && {
@@ -22,10 +22,10 @@ var skipLinkStyles = _objectSpread(_objectSpread({
22
22
  left: -999999,
23
23
  position: 'fixed',
24
24
  opacity: 0,
25
- background: 'white',
25
+ background: "var(--ds-surface-overlay, white)",
26
26
  border: 'none',
27
27
  padding: '0.8rem 1rem',
28
- boxShadow: "0 0 0 1px ".concat(_colors.N30A, ", 0 2px 10px ").concat(_colors.N30A, ", 0 0 20px -4px ").concat(_colors.N60A),
28
+ boxShadow: "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(_colors.N30A, ", 0 2px 10px ").concat(_colors.N30A, ", 0 0 20px -4px ").concat(_colors.N60A), ")"),
29
29
  borderRadius: '3px',
30
30
  margin: 10
31
31
  }, (0, _motion.prefersReducedMotion)()), {}, {
@@ -33,11 +33,11 @@ var focusStyles = {
33
33
  outline: 'none',
34
34
  '& [data-wrapper-element]': {
35
35
  outline: 'none',
36
- boxShadow: '0px 0px 0px 2px inset #4C9AFF'
36
+ boxShadow: "0px 0px 0px 2px inset ".concat("var(--ds-border-focused, #4C9AFF)")
37
37
  },
38
38
  '& > div:not([data-skip-link-wrapper])': {
39
39
  outline: 'none',
40
- boxShadow: '0px 0px 0px 2px inset #4C9AFF'
40
+ boxShadow: "0px 0px 0px 2px inset ".concat("var(--ds-border-focused, #4C9AFF)")
41
41
  }
42
42
  }
43
43
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/page-layout",
3
- "version": "1.0.7",
3
+ "version": "1.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -7,15 +7,16 @@ export const resizeControlCSS = (setIsGrabAreaFocused, isLeftSidebarCollapsed) =
7
7
  bottom: 0,
8
8
  position: 'absolute',
9
9
  outline: 'none',
10
+ // TODO https://product-fabric.atlassian.net/browse/DSP-3392
10
11
  [`[${GRAB_AREA_SELECTOR}]:enabled`]: {
11
12
  [`&:hover [${GRAB_AREA_LINE_SELECTOR}]`]: {
12
- backgroundColor: B100
13
+ backgroundColor: `var(--ds-background-brand-bold-hovered, ${B100})`
13
14
  },
14
15
  [`&:active [${GRAB_AREA_LINE_SELECTOR}] , &:focus [${GRAB_AREA_LINE_SELECTOR}]`]: {
15
- backgroundColor: B200
16
+ backgroundColor: `var(--ds-background-brand-bold-pressed, ${B200})`
16
17
  },
17
18
  [`&:hover [${RESIZE_BUTTON_SELECTOR}]:not(:focus):not(:hover)`]: {
18
- color: B100
19
+ backgroundColor: `var(--ds-background-brand-bold-hovered, ${B100})`
19
20
  },
20
21
  [`&:hover [${RESIZE_BUTTON_SELECTOR}]`]: {
21
22
  opacity: 1
@@ -26,15 +27,17 @@ export const resizeControlCSS = (setIsGrabAreaFocused, isLeftSidebarCollapsed) =
26
27
  }
27
28
  });
28
29
  export const resizeIconButtonCSS = isCollapsed => ({
29
- backgroundColor: N0,
30
+ backgroundColor: `var(--ds-surface-overlay, ${N0})`,
30
31
  position: 'absolute',
31
32
  top: 32,
32
33
  left: 0,
33
34
  transform: 'translateX(-50%)',
34
35
  border: 0,
35
36
  borderRadius: '50%',
37
+ // TODO https://product-fabric.atlassian.net/browse/DSP-3392
38
+ // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
36
39
  boxShadow: `0 0 0 1px ${N30A}, 0 2px 4px 1px ${N30A}`,
37
- color: N200,
40
+ color: `var(--ds-text-subtle, ${N200})`,
38
41
  cursor: 'pointer',
39
42
  height: 24,
40
43
  opacity: 0,
@@ -47,18 +50,18 @@ export const resizeIconButtonCSS = isCollapsed => ({
47
50
  `,
48
51
  width: 24,
49
52
  ':hover': {
50
- backgroundColor: B100,
51
- color: N0,
53
+ backgroundColor: `var(--ds-background-brand-hovered, ${B100})`,
54
+ color: `var(--ds-text-inverse, ${N0})`,
52
55
  opacity: 1
53
56
  },
54
57
  ':active': {
55
- backgroundColor: B200,
56
- color: N0,
58
+ backgroundColor: `var(--ds-background-brand-pressed, ${B200})`,
59
+ color: `var(--ds-text-inverse, ${N0})`,
57
60
  opacity: 1
58
61
  },
59
62
  ':focus': {
60
- backgroundColor: B200,
61
- color: N0,
63
+ backgroundColor: `var(--ds-background-brand-pressed, ${B200})`,
64
+ color: `var(--ds-text-inverse, ${N0})`,
62
65
  opacity: 1
63
66
  },
64
67
  ...(!isCollapsed && {
@@ -5,10 +5,10 @@ export const skipLinkStyles = {
5
5
  left: -999999,
6
6
  position: 'fixed',
7
7
  opacity: 0,
8
- background: 'white',
8
+ background: "var(--ds-surface-overlay, white)",
9
9
  border: 'none',
10
10
  padding: '0.8rem 1rem',
11
- boxShadow: `0 0 0 1px ${N30A}, 0 2px 10px ${N30A}, 0 0 20px -4px ${N60A}`,
11
+ boxShadow: `var(--ds-shadow-overlay, ${`0 0 0 1px ${N30A}, 0 2px 10px ${N30A}, 0 0 20px -4px ${N60A}`})`,
12
12
  borderRadius: '3px',
13
13
  margin: 10,
14
14
 
@@ -29,11 +29,11 @@ export const focusStyles = {
29
29
  outline: 'none',
30
30
  '& [data-wrapper-element]': {
31
31
  outline: 'none',
32
- boxShadow: '0px 0px 0px 2px inset #4C9AFF'
32
+ boxShadow: `0px 0px 0px 2px inset ${"var(--ds-border-focused, #4C9AFF)"}`
33
33
  },
34
34
  '& > div:not([data-skip-link-wrapper])': {
35
35
  outline: 'none',
36
- boxShadow: '0px 0px 0px 2px inset #4C9AFF'
36
+ boxShadow: `0px 0px 0px 2px inset ${"var(--ds-border-focused, #4C9AFF)"}`
37
37
  }
38
38
  }
39
39
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/page-layout",
3
- "version": "1.0.7",
3
+ "version": "1.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -17,11 +17,11 @@ export var resizeControlCSS = function resizeControlCSS(setIsGrabAreaFocused, is
17
17
  position: 'absolute',
18
18
  outline: 'none'
19
19
  }, _defineProperty(_ref, "[".concat(GRAB_AREA_SELECTOR, "]:enabled"), (_$concat = {}, _defineProperty(_$concat, "&:hover [".concat(GRAB_AREA_LINE_SELECTOR, "]"), {
20
- backgroundColor: B100
20
+ backgroundColor: "var(--ds-background-brand-bold-hovered, ".concat(B100, ")")
21
21
  }), _defineProperty(_$concat, "&:active [".concat(GRAB_AREA_LINE_SELECTOR, "] , &:focus [").concat(GRAB_AREA_LINE_SELECTOR, "]"), {
22
- backgroundColor: B200
22
+ backgroundColor: "var(--ds-background-brand-bold-pressed, ".concat(B200, ")")
23
23
  }), _defineProperty(_$concat, "&:hover [".concat(RESIZE_BUTTON_SELECTOR, "]:not(:focus):not(:hover)"), {
24
- color: B100
24
+ backgroundColor: "var(--ds-background-brand-bold-hovered, ".concat(B100, ")")
25
25
  }), _defineProperty(_$concat, "&:hover [".concat(RESIZE_BUTTON_SELECTOR, "]"), {
26
26
  opacity: 1
27
27
  }), _$concat)), _defineProperty(_ref, "[".concat(RESIZE_BUTTON_SELECTOR, "]"), {
@@ -30,15 +30,17 @@ export var resizeControlCSS = function resizeControlCSS(setIsGrabAreaFocused, is
30
30
  };
31
31
  export var resizeIconButtonCSS = function resizeIconButtonCSS(isCollapsed) {
32
32
  return _objectSpread(_objectSpread({
33
- backgroundColor: N0,
33
+ backgroundColor: "var(--ds-surface-overlay, ".concat(N0, ")"),
34
34
  position: 'absolute',
35
35
  top: 32,
36
36
  left: 0,
37
37
  transform: 'translateX(-50%)',
38
38
  border: 0,
39
39
  borderRadius: '50%',
40
+ // TODO https://product-fabric.atlassian.net/browse/DSP-3392
41
+ // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
40
42
  boxShadow: "0 0 0 1px ".concat(N30A, ", 0 2px 4px 1px ").concat(N30A),
41
- color: N200,
43
+ color: "var(--ds-text-subtle, ".concat(N200, ")"),
42
44
  cursor: 'pointer',
43
45
  height: 24,
44
46
  opacity: 0,
@@ -47,18 +49,18 @@ export var resizeIconButtonCSS = function resizeIconButtonCSS(isCollapsed) {
47
49
  transition: "\n background-color ".concat(smallDurationMs, "ms linear,\n color ").concat(smallDurationMs, "ms linear,\n opacity ").concat(mediumDurationMs, "ms ").concat(easeOut, "\n "),
48
50
  width: 24,
49
51
  ':hover': {
50
- backgroundColor: B100,
51
- color: N0,
52
+ backgroundColor: "var(--ds-background-brand-hovered, ".concat(B100, ")"),
53
+ color: "var(--ds-text-inverse, ".concat(N0, ")"),
52
54
  opacity: 1
53
55
  },
54
56
  ':active': {
55
- backgroundColor: B200,
56
- color: N0,
57
+ backgroundColor: "var(--ds-background-brand-pressed, ".concat(B200, ")"),
58
+ color: "var(--ds-text-inverse, ".concat(N0, ")"),
57
59
  opacity: 1
58
60
  },
59
61
  ':focus': {
60
- backgroundColor: B200,
61
- color: N0,
62
+ backgroundColor: "var(--ds-background-brand-pressed, ".concat(B200, ")"),
63
+ color: "var(--ds-text-inverse, ".concat(N0, ")"),
62
64
  opacity: 1
63
65
  }
64
66
  }, !isCollapsed && {
@@ -11,10 +11,10 @@ export var skipLinkStyles = _objectSpread(_objectSpread({
11
11
  left: -999999,
12
12
  position: 'fixed',
13
13
  opacity: 0,
14
- background: 'white',
14
+ background: "var(--ds-surface-overlay, white)",
15
15
  border: 'none',
16
16
  padding: '0.8rem 1rem',
17
- boxShadow: "0 0 0 1px ".concat(N30A, ", 0 2px 10px ").concat(N30A, ", 0 0 20px -4px ").concat(N60A),
17
+ boxShadow: "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(N30A, ", 0 2px 10px ").concat(N30A, ", 0 0 20px -4px ").concat(N60A), ")"),
18
18
  borderRadius: '3px',
19
19
  margin: 10
20
20
  }, prefersReducedMotion()), {}, {
@@ -18,11 +18,11 @@ export var focusStyles = {
18
18
  outline: 'none',
19
19
  '& [data-wrapper-element]': {
20
20
  outline: 'none',
21
- boxShadow: '0px 0px 0px 2px inset #4C9AFF'
21
+ boxShadow: "0px 0px 0px 2px inset ".concat("var(--ds-border-focused, #4C9AFF)")
22
22
  },
23
23
  '& > div:not([data-skip-link-wrapper])': {
24
24
  outline: 'none',
25
- boxShadow: '0px 0px 0px 2px inset #4C9AFF'
25
+ boxShadow: "0px 0px 0px 2px inset ".concat("var(--ds-border-focused, #4C9AFF)")
26
26
  }
27
27
  }
28
28
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/page-layout",
3
- "version": "1.0.7",
3
+ "version": "1.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,6 +1,6 @@
1
1
  import { CSSObject } from '@emotion/core';
2
- export declare const gridStyles: import("@emotion/core").SerializedStyles;
3
- export declare const contentStyles: import("@emotion/core").SerializedStyles;
2
+ export declare const gridStyles: import("@emotion/utils").SerializedStyles;
3
+ export declare const contentStyles: import("@emotion/utils").SerializedStyles;
4
4
  export declare const focusStyles: {
5
5
  '&:focus': {
6
6
  outline: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/page-layout",
3
- "version": "1.0.7",
3
+ "version": "1.1.0",
4
4
  "description": "A collection of components which let you compose an application's page layout",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -26,6 +26,7 @@
26
26
  "@atlaskit/icon": "^21.10.0",
27
27
  "@atlaskit/motion": "^1.0.0",
28
28
  "@atlaskit/theme": "^12.1.0",
29
+ "@atlaskit/tokens": "^0.7.0",
29
30
  "@babel/runtime": "^7.0.0",
30
31
  "@emotion/core": "^10.0.9",
31
32
  "raf-schd": "^4.0.3"
@@ -35,14 +36,14 @@
35
36
  "react-dom": "^16.8.0"
36
37
  },
37
38
  "devDependencies": {
38
- "@atlaskit/atlassian-navigation": "^2.0.0",
39
+ "@atlaskit/atlassian-navigation": "^2.1.0",
39
40
  "@atlaskit/atlassian-notifications": "^0.3.0",
40
- "@atlaskit/button": "^16.0.0",
41
+ "@atlaskit/button": "^16.2.0",
41
42
  "@atlaskit/docs": "*",
42
43
  "@atlaskit/drawer": "^7.1.0",
43
44
  "@atlaskit/icon": "*",
44
45
  "@atlaskit/logo": "^13.0.0",
45
- "@atlaskit/menu": "^1.2.0",
46
+ "@atlaskit/menu": "^1.3.0",
46
47
  "@atlaskit/notification-indicator": "^9.0.0",
47
48
  "@atlaskit/notification-log-client": "^6.0.0",
48
49
  "@atlaskit/onboarding": "^10.3.0",
@@ -79,7 +80,8 @@
79
80
  "analytics-next"
80
81
  ],
81
82
  "theming": [
82
- "react-context"
83
+ "react-context",
84
+ "tokens"
83
85
  ],
84
86
  "deprecation": "no-deprecated-imports",
85
87
  "styling": [