toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert changes that select channel before channel drawer is closed (#930)

Browse source
This commit is contained in:
Harrison Healey 2017-09-22 10:16:56 -04:00 committed by enahum
parent 9a5e7ac541
commit a09e1ebcc1
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/components/channel_drawer/channel_drawer.js
View file

@ -48,6 +48,8 @@ export default class ChannelDrawer extends PureComponent {
theme: PropTypes.object.isRequired
};
closeLeftHandle = null;
openLeftHandle = null;
swiperIndex = 1;
constructor(props) {
@ -112,6 +114,11 @@ export default class ChannelDrawer extends PureComponent {
handleDrawerClose = () => {
this.resetDrawer();
if (this.closeLeftHandle) {
InteractionManager.clearInteractionHandle(this.closeLeftHandle);
this.closeLeftHandle = null;
}
if (this.state.openDrawer) {
// The state doesn't get updated if you swipe to close
this.setState({
@ -120,13 +127,28 @@ export default class ChannelDrawer extends PureComponent {
}
};
handleDrawerCloseStart = () => {
if (!this.closeLeftHandle) {
this.closeLeftHandle = InteractionManager.createInteractionHandle();
}
}
handleDrawerOpen = () => {
if (this.state.openDrawerOffset !== 0) {
Keyboard.dismiss();
}
if (this.openLeftHandle) {
InteractionManager.clearInteractionHandle(this.openLeftHandle);
this.openLeftHandle = null;
}
};
handleDrawerOpenStart = () => {
if (!this.openLeftHandle) {
this.openLeftHandle = InteractionManager.createInteractionHandle();
}
if (!this.state.openDrawer) {
// The state doesn't get updated if you swipe to open
this.setState({
@ -183,15 +205,15 @@ export default class ChannelDrawer extends PureComponent {
viewChannel
} = actions;
markChannelAsRead(channel.id, currentChannelId);
setChannelLoading();
viewChannel(currentChannelId);
setChannelDisplayName(channel.display_name);
handleSelectChannel(channel.id);
this.closeChannelDrawer();
InteractionManager.runAfterInteractions(() => {
markChannelAsRead(channel.id, currentChannelId);
viewChannel(currentChannelId);
handleSelectChannel(channel.id);
});
};
@ -346,7 +368,7 @@ export default class ChannelDrawer extends PureComponent {
panThreshold={0.25}
acceptPan={true}
negotiatePan={true}
useInteractionManager={true}
useInteractionManager={false}
tweenDuration={100}
tweenHandler={this.handleDrawerTween}
elevation={-5}