Skip to content

Commit f8add4e

Browse files
authored
Merge pull request #48973 from bernhardoj/fix/48161-main-composer-doesnt-hide
Fix edit composer isn't focused
2 parents a8e6a4f + 3e2b7d6 commit f8add4e

File tree

4 files changed

+3
-44
lines changed

4 files changed

+3
-44
lines changed

src/libs/focusTextInputAfterAnimation/index.android.ts

-26
This file was deleted.

src/libs/focusTextInputAfterAnimation/index.ts

-10
This file was deleted.

src/libs/focusTextInputAfterAnimation/types.ts

-5
This file was deleted.

src/pages/home/report/ReportActionItem.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
4141
import ControlSelection from '@libs/ControlSelection';
4242
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
4343
import * as ErrorUtils from '@libs/ErrorUtils';
44-
import focusTextInputAfterAnimation from '@libs/focusTextInputAfterAnimation';
44+
import focusComposerWithDelay from '@libs/focusComposerWithDelay';
4545
import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage';
4646
import Navigation from '@libs/Navigation/Navigation';
4747
import Permissions from '@libs/Permissions';
@@ -199,7 +199,7 @@ function ReportActionItem({
199199
const [moderationDecision, setModerationDecision] = useState<OnyxTypes.DecisionName>(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
200200
const reactionListRef = useContext(ReactionListContext);
201201
const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
202-
const textInputRef = useRef<TextInput | HTMLTextAreaElement>();
202+
const textInputRef = useRef<TextInput | HTMLTextAreaElement>(null);
203203
const popoverAnchorRef = useRef<Exclude<ReportActionContextMenu.ContextMenuAnchor, TextInput>>(null);
204204
const downloadedPreviews = useRef<string[]>([]);
205205
const prevDraftMessage = usePrevious(draftMessage);
@@ -274,7 +274,7 @@ function ReportActionItem({
274274
return;
275275
}
276276

277-
focusTextInputAfterAnimation(textInputRef.current, 100);
277+
focusComposerWithDelay(textInputRef.current)(true);
278278
}, [prevDraftMessage, draftMessage]);
279279

280280
useEffect(() => {

0 commit comments

Comments
 (0)