Skip to content
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

Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85e3947
Fix back button arrow won't back when viewing attachment image and fi…
tsa321 May 29, 2024
0fdb94f
Merge main and resolve conflict
tsa321 Jun 3, 2024
961ead8
Another merge main and resolve conflict
tsa321 Jun 4, 2024
29992cf
Move the areAllModalsHidden check into shouldAutoFocus of ComposerWit…
tsa321 Jun 5, 2024
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: 6 additions & 1 deletion ...pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import SilentCommentUpdater from '@pages/home/report/ReportActionCompose/SilentC
import Suggestions from '@pages/home/report/ReportActionCompose/Suggestions';
import * as EmojiPickerActions from '@userActions/EmojiPickerAction';
import * as InputFocus from '@userActions/InputFocus';
import * as Modal from '@userActions/Modal';
import * as Report from '@userActions/Report';
import * as User from '@userActions/User';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -285,7 +286,11 @@ function ComposerWithSuggestions(

const parentReportAction = parentReportActions?.[parentReportActionID ?? ''] ?? null;
const shouldAutoFocus =
!modal?.isVisible && isFocused && (shouldFocusInputOnScreenFocus || (isEmptyChat && !ReportActionsUtils.isTransactionThread(parentReportAction))) && shouldShowComposeInput;
!modal?.isVisible &&
Modal.areAllModalsHidden() &&
isFocused &&
(shouldFocusInputOnScreenFocus || (isEmptyChat && !ReportActionsUtils.isTransactionThread(parentReportAction))) &&
shouldShowComposeInput;

const valueRef = useRef(value);
valueRef.current = value;
Expand Down
Loading