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

MM-16070 Fix channel sidebar state while filtering (#2864)

Browse source
This commit is contained in:
Elias Nahum 2019-06-05 19:33:23 -04:00
parent 151a304857
commit ddbc89bb9a
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
5 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/components/sidebars/main/channels_list/channels_list.js
View file

@ -49,11 +49,11 @@ export default class ChannelsList extends PureComponent {
});
}
componentWillReceiveProps(nextProps) {
if (!nextProps.drawerOpened && this.props.drawerOpened) {
this.cancelSearch();
cancelSearch = () => {
if (this.refs.search_bar) {
this.refs.search_bar.cancel();
}
}
};
onSelectChannel = (channel, currentChannelId) => {
if (channel.fake) {
@ -62,9 +62,7 @@ export default class ChannelsList extends PureComponent {
this.props.onSelectChannel(channel, currentChannelId);
}
if (this.refs.search_bar) {
this.refs.search_bar.cancel();
}
this.cancelSearch();
};
onSearch = (term) => {
@ -79,7 +77,7 @@ export default class ChannelsList extends PureComponent {
this.props.onSearchStart();
};
cancelSearch = () => {
onSearchCancel = () => {
this.props.onSearchEnds();
this.setState({searching: false});
this.onSearch('');
@ -142,7 +140,7 @@ export default class ChannelsList extends PureComponent {
titleCancelColor={theme.sidebarHeaderTextColor}
selectionColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
onSearchButtonPress={this.onSearch}
onCancelButtonPress={this.cancelSearch}
onCancelButtonPress={this.onSearchCancel}
onChangeText={this.onSearch}
onFocus={this.onSearchFocused}
searchIconCollapsedMargin={5}

2
app/components/sidebars/main/channels_list/index.js
View file

@ -13,4 +13,4 @@ function mapStateToProps(state) {
};
}
export default connect(mapStateToProps)(ChannelsList);
export default connect(mapStateToProps, null, null, {forwardRef: true})(ChannelsList);

1
app/components/sidebars/main/drawer_swipper/drawer_swiper.js
View file

@ -59,7 +59,6 @@ export default class DrawerSwiper extends Component {
showTeamsPage = () => {
if (this.swiperRef?.current) {
this.swiperRef.current.scrollToIndex(0, true);
this.swiperPageSelected(0);
}
};

11
app/components/sidebars/main/main_sidebar.js
View file

@ -63,6 +63,7 @@ export default class ChannelSidebar extends Component {
this.swiperIndex = 1;
this.drawerRef = React.createRef();
this.channelListRef = React.createRef();
this.state = {
show: false,
openDrawerOffset,
@ -142,6 +143,7 @@ export default class ChannelSidebar extends Component {
handleDrawerClose = () => {
this.setState({
drawerOpened: false,
searching: false,
});
this.resetDrawer();
Keyboard.dismiss();
@ -283,6 +285,14 @@ export default class ChannelSidebar extends Component {
if (this.drawerSwiper) {
this.drawerSwiper.resetPage();
}
if (this.drawerRef?.current) {
this.drawerRef.current.canClose = true;
}
if (this.channelListRef?.current) {
this.channelListRef.current.cancelSearch();
}
};
renderNavigationView = (drawerWidth) => {
@ -334,6 +344,7 @@ export default class ChannelSidebar extends Component {
style={style.swiperContent}
>
<ChannelsList
ref={this.channelListRef}
navigator={navigator}
onSelectChannel={this.selectChannel}
onJoinChannel={this.joinChannel}

4
app/components/swiper.js
View file

@ -182,9 +182,7 @@ export default class Swiper extends PureComponent {
}
this.scrollView.scrollTo({x: (index * this.props.width), animated});
if (index === 0) {
this.offset = 0;
}
this.updateIndex(this.props.width * index);
};
updateIndex = (offset) => {