mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Trim group titles when creating or editing

Browse source 
* Trim group titles when creating or editing

* Trim title in more places
This commit is contained in:
Evan Hahn 2021-03-10 19:54:13 -06:00 • committed by Josh Perez
parent 2cd29e1b63
commit 80e3582d01
3 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
View file

@ -55,9 +55,11 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
const [avatar, setAvatar] = useState<undefined | ArrayBuffer>(
externalAvatarPath ? TEMPORARY_AVATAR_VALUE : undefined
);
const [title, setTitle] = useState(externalTitle);
const [rawTitle, setRawTitle] = useState(externalTitle);
const [hasAvatarChanged, setHasAvatarChanged] = useState(false);
const trimmedTitle = rawTitle.trim();
useEffect(() => {
const startingAvatarPath = startingAvatarPathRef.current;
if (!startingAvatarPath) {
@ -90,14 +92,14 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
const hasChangedExternally =
startingAvatarPathRef.current !== externalAvatarPath ||
startingTitleRef.current !== externalTitle;
const hasTitleChanged = title !== externalTitle;
const hasTitleChanged = trimmedTitle !== externalTitle.trim();
const isRequestActive = requestState === RequestState.Active;
const canSubmit =
!isRequestActive &&
(hasChangedExternally || hasTitleChanged || hasAvatarChanged) &&
title.length > 0;
trimmedTitle.length > 0;
const onSubmit: FormEventHandler<HTMLFormElement> = event => {
event.preventDefault();
@ -110,7 +112,7 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
request.avatar = avatar;
}
if (hasTitleChanged) {
request.title = title;
request.title = trimmedTitle;
}
makeRequest(request);
};
@ -150,8 +152,8 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
<GroupTitleInput
disabled={isRequestActive}
i18n={i18n}
onChangeValue={setTitle}
value={title}
onChangeValue={setRawTitle}
value={rawTitle}
/>
{requestState === RequestState.InactiveWithError && (