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

Allow edits which just remove the quote

Browse source
This commit is contained in:
Scott Nonnenberg 2024-09-20 10:40:26 +10:00 • committed by GitHub
parent 96a2d05906
commit 855b1c03b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/components/CompositionInput.tsx
View file

@ -71,6 +71,7 @@ import {
} from '../quill/formatting/matchers';
import { missingCaseError } from '../util/missingCaseError';
import { AutoSubstituteAsciiEmojis } from '../quill/auto-substitute-ascii-emojis';
import { dropNull } from '../util/dropNull';
Quill.register('formats/emoji', EmojiBlot);
Quill.register('formats/mention', MentionBlot);
@ -139,9 +140,8 @@ export type Props = Readonly<{
): unknown;
onScroll?: (ev: React.UIEvent<HTMLElement>) => void;
platform: string;
quotedMessageId: string | null;
shouldHidePopovers: boolean | null;
getQuotedMessage?(): unknown;
clearQuotedMessage?(): unknown;
linkPreviewLoading?: boolean;
linkPreviewResult: LinkPreviewType | null;
onCloseLinkPreview?(conversationId: string): unknown;
@ -153,14 +153,12 @@ const BASE_CLASS_NAME = 'module-composition-input';
export function CompositionInput(props: Props): React.ReactElement {
const {
children,
clearQuotedMessage,
conversationId,
disabled,
draftBodyRanges,
draftEditMessage,
draftText,
getPreferredBadge,
getQuotedMessage,
i18n,
inputApi,
isFormattingEnabled,
@ -177,6 +175,7 @@ export function CompositionInput(props: Props): React.ReactElement {
onSubmit,
placeholder,
platform,
quotedMessageId,
shouldHidePopovers,
skinTone,
sendCounter,
@ -510,11 +509,6 @@ export function CompositionInput(props: Props): React.ReactElement {
}
}
if (getQuotedMessage?.()) {
clearQuotedMessage?.();
return false;
}
return true;
};
@ -598,6 +592,8 @@ export function CompositionInput(props: Props): React.ReactElement {
isDirty = true;
} else if (!areBodyRangesEqual(bodyRanges, draftEditMessage.bodyRanges)) {
isDirty = true;
} else if (dropNull(quotedMessageId) !== draftEditMessage.quote?.id) {
isDirty = true;
}
propsRef.current.onDirtyChange(isDirty);