Skip to content

Commit ffd61b6

Browse files
committed
fix(theming): select date border
affects: @datepicker-react/styled
1 parent 01df17d commit ffd61b6

File tree

6 files changed

+93
-186
lines changed

6 files changed

+93
-186
lines changed

docs/THEME_PROPS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ selectDateDateFontSize?: ResponsiveValue<FontSizeProperty<TLengthStyledSystem>>
1919
selectDateDateFontWeight?: ResponsiveValue<FontWeightProperty>
2020
selectDateDatePadding?: ResponsiveValue<PaddingProperty<TLengthStyledSystem>>
2121
selectDatePadding?: ResponsiveValue<PaddingProperty<TLengthStyledSystem>>
22+
selectDateBorderColor?: string
2223

2324
resetDatesIconColor?: string
2425
resetDatesIconHeight?: string

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@storybook/addon-links": "^5.1.9",
5555
"@storybook/addon-viewport": "^5.1.9",
5656
"@storybook/addons": "^5.1.9",
57-
"@storybook/react": "^5.1.8",
57+
"@storybook/react": "^5.1.9",
5858
"@testing-library/react": "^8.0.1",
5959
"@types/jest": "^24.0.15",
6060
"@types/react": "^16.8.22",

packages/styled/src/@types/theme.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export interface SelectDateTheme extends CommonTheme {
5050
selectDateDateFontWeight?: ResponsiveValue<FontWeightProperty>
5151
selectDateDatePadding?: ResponsiveValue<PaddingProperty<TLengthStyledSystem>>
5252
selectDatePadding?: ResponsiveValue<PaddingProperty<TLengthStyledSystem>>
53+
selectDateBorderColor?: string
5354
}
5455

5556
export interface ResetDatesTheme extends CommonTheme {

packages/styled/src/components/SelectedDate/SelectedDate.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Box from '../Box'
99

1010
interface StyledDateProps {
1111
isActive: boolean
12+
selectDateBorderColor: string
1213
}
1314
const StyledDate = styled(Text)<StyledDateProps>`
1415
position: relative;
@@ -24,11 +25,11 @@ const StyledDate = styled(Text)<StyledDateProps>`
2425
z-index: 1;
2526
}
2627
27-
${({isActive}) =>
28+
${({isActive, selectDateBorderColor}) =>
2829
isActive &&
2930
css`
3031
&:after {
31-
background: #00aeef;
32+
background: ${selectDateBorderColor};
3233
}
3334
`}
3435
`
@@ -50,6 +51,7 @@ function SelectDate({title, isActive, date, vertical}: SelectDateProps) {
5051
selectDateDateFontSize: vertical ? '16px' : '24px',
5152
selectDateDateFontWeight: 500,
5253
selectDateDatePadding: '0 0 15px',
54+
selectDateBorderColor: globalStyles.colors.primaryColor,
5355
selectDatePadding: '0',
5456
})
5557

@@ -73,6 +75,8 @@ function SelectDate({title, isActive, date, vertical}: SelectDateProps) {
7375
fontFamily={theme.fontFamily}
7476
p={theme.selectDateDatePadding}
7577
isActive={isActive}
78+
// @ts-ignore
79+
selectDateBorderColor={theme.selectDateBorderColor}
7680
>
7781
{date}
7882
</StyledDate>

packages/styled/src/globalStyles.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export default {
22
fontFamily: 'Montserrat, sans-serif',
33
colors: {
4+
primaryColor: '#00aeef',
45
silverCloud: '#929598',
56
charcoal: '#001217',
67
darcula: '#343132',

0 commit comments

Comments
 (0)