Skip to content

[FIX] Serverdrop not closing after changing screens #1299

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

Merged
diegolmello merged 4 commits into from
Oct 28, 2019
Merged

[FIX] Serverdrop not closing after changing screens #1299

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72ad758
Fix server dropdown when change screen
LucasSiqz Oct 10, 2019
e6a5c53
Merge develop
djorkaeffalexandre Oct 10, 2019
828d9c5
Only close
djorkaeffalexandre Oct 10, 2019
928b732
Merge branch 'develop' into fix.server-dropdown
diegolmello Oct 28, 2019
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
20 changes: 13 additions & 7 deletions app/views/RoomsListView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import {
toggleSortDropdown as toggleSortDropdownAction,
openSearchHeader as openSearchHeaderAction,
closeSearchHeader as closeSearchHeaderAction,
roomsRequest as roomsRequestAction
roomsRequest as roomsRequestAction,
closeServerDropdown as closeServerDropdownAction
} from '../../actions/rooms';
import { appStart as appStartAction } from '../../actions';
import debounce from '../../utils/debounce';
Expand Down Expand Up @@ -138,7 +139,8 @@ class RoomsListView extends React.Component {
openSearchHeader: PropTypes.func,
closeSearchHeader: PropTypes.func,
appStart: PropTypes.func,
roomsRequest: PropTypes.func
roomsRequest: PropTypes.func,
closeServerDropdown: PropTypes.func
};

constructor(props) {
Expand Down Expand Up @@ -176,10 +178,13 @@ class RoomsListView extends React.Component {
this.handleBackPress
);
});
this.willBlurListener = props.navigation.addListener('willBlur', () => BackHandler.addEventListener(
'hardwareBackPress',
this.handleBackPress
));
this.willBlurListener = props.navigation.addListener('willBlur', () => {
props.closeServerDropdown();
BackHandler.addEventListener(
'hardwareBackPress',
this.handleBackPress
);
});
}

componentDidMount() {
Expand Down Expand Up @@ -819,7 +824,8 @@ const mapDispatchToProps = dispatch => ({
closeSearchHeader: () => dispatch(closeSearchHeaderAction()),
appStart: () => dispatch(appStartAction()),
roomsRequest: () => dispatch(roomsRequestAction()),
selectServerRequest: server => dispatch(selectServerRequestAction(server))
selectServerRequest: server => dispatch(selectServerRequestAction(server)),
closeServerDropdown: () => dispatch(closeServerDropdownAction())
});

export default connect(mapStateToProps, mapDispatchToProps)(RoomsListView);