mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 02:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll

Browse source 
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
This commit is contained in:
Michael Telatynski 2020-04-01 17:46:41 +01:00 committed by GitHub
commit 7143c91d16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/RoomSubList.js
View file

@ -126,7 +126,7 @@ export default class RoomSubList extends React.PureComponent {
break; break;
case 'view_room': case 'view_room':
if (this.state.hidden && !this.props.forceExpand && if (this.state.hidden && !this.props.forceExpand && payload.show_room_tile &&
this.props.list.some((r) => r.roomId === payload.room_id) this.props.list.some((r) => r.roomId === payload.room_id)
) { ) {
this.toggle(); this.toggle();
@ -193,6 +193,7 @@ export default class RoomSubList extends React.PureComponent {
onRoomTileClick = (roomId, ev) => { onRoomTileClick = (roomId, ev) => {
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
show_room_tile: true, // to make sure the room gets scrolled into view
room_id: roomId, room_id: roomId,
clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)), clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)),
}); });

1
src/components/views/rooms/RoomList.js
View file

@ -289,6 +289,7 @@ export default createReactClass({
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
room_id: room.roomId, room_id: room.roomId,
show_room_tile: true, // to make sure the room gets scrolled into view
}); });
} }
break; break;

2
src/components/views/rooms/RoomTile.js
View file

@ -203,7 +203,7 @@ export default createReactClass({
case 'view_room': case 'view_room':
// when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcut access // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcut access
if (payload.room_id === this.props.room.roomId) { if (payload.room_id === this.props.room.roomId && payload.show_room_tile) {
this._scrollIntoView(); this._scrollIntoView();
} }
break; break;