fix: some minor fixes

gravity-ui · Feb 15, 2024 · 7b941f4 · 7b941f4
1 parent 910b5de
commit 7b941f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/User/User.tsx b/src/components/User/User.tsx
@@ -44,11 +44,11 @@ export const User = React.forwardRef<HTMLDivElement, UserProps>(
                             avatar
                         ) : (
                             <Avatar
-                                {...avatar}
                                 size={size}
                                 alt={alt}
                                 aria-label={avatarAriaLabel}
                                 aria-labelledby={avatarAriaLabelledBy}
+                                {...avatar}
                             />
                         )}
                     </div>

diff --git a/src/components/UserLabel/UserLabel.tsx b/src/components/UserLabel/UserLabel.tsx
@@ -44,7 +44,7 @@ export const UserLabel = React.forwardRef<HTMLDivElement, UserLabelProps>(
             avatarProps = {
                 imgUrl: avatar,
             };
-        } else if (avatar) {
+        } else if (avatar && !React.isValidElement(avatar)) {
             avatarProps = avatar;
         } else if (!avatar && typeof children === 'string') {
             avatarProps = {