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

Jump to bottom

fix composer focusing for popups #26826

Merged
merged 4 commits into from
Sep 12, 2023
Merged

fix composer focusing for popups #26826

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1ad982
fix composer focusing for popups
b4s36t4 Sep 5, 2023
9465e2b
fix lint
b4s36t4 Sep 6, 2023
67fd84e
Merge branch 'main' of github.com:Expensify/App into fix/composer-foc…
b4s36t4 Sep 11, 2023
29814a9
Update src/pages/home/report/ReportActionCompose/ComposerWithSuggesti…
b4s36t4 Sep 11, 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
5 changes: 3 additions & 2 deletions src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,10 @@ function ComposerWithSuggestions({
* @returns {Boolean}
*/
const checkComposerVisibility = useCallback(() => {
const isComposerCoveredUp = EmojiPickerActions.isEmojiPickerVisible() || isMenuVisible || modal.isVisible;
// Checking whether the screen is focused or not, helps avoid `modal.isVisible` false when popups are closed, even if the modal is opened.
const isComposerCoveredUp = !isFocused || EmojiPickerActions.isEmojiPickerVisible() || isMenuVisible || modal.isVisible || modal.willAlertModalBecomeVisible;
return !isComposerCoveredUp;
}, [isMenuVisible, modal.isVisible]);
}, [isMenuVisible, modal, isFocused]);

const focusComposerOnKeyPress = useCallback(
(e) => {
Expand Down
Loading