Support for joining New Groups via invite links

This commit is contained in:
Scott Nonnenberg 2021-01-29 14:16:48 -08:00 committed by GitHub
parent c0510b08a5
commit a48b3e381e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 2532 additions and 381 deletions

View file

@ -4,6 +4,8 @@
import * as React from 'react';
import classNames from 'classnames';
import { Spinner } from './Spinner';
import { getInitials } from '../util/getInitials';
import { LocalizerType } from '../types/Util';
import { ColorType } from '../types/Colors';
@ -20,6 +22,7 @@ export enum AvatarSize {
export type Props = {
avatarPath?: string;
color?: ColorType;
loading?: boolean;
conversationType: 'group' | 'direct';
noteToSelf?: boolean;
@ -136,11 +139,27 @@ export class Avatar extends React.Component<Props, State> {
);
}
public renderLoading(): JSX.Element {
const { size } = this.props;
const svgSize = size < 40 ? 'small' : 'normal';
return (
<div className="module-avatar__spinner-container">
<Spinner
size={`${size - 8}px`}
svgSize={svgSize}
direction="on-avatar"
/>
</div>
);
}
public render(): JSX.Element {
const {
avatarPath,
color,
innerRef,
loading,
noteToSelf,
onClick,
size,
@ -156,7 +175,9 @@ export class Avatar extends React.Component<Props, State> {
let contents;
if (onClick) {
if (loading) {
contents = this.renderLoading();
} else if (onClick) {
contents = (
<button
type="button"