Revert "Member avatars without canvas (#9990)"

This reverts commit a8aa4de.

Author: t3chguy

res/css/views/rooms/_BasicMessageComposer.pcss

@@ -78,7 +78,7 @@ limitations under the License.
                     min-width: $font-16px; /* ensure the avatar is not compressed */
                     height: $font-16px;
                     margin-inline-end: 0.24rem;
-                    background: var(--avatar-background);
+                    background: var(--avatar-background), $background;
                     color: $avatar-initial-color;
                     background-repeat: no-repeat;
                     background-size: $font-16px;

src/Avatar.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016, 2023 The Matrix.org Foundation C.I.C.
+Copyright 2015, 2016 OpenMarket Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,19 +24,16 @@ import DMRoomMap from "./utils/DMRoomMap";
 import { mediaFromMxc } from "./customisations/Media";
 import { isLocalRoom } from "./utils/localRoom/isLocalRoom";
 
-const DEFAULT_COLORS: Readonly<string[]> = ["#0DBD8B", "#368bd6", "#ac3ba8"];
-
 // Not to be used for BaseAvatar urls as that has similar default avatar fallback already
 export function avatarUrlForMember(
-    member: RoomMember | null | undefined,
+    member: RoomMember,
     width: number,
     height: number,
     resizeMethod: ResizeMethod,
 ): string {
-    let url: string | undefined;
-    const mxcUrl = member?.getMxcAvatarUrl();
-    if (mxcUrl) {
-        url = mediaFromMxc(mxcUrl).getThumbnailOfSourceHttp(width, height, resizeMethod);
+    let url: string;
+    if (member?.getMxcAvatarUrl()) {
+        url = mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
     }
     if (!url) {
         // member can be null here currently since on invites, the JS SDK
@@ -47,17 +44,6 @@ export function avatarUrlForMember(
     return url;
 }
 
-export function getMemberAvatar(
-    member: RoomMember | null | undefined,
-    width: number,
-    height: number,
-    resizeMethod: ResizeMethod,
-): string | undefined {
-    const mxcUrl = member?.getMxcAvatarUrl();
-    if (!mxcUrl) return undefined;
-    return mediaFromMxc(mxcUrl).getThumbnailOfSourceHttp(width, height, resizeMethod);
-}
-
 export function avatarUrlForUser(
     user: Pick<User, "avatarUrl">,
     width: number,
@@ -100,10 +86,18 @@ function urlForColor(color: string): string {
 // hard to install a listener here, even if there were a clear event to listen to
 const colorToDataURLCache = new Map<string, string>();
 
-export function defaultAvatarUrlForString(s: string | undefined): string {
+export function defaultAvatarUrlForString(s: string): string {
     if (!s) return ""; // XXX: should never happen but empirically does by evidence of a rageshake
-
-    const color = getColorForString(s);
+    const defaultColors = ["#0DBD8B", "#368bd6", "#ac3ba8"];
+    let total = 0;
+    for (let i = 0; i < s.length; ++i) {
+        total += s.charCodeAt(i);
+    }
+    const colorIndex = total % defaultColors.length;
+    // overwritten color value in custom themes
+    const cssVariable = `--avatar-background-colors_${colorIndex}`;
+    const cssValue = document.body.style.getPropertyValue(cssVariable);
+    const color = cssValue || defaultColors[colorIndex];
     let dataUrl = colorToDataURLCache.get(color);
     if (!dataUrl) {
         // validate color as this can come from account_data
@@ -118,23 +112,13 @@ export function defaultAvatarUrlForString(s: string | undefined): string {
     return dataUrl;
 }
 
-export function getColorForString(input: string): string {
-    const charSum = [...input].reduce((s, c) => s + c.charCodeAt(0), 0);
-    const index = charSum % DEFAULT_COLORS.length;
-
-    // overwritten color value in custom themes
-    const cssVariable = `--avatar-background-colors_${index}`;
-    const cssValue = document.body.style.getPropertyValue(cssVariable);
-    return cssValue || DEFAULT_COLORS[index]!;
-}
-
 /**
  * returns the first (non-sigil) character of 'name',
  * converted to uppercase
  * @param {string} name
  * @return {string} the first letter
  */
-export function getInitialLetter(name: string): string | undefined {
+export function getInitialLetter(name: string): string {
     if (!name) {
         // XXX: We should find out what causes the name to sometimes be falsy.
         console.trace("`name` argument to `getInitialLetter` not supplied");
@@ -150,20 +134,19 @@ export function getInitialLetter(name: string): string | undefined {
     }
 
     // rely on the grapheme cluster splitter in lodash so that we don't break apart compound emojis
-    return split(name, "", 1)[0]!.toUpperCase();
+    return split(name, "", 1)[0].toUpperCase();
 }
 
 export function avatarUrlForRoom(
-    room: Room | undefined,
+    room: Room,
     width: number,
     height: number,
     resizeMethod?: ResizeMethod,
 ): string | null {
     if (!room) return null; // null-guard
 
-    const mxcUrl = room.getMxcAvatarUrl();
-    if (mxcUrl) {
-        return mediaFromMxc(mxcUrl).getThumbnailOfSourceHttp(width, height, resizeMethod);
+    if (room.getMxcAvatarUrl()) {
+        return mediaFromMxc(room.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
     }
 
     // space rooms cannot be DMs so skip the rest
@@ -176,9 +159,8 @@ export function avatarUrlForRoom(
 
     // If there are only two members in the DM use the avatar of the other member
     const otherMember = room.getAvatarFallbackMember();
-    const otherMemberMxc = otherMember?.getMxcAvatarUrl();
-    if (otherMemberMxc) {
-        return mediaFromMxc(otherMemberMxc).getThumbnailOfSourceHttp(width, height, resizeMethod);
+    if (otherMember?.getMxcAvatarUrl()) {
+        return mediaFromMxc(otherMember.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
     }
     return null;
 }

src/components/views/avatars/BaseAvatar.tsx

@@ -1,6 +1,8 @@
 /*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <[email protected]>
-Copyright 2015, 2016, 2018, 2019, 2020, 2023 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,41 +21,34 @@ import React, { useCallback, useContext, useEffect, useState } from "react";
 import classNames from "classnames";
 import { ResizeMethod } from "matrix-js-sdk/src/@types/partials";
 import { ClientEvent } from "matrix-js-sdk/src/client";
-import { SyncState } from "matrix-js-sdk/src/sync";
 
 import * as AvatarLogic from "../../../Avatar";
+import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import RoomContext from "../../../contexts/RoomContext";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
 import { toPx } from "../../../utils/units";
 import { _t } from "../../../languageHandler";
-import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 
 interface IProps {
-    /** The name (first initial used as default) */
-    name: string;
-    /** ID for generating hash colours */
-    idName?: string;
-    /** onHover title text */
-    title?: string;
-    /** highest priority of them all, shortcut to set in urls[0] */
-    url?: string;
-    /** [highest_priority, ... , lowest_priority] */
-    urls?: string[];
+    name: string; // The name (first initial used as default)
+    idName?: string; // ID for generating hash colours
+    title?: string; // onHover title text
+    url?: string; // highest priority of them all, shortcut to set in urls[0]
+    urls?: string[]; // [highest_priority, ... , lowest_priority]
     width?: number;
     height?: number;
-    /** @deprecated not actually used */
+    // XXX: resizeMethod not actually used.
     resizeMethod?: ResizeMethod;
-    /** true to add default url */
-    defaultToInitialLetter?: boolean;
-    onClick?: React.ComponentPropsWithoutRef<typeof AccessibleTooltipButton>["onClick"];
+    defaultToInitialLetter?: boolean; // true to add default url
+    onClick?: React.MouseEventHandler;
     inputRef?: React.RefObject<HTMLImageElement & HTMLSpanElement>;
     className?: string;
     tabIndex?: number;
 }
 
-const calculateUrls = (url: string | undefined, urls: string[] | undefined, lowBandwidth: boolean): string[] => {
+const calculateUrls = (url: string, urls: string[], lowBandwidth: boolean): string[] => {
     // work out the full set of urls to try to load. This is formed like so:
     // imageUrls: [ props.url, ...props.urls ]
 
@@ -71,26 +66,11 @@ const calculateUrls = (url: string | undefined, urls: string[] | undefined, lowB
     return Array.from(new Set(_urls));
 };
 
-/**
- * Hook for cycling through a changing set of images.
- *
- * The set of images is updated whenever `url` or `urls` change, the user's
- * `lowBandwidth` preference changes, or the client reconnects.
- *
- * Returns `[imageUrl, onError]`. When `onError` is called, the next image in
- * the set will be displayed.
- */
-const useImageUrl = ({
-    url,
-    urls,
-}: {
-    url: string | undefined;
-    urls: string[] | undefined;
-}): [string | undefined, () => void] => {
+const useImageUrl = ({ url, urls }): [string, () => void] => {
     // Since this is a hot code path and the settings store can be slow, we
     // use the cached lowBandwidth value from the room context if it exists
     const roomContext = useContext(RoomContext);
-    const lowBandwidth = roomContext.lowBandwidth;
+    const lowBandwidth = roomContext ? roomContext.lowBandwidth : SettingsStore.getValue("lowBandwidth");
 
     const [imageUrls, setUrls] = useState<string[]>(calculateUrls(url, urls, lowBandwidth));
     const [urlsIndex, setIndex] = useState<number>(0);
@@ -105,10 +85,10 @@ const useImageUrl = ({
     }, [url, JSON.stringify(urls)]); // eslint-disable-line react-hooks/exhaustive-deps
 
     const cli = useContext(MatrixClientContext);
-    const onClientSync = useCallback((syncState: SyncState, prevState: SyncState | null) => {
+    const onClientSync = useCallback((syncState, prevState) => {
         // Consider the client reconnected if there is no error with syncing.
         // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
-        const reconnected = syncState !== SyncState.Error && prevState !== syncState;
+        const reconnected = syncState !== "ERROR" && prevState !== syncState;
         if (reconnected) {
             setIndex(0);
         }
@@ -128,18 +108,46 @@ const BaseAvatar: React.FC<IProps> = (props) => {
         urls,
         width = 40,
         height = 40,
+        resizeMethod = "crop", // eslint-disable-line @typescript-eslint/no-unused-vars
         defaultToInitialLetter = true,
         onClick,
         inputRef,
         className,
-        resizeMethod: _unused, // to keep it from being in `otherProps`
         ...otherProps
     } = props;
 
     const [imageUrl, onError] = useImageUrl({ url, urls });
 
     if (!imageUrl && defaultToInitialLetter && name) {
-        const avatar = <TextAvatar name={name} idName={idName} width={width} height={height} title={title} />;
+        const initialLetter = AvatarLogic.getInitialLetter(name);
+        const textNode = (
+            <span
+                className="mx_BaseAvatar_initial"
+                aria-hidden="true"
+                style={{
+                    fontSize: toPx(width * 0.65),
+                    width: toPx(width),
+                    lineHeight: toPx(height),
+                }}
+            >
+                {initialLetter}
+            </span>
+        );
+        const imgNode = (
+            <img
+                className="mx_BaseAvatar_image"
+                src={AvatarLogic.defaultAvatarUrlForString(idName || name)}
+                alt=""
+                title={title}
+                onError={onError}
+                style={{
+                    width: toPx(width),
+                    height: toPx(height),
+                }}
+                aria-hidden="true"
+                data-testid="avatar-img"
+            />
+        );
 
         if (onClick) {
             return (
@@ -151,12 +159,9 @@ const BaseAvatar: React.FC<IProps> = (props) => {
                     className={classNames("mx_BaseAvatar", className)}
                     onClick={onClick}
                     inputRef={inputRef}
-                    style={{
-                        width: toPx(width),
-                        height: toPx(height),
-                    }}
                 >
-                    {avatar}
+                    {textNode}
+                    {imgNode}
                 </AccessibleButton>
             );
         } else {
@@ -165,13 +170,10 @@ const BaseAvatar: React.FC<IProps> = (props) => {
                     className={classNames("mx_BaseAvatar", className)}
                     ref={inputRef}
                     {...otherProps}
-                    style={{
-                        width: toPx(width),
-                        height: toPx(height),
-                    }}
                     role="presentation"
                 >
-                    {avatar}
+                    {textNode}
+                    {imgNode}
                 </span>
             );
         }
@@ -218,31 +220,3 @@ const BaseAvatar: React.FC<IProps> = (props) => {
 
 export default BaseAvatar;
 export type BaseAvatarType = React.FC<IProps>;
-
-const TextAvatar: React.FC<{
-    name: string;
-    idName?: string;
-    width: number;
-    height: number;
-    title?: string;
-}> = ({ name, idName, width, height, title }) => {
-    const initialLetter = AvatarLogic.getInitialLetter(name);
-
-    return (
-        <span
-            className="mx_BaseAvatar_image mx_BaseAvatar_initial"
-            aria-hidden="true"
-            style={{
-                backgroundColor: AvatarLogic.getColorForString(idName || name),
-                width: toPx(width),
-                height: toPx(height),
-                fontSize: toPx(width * 0.65),
-                lineHeight: toPx(height),
-            }}
-            title={title}
-            data-testid="avatar-img"
-        >
-            {initialLetter}
-        </span>
-    );
-};