Skip to content

fix: Allowing DatePicker to be focusable within FocusZones by default #25428

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
khmakoto merged 4 commits into from
Oct 28, 2022
Merged

fix: Allowing DatePicker to be focusable within FocusZones by default #25428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47051be
fix: Allowing DatePicker to be focusable within FocusZones by default.
Oct 27, 2022
80da4b2
Adding change file.
Oct 27, 2022
a9c966a
Adding ability to override data-is-focusable.
Oct 27, 2022
d1328f2
Fixing ssr-tests issue.
Oct 27, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-fd0c9c49-c0d9-4b5b-8991-45f1667ef481.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Allowing DatePicker to be focusable within FocusZones by default.",
"packageName": "@fluentui/react",
"email": "humberto_makoto@hotmail.com",
"dependentChangeType": "patch"
}
3 changes: 3 additions & 0 deletions packages/react/src/components/DatePicker/DatePicker.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@ export const DatePickerBase: React.FunctionComponent<IDatePickerProps> = React.f
textFieldProps && textFieldProps.id && textFieldProps.id !== id ? textFieldProps.id : id + '-label';
const readOnly = !allowTextInput && !disabled;

const dataIsFocusable = (textFieldProps as any)?.['data-is-focusable'] ?? (props as any)['data-is-focusable'] ?? true;

return (
<div {...nativeProps} className={classNames.root} ref={forwardedRef}>
<div ref={datePickerDiv} aria-owns={isCalendarShown ? calloutId : undefined} className={classNames.wrapper}>
Expand All @@ -471,6 +473,7 @@ export const DatePickerBase: React.FunctionComponent<IDatePickerProps> = React.f
tabIndex={tabIndex}
readOnly={!allowTextInput}
{...textFieldProps}
data-is-focusable={dataIsFocusable}
id={textFieldId}
className={css(classNames.textField, textFieldProps && textFieldProps.className)}
iconProps={{
Expand Down
3 changes: 3 additions & 0 deletions packages/react/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ exports[`DatePicker renders DatePicker allowing text input correctly 1`] = `
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){&::-ms-input-placeholder {
color: GrayText;
}
data-is-focusable={true}
id="DatePicker0-label"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -390,6 +391,7 @@ exports[`DatePicker renders DatePicker with value correctly 1`] = `
overflow: hidden;
text-overflow: ellipsis;
}
data-is-focusable={true}
id="DatePicker0-label"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -622,6 +624,7 @@ exports[`DatePicker renders default DatePicker correctly 1`] = `
overflow: hidden;
text-overflow: ellipsis;
}
data-is-focusable={true}
id="DatePicker0-label"
onBlur={[Function]}
onChange={[Function]}
Expand Down