Skip to content

Commit ed4fdbb

Browse files
authored
Merge pull request Expensify#67021 from dukenv0307/fix/65736-console-error
Dev : Console error displayed on date selection for per-diem expenses
2 parents d5c6449 + b3221e1 commit ed4fdbb

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/components/PopoverWithMeasuredContent.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {circularDeepEqual, deepEqual} from 'fast-equals';
2-
import React, {useContext, useMemo, useState} from 'react';
2+
import React, {useContext, useEffect, useMemo, useState} from 'react';
33
import type {LayoutChangeEvent} from 'react-native';
44
import {View} from 'react-native';
55
import usePrevious from '@hooks/usePrevious';
@@ -84,9 +84,12 @@ function PopoverWithMeasuredContent({
8484

8585
const modalId = useMemo(() => ComposerFocusManager.getId(), []);
8686

87-
if (!prevIsVisible && isVisible && shouldEnableNewFocusManagement) {
87+
useEffect(() => {
88+
if (prevIsVisible || !isVisible || !shouldEnableNewFocusManagement) {
89+
return;
90+
}
8891
ComposerFocusManager.saveFocusState(modalId);
89-
}
92+
}, [isVisible, shouldEnableNewFocusManagement, prevIsVisible, modalId]);
9093

9194
if (!prevIsVisible && isVisible && isContentMeasured && !shouldSkipRemeasurement) {
9295
// Check if anything significant changed that would require re-measurement

0 commit comments

Comments
 (0)