Skip to content

Prevent resize error when DatePicker input ref is undefined #3413

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
merged 1 commit into from
Aug 22, 2022
+20 −17
Merged

Prevent resize error when DatePicker input ref is undefined #3413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 20 additions & 17 deletions packages/@react-spectrum/datepicker/src/Input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,32 @@ function Input(props, ref) {
// not cause a layout shift.
let [reservePadding, setReservePadding] = useValueEffect(false);
let onResize = useCallback(() => setReservePadding(function *(reservePadding) {
if (reservePadding) {
// Try to collapse padding if the content is clipped.
if (inputRef.current.scrollWidth > inputRef.current.offsetWidth) {
let width = inputRef.current.parentElement.offsetWidth;
yield false;
if (inputRef.current) {
Copy link
Member Author

@LFDanLu LFDanLu Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff is weird, this is just wrapping the old if statement in a inputRef.current check

Copy link
Member Author

@LFDanLu LFDanLu Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff is weird, this is just wrapping the old if statement in a inputRef.current check

if (reservePadding) {
// Try to collapse padding if the content is clipped.
if (inputRef.current.scrollWidth > inputRef.current.offsetWidth) {
let width = inputRef.current.parentElement.offsetWidth;
yield false;

// If removing padding causes a layout shift, add it back.
if (inputRef.current.parentElement.offsetWidth !== width) {
yield true;
// If removing padding causes a layout shift, add it back.
if (inputRef.current.parentElement.offsetWidth !== width) {
yield true;
}
}
}
} else {
// Try to add padding if the content is not clipped.
if (inputRef.current.offsetWidth >= inputRef.current.scrollWidth) {
let width = inputRef.current.parentElement.offsetWidth;
yield true;
} else {
// Try to add padding if the content is not clipped.
if (inputRef.current.offsetWidth >= inputRef.current.scrollWidth) {
let width = inputRef.current.parentElement.offsetWidth;
yield true;

// If adding padding does not change the width (i.e. width is constrained), remove it again.
if (inputRef.current.parentElement.offsetWidth === width) {
yield false;
// If adding padding does not change the width (i.e. width is constrained), remove it again.
if (inputRef.current.parentElement.offsetWidth === width) {
yield false;
}
}
}
}

}), [inputRef, setReservePadding]);

useLayoutEffect(onResize, [onResize]);
Expand Down