Commit graph

52 commits

Author SHA1 Message Date
Travis Ralston
8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
This reverts commit ad47144355.
2019-01-03 15:37:03 -07:00
David Baker
7d161de35b Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
Bruno Windels
b359a2edee call header clicked callback after rerendering, so resizer has DOM nodes 2018-12-18 10:56:00 +01:00
Bruno Windels
3ea0fd1a2f fix overflow indicators not being updated when searching 2018-12-14 17:06:51 +01:00
Travis Ralston
ca1313099f Show the IncomingCallBox if the call is for the RoomSubList
Fixes https://github.com/vector-im/riot-web/issues/4369

Previously the RoomSubList would filter its list of rooms to verify that the incoming call belongs to it. This causes problems when the sub list is being told some rooms don't exist (ie: the list is filtered). It is trivial for the RoomList to instead track which RoomSubList (tag) it should be handing the call off to so we do that instead now. The RoomSubList trusts that the caller has already filtered it and will render the IncomingCallBox if it has an incoming call.
2018-12-06 11:45:58 -07:00
Bruno Windels
8e77a6716c don't set initial size based on item count anymore 2018-11-26 14:49:30 +01:00
Bruno Windels
0f226853f5 add scroll indicator gradients to top and bottom of room sub list 2018-11-12 12:57:21 +01:00
Bruno Windels
9e95a1402c
Merge pull request #2269 from matrix-org/bwindels/roomlistpolish
Redesign: room list visual polish
2018-11-07 11:44:47 +00:00
Bruno Windels
3bd0bcde4b align room sub list header with design
also make css more maintainable with less hardcoded dimensions
2018-11-06 14:03:01 +01:00
Bruno Windels
665d424758 use svg icon in add room button 2018-11-05 14:25:28 +01:00
Bruno Windels
05935db8fc don't show sublist header badge in collapsed mode
just not enough space
2018-11-05 14:25:07 +01:00
Bruno Windels
6993dc034d always show badges in room sub list header 2018-11-05 10:35:50 +01:00
Bruno Windels
e29227db4e bring back "filter rooms" field
this does the filtering in RoomList instead of RoomSubList, so
we can hide sections that don't have any results.

The filtering does happen with every rerender of RoomList,
but only does something while searching, so the performance
implications are probably negligible.
2018-11-02 15:27:17 +01:00
Bruno Windels
3e02f247c8 use AutoHideScrollbar in RoomSubList 2018-11-01 17:33:21 +01:00
Bruno Windels
0038d6d219
Merge pull request #2234 from matrix-org/bwindels/roomsectionfixcollapsedsize
Redesign: Fix room lists sizing
2018-10-24 12:23:05 +00:00
Bruno Windels
521e035bf0 add vertical space above and below room section 2018-10-22 18:17:14 +02:00
Bruno Windels
91a2ee1779 tweak badges 2018-10-22 18:16:36 +02:00
Bruno Windels
a69463e7fa clear height flexbox properties when collapsing
so item doesn't maintain height given by resizing
2018-10-22 15:57:56 +02:00
Bruno Windels
5c843acc10 fix room lists growing taller than screen height in FF
sections with flex-basis don't seem to shrink smaller in FF,
so use flexGrow which is unitless/proportional but works as well
2018-10-22 11:16:33 +02:00
Bruno Windels
e4276d9378 don't show notification count in expanded room section header 2018-10-19 14:50:35 +02:00
Bruno Windels
acd383c6a9 move closer to usage 2018-10-19 14:44:37 +02:00
Bruno Windels
d48f19bc19 remove alwaysShowHeader, as now onAddRoom prop determines this 2018-10-19 14:43:02 +02:00
Bruno Windels
5091aa3b43 get rid of emptyContent, also cleanup sublist render method
also assume empty list in css by default and add nonEmpty class
2018-10-19 14:41:51 +02:00
Bruno Windels
57a9d3ca98 remove obsolete resizer 2018-10-19 14:37:23 +02:00
Bruno Windels
14cdd723f7 only show chevron for non-empty lists 2018-10-19 14:33:51 +02:00
Bruno Windels
0386a1e048 get rid of obsolete showEmpty prop 2018-10-19 14:32:49 +02:00
Bruno Windels
ae8723451a remove onShowMoreRooms, as room tiles & scrollbar rendered at same level 2018-10-19 14:27:36 +02:00
Bruno Windels
07799f609f fix lint 2018-10-19 12:34:55 +02:00
Bruno Windels
798be2d514 remove room count leftovers 2018-10-19 12:08:05 +02:00
Bruno Windels
6af61ebb09 add plus button for rooms and people 2018-10-19 12:07:36 +02:00
Bruno Windels
197dd57461 also set max-height so you can't make a sublist bigger than the content 2018-10-18 16:58:23 +02:00
Bruno Windels
44b92eb071 set sub list height with flex-basis to make it ... well, grow less 2018-10-18 16:58:17 +02:00
Bruno Windels
d264687796 don't scroll sub list header 2018-10-18 16:25:22 +02:00
Bruno Windels
0b615b21e2 fix lint 2018-10-18 15:53:27 +02:00
Bruno Windels
6906d5a5f9 remove DND for room tiles 2018-10-17 16:02:35 +02:00
Bruno Windels
874ef50273 don't truncate room lists 2018-10-17 14:45:36 +02:00
Matthew Hodgson
fe73953d9d fix merge; disable sticky headers; tweak chevrons 2018-07-30 09:00:11 -07:00
Matthew Hodgson
9783b6100d Merge branch 'develop' into matthew/dharma 2018-07-29 17:03:23 +01:00
Michael Telatynski
ca83f1e8c8
allow RoomSubList to use old behaviour of not hiding even if empty
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:06:33 +01:00
David Baker
6fb57c0c66
Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click
on room sub list badge click goto first relevant room
2018-06-27 10:29:22 +01:00
Michael Telatynski
613e83edb4
on roomsublist invite badge click goto first room/group
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:58 +01:00
Michael Telatynski
b3341e6664
on click roomsublist notif badge, goto first room with notif
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:25 +01:00
Michael Telatynski
abd37d141e
clear up if statement to make it more readable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:54:38 +01:00
Michael Telatynski
9b50daa748
give Historical an emptyContent to make it look more consistent
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:33 +01:00
Michael Telatynski
fabdf22aad
delint RoomSubList and generate eslintignore file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-25 09:54:33 +01:00
Michael Telatynski
a174555452
hide RoomSubList if has 0 tiles and either searchFilter or emptyContent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-25 09:42:42 +01:00
Michael Telatynski
384c974589
tidy up if statements and fix up comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:16:57 +01:00
Michael Telatynski
41be46a712
apply roomlist searchFilter to aliases if it begins with a #
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:51:35 +01:00
Matthew Hodgson
7fe2bfc212 remove numbers 2018-05-25 16:30:38 +01:00