Skip to content

Commit c842036

Browse files
authored
fix(datepicker): pass down date prop if provided (#611)
* fix(datepicker): pass down date prop if provided * chore: install babel-jest
1 parent 1be2732 commit c842036

File tree

3 files changed

+308
-14
lines changed

3 files changed

+308
-14
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"@types/jest": "26.0.23",
5454
"@types/storybook__react": "5.2.1",
5555
"autoprefixer": "9.8.6",
56+
"babel-jest": "27.0.6",
5657
"babel-loader": "8.2.2",
5758
"cssnano": "4.1.11",
5859
"eslint-plugin-prettier": "3.3.1",

src/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const style: React.CSSProperties = {
2222
display: 'inline-block',
2323
position: 'relative',
2424
};
25+
2526
const semanticInputProps = [
2627
'autoComplete',
2728
'autoFocus',
@@ -152,11 +153,11 @@ class SemanticDatepicker extends React.Component<
152153
};
153154
}
154155

155-
get date() {
156+
get date(): Date | undefined {
156157
const { selectedDate } = this.state;
157158
const { date } = this.props;
158159

159-
if (!selectedDate) {
160+
if (date || !selectedDate) {
160161
return date;
161162
}
162163

0 commit comments

Comments
 (0)