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

Revert "Use styled mxids in member list (#6328)" (#8107)

Browse source 
This reverts commit 5d28e0533d.
This commit is contained in:
Travis Ralston 2022-03-21 19:58:38 -06:00 • committed by GitHub
parent 5d28e0533d
commit 709e6e78d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 51 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/rooms/EntityTile.tsx
View file

@ -64,7 +64,6 @@ function presenceClassForMember(presenceState: string, lastActiveAgo: number, sh
interface IProps {
name?: string;
nameJSX?: JSX.Element;
title?: string;
avatarJsx?: JSX.Element; // <BaseAvatar />
className?: string;
@ -118,7 +117,7 @@ export default class EntityTile extends React.PureComponent<IProps, IState> {
mainClassNames[presenceClass] = true;
let nameEl;
const name = this.props.nameJSX || this.props.name;
const { name } = this.props;
if (!this.props.suppressOnHover) {
const activeAgo = this.props.presenceLastActiveAgo ?

9
src/components/views/rooms/MemberTile.tsx
View file

@ -33,7 +33,6 @@ import { Action } from "../../../dispatcher/actions";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import EntityTile, { PowerStatus } from "./EntityTile";
import MemberAvatar from "./../avatars/MemberAvatar";
import DisambiguatedProfile from "../messages/DisambiguatedProfile";
import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
interface IProps {
@ -259,13 +258,6 @@ export default class MemberTile extends React.Component<IProps, IState> {
e2eStatus = this.state.e2eStatus;
}
const nameJSX = (
<DisambiguatedProfile
member={member}
fallbackName={name || ""}
/>
);
return (
<EntityTile
{...this.props}
@ -276,7 +268,6 @@ export default class MemberTile extends React.Component<IProps, IState> {
avatarJsx={av}
title={this.getPowerLabel()}
name={name}
nameJSX={nameJSX}
powerStatus={powerStatus}
showPresence={this.props.showPresence}
subtextLabel={statusMessage}