Michael Telatynski
986d56ffdc
Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
...
Conflicts:
src/components/views/rooms/RoomSublist2.tsx
src/components/views/rooms/RoomTile2.tsx
2020-07-07 17:11:04 +01:00
Jorik Schellekens
262c7b1fa5
Merge pull request #4910 from matrix-org/joriks/orange-is-the-new-black
...
Change orange to our orange and do some lints
2020-07-07 16:46:12 +01:00
Jorik Schellekens
6b5eaca0b9
Remove comment
2020-07-07 16:45:43 +01:00
Jorik Schellekens
da1d1ffa09
Change colour to orange and do some lints
2020-07-07 15:42:54 +01:00
Michael Telatynski
8ba2be0be5
Merge pull request #4900 from matrix-org/t3chguy/room-list/1234
...
New Room List implement view_room_delta for keyboard shortcuts
2020-07-07 15:36:30 +01:00
Michael Telatynski
502a0d930d
Merge pull request #4896 from matrix-org/t3chguy/room-list/123
...
New Room List accessibility
2020-07-07 14:51:41 +01:00
Michael Telatynski
69852ecef4
Merge branches 'develop' and 't3chguy/room-list/123' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/123
...
Conflicts:
src/components/views/rooms/RoomSublist2.tsx
2020-07-07 14:10:58 +01:00
Michael Telatynski
44ae83f228
Move the Volume union type out to a throwaway
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 14:07:35 +01:00
Travis Ralston
7173ea71a5
Merge pull request #4905 from matrix-org/travis/room-list/room-safety
...
Improve room safety in the new room list
2020-07-07 06:59:59 -06:00
Travis Ralston
b3b404f121
Merge pull request #4906 from matrix-org/travis/room-list/invites-list
...
Fix a number of issues with the new room list's invites
2020-07-07 06:55:30 -06:00
Travis Ralston
d04bcdfa15
Merge pull request #4907 from matrix-org/travis/room-list/raise
...
Decrease default visible rooms down to 5
2020-07-07 06:54:49 -06:00
Travis Ralston
1b48b99f99
Append community invites to bottom instead
2020-07-07 06:53:17 -06:00
Travis Ralston
994d8708f2
Move to a fragment
2020-07-07 06:52:44 -06:00
Bruno Windels
453924a98a
Merge pull request #4909 from matrix-org/bwindels/noroomtilebuttonjump
...
swap order of context menu buttons so it does not jump when muted
2020-07-07 11:12:15 +00:00
Bruno Windels
8f47b59de8
fix margin between buttons
...
I think the selector wasn't working before either fwiw
2020-07-07 13:03:18 +02:00
Bruno Windels
2ca9044171
swap order of context menu buttons so it does not jump when muted
2020-07-07 12:46:33 +02:00
Michael Telatynski
19e1c79796
update comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 10:35:16 +01:00
Michael Telatynski
63ec793fad
Support view_room's show_room_tile in the new room list
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 10:34:42 +01:00
Michael Telatynski
1259a8e1af
Merge branch 'travis/room-list/room-safety' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
2020-07-07 10:27:09 +01:00
Travis Ralston
2c502ed2fe
Decrease default visible rooms down to 5
2020-07-06 20:48:49 -06:00
Travis Ralston
29aeea2974
Fix i18n
2020-07-06 20:45:36 -06:00
Travis Ralston
56333ae017
Ensure the recents algorithm is aware of invites
2020-07-06 20:42:43 -06:00
Travis Ralston
3284cc730e
Show ordering options on invites
...
Fixes https://github.com/vector-im/riot-web/issues/14309
2020-07-06 20:42:43 -06:00
Travis Ralston
f103fd1ccf
Make community invites appear even if there's no room invites
...
Fixes https://github.com/vector-im/riot-web/issues/14358
2020-07-06 20:32:37 -06:00
Travis Ralston
b28a267669
Remove old community invite placeholder handling
...
We ended up shoving it into the invite list, so don't render it here.
2020-07-06 20:32:09 -06:00
Travis Ralston
8739e2f781
Fix room duplication when the sticky room reference changes
2020-07-06 20:12:25 -06:00
Travis Ralston
34bd59c151
Remove the lock around the algorithm
...
This isn't needed
2020-07-06 19:38:13 -06:00
Travis Ralston
70e5da677b
Clean up debug logging
2020-07-06 19:38:13 -06:00
Travis Ralston
dd833f4f2f
Ensure the sticky room changes if the tag changes
...
This fixes a case where a user accepts an invite, which causes a tag change, but the room stays stuck in the invites list. The tag change additionally gets swallowed when the user moves away, causing the room to get lost.
By moving it when we see it, potentially during a sticky room change itself (though extremely rare), we avoid having the room get lost in the wrong lists. A side effect of this is that accepting an invite puts it at the top of the tag it's going to (usually untagged), however this feels like the best option for the user.
A rare case of a tag change happening during a sticky room change is when a leave event comes in for the sticky room, but because it's come through as a tag change it can get swallowed. If it does get swallowed and the user clicks away, the tag change will happen when the room is re-introduced to the list (fake NewRoom event).
2020-07-06 19:38:13 -06:00
Travis Ralston
4345f972e0
Handle sticky room to avoid accidental removal
...
Plus a bunch of logging.
This fixes a case where switching rooms would cause the last room you were on to disappear due to an optimization where known NewRoom fires would be translated to tag change fires, which wouldn't re-add the room to the underlying tag algorithm.
By tracking the last sticky room, we can identify when we're about to do this and avoid it.
This commit also adds a check to ensure that we have the latest reference of a room stored as rooms changing from invite -> join change references.
This commit additionally updates the PossibleTagChange handling to be faster and smarter, leading to a more stable generation of the room list. We convert the update cause to a Timeline update in order to indicate it is a change within the same tag rather than having to jump tags. This also means that PossibleTagChange should no longer make it as far as the underlying algorithm.
New logging has also been added to aid debugging.
2020-07-06 19:38:13 -06:00
Travis Ralston
18df29b627
Flag & add some debugging
2020-07-06 19:38:13 -06:00
Travis Ralston
0b6f744a58
Wrap handleRoomUpdate in a lock
...
Dev note: this is removed in a later commit
2020-07-06 19:38:13 -06:00
Michael Telatynski
64237c9f4e
Apply scroll margins to RoomTile so that they don't scroll under the "sticky" headers
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 00:11:32 +01:00
Michael Telatynski
6bc39547c7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
2020-07-07 00:10:06 +01:00
Travis Ralston
d14dd777b7
Revert "don't need to set width with javascript?"
...
This reverts commit a2cf641c0e
.
2020-07-06 15:23:20 -06:00
Travis Ralston
70eebc978f
Revert "Minor cleanup of sticky header CSS"
...
This reverts commit 5bf14d8427
.
2020-07-06 15:22:40 -06:00
Michael Telatynski
3094bb32ec
Merge pull request #4901 from matrix-org/t3chguy/room-list/112
...
Fix some room list sticky header instabilities
2020-07-06 22:21:02 +01:00
Michael Telatynski
abfbcf4090
use uglier style for props but be consistent :'(
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 22:04:30 +01:00
Michael Telatynski
f038dd52e6
Merge pull request #4903 from matrix-org/t3chguy/room-list/14353
...
null-guard against groups with a null name in new Room List
2020-07-06 22:01:41 +01:00
Michael Telatynski
60225154e6
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 21:58:44 +01:00
Michael Telatynski
97d4295bf5
Merge pull request #4902 from matrix-org/t3chguy/room-list/14306
...
Allow vertical scrolling on the new room list breadcrumbs
2020-07-06 21:53:54 +01:00
Michael Telatynski
f6aa6208ee
null-guard against groups with a null name :((
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 21:53:20 +01:00
Travis Ralston
5bf14d8427
Minor cleanup of sticky header CSS
2020-07-06 14:37:38 -06:00
Bruno Windels
7647072b05
remove prop instead of assigning unset
2020-07-06 14:36:07 -06:00
Bruno Windels
201f6ebe83
make stick headers jump in a bit later so the transition is less jumpy
2020-07-06 14:36:01 -06:00
Bruno Windels
a2cf641c0e
don't need to set width with javascript?
2020-07-06 14:35:53 -06:00
Bruno Windels
61a5807fd1
only show topmost top sticky header
2020-07-06 14:35:46 -06:00
Michael Telatynski
c9bc318ca7
Allow vertical scrolling on the new room list breadcrumbs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 21:32:46 +01:00
Michael Telatynski
8233dec72e
Fix some room list sticky header instabilities
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 21:05:06 +01:00
Michael Telatynski
2c1eb07768
Merge pull request #4883 from matrix-org/t3chguy/ts123
...
Convert things to Typescript, including languageHandler
2020-07-06 18:54:19 +01:00