Skip to content

fix(DatePicker): prevented textless helper text from rendering #11713

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
wise-king-sullyman merged 2 commits into from
Apr 8, 2025
Merged

fix(DatePicker): prevented textless helper text from rendering #11713

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
f229105
fix(DatePicker): prevented textless helper text from rendering
Mar 25, 2025
2f42043
Updated validator assertion
Apr 8, 2025
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
4 changes: 3 additions & 1 deletion packages/react-core/src/components/DatePicker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ const DatePickerBase = (
}, [value]);

const applyValidators = (date: Date) => {
setErrorText(validators.map((validator) => validator(date)).join('\n') || '');
const validatorResults = validators.map((validator) => validator(date));
const validatorsToApply = validatorResults.filter((validator) => validator !== '');
setErrorText(validatorsToApply.join('\n') || '');
};

const onTextInput = (event: React.FormEvent<HTMLInputElement>, value: string) => {
Expand Down
42 changes: 40 additions & 2 deletions packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,57 @@ test('disabled date picker', () => {
expect(asFragment()).toMatchSnapshot();
});

test('Date picker with multiple validators does not show invalid icon on valid input', async () => {
test('Does not render aria-invalid input when multiple validators return empty strings', async () => {
const user = userEvent.setup();

const rangeValidator = (_date: Date) => '';
const rangeValidatorB = (_date: Date) => '';
render(<DatePicker value="2020-03-17" validators={[rangeValidator, rangeValidatorB]} />);

await user.click(screen.getByRole('textbox'));
await user.click(document.body);
expect(screen.getByRole('textbox')).not.toBeInvalid();
});

test('Does not render helper text when multiple validators return empty strings', async () => {
const user = userEvent.setup();

const rangeValidator = (_date: Date) => '';
const rangeValidatorB = (_date: Date) => '';
render(<DatePicker value="2020-03-17" validators={[rangeValidator, rangeValidatorB]} />);

await user.click(screen.getByRole('textbox'));
await user.click(document.body);

expect(screen.queryByText(': error status;')).not.toBeInTheDocument();
});

test('Renders helper text when at least 1 validator returns a string', async () => {
const user = userEvent.setup();

const rangeValidator = (_date: Date) => 'Some error.';
const rangeValidatorB = (_date: Date) => '';
render(<DatePicker value="2020-03-17" validators={[rangeValidator, rangeValidatorB]} />);

await user.click(screen.getByRole('textbox'));
await user.click(document.body);

expect(screen.getByText('Some error.')).toBeVisible();
expect(screen.getByText(': error status;')).toBeInTheDocument();
});

test('Renders helper text when more than 1 validator returns a string', async () => {
const user = userEvent.setup();

const rangeValidator = (_date: Date) => 'Some error.';
const rangeValidatorB = (_date: Date) => 'Another error.';
render(<DatePicker value="2020-03-17" validators={[rangeValidator, rangeValidatorB]} />);

await user.click(screen.getByRole('textbox'));
await user.click(document.body);
expect(screen.getByRole('textbox')).not.toBeInvalid();

expect(screen.getByText('Some error. Another error.')).toBeVisible();
expect(screen.getByText(': error status;')).toBeInTheDocument();
});

test('Error state can be cleared from outside', async () => {
Expand Down
6 changes: 3 additions & 3 deletions ...ges/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`With popover opened 1`] = `
<input
aria-invalid="false"
aria-label="Date picker"
data-ouia-component-id="OUIA-Generated-TextInputBase-4"
data-ouia-component-id="OUIA-Generated-TextInputBase-7"
data-ouia-component-type="PF6/TextInput"
data-ouia-safe="true"
placeholder="YYYY-MM-DD"
Expand All @@ -37,7 +37,7 @@ exports[`With popover opened 1`] = `
aria-haspopup="dialog"
aria-label="Toggle date picker"
class="pf-v6-c-button pf-m-control"
data-ouia-component-id="OUIA-Generated-Button-control-4"
data-ouia-component-id="OUIA-Generated-Button-control-7"
data-ouia-component-type="PF6/Button"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -185,7 +185,7 @@ exports[`With popover opened 1`] = `
<input
aria-invalid="false"
aria-label="Select year"
data-ouia-component-id="OUIA-Generated-TextInputBase-5"
data-ouia-component-id="OUIA-Generated-TextInputBase-8"
data-ouia-component-type="PF6/TextInput"
data-ouia-safe="true"
type="number"
Expand Down