Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(flat-components): fix avatar show error #1989

Merged
merged 1 commit into from
Aug 7, 2023
Merged

fix(flat-components): fix avatar show error #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/flat-components/src/components/MainPageLayout/MainPageNavAvatar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import React, { useState } from "react";
import { MainPageLayoutItem } from "../types";

export interface MainPageNavAvatarProps {
userUUID: string;
/** user avatar src*/
avatarSrc: string;
/** user name */
Expand All @@ -20,6 +21,7 @@ export interface MainPageNavAvatarProps {
}

export const MainPageNavAvatar: React.FC<MainPageNavAvatarProps> = ({
userUUID,
avatarSrc,
userName,
onClick,
Expand All @@ -30,7 +32,7 @@ export const MainPageNavAvatar: React.FC<MainPageNavAvatarProps> = ({
const [popMenuVisible, setPopMenuVisible] = useState(false);
const [isAvatarLoadFailed, setAvatarLoadFailed] = useState(false);

const avatar = isAvatarLoadFailed ? generateAvatar(avatarSrc) : avatarSrc;
const avatar = isAvatarLoadFailed || !avatarSrc ? generateAvatar(userUUID) : avatarSrc;

const togglePopMenuVisible = (): void => {
setPopMenuVisible(!popMenuVisible);
Expand Down
2 changes: 2 additions & 0 deletions packages/flat-components/src/components/MainPageLayout/MainPageNavHorizontal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface MainPageNavHorizontalProps extends MainPageNavAvatarProps, Main
}

export const MainPageNavHorizontal: React.FC<MainPageNavHorizontalProps> = ({
userUUID,
avatarSrc,
userName,
onClick,
Expand Down Expand Up @@ -101,6 +102,7 @@ export const MainPageNavHorizontal: React.FC<MainPageNavHorizontalProps> = ({
generateAvatar={generateAvatar}
popMenu={popMenu}
userName={userName}
userUUID={userUUID}
onClick={onClick}
/>
</div>
Expand Down
2 changes: 2 additions & 0 deletions packages/flat-components/src/components/MainPageLayout/MainPageTopBar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export interface MainPageTopBarProps extends MainPageNavAvatarProps {
}

export const MainPageTopBar: React.FC<MainPageTopBarProps> = ({
userUUID,
activeKeys,
avatarSrc,
popMenu,
Expand All @@ -36,6 +37,7 @@ export const MainPageTopBar: React.FC<MainPageTopBarProps> = ({
generateAvatar={generateAvatar}
popMenu={popMenu}
userName={userName}
userUUID={userUUID}
onClick={onClick}
/>
</div>
Expand Down
1 change: 1 addition & 0 deletions packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export const MainPageLayoutHorizontalContainer = observer<MainPageLayoutHorizont
subMenu={subMenu}
title={title}
userName={globalStore.userName ?? ""}
userUUID={globalStore.userUUID ?? ""}
onBackPreviousPage={onBackPreviousPage}
onClick={onMenuItemClick}
>
Expand Down