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

Focus compose box when navigate away from RHN #2050

Merged
merged 5 commits into from
Apr 7, 2021
Merged

Focus compose box when navigate away from RHN #2050

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
127d15b
Focus compose box when navigate away from RHN
Beamanator Mar 24, 2021
0f098fd
Handle modal visibility in screen listeners
Beamanator Mar 25, 2021
3ac2f7a
Fix js linting
Beamanator Mar 25, 2021
dc52e54
Undo adding extra empty line
Beamanator Mar 25, 2021
93ed2ea
Merge branch 'master' of github.com:Expensify/Expensify.cash into bea…
Beamanator Apr 7, 2021
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
19 changes: 19 additions & 0 deletions src/libs/Navigation/AppNavigator/AuthScreens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {fetchCountryCodeByRequestIP} from '../../actions/GeoLocation';
import KeyboardShortcut from '../../KeyboardShortcut';
import Navigation from '../Navigation';
import * as User from '../../actions/User';
import {setModalVisibility} from '../../actions/Modal';
import NameValuePair from '../../actions/NameValuePair';
import modalCardStyleInterpolator from './modalCardStyleInterpolator';
import createCustomModalStackNavigator from './createCustomModalStackNavigator';
Expand All @@ -42,6 +43,17 @@ import {

const RootStack = createCustomModalStackNavigator();

// When modal screen gets focused, update modal visibility in Onyx
// https://reactnavigation.org/docs/navigation-events/
const modalScreenListeners = {
focus: () => {
setModalVisibility(true);
},
beforeRemove: () => {
setModalVisibility(false);
},
};

const propTypes = {
network: PropTypes.shape({isOffline: PropTypes.bool}),
...windowDimensionsPropTypes,
Expand Down Expand Up @@ -147,36 +159,43 @@ class AuthScreens extends React.Component {
name="Settings"
options={modalScreenOptions}
component={SettingsModalStackNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name="NewChat"
options={modalScreenOptions}
component={NewChatModalStackNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name="NewGroup"
options={modalScreenOptions}
component={NewGroupModalStackNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name="Search"
options={modalScreenOptions}
component={SearchModalStackNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name="Details"
options={modalScreenOptions}
component={DetailsModalStackNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name="IOU_Request"
options={modalScreenOptions}
component={IOURequestModalStackNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name="IOU_Bill"
options={modalScreenOptions}
component={IOUBillStackNavigator}
listeners={modalScreenListeners}
/>
</RootStack.Navigator>
);
Expand Down