jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clear button in AvatarEditor

This commit is contained in:
Fedor Indutny 2022-02-24 15:57:16 -08:00 committed by GitHub
parent b1e48dca8f
commit 112de16d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ts/components/AvatarEditor.tsx
View File

@ -71,6 +71,7 @@ export const AvatarEditor = ({
const [localAvatarData, setLocalAvatarData] = useState<Array<AvatarDataType>>(
userAvatarData.slice()
);
const [pendingClear, setPendingClear] = useState(false);
const [editMode, setEditMode] = useState<EditMode>(EditMode.Main);
@ -150,7 +151,8 @@ export const AvatarEditor = ({
setInitialAvatar(avatarBuffer);
}, []);
const hasChanges = initialAvatar !== avatarPreview;
const hasChanges =
initialAvatar !== avatarPreview || Boolean(pendingClear && avatarPath);
let content: JSX.Element | undefined;
@ -160,13 +162,14 @@ export const AvatarEditor = ({
<div className="AvatarEditor__preview">
<AvatarPreview
avatarColor={avatarColor}
avatarPath={avatarPath}
avatarPath={pendingClear ? undefined : avatarPath}
avatarValue={avatarPreview}
conversationTitle={conversationTitle}
i18n={i18n}
isGroup={isGroup}
onAvatarLoaded={handleAvatarLoaded}
onClear={() => {
setPendingClear(true);
setAvatarPreview(undefined);
setProvisionalSelectedAvatar(undefined);
}}