Skip to content

DatePicker: allow passing in a placeholder, to fix a flaky test #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HichamELBSI merged 2 commits into from
Mar 1, 2022
Merged

DatePicker: allow passing in a placeholder, to fix a flaky test #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eb415c
DatePicker: allow passing in a placeholder, to fix a flaky test
Mar 1, 2022
a1ae2a6
chore: Update snapshot tests
Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/strapi-design-system/src/DatePicker/DatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const DatePicker = ({
disabled,
minDate,
maxDate,
placeholder,
id,
...props
}) => {
Expand All @@ -30,7 +31,6 @@ export const DatePicker = ({
const inputRef = useRef(null);
const datePickerButtonRef = useRef(null);
const formattedDate = selectedDate ? formatDate(selectedDate) : '';
const placeholder = formatDate(new Date());

const toggleVisibility = () => {
if (disabled) return;
Expand All @@ -57,7 +57,7 @@ export const DatePicker = ({
// Prevent input from changing for now
onChange={() => {}}
value={formattedDate}
placeholder={placeholder}
placeholder={placeholder || formatDate(new Date(1970, 0, 1))}
size={size}
startAction={
<DatePickerButton
Expand Down Expand Up @@ -108,6 +108,7 @@ DatePicker.defaultProps = {
label: undefined,
initialDate: new Date(),
onClear: undefined,
placeholder: undefined,
selectedDate: undefined,
size: 'M',
};
Expand All @@ -123,6 +124,7 @@ DatePicker.propTypes = {
minDate: PropTypes.instanceOf(Date),
onChange: PropTypes.func.isRequired,
onClear: PropTypes.func,
placeholder: PropTypes.string,
selectedDate: PropTypes.instanceOf(Date),
selectedDateLabel: PropTypes.func.isRequired,
size: PropTypes.oneOf(Object.keys(sizes.input)),
Expand Down
1 change: 1 addition & 0 deletions packages/strapi-design-system/src/DatePicker/DatePicker.stories.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ By passing in `minDate` or `maxDate` it is possible to define the range of years
name="datepicker"
clearLabel={'Clear the datepicker'}
onClear={() => setDate(undefined)}
placeholder="03/01/1970"
selectedDateLabel={(formattedDate) => `Date picker, current is ${formattedDate}`}
minDate={new Date(2000, 1, 1)}
maxDate={new Date(2040, 1, 1)}
Expand Down
8 changes: 4 additions & 4 deletions packages/strapi-design-system/tests/__snapshots__/storyshots.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11741,7 +11741,7 @@ exports[`Storyshots Design System/Components/DatePicker base 1`] = `
class="c8"
id="datepicker-45"
name="datepicker"
placeholder="3/1/2022"
placeholder="1/1/1970"
value=""
/>
</div>
Expand Down Expand Up @@ -11974,7 +11974,7 @@ exports[`Storyshots Design System/Components/DatePicker disabled 1`] = `
class="c8"
id="datepicker-46"
name="datepicker"
placeholder="3/1/2022"
placeholder="1/1/1970"
value=""
/>
</div>
Expand Down Expand Up @@ -12201,7 +12201,7 @@ exports[`Storyshots Design System/Components/DatePicker min/ max date 1`] = `
class="c8"
id="datepicker-47"
name="datepicker"
placeholder="3/1/2022"
placeholder="03/01/1970"
value=""
/>
</div>
Expand Down Expand Up @@ -12421,7 +12421,7 @@ exports[`Storyshots Design System/Components/DatePicker size S 1`] = `
class="c8"
id="datepicker-48"
name="datepicker"
placeholder="3/1/2022"
placeholder="1/1/1970"
value=""
/>
</div>
Expand Down