imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Iterate facepiles, fix default avatar alignment and sort explicit avatars first

Browse source
This commit is contained in:
Michael Telatynski 2021-03-26 11:55:22 +00:00
parent aff05eff48
commit 4341dfb314
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/elements/_FacePile.scss
View file

@ -27,6 +27,10 @@ limitations under the License.
.mx_BaseAvatar_image { .mx_BaseAvatar_image {
border: 1px solid $primary-bg-color; border: 1px solid $primary-bg-color;
} }
.mx_BaseAvatar_initial {
margin: 1px; // to offset the border on the image
}
} }
> span { > span {

5
src/components/views/elements/FacePile.tsx
View file

@ -16,6 +16,7 @@ limitations under the License.
import React from "react"; import React from "react";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { sortBy } from "lodash";
import MemberAvatar from "../avatars/MemberAvatar"; import MemberAvatar from "../avatars/MemberAvatar";
import { _t } from "../../../languageHandler"; import { _t } from "../../../languageHandler";
@ -30,9 +31,9 @@ interface IProps {
} }
const FacePile = ({ room, numShown = DEFAULT_NUM_FACES }: IProps) => { const FacePile = ({ room, numShown = DEFAULT_NUM_FACES }: IProps) => {
const knownMembers = room.getJoinedMembers().filter(member => { const knownMembers = sortBy(room.getJoinedMembers().filter(member => {
return !!DMRoomMap.shared().getDMRoomsForUserId(member.userId)?.length; return !!DMRoomMap.shared().getDMRoomsForUserId(member.userId)?.length;
}); }), member => member.getMxcAvatarUrl() ? 0 : 1); // sort users with an explicit avatar first
if (knownMembers.length < 1) return null; if (knownMembers.length < 1) return null;
const shownMembers = knownMembers.slice(0, numShown); const shownMembers = knownMembers.slice(0, numShown);