chore: ts

RocketChat · Nov 26, 2024 · 62944f2 · 62944f2
1 parent f934f58
commit 62944f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/ui-avatar/src/components/UserAvatar.tsx b/packages/ui-avatar/src/components/UserAvatar.tsx
@@ -4,13 +4,21 @@ import { memo } from 'react';
 import type { BaseAvatarProps } from './BaseAvatar';
 import BaseAvatar from './BaseAvatar';
 
-type UserAvatarProps = Omit<BaseAvatarProps, 'url' | 'title'> & {
+type UsernameProp = {
 	username: string;
-	userId?: string;
+	userId?: never;
+};
+
+type UserIdProp = {
+	userId: string;
+	username?: never;
+};
+
+type UserAvatarProps = Omit<BaseAvatarProps, 'url' | 'title'> & {
 	etag?: string;
 	url?: string;
 	title?: string;
-};
+} & (UsernameProp | UserIdProp);
 
 const UserAvatar = ({ username, userId, etag, ...rest }: UserAvatarProps) => {
 	const getUserAvatarPath = useUserAvatarPath();

diff --git a/packages/ui-contexts/src/AvatarUrlContext.ts b/packages/ui-contexts/src/AvatarUrlContext.ts
@@ -4,9 +4,8 @@ const dummy = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcS
 
 export type AvatarUrlContextValue = {
 	getUserPathAvatar: {
-		(username: string, etag?: string): string;
 		(params: { userId: string; etag?: string }): string;
-		(params: { username: string; etag?: string }): string;
+		(params: { username?: string; etag?: string }): string;
 	};
 	getRoomPathAvatar: (...args: any) => string;
 };