Skip to content

fix(react-datepicker-compat): Fix text entry issues with input #27204

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
sopranopillow merged 3 commits into from
Mar 14, 2023
Merged

fix(react-datepicker-compat): Fix text entry issues with input #27204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a9ed7b
fixing space issue and delete issue
sopranopillow Mar 14, 2023
588240e
removing comment and adding back ignore comment
sopranopillow Mar 14, 2023
665fedc
Merge branch 'master' of https://www.github.com/microsoft/fluentui in…
sopranopillow Mar 14, 2023
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: 5 additions & 2 deletions ...s/react-components/react-datepicker-compat/src/components/DatePicker/renderDatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ export const renderDatePicker_unstable = (state: DatePickerState) => {
<slots.popover {...(slotProps.popover as PopoverProps)}>
<PopoverTrigger>
{popoverTriggerChildProps => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const rootProps: any = { root: popoverTriggerChildProps };
// onKeyDown is not needed as DatePicker handles closing the popover with ESC internally. onKeyDown also
// causes issues when typing in the input, not letting the user type SPACE and bugs with BACKSPACE.
const { onKeyDown, ...inputTriggerProps } = popoverTriggerChildProps;
const rootProps = { root: { ...inputTriggerProps } };

return (
<slots.inputField {...slotProps.inputField}>
<slots.input {...slotProps.input} {...rootProps} />
Expand Down
82 changes: 16 additions & 66 deletions ...ages/react-components/react-datepicker-compat/src/components/DatePicker/useDatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
showWeekNumbers = false,
strings = defaultDatePickerStrings,
tabIndex,
textField: textFieldProps,
input: inputProps,
today,
underlined = false,
value,
Expand Down Expand Up @@ -322,7 +322,7 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
[focus, setErrorMessage, setIsCalendarShown, setSelectedDate, setStatusMessage, showDatePickerPopup],
);

const onTextFieldFocus = React.useCallback((): void => {
const onInputFocus = React.useCallback((): void => {
if (disableAutoFocus) {
return;
}
Expand All @@ -335,24 +335,11 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
}
}, [allowTextInput, disableAutoFocus, preventFocusOpeningPicker, showDatePickerPopup]);

// const onCalloutPositioned = React.useCallback((): void => {
// let shouldFocus = true;
// // If the user has specified that the callout shouldn't use initial focus, then respect
// // that and don't attempt to set focus. That will default to true within the callout
// // so we need to check if it's undefined here.
// if (props.calloutProps && props.calloutProps.setInitialFocus !== undefined) {
// shouldFocus = props.calloutProps.setInitialFocus;
// }
// if (calendar.current && shouldFocus) {
// calendar.current.focus();
// }
// }, [props.calloutProps]);

const onTextFieldBlur = React.useCallback((): void => {
const onInputBlur = React.useCallback((): void => {
validateTextInput();
}, [validateTextInput]);

const onTextFieldChanged = React.useCallback(
const onInputChange = React.useCallback(
(ev: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>, data: InputOnChangeData): void => {
const { value: newValue } = data;

Expand All @@ -361,15 +348,13 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
dismissDatePickerPopup();
}

if (newValue) {
setFormattedDate(newValue);
}
setFormattedDate(newValue);
}
},
[allowTextInput, dismissDatePickerPopup, isCalendarShown, setFormattedDate],
);

const onTextFieldKeyDown = React.useCallback(
const onInputKeyDown = React.useCallback(
(ev: React.KeyboardEvent<HTMLElement>): void => {
switch (ev.key) {
case Enter:
Expand Down Expand Up @@ -411,7 +396,7 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
],
);

const onTextFieldClick = React.useCallback((): void => {
const onInputClick = React.useCallback((): void => {
// default openOnClick to !props.disableAutoFocus for legacy support of disableAutoFocus behavior
const openOnClick = props.openOnClick || !props.disableAutoFocus;
if (openOnClick && !isCalendarShown && !props.disabled) {
Expand Down Expand Up @@ -440,42 +425,7 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
}
};

// const renderTextfieldDescription = (
// inputProps?: ITextFieldProps,
// defaultRender?: (
// props?: ITextFieldProps,
// defaultRender?: (props: ITextFieldProps) => JSX.Element | null,
// ) => JSX.Element | null,
// ) => {
// return (
// <>
// {inputProps?.description ? defaultRender?.(inputProps) : null}
// <div aria-live="assertive" className={classNames.statusMessage}>
// {statusMessage}
// </div>
// </>
// );
// };

// const renderReadOnlyInput: ITextFieldProps['onRenderInput'] = inputProps => {
// const divProps = getNativeProps(inputProps!, divProperties);

// // Talkback on Android treats readonly inputs as disabled, so swipe gestures to open the Calendar
// // don't register. Workaround is rendering a div with role="combobox" (passed in via TextField props).
// return (
// <div {...divProps} className={css(divProps.className, classNames.readOnlyTextField)} tabIndex={tabIndex || 0}>
// {formattedDate || (
// // Putting the placeholder in a separate span fixes specificity issues for the text color
// <span className={classNames.readOnlyPlaceholder}>{placeholder}</span>
// )}
// </div>
// );
// };

// const nativeProps = getNativeProps<React.HTMLAttributes<HTMLDivElement>>(props, divProperties, ['value']);
// // const iconProps = textFieldProps && textFieldProps.iconProps;
const textFieldId =
textFieldProps && textFieldProps.id && textFieldProps.id !== id ? textFieldProps.id : id + '-label';
const inputId = inputProps && inputProps.id && inputProps.id !== id ? inputProps.id : id + '-label';

const inputAppearance: InputProps['appearance'] = underlined
? 'underline'
Expand Down Expand Up @@ -507,15 +457,21 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
'aria-label': ariaLabel,
contentAfter: <CalendarMonthRegular onClick={onIconClick as unknown as React.MouseEventHandler<SVGElement>} />,
disabled,
id: textFieldId,
id: inputId,
placeholder,
readOnly: !allowTextInput,
required: isRequired,
role: 'combobox',
tabIndex,
...textFieldProps,
...inputProps,
},
});
inputShorthand.onBlur = onInputBlur;
inputShorthand.onClick = onInputClick;
inputShorthand.onFocus = onInputFocus;
inputShorthand.onKeyDown = onInputKeyDown;
inputShorthand.onChange = mergeCallbacks(onInputChange, props.input?.onChange);
inputShorthand.value = formattedDate;

const inputFieldShorthand = resolveShorthand(props.inputField, {
defaultProps: {
Expand All @@ -526,12 +482,6 @@ export const useDatePicker_unstable = (props: DatePickerProps, ref: React.Ref<HT
},
required: true,
});
inputShorthand.onBlur = onTextFieldBlur;
inputShorthand.onClick = onTextFieldClick;
inputShorthand.onFocus = onTextFieldFocus;
inputShorthand.onKeyDown = onTextFieldKeyDown;
inputShorthand.onChange = mergeCallbacks(onTextFieldChanged, props.textField?.onChange);
inputShorthand.value = formattedDate;

const wrapperShorthand = resolveShorthand(props.wrapper, {
defaultProps: {
Expand Down