Commit Graph

10967 Commits

Author SHA1 Message Date
Travis Ralston e51f9d2492 Fix closing the context menu causing the tile to be selected
Fixes https://github.com/vector-im/riot-web/issues/14293
2020-07-02 13:53:38 -06:00
Travis Ralston 45f4a2a980 Fix imports for NotificationStates 2020-07-02 13:28:06 -06:00
Travis Ralston b54635863f Merge branch 'develop' into travis/room-list/notification-state 2020-07-02 13:26:16 -06:00
Travis Ralston 43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski 4a03b464d6 Merge pull request #4875 from matrix-org/t3chguy/room-list/4
Add click-to-jump on badge in the room sublist header
2020-07-02 20:04:43 +01:00
Michael Telatynski ae2a6ebc07 improve comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 19:56:41 +01:00
Michael Telatynski a658612078 Add click-to-jump on badge in the room sublist header
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 19:48:06 +01:00
Michael Telatynski c4bbdefa8d Merge pull request #4870 from matrix-org/t3chguy/room-list/2
Room List v2 context menu interactions
2020-07-02 18:02:21 +01:00
Travis Ralston 32642d592c Add a key 2020-07-02 09:27:42 -06:00
Travis Ralston b7aa8203b6 Wedge community invites into the new room list
Fixes https://github.com/vector-im/riot-web/issues/14179

Disclaimer: this is all of the horrible because it's not meant to be here. Invites in general are likely to move out of the room list, which means this is temporary. Additionally, the communities rework will take care of this more correctly. For now, we support the absolute bare minimum to have them shown.
2020-07-02 09:04:38 -06:00
J. Ryan Stinnett 209b386e23 Merge remote-tracking branch 'origin/develop' into jryans/room-view-crypto-crash 2020-07-02 13:46:50 +01:00
J. Ryan Stinnett a928785f72 Check whether crypto is enabled in room recovery reminder
This avoids a soft crash that may occur otherwise.

Fixes https://github.com/vector-im/riot-web/issues/14289
2020-07-02 13:19:27 +01:00
J. Ryan Stinnett b5c94acbe6 Remove unused crypto import 2020-07-02 13:17:51 +01:00
Michael Telatynski 4b27a67e33 improve default behaviour for consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 23:16:54 +01:00
Michael Telatynski 6424ffb22a fix repeated context menu interaction by not erroring
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 23:13:54 +01:00
Michael Telatynski e8702aafa5 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 23:09:02 +01:00
Michael Telatynski 5c2b291510 Support right click context menu interactions on Room List 2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 23:06:26 +01:00
Michael Telatynski 89bd572371 Fix context menu nesting causing bubbling and instabilities
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 23:05:37 +01:00
Jorik Schellekens 62314cac06 Merge pull request #4863 from matrix-org/joriks/room-list-autohide-scrollbar
Hide scrollbar without pixel jumping
2020-07-01 20:07:32 +01:00
Michael Telatynski 28e430060c Merge pull request #4858 from matrix-org/t3chguy/room-list/2
Room Tile context menu, notifications, indicator and placement
2020-07-01 19:20:09 +01:00
Travis Ralston 51ce80f333 Merge branch 'develop' into travis/room-list/notification-state 2020-07-01 12:01:07 -06:00
Travis Ralston 2cd6fae2ce Merge pull request #4865 from matrix-org/travis/room-list/default-vis
Improve resizing interactions in the new room list
2020-07-01 11:59:54 -06:00
Travis Ralston 946fde5cc5 Be consistent in visible tiles usage 2020-07-01 11:59:32 -06:00
Jorik Schellekens 2162517a37 Display breadcrumbs only after 20 rooms have been joined 2020-07-01 16:05:27 +01:00
Jorik Schellekens ad27dbbfab Clean up classnames 2020-07-01 15:15:18 +01:00
Michael Telatynski 9831698b1e Hide notifications menu from invite tiles
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 14:28:00 +01:00
Michael Telatynski 10e547539d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-07-01 14:26:56 +01:00
Travis Ralston fed0c327d5 Merge pull request #4866 from matrix-org/travis/room-list/rm-ordering-options
Disable use of account-level ordering options in new room list
2020-07-01 07:25:04 -06:00
Michael Telatynski 3b7b6eca6f align context menus even better
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 14:05:33 +01:00
Michael Telatynski b5014282a4 Iterate PR based on Figma design and feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 13:59:50 +01:00
Jorik Schellekens 1dd9c1eea3 Use avatar sisze inplace 2020-07-01 12:28:32 +01:00
Travis Ralston ad982624fe Remove context menu on invites in new room list
Fixes https://github.com/vector-im/riot-web/issues/14198

For both, the decision has been made to not have a context menu pending further considerations of where invites should (and should not) be. Likely this will be dealt with in FTUE Notifications.
2020-06-30 19:43:00 -06:00
Travis Ralston 0868af650a Appease the linter 2020-06-30 19:37:00 -06:00
Travis Ralston d402808101 Disable use of account-level ordering options in new room list
Fixes https://github.com/vector-im/riot-web/issues/14069

We can't drop them completely for compatibility with the old room list.
2020-06-30 19:31:59 -06:00
Travis Ralston 7674030c6e Show 'show more' when there are less tiles than the default
For example, if you only have 3/10 rooms required for the default then resize smaller, we should have a 'show more' button.

This works by changing the rendering to be slightly more efficient and only looping over what is seen (renderVisibleTiles(), using this.numTiles in place of tiles.length) and using a new setVisibleTilesWithin() function on the layout. Previously resizing the 3/10 case would be setting visibleTiles to ~8 instead of ~1 like it should (because the getter returns a default).
2020-06-30 19:14:36 -06:00
Jorik Schellekens d2fb30a211 Hide scrollbar without pixel jumping 2020-06-30 23:52:13 +01:00
Jorik Schellekens 2379ec577c Lint semicolons 2020-06-30 23:39:25 +01:00
Jorik Schellekens 0904ae8c7a Bug fixes 2020-06-30 23:35:59 +01:00
Jorik Schellekens dcd51b5be3 Implement breadcrumb notifications and scrolling 2020-06-30 23:24:46 +01:00
J. Ryan Stinnett b456529c3e Merge pull request #4860 from matrix-org/jryans/read-marker-jump-invis-2
Fix jumping to read marker for events without tiles
2020-06-30 23:01:19 +01:00
Michael Telatynski 508dea1c89 Wire up Notifications context menu on room tile 2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 22:53:30 +01:00
Michael Telatynski 198958dcdd Iterate to match figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 22:32:59 +01:00
Michael Telatynski cbd2a9cd35 Redo Iconized Context Menu styling to match Figma and simplify future a11y work by flattening the DOM
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 22:11:12 +01:00
Michael Telatynski 2a12fd1f6e Fix User context menu alignment to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 21:58:54 +01:00
Michael Telatynski fe4cf9f9b4 Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-06-30 21:16:37 +01:00
Travis Ralston 782a555e44 Make badges represent old list behaviour
Fixes https://github.com/vector-im/riot-web/issues/14160
2020-06-30 13:45:10 -06:00
Travis Ralston 393eaf84c3 Move notification states out of the NotificationBadge component
Fixes https://github.com/vector-im/riot-web/issues/14153
2020-06-30 13:34:44 -06:00
J. Ryan Stinnett 51118863c7 Fix jumping to read marker for events without tiles
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.

This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.

Fixes vector-im/riot-web#10975
2020-06-30 18:40:52 +01:00
David Baker 2247400010 Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2
Add file upload button to recovery key input
2020-06-30 18:06:12 +01:00
David Baker 7caf2d5459 remove rogue blank line 2020-06-30 17:56:50 +01:00