@sproutsocial/racine 7.7.0-beta-collapsible.0 → 8.0.0-beta-dark-mode.3

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 (179) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/__flow__/Badge/styles.js +1 -1
  3. package/__flow__/Banner/index.js +2 -1
  4. package/__flow__/Banner/styles.js +9 -6
  5. package/__flow__/Box/index.stories.js +3 -3
  6. package/__flow__/Box/styles.js +9 -9
  7. package/__flow__/Button/__snapshots__/index.test.js.snap +4 -4
  8. package/__flow__/Button/index.js +7 -2
  9. package/__flow__/Button/index.stories.js +6 -1
  10. package/__flow__/Button/styles.js +17 -12
  11. package/__flow__/Card/index.js +2 -2
  12. package/__flow__/CharacterCounter/styles.js +1 -1
  13. package/__flow__/ChartLegend/styles.js +6 -6
  14. package/__flow__/Checkbox/styles.js +18 -16
  15. package/__flow__/Collapsible/index.js +6 -24
  16. package/__flow__/Collapsible/index.stories.js +11 -82
  17. package/__flow__/Collapsible/styles.js +2 -28
  18. package/__flow__/DatePicker/styles.js +14 -12
  19. package/__flow__/Drawer/styles.js +1 -1
  20. package/__flow__/FormField/index.js +1 -1
  21. package/__flow__/Icon/index.stories.js +24 -6
  22. package/__flow__/Input/styles.js +6 -6
  23. package/__flow__/KeyboardKey/styles.js +2 -2
  24. package/__flow__/Link/styles.js +3 -5
  25. package/__flow__/Listbox/__snapshots__/index.test.js.snap +8 -2
  26. package/__flow__/Listbox/index.js +4 -4
  27. package/__flow__/Menu/__snapshots__/index.test.js.snap +5 -2
  28. package/__flow__/Menu/index.js +7 -2
  29. package/__flow__/Menu/styles.js +6 -3
  30. package/__flow__/Message/index.js +2 -2
  31. package/__flow__/Message/index.stories.js +1 -1
  32. package/__flow__/Modal/index.js +1 -1
  33. package/__flow__/Modal/index.stories.js +14 -8
  34. package/__flow__/Modal/styles.js +2 -2
  35. package/__flow__/Numeral/styles.js +2 -1
  36. package/__flow__/OverflowList/index.stories.js +15 -8
  37. package/__flow__/Popout/index.js +3 -3
  38. package/__flow__/Radio/styles.js +8 -8
  39. package/__flow__/SegmentedControl/styles.js +9 -5
  40. package/__flow__/Select/styles.js +5 -5
  41. package/__flow__/Skeleton/index.js +4 -4
  42. package/__flow__/Skeleton/index.stories.js +1 -1
  43. package/__flow__/Stack/index.js +1 -1
  44. package/__flow__/Stack/index.stories.js +3 -1
  45. package/__flow__/Switch/styles.js +13 -11
  46. package/__flow__/Table/styles.js +2 -1
  47. package/__flow__/TableCell/index.stories.js +2 -0
  48. package/__flow__/TableHeaderCell/index.stories.js +3 -0
  49. package/__flow__/TableRowAccordion/styles.js +2 -1
  50. package/__flow__/Tabs/styles.js +5 -5
  51. package/__flow__/Textarea/styles.js +5 -5
  52. package/__flow__/ThemeProvider/index.js +2 -2
  53. package/__flow__/Toast/index.js +1 -1
  54. package/__flow__/Toast/styles.js +3 -3
  55. package/__flow__/Token/styles.js +19 -8
  56. package/__flow__/TokenInput/index.js +2 -1
  57. package/__flow__/TokenInput/styles.js +14 -6
  58. package/__flow__/Tooltip/index.js +2 -2
  59. package/__flow__/index.js +2 -2
  60. package/__flow__/themes/dark/decorative-palettes.js +43 -0
  61. package/__flow__/themes/dark/theme.js +195 -0
  62. package/__flow__/themes/default/decorative-palettes.js +43 -0
  63. package/__flow__/themes/default/literal-colors.js +160 -0
  64. package/__flow__/themes/default/theme.js +336 -0
  65. package/__flow__/types/system-props.flow.js +2 -2
  66. package/__flow__/types/theme.colors.flow.js +244 -0
  67. package/__flow__/types/theme.flow.js +38 -213
  68. package/__flow__/utils/mixins.js +4 -3
  69. package/__flow__/utils/responsiveProps/index.js +1 -1
  70. package/commonjs/Badge/styles.js +1 -1
  71. package/commonjs/Banner/index.js +3 -2
  72. package/commonjs/Banner/styles.js +1 -1
  73. package/commonjs/Button/index.js +5 -3
  74. package/commonjs/Button/styles.js +12 -11
  75. package/commonjs/Card/index.js +2 -2
  76. package/commonjs/CharacterCounter/styles.js +1 -1
  77. package/commonjs/Checkbox/styles.js +7 -7
  78. package/commonjs/Collapsible/index.js +6 -15
  79. package/commonjs/Collapsible/styles.js +1 -8
  80. package/commonjs/DatePicker/styles.js +13 -11
  81. package/commonjs/Drawer/styles.js +1 -1
  82. package/commonjs/FormField/index.js +1 -1
  83. package/commonjs/Input/styles.js +6 -6
  84. package/commonjs/KeyboardKey/styles.js +2 -2
  85. package/commonjs/Link/styles.js +4 -8
  86. package/commonjs/Listbox/index.js +4 -4
  87. package/commonjs/Menu/index.js +2 -2
  88. package/commonjs/Menu/styles.js +10 -4
  89. package/commonjs/Message/index.js +2 -2
  90. package/commonjs/Modal/index.js +1 -1
  91. package/commonjs/Modal/styles.js +2 -2
  92. package/commonjs/Numeral/styles.js +1 -1
  93. package/commonjs/Popout/index.js +2 -2
  94. package/commonjs/Radio/styles.js +4 -4
  95. package/commonjs/SegmentedControl/styles.js +5 -5
  96. package/commonjs/Select/styles.js +5 -5
  97. package/commonjs/Skeleton/index.js +2 -2
  98. package/commonjs/Switch/styles.js +7 -7
  99. package/commonjs/Table/styles.js +1 -1
  100. package/commonjs/TableRowAccordion/styles.js +1 -1
  101. package/commonjs/Tabs/styles.js +5 -5
  102. package/commonjs/Textarea/styles.js +5 -5
  103. package/commonjs/ThemeProvider/index.js +1 -1
  104. package/commonjs/Toast/index.js +1 -1
  105. package/commonjs/Toast/styles.js +3 -3
  106. package/commonjs/Token/styles.js +18 -10
  107. package/commonjs/TokenInput/index.js +38 -35
  108. package/commonjs/TokenInput/styles.js +9 -7
  109. package/commonjs/Tooltip/index.js +2 -2
  110. package/commonjs/index.js +3 -3
  111. package/commonjs/themes/dark/decorative-palettes.js +51 -0
  112. package/commonjs/themes/dark/theme.js +195 -0
  113. package/commonjs/themes/default/decorative-palettes.js +51 -0
  114. package/commonjs/themes/default/literal-colors.js +165 -0
  115. package/commonjs/themes/default/theme.js +334 -0
  116. package/commonjs/types/theme.colors.flow.js +5 -0
  117. package/commonjs/types/theme.flow.js +1 -5
  118. package/commonjs/utils/mixins.js +2 -2
  119. package/commonjs/utils/responsiveProps/index.js +1 -1
  120. package/lib/Badge/styles.js +1 -1
  121. package/lib/Banner/index.js +3 -2
  122. package/lib/Banner/styles.js +1 -1
  123. package/lib/Button/index.js +5 -3
  124. package/lib/Button/styles.js +11 -11
  125. package/lib/Card/index.js +2 -2
  126. package/lib/CharacterCounter/styles.js +1 -1
  127. package/lib/Checkbox/styles.js +7 -7
  128. package/lib/Collapsible/index.js +6 -15
  129. package/lib/Collapsible/styles.js +1 -8
  130. package/lib/DatePicker/styles.js +12 -11
  131. package/lib/Drawer/styles.js +1 -1
  132. package/lib/FormField/index.js +1 -1
  133. package/lib/Input/styles.js +6 -6
  134. package/lib/KeyboardKey/styles.js +2 -2
  135. package/lib/Link/styles.js +4 -8
  136. package/lib/Listbox/index.js +4 -4
  137. package/lib/Menu/index.js +2 -2
  138. package/lib/Menu/styles.js +10 -4
  139. package/lib/Message/index.js +2 -2
  140. package/lib/Modal/index.js +1 -1
  141. package/lib/Modal/styles.js +2 -2
  142. package/lib/Numeral/styles.js +1 -1
  143. package/lib/Popout/index.js +2 -2
  144. package/lib/Radio/styles.js +4 -4
  145. package/lib/SegmentedControl/styles.js +5 -5
  146. package/lib/Select/styles.js +5 -5
  147. package/lib/Skeleton/index.js +2 -2
  148. package/lib/Switch/styles.js +7 -7
  149. package/lib/Table/styles.js +1 -1
  150. package/lib/TableRowAccordion/styles.js +1 -1
  151. package/lib/Tabs/styles.js +5 -5
  152. package/lib/Textarea/styles.js +5 -5
  153. package/lib/ThemeProvider/index.js +1 -1
  154. package/lib/Toast/index.js +1 -1
  155. package/lib/Toast/styles.js +3 -3
  156. package/lib/Token/styles.js +18 -10
  157. package/lib/TokenInput/index.js +38 -35
  158. package/lib/TokenInput/styles.js +9 -7
  159. package/lib/Tooltip/index.js +2 -2
  160. package/lib/index.js +2 -2
  161. package/lib/themes/dark/decorative-palettes.js +36 -0
  162. package/lib/themes/dark/theme.js +185 -0
  163. package/lib/themes/default/decorative-palettes.js +36 -0
  164. package/lib/themes/default/literal-colors.js +156 -0
  165. package/lib/themes/default/theme.js +306 -0
  166. package/lib/types/theme.colors.flow.js +1 -0
  167. package/lib/types/theme.flow.js +1 -1
  168. package/lib/utils/mixins.js +2 -2
  169. package/lib/utils/responsiveProps/index.js +1 -1
  170. package/package.json +2 -2
  171. package/__flow__/themes/dark.js +0 -133
  172. package/__flow__/themes/light.js +0 -7
  173. package/__flow__/utils/theme.js +0 -422
  174. package/commonjs/themes/dark.js +0 -140
  175. package/commonjs/themes/light.js +0 -14
  176. package/commonjs/utils/theme.js +0 -421
  177. package/lib/themes/dark.js +0 -131
  178. package/lib/themes/light.js +0 -5
  179. package/lib/utils/theme.js +0 -402
@@ -4,35 +4,9 @@ import Box from "../Box";
4
4
 
5
5
  import type { TypeTheme } from "../types/theme.flow";
6
6
 
7
- export const CollapsingBox = styled<typeof Box, TypeTheme, *>(Box)`
7
+ export const CollapsingBox = styled<typeof Box, TypeTheme>(Box)`
8
8
  transition: max-height ${(p) => p.theme.duration.medium}
9
9
  ${(p) => p.theme.easing.ease_inout};
10
10
  will-change: max-height;
11
- position: relative;
12
- overflow: auto;
13
- background: /* Shadow covers */ linear-gradient(
14
- ${(p) => p.theme.colors.neutral[100]} 30%,
15
- rgba(255, 255, 255, 0)
16
- ),
17
- linear-gradient(
18
- rgba(255, 255, 255, 0),
19
- ${(p) => p.theme.colors.neutral[100]} 70%
20
- )
21
- 0 100%,
22
- /* Shadows */
23
- radial-gradient(
24
- farthest-side at 50% 0,
25
- rgb(39 51 51 / 5%),
26
- rgba(0, 0, 0, 0)
27
- ),
28
- radial-gradient(
29
- farthest-side at 50% 100%,
30
- rgb(39 51 51 / 5%),
31
- rgba(0, 0, 0, 0)
32
- )
33
- 0 100%;
34
- background-repeat: no-repeat;
35
- background-size: 100% 40px, 100% 40px, 100% 14px, 100% 14px;
36
- background-attachment: local, local, scroll, scroll;
37
- ${({ scrollable }) => (scrollable ? `overflow: auto` : `overflow: hidden`)};
11
+ overflow: hidden;
38
12
  `;
@@ -2,6 +2,7 @@
2
2
  import styled, { createGlobalStyle, css } from "styled-components";
3
3
  import moment from "moment";
4
4
  import Box from "../Box";
5
+ import { disabled } from "../utils/mixins";
5
6
  import type { TypeTheme } from "../types/theme.flow";
6
7
 
7
8
  /*
@@ -61,8 +62,8 @@ export const CalendarDay = styled<typeof Box, TypeTheme, *>(Box)`
61
62
  ${({ modifiers, day, theme }) => {
62
63
  if (isSelected(modifiers)) {
63
64
  return css`
64
- background-color: ${theme.colors.selection.background};
65
- color: ${theme.colors.selection.color};
65
+ background-color: ${theme.colors.container.background.selected};
66
+ color: ${theme.colors.text.inverse};
66
67
  margin-left: ${shouldHaveLeftPill(modifiers, day) && theme.space[200]};
67
68
  margin-right: ${shouldHaveRightPill(modifiers, day) &&
68
69
  theme.space[200]};
@@ -81,11 +82,12 @@ export const CalendarDay = styled<typeof Box, TypeTheme, *>(Box)`
81
82
  return css`
82
83
  margin: 0 ${theme.space[200]};
83
84
  border-radius: ${theme.radii.pill};
84
- border: 1px solid ${theme.colors.selection.border};
85
+ border: 1px solid ${theme.colors.container.border.selected};
85
86
  `;
86
87
  } else if (isOutOfRange(modifiers)) {
87
88
  return css`
88
- color: ${theme.colors.selection.disabledColor};
89
+ color: ${theme.colors.text.subtext};
90
+ ${disabled};
89
91
  `;
90
92
  }
91
93
  }};
@@ -107,7 +109,7 @@ export const ReactDatesCssOverrides = createGlobalStyle`
107
109
 
108
110
  &_weekHeader {
109
111
  color: ${({ theme }) => theme.colors.text.headline};
110
- border-bottom: 1px solid ${({ theme }) => theme.colors.border};
112
+ border-bottom: 1px solid ${({ theme }) => theme.colors.container.border.base};
111
113
 
112
114
  /* Magic number to match position of .CalendarMonth_caption */
113
115
  top: 26px;
@@ -134,7 +136,7 @@ export const ReactDatesCssOverrides = createGlobalStyle`
134
136
 
135
137
  &__horizontal {
136
138
  box-shadow: none;
137
- background: ${({ theme }) => theme.colors.background.container};
139
+ background: ${({ theme }) => theme.colors.container.background.base};
138
140
  }
139
141
  }
140
142
 
@@ -157,7 +159,7 @@ export const ReactDatesCssOverrides = createGlobalStyle`
157
159
 
158
160
  .CalendarMonth {
159
161
  ${({ theme }) => theme.typography[200]}
160
- background: ${({ theme }) => theme.colors.background.container};
162
+ background: ${({ theme }) => theme.colors.container.background.base};
161
163
 
162
164
  /* spacing between visible months and months off canvas */
163
165
  padding: 0 15px;
@@ -166,7 +168,7 @@ export const ReactDatesCssOverrides = createGlobalStyle`
166
168
  ${({ theme }) => theme.typography[200]}
167
169
  color: ${({ theme }) => theme.colors.text.headline};
168
170
  padding-top: 0;
169
- background: ${({ theme }) => theme.colors.background.container};
171
+ background: ${({ theme }) => theme.colors.container.background.base};
170
172
 
171
173
  strong {
172
174
  font-weight: ${({ theme }) => theme.fontWeights.semibold};
@@ -186,19 +188,19 @@ export const ReactDatesCssOverrides = createGlobalStyle`
186
188
  }
187
189
 
188
190
  .CalendarMonthGrid {
189
- background: ${({ theme }) => theme.colors.background.container};
191
+ background: ${({ theme }) => theme.colors.container.background.base};
190
192
  }
191
193
 
192
194
  /* Left and Right Arrow Buttons to navigate months */
193
195
  .DayPickerNavigation_button__horizontal {
194
- color: ${({ theme }) => theme.colors.cta.pill.color};
196
+ color: ${({ theme }) => theme.colors.button.pill.text.base};
195
197
  top: -4px;
196
198
  padding: 7px 8px;
197
199
  position: absolute;
198
200
  line-height: 0.78;
199
201
  border-radius: 9999px;
200
202
  border: none;
201
- background: ${({ theme }) => theme.colors.cta.pill.background};
203
+ background: ${({ theme }) => theme.colors.button.pill.background.base};
202
204
 
203
205
  &:nth-child(1) {
204
206
  left: 22px;
@@ -208,7 +210,7 @@ export const ReactDatesCssOverrides = createGlobalStyle`
208
210
  }
209
211
 
210
212
  &:hover {
211
- background: ${({ theme }) => theme.colors.cta.pill.hoverBackground};
213
+ background: ${({ theme }) => theme.colors.button.pill.background.hover};
212
214
  }
213
215
  }
214
216
  `;
@@ -16,7 +16,7 @@ const Container: StyledComponent<any, TypeTheme, *> = styled.div`
16
16
  top: 0;
17
17
  height: 100%;
18
18
  width: ${(props) => props.width}px;
19
- background-color: ${(props) => props.theme.colors.background.container};
19
+ background-color: ${(props) => props.theme.colors.container.background.base};
20
20
  box-shadow: ${(props) => props.theme.shadows[400]};
21
21
  filter: blur(0);
22
22
 
@@ -81,7 +81,7 @@ const FormField = ({
81
81
  <Text
82
82
  as="div"
83
83
  fontSize={200}
84
- color="error.color"
84
+ color="text.error"
85
85
  mt={300}
86
86
  id={errorId}
87
87
  data-qa-formfield-error={
@@ -11,21 +11,31 @@ export default {
11
11
  };
12
12
 
13
13
  export const mini12X12 = () => (
14
- <Icon name={text("name", "dashboard")} size={text("size", "mini")} />
14
+ <Icon
15
+ color="icon.base"
16
+ name={text("name", "dashboard")}
17
+ size={text("size", "mini")}
18
+ />
15
19
  );
16
20
 
17
21
  mini12X12.story = {
18
22
  name: "Mini (12 x 12)",
19
23
  };
20
24
 
21
- export const default16X16 = () => <Icon name={text("name", "dashboard")} />;
25
+ export const default16X16 = () => (
26
+ <Icon color="icon.base" name={text("name", "dashboard")} />
27
+ );
22
28
 
23
29
  default16X16.story = {
24
30
  name: "Default (16 x 16)",
25
31
  };
26
32
 
27
33
  export const medium24X24 = () => (
28
- <Icon name={text("name", "dashboard")} size={text("size", "medium")} />
34
+ <Icon
35
+ color="icon.base"
36
+ name={text("name", "dashboard")}
37
+ size={text("size", "medium")}
38
+ />
29
39
  );
30
40
 
31
41
  medium24X24.story = {
@@ -33,7 +43,11 @@ medium24X24.story = {
33
43
  };
34
44
 
35
45
  export const large32X32 = () => (
36
- <Icon name={text("name", "dashboard")} size={text("size", "large")} />
46
+ <Icon
47
+ color="icon.base"
48
+ name={text("name", "dashboard")}
49
+ size={text("size", "large")}
50
+ />
37
51
  );
38
52
 
39
53
  large32X32.story = {
@@ -41,7 +55,11 @@ large32X32.story = {
41
55
  };
42
56
 
43
57
  export const jumbo64X64 = () => (
44
- <Icon name={text("name", "dashboard")} size={text("size", "jumbo")} />
58
+ <Icon
59
+ color="icon.base"
60
+ name={text("name", "dashboard")}
61
+ size={text("size", "jumbo")}
62
+ />
45
63
  );
46
64
 
47
65
  jumbo64X64.story = {
@@ -49,7 +67,7 @@ jumbo64X64.story = {
49
67
  };
50
68
 
51
69
  export const defaultFixedWidth = () => (
52
- <Icon name={text("name", "dashboard")} fixedWidth />
70
+ <Icon color="icon.success" name={text("name", "dashboard")} fixedWidth />
53
71
  );
54
72
 
55
73
  defaultFixedWidth.story = {
@@ -14,7 +14,7 @@ const Container: StyledComponent<any, TypeTheme, *> = styled.div`
14
14
  width: 100%;
15
15
  border: 1px solid transparent;
16
16
  border-radius: ${(props) => props.theme.radii[500]};
17
- background-color: ${(props) => props.theme.colors.background.container};
17
+ background-color: ${(props) => props.theme.colors.form.background.base};
18
18
  color: ${(props) => props.theme.colors.text.body};
19
19
  outline: none;
20
20
  transition: border-color ${(props) => props.theme.duration.fast}
@@ -70,7 +70,7 @@ const Container: StyledComponent<any, TypeTheme, *> = styled.div`
70
70
  }
71
71
 
72
72
  &:placeholder {
73
- color: ${(props) => props.theme.colors.forms.placeholderColor};
73
+ color: ${(props) => props.theme.colors.form.placeholder.base};
74
74
  }
75
75
 
76
76
  ${(props) =>
@@ -100,7 +100,7 @@ const Container: StyledComponent<any, TypeTheme, *> = styled.div`
100
100
  props.appearance === "primary" &&
101
101
  css`
102
102
  input {
103
- border: 1px solid ${(props) => props.theme.colors.forms.borderColor};
103
+ border: 1px solid ${(props) => props.theme.colors.form.border.base};
104
104
  }
105
105
  `}
106
106
 
@@ -108,7 +108,7 @@ const Container: StyledComponent<any, TypeTheme, *> = styled.div`
108
108
  props.invalid &&
109
109
  css`
110
110
  input {
111
- border-color: ${(props) => props.theme.colors.error.color};
111
+ border-color: ${(props) => props.theme.colors.form.border.error};
112
112
  }
113
113
  `}
114
114
 
@@ -116,7 +116,7 @@ const Container: StyledComponent<any, TypeTheme, *> = styled.div`
116
116
  props.warning &&
117
117
  css`
118
118
  input {
119
- border-color: ${(props) => props.theme.colors.warning.color};
119
+ border-color: ${(props) => props.theme.colors.form.border.warning};
120
120
  }
121
121
  `}
122
122
 
@@ -127,7 +127,7 @@ export const Accessory: StyledComponent<any, TypeTheme, *> = styled.div`
127
127
  position: absolute;
128
128
  top: 50%;
129
129
  transform: translateY(-50%);
130
- color: ${(props) => props.theme.colors.icon.primary};
130
+ color: ${(props) => props.theme.colors.icon.base};
131
131
  display: flex;
132
132
  align-items: center;
133
133
 
@@ -7,8 +7,8 @@ import type { TypeTheme } from "../types/theme.flow";
7
7
  const Container: StyledComponent<{ ... }, TypeTheme, *> = styled.div`
8
8
  display: inline-flex;
9
9
  color: ${(props) => props.theme.colors.text.body};
10
- background-color: ${(props) => props.theme.colors.background.container};
11
- border: 1px solid ${(props) => props.theme.colors.border};
10
+ background-color: ${(props) => props.theme.colors.container.background.base};
11
+ border: 1px solid ${(props) => props.theme.colors.container.border.base};
12
12
  border-radius: ${(props) => props.theme.radii[500]};
13
13
  box-shadow: ${(props) => props.theme.shadows[100]};
14
14
  padding: 0 ${(props) => props.theme.space[200]};
@@ -9,8 +9,6 @@ import type { TypeTheme } from "../types/theme.flow";
9
9
  const Container = styled<typeof Text, TypeTheme, any>(Text)`
10
10
  border: 0;
11
11
  font-family: ${(props) => props.theme.fontFamily};
12
- transition: all ${(props) => props.theme.duration.fast}
13
- ${(props) => props.theme.easing.ease_inout};
14
12
  text-decoration: ${(props) => (props.underline ? "underline" : "none")};
15
13
  appearance: none;
16
14
  cursor: pointer;
@@ -21,15 +19,15 @@ const Container = styled<typeof Text, TypeTheme, any>(Text)`
21
19
  cursor: not-allowed;
22
20
  `}
23
21
  font-weight: ${(props) => props.theme.fontWeights.semibold};
24
- color: ${(props) => props.theme.colors.cta.link.color};
22
+ color: ${(props) => props.theme.colors.link.base};
25
23
 
26
24
  &:hover {
27
- color: ${(props) => props.theme.colors.cta.link.color};
25
+ color: ${(props) => props.theme.colors.link.hover};
28
26
  text-decoration: underline;
29
27
  }
30
28
 
31
29
  &:active {
32
- color: ${(props) => props.theme.colors.cta.link.hoverColor};
30
+ color: ${(props) => props.theme.colors.link.hover};
33
31
  }
34
32
 
35
33
  &:focus {
@@ -409,6 +409,7 @@ exports[`Listbox AsListbox with checkboxes should match snapshot 1`] = `
409
409
 
410
410
  .c6:focus,
411
411
  .c6:hover {
412
+ color: #364141;
412
413
  background-color: #f3f4f4;
413
414
  }
414
415
 
@@ -431,11 +432,13 @@ exports[`Listbox AsListbox with checkboxes should match snapshot 1`] = `
431
432
  outline: 0;
432
433
  font-size: 13px;
433
434
  line-height: 21.333333333333332px;
434
- background-color: #f3f4f4;
435
+ color: #FFFFFF;
436
+ background-color: #364141;
435
437
  }
436
438
 
437
439
  .c4:focus,
438
440
  .c4:hover {
441
+ color: #364141;
439
442
  background-color: #f3f4f4;
440
443
  }
441
444
 
@@ -687,6 +690,7 @@ exports[`Listbox AsListbox with filter input should match snapshot 1`] = `
687
690
 
688
691
  .c7:focus,
689
692
  .c7:hover {
693
+ color: #364141;
690
694
  background-color: #f3f4f4;
691
695
  }
692
696
 
@@ -709,11 +713,13 @@ exports[`Listbox AsListbox with filter input should match snapshot 1`] = `
709
713
  outline: 0;
710
714
  font-size: 13px;
711
715
  line-height: 21.333333333333332px;
712
- background-color: #f3f4f4;
716
+ color: #FFFFFF;
717
+ background-color: #364141;
713
718
  }
714
719
 
715
720
  .c5:focus,
716
721
  .c5:hover {
722
+ color: #364141;
717
723
  background-color: #f3f4f4;
718
724
  }
719
725
 
@@ -33,9 +33,9 @@ export const ListboxButtonContainer = styled<typeof MenuButton, TypeTheme, *>(
33
33
  )`
34
34
  position: relative;
35
35
  width: 100%;
36
- border: 1px solid ${(props) => props.theme.colors.forms.borderColor};
36
+ border: 1px solid ${(props) => props.theme.colors.form.border.base};
37
37
  border-radius: ${(props) => props.theme.radii[500]};
38
- background-color: ${(props) => props.theme.colors.background.container};
38
+ background-color: ${(props) => props.theme.colors.form.background.base};
39
39
  color: ${(props) => props.theme.colors.text.body};
40
40
  cursor: ${(props) => (props.disabled ? "not-allowed" : "pointer")};
41
41
  outline: none;
@@ -77,9 +77,9 @@ export const ListboxButtonContainer = styled<typeof MenuButton, TypeTheme, *>(
77
77
  ${(props) =>
78
78
  props.invalid &&
79
79
  css`
80
- border-color: ${(props) => props.theme.colors.error.border};
80
+ border-color: ${(props) => props.theme.colors.form.border.error};
81
81
  ${Arrow} {
82
- color: ${(props) => props.theme.colors.error.color};
82
+ color: ${(props) => props.theme.colors.icon.error};
83
83
  }
84
84
  `}
85
85
  `;
@@ -43,6 +43,7 @@ exports[`Menu AsMenu should match snapshot 1`] = `
43
43
 
44
44
  .c7:focus,
45
45
  .c7:hover {
46
+ color: #364141;
46
47
  background-color: #f3f4f4;
47
48
  }
48
49
 
@@ -65,11 +66,13 @@ exports[`Menu AsMenu should match snapshot 1`] = `
65
66
  outline: 0;
66
67
  font-size: 13px;
67
68
  line-height: 21.333333333333332px;
68
- background-color: #f3f4f4;
69
+ color: #FFFFFF;
70
+ background-color: #364141;
69
71
  }
70
72
 
71
73
  .c6:focus,
72
74
  .c6:hover {
75
+ color: #364141;
73
76
  background-color: #f3f4f4;
74
77
  }
75
78
 
@@ -310,7 +313,7 @@ html .c3 {
310
313
 
311
314
  .c1:active {
312
315
  color: #FFFFFF;
313
- background: #364141;
316
+ background: #273333;
314
317
  -webkit-transform: translateY(1px);
315
318
  -ms-transform: translateY(1px);
316
319
  transform: translateY(1px);
@@ -273,7 +273,12 @@ export const MenuGroup = ({
273
273
  }: TypeMenuGroupProps) => (
274
274
  <>
275
275
  {title && (
276
- <Box pl={400} borderTop="1px solid" borderColor="border" mt="-1px">
276
+ <Box
277
+ pl={400}
278
+ borderTop="1px solid"
279
+ borderColor="container.border.base"
280
+ mt="-1px"
281
+ >
277
282
  <Text
278
283
  forwardedAs={titleAs || "div"}
279
284
  fontSize={200}
@@ -297,7 +302,7 @@ export const MenuDivider = (props: any) => (
297
302
  as="li"
298
303
  role="separator"
299
304
  borderTop="1px solid"
300
- borderColor="border"
305
+ borderColor="container.border.base"
301
306
  {...props}
302
307
  />
303
308
  );
@@ -22,7 +22,7 @@ export const MenuItemContainer = styled<
22
22
  `};
23
23
  width: 100%;
24
24
  border-radius: ${(props) => props.theme.radii[500]};
25
- background-color: transparent;
25
+ background-color: ${(props) => props.theme.colors.listItem.background.base};
26
26
  border: none;
27
27
  text-align: left;
28
28
  color: ${(props) => props.theme.colors.text.body};
@@ -39,7 +39,8 @@ export const MenuItemContainer = styled<
39
39
  props.active &&
40
40
  !props.disabled &&
41
41
  css`
42
- background-color: ${props.theme.colors.background.app};
42
+ color: ${(props) => props.theme.colors.text.inverse};
43
+ background-color: ${props.theme.colors.listItem.background.selected};
43
44
  `}
44
45
 
45
46
  ${(props) =>
@@ -54,7 +55,9 @@ export const MenuItemContainer = styled<
54
55
  css`
55
56
  &:focus,
56
57
  &:hover {
57
- background-color: ${(props) => props.theme.colors.background.app};
58
+ color: ${(props) => props.theme.colors.text.body};
59
+ background-color: ${(props) =>
60
+ props.theme.colors.listItem.background.hover};
58
61
  }
59
62
  `}
60
63
 
@@ -47,7 +47,7 @@ export type TypeProps = {
47
47
  // $FlowIssue Upgrade 0.111.1
48
48
  const MessageContext = React.createContext({
49
49
  density: MESSAGE_DENSITIES.SMALL,
50
- borderColor: "border",
50
+ borderColor: "container.border.base",
51
51
  bg: "background.container",
52
52
  indentContent: true,
53
53
  });
@@ -55,7 +55,7 @@ const MessageContext = React.createContext({
55
55
  const Message = ({
56
56
  children,
57
57
  density = MESSAGE_DENSITIES.SMALL,
58
- borderColor = "border",
58
+ borderColor = "container.border.base",
59
59
  bg = "background.container",
60
60
  indentContent = true,
61
61
  innerRef,
@@ -15,7 +15,7 @@ export const defaultStory = ({
15
15
  "condensed"
16
16
  ),
17
17
  }) => (
18
- <Message density={density}>
18
+ <Message density={density} bg="container.background.base">
19
19
  <Message.Header>
20
20
  <Box display="flex" alignItems="center">
21
21
  <Message.Avatar
@@ -74,7 +74,7 @@ type TypeModalFooterProps = {
74
74
 
75
75
  const ModalFooter = (props: TypeModalFooterProps) => (
76
76
  // $FlowIssue - upgrade v0.112.0
77
- <Footer borderTop={500} borderColor="border" {...props} />
77
+ <Footer borderTop={500} borderColor="container.border.base" {...props} />
78
78
  );
79
79
 
80
80
  ModalFooter.defaultProps = {
@@ -3,9 +3,9 @@ import Component from "@reach/component-component";
3
3
  import Modal from "./";
4
4
  import Box from "../Box";
5
5
  import Button from "../Button";
6
- import Label from "../Label";
7
6
  import Input from "../Input";
8
7
  import Text from "../Text";
8
+ import FormField from "../FormField";
9
9
 
10
10
  export default {
11
11
  title: "Modal",
@@ -335,12 +335,18 @@ export const withForm = () => (
335
335
  subtitle="Anyone with this link will be able to view its contents."
336
336
  />
337
337
  <Modal.Content>
338
- <Label htmlFor="title">Title</Label>
339
- <Text color="neutral.700">
340
- The title is the link’s name and will appear on your link’s
341
- generated page.
342
- </Text>
343
- <Input name="title" id="title" />
338
+ <FormField
339
+ label="Label"
340
+ helperText="This is some helpful helper text"
341
+ >
342
+ {(props) => (
343
+ <Input
344
+ placeholder="Type the things..."
345
+ name="title"
346
+ id="title"
347
+ />
348
+ )}
349
+ </FormField>
344
350
  </Modal.Content>
345
351
  <Modal.Footer>
346
352
  <Box display="flex" justifyContent="flex-end">
@@ -366,7 +372,7 @@ export const customBackgroundColor = () => (
366
372
  Open Modal
367
373
  </button>
368
374
  <Modal
369
- bg="purple.300"
375
+ bg="container.background.decorative.purple"
370
376
  width="500px"
371
377
  appElementSelector="#root"
372
378
  isOpen={state.isOpen}
@@ -82,7 +82,7 @@ export const Container: StyledComponent<any, TypeTheme, *> = styled(ReactModalAd
82
82
  &__Content {
83
83
  display: flex;
84
84
  flex-direction: column;
85
- background: ${(props) => props.theme.colors.background.container};
85
+ background: ${(props) => props.theme.colors.container.background.base};
86
86
  border-radius: ${(props) => props.theme.radii[500]};
87
87
  box-shadow: ${(props) => props.theme.shadows[300]};
88
88
  filter: blur(0);
@@ -133,7 +133,7 @@ export const Header = styled<typeof HeaderContainer, TypeTheme, any>(HeaderConta
133
133
  flex: 0 0 auto;
134
134
  border-bottom-width: ${(props) => props.theme.borderWidths[500]};
135
135
  border-bottom-color: ${(props) =>
136
- props.bordered ? props.theme.colors.border : "transparent"};
136
+ props.bordered ? props.theme.colors.container.border.base : "transparent"};
137
137
  border-bottom-style: solid;
138
138
  `;
139
139
 
@@ -10,5 +10,6 @@ export const Container = styled<typeof Text, TypeTheme>(Text)`
10
10
 
11
11
  export const AbbrContainer = styled<typeof Text, TypeTheme>(Text)`
12
12
  font-variant-numeric: tabular-nums;
13
- border-bottom: 1px dotted ${(props) => props.theme.colors.border};
13
+ border-bottom: 1px dotted
14
+ ${(props) => props.theme.colors.container.border.base};
14
15
  `;
@@ -1,6 +1,7 @@
1
1
  import React from "react";
2
2
  import OverflowList from "./index";
3
3
  import Box from "../Box";
4
+ import Text from "../Text";
4
5
  import { names } from "../Menu/names";
5
6
 
6
7
  export default {
@@ -10,7 +11,9 @@ export default {
10
11
  export const defaultStory = () => (
11
12
  <OverflowList height={300} width={200}>
12
13
  {names.map((name) => (
13
- <Box key={name}>{name}</Box>
14
+ <Box key={name}>
15
+ <Text color="text.body">{name}</Text>
16
+ </Box>
14
17
  ))}
15
18
  </OverflowList>
16
19
  );
@@ -26,7 +29,11 @@ export const PropGetters = () => {
26
29
  width={200}
27
30
  items={names}
28
31
  getItemProps={({ item }) => ({ key: item, item })}
29
- ItemComponent={({ item }) => <Box>{item}</Box>}
32
+ ItemComponent={({ item }) => (
33
+ <Box>
34
+ <Text color="text.body">{item}</Text>
35
+ </Box>
36
+ )}
30
37
  />
31
38
  );
32
39
  };
@@ -38,23 +45,23 @@ export const FlexBox = () => {
38
45
  width="100%"
39
46
  display="flex"
40
47
  border="1px solid"
41
- borderColor="border"
48
+ borderColor="container.border.base"
42
49
  flexDirection="column"
43
50
  >
44
- <Box p={300} borderBottom="1px solid" borderColor="border">
45
- item 1
51
+ <Box p={300} borderBottom="1px solid" borderColor="container.border.base">
52
+ <Text color="text.body">item 1</Text>
46
53
  </Box>
47
54
  <Box flex="1">
48
55
  <OverflowList height="100%" width="100%" containerProps={{ p: 300 }}>
49
56
  {names.map((name) => (
50
57
  <Box key={name} py={200}>
51
- {name}
58
+ <Text color="text.body">{name}</Text>
52
59
  </Box>
53
60
  ))}
54
61
  </OverflowList>
55
62
  </Box>
56
- <Box p={300} borderTop="1px solid" borderColor="border">
57
- item 2
63
+ <Box p={300} borderTop="1px solid" borderColor="container.border.base">
64
+ <Text color="text.body">item 2</Text>
58
65
  </Box>
59
66
  </Box>
60
67
  );
@@ -390,11 +390,11 @@ export default function Popout({
390
390
  type TypePopoutContentProps = React.ElementConfig<typeof Box>;
391
391
  Popout.Content = ({ children, ...rest }: TypePopoutContentProps) => (
392
392
  <Box
393
- bg="background.container"
393
+ bg="container.background.base"
394
394
  color="text.body"
395
395
  border={500}
396
- borderColor={"border"}
397
- borderRadius={"outer"}
396
+ borderColor="container.border.base"
397
+ borderRadius="outer"
398
398
  boxShadow={300}
399
399
  p={400}
400
400
  m={300}