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 not focused when pressing key after coming from WS share code page #46855

Merged
merged 4 commits into from
Aug 7, 2024
Merged

Fix composer not focused when pressing key after coming from WS share code page #46855

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1207094
fix composer not focused when pressing key
bernhardoj Aug 6, 2024
41f006e
use navigate back
bernhardoj Aug 6, 2024
fbcfdb7
set the modal visibility when blurred
bernhardoj Aug 6, 2024
4f37bc7
remove unused logic
bernhardoj Aug 6, 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
5 changes: 5 additions & 0 deletions src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import WIDE_LAYOUT_INACTIVE_SCREENS from '@components/FocusTrap/WIDE_LAYOUT_INAC
import useWindowDimensions from '@hooks/useWindowDimensions';
import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
import type FocusTrapProps from './FocusTrapProps';

function FocusTrapForScreen({children}: FocusTrapProps) {
Expand All @@ -26,6 +27,10 @@ function FocusTrapForScreen({children}: FocusTrapProps) {
return isFocused;
}

if (route.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a bit comment as in other conditions?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just retested after not dismissing the RHP, this fix isn't needed anymore, so I remove it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I confirm, everything works
Thanks for cleaning the code

return isFocused;
}

// Focus trap can't be active on these screens if the layout is wide because they may be displayed side by side.
if (WIDE_LAYOUT_INACTIVE_SCREENS.includes(route.name) && !isSmallScreenWidth) {
return false;
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/AppNavigator/AuthScreens.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ const modalScreenListeners = {
focus: () => {
Modal.setModalVisibility(true);
},
blur: () => {
Modal.setModalVisibility(false);
},
beforeRemove: () => {
// Clear search input (WorkspaceInvitePage) when modal is closed
SearchInputManager.searchInput = '';
Expand Down
Loading