Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Improve avatars loading (#79)
Hakan Shehu0087dfb5e678
diff --git a/packages/ui/src/components/avatars/avatar-fallback.tsx b/packages/ui/src/components/avatars/avatar-fallback.tsxindex 1124d80c..dc0ba9e2 100644--- a/packages/ui/src/components/avatars/avatar-fallback.tsx+++ b/packages/ui/src/components/avatars/avatar-fallback.tsx@@ -1,56 +1,25 @@-import { getIdType } from '@colanode/core';import {getColorForId,- getDefaultNodeAvatar,getAvatarSizeClasses,- AvatarSize,+ AvatarProps,} from '@colanode/ui/lib/avatars';import { cn } from '@colanode/ui/lib/utils';-import { Avatar } from './avatar';+export const AvatarFallback = (props: AvatarProps) => {+ const { id, name, size, className } = props;-interface AvatarFallbackProps {- id: string;- name?: string | null;- size?: AvatarSize;- className?: string;-}--export const AvatarFallback = ({- id,- name,- size,- className,-}: AvatarFallbackProps) => {- const idType = getIdType(id);- const defaultAvatar = getDefaultNodeAvatar(idType);- if (defaultAvatar) {- return (- <Avatar- id={id}- name={name}- avatar={defaultAvatar}- size={size}- className={className}- />- );- }-- if (name) {- const color = getColorForId(id);- return (- <span- className={cn(- 'inline-flex items-center justify-center overflow-hidden rounded text-white shadow',- getAvatarSizeClasses(size),- className- )}- style={{ backgroundColor: color }}- >- <span className="font-medium">{name[0]?.toLocaleUpperCase()}</span>- </span>- );- }-- return null;+ const char = name?.[0]?.toLocaleUpperCase() || '?';+ const color = getColorForId(id);+ return (+ <span+ className={cn(+ 'inline-flex items-center justify-center overflow-hidden rounded text-white shadow',+ getAvatarSizeClasses(size),+ className+ )}+ style={{ backgroundColor: color }}+ >+ <span className="font-medium">{char}</span>+ </span>+ );};diff --git a/packages/ui/src/components/avatars/avatar-image.tsx b/packages/ui/src/components/avatars/avatar-image.tsxindex 36a3c2f3..30870b8f 100644--- a/packages/ui/src/components/avatars/avatar-image.tsx+++ b/packages/ui/src/components/avatars/avatar-image.tsx@@ -6,7 +6,7 @@ import { useQuery } from '@colanode/ui/hooks/use-query';import { AvatarProps, getAvatarSizeClasses } from '@colanode/ui/lib/avatars';import { cn } from '@colanode/ui/lib/utils';-export const AvatarImage = ({ avatar, size, className }: AvatarProps) => {+export const AvatarImage = (props: AvatarProps) => {const account = useAccount();const [failed, setFailed] = useState(false);@@ -14,30 +14,25 @@ export const AvatarImage = ({ avatar, size, className }: AvatarProps) => {{type: 'avatar.url.get',accountId: account.id,- avatarId: avatar!,+ avatarId: props.avatar!,},{- enabled: !!avatar,+ enabled: !!props.avatar,});- if (!avatar) {- return null;- }-const url = data?.url;if (failed || !url || isPending) {- const avatarSize = size || 'medium';- return <AvatarFallback id={avatar} size={avatarSize} className={className} />;+ return <AvatarFallback {...props} />;}return (<imgsrc={url}className={cn(- getAvatarSizeClasses(size),+ getAvatarSizeClasses(props.size),'object-cover rounded',- className+ props.className)}alt={'Custom Avatar'}onError={() => setFailed(true)}diff --git a/packages/ui/src/components/avatars/avatar.tsx b/packages/ui/src/components/avatars/avatar.tsxindex ce7e7712..2256af9c 100644--- a/packages/ui/src/components/avatars/avatar.tsx+++ b/packages/ui/src/components/avatars/avatar.tsx@@ -3,11 +3,22 @@ import { AvatarFallback } from '@colanode/ui/components/avatars/avatar-fallback'import { AvatarImage } from '@colanode/ui/components/avatars/avatar-image';import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';import { IconElement } from '@colanode/ui/components/icons/icon-element';-import { AvatarProps, getAvatarSizeClasses } from '@colanode/ui/lib/avatars';+import {+ AvatarProps,+ getAvatarSizeClasses,+ getDefaultNodeAvatar,+} from '@colanode/ui/lib/avatars';import { cn } from '@colanode/ui/lib/utils';export const Avatar = (props: AvatarProps) => {- const { avatar } = props;+ let avatar = props.avatar;++ if (!avatar || avatar === '') {+ const idType = getIdType(props.id);+ const defaultAvatar = getDefaultNodeAvatar(idType);+ avatar = defaultAvatar;+ }+if (!avatar) {return <AvatarFallback {...props} />;}@@ -31,5 +42,9 @@ export const Avatar = (props: AvatarProps) => {);}- return <AvatarImage {...props} />;+ if (avatarType === IdType.Avatar) {+ return <AvatarImage {...props} />;+ }++ return <AvatarFallback {...props} />;};