starred/native
1
0
Fork 0
mirror of https://github.com/bulwarkmail/native.git synced 2026-11-04 16:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: let @ mentions be turned off and choose where a mentioned contact is added

Browse Source
This commit is contained in:
Linus Rath
2026-10-31 16:05:14 +01:00
parent fe3f860e73
commit ab226b03b4
6 changed files with 117 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/settings/ComposingSettings.tsx
+27 -1
View File
@@ -5,7 +5,7 @@ import { SettingsSection, SettingItem, ToggleSwitch } from './settings-section';
import Button from '../Button';
import { spacing, radius, typography, type ThemePalette } from '../../theme/tokens';
import { useColors } from '../../theme/colors';
import { useSettingsStore, type ReplyIdentityMatch, type SignaturePosition } from '../../stores/settings-store';
import { useSettingsStore, type MentionAddsRecipientTo, type ReplyIdentityMatch, type SignaturePosition } from '../../stores/settings-store';
import { useLocaleStore } from '../../stores/locale-store';
import { useSettingLocked } from '../../stores/policy-store';
import { SUPPORTED_SUB_ADDRESS_DELIMITERS } from '../../lib/sub-addressing';
@@ -34,6 +34,8 @@ export function ComposingSettings() {
const requestReadReceiptDefault = useSettingsStore((s) => s.requestReadReceiptDefault);
const emptySubjectWarningEnabled = useSettingsStore((s) => s.emptySubjectWarningEnabled);
const placeholderWarningEnabled = useSettingsStore((s) => s.placeholderWarningEnabled);
const recipientMentionsEnabled = useSettingsStore((s) => s.recipientMentionsEnabled);
const mentionAddsRecipientTo = useSettingsStore((s) => s.mentionAddsRecipientTo);
const autoSaveDraftInterval = useSettingsStore((s) => s.autoSaveDraftInterval);
const subAddressDelimiter = useSettingsStore((s) => s.subAddressDelimiter);
const updateSetting = useSettingsStore((s) => s.updateSetting);
@@ -78,6 +80,12 @@ export function ComposingSettings() {
{ label: t('settings.email_behavior.signature_position.below_quote', 'After quoted text'), value: 'below_quote' },
];
const MENTION_ADDS_RECIPIENT: { label: string; value: MentionAddsRecipientTo }[] = [
{ label: t('settings.email_behavior.mention_adds_recipient.to', 'Add to To'), value: 'to' },
{ label: t('settings.email_behavior.mention_adds_recipient.cc', 'Add to Cc'), value: 'cc' },
{ label: t('settings.email_behavior.mention_adds_recipient.off', 'Only offer recipients'), value: 'off' },
];
const REPLY_IDENTITY_MATCHES: { label: string; value: ReplyIdentityMatch }[] = [
{ label: t('settings.email_behavior.reply_identity_match.exact', 'Exact address only'), value: 'exact' },
{ label: t('settings.email_behavior.reply_identity_match.domain', 'Any address on my domains'), value: 'domain' },
@@ -151,6 +159,24 @@ export function ComposingSettings() {
<ToggleSwitch checked={plainTextMode} onChange={(v) => updateSetting('plainTextMode', v)} />
</SettingItem>
<SettingItem
label={t('settings.email_behavior.recipient_mentions.label', 'Mention recipients with @')}
// The webmail's description names Enter and Tab, which a phone has not.
description={t('settings.email_behavior.recipient_mentions.description_mobile', "Typing @ in the message offers its recipients and inserts the chosen one's first name.")}
>
<ToggleSwitch checked={recipientMentionsEnabled} onChange={(v) => updateSetting('recipientMentionsEnabled', v)} />
</SettingItem>
{recipientMentionsEnabled && (
<View style={styles.subBlock}>
<Text style={styles.subLabel}>{t('settings.email_behavior.mention_adds_recipient.label', 'Contacts in @ mentions')}</Text>
<Text style={styles.subDescription}>
{t('settings.email_behavior.mention_adds_recipient.description', "Typing @ also offers your contacts and people from the directory. Picking someone who isn't a recipient yet adds them to the message.")}
</Text>
{segmented(MENTION_ADDS_RECIPIENT, mentionAddsRecipientTo, (v) => updateSetting('mentionAddsRecipientTo', v))}
</View>
)}
<SettingItem
label={t('settings.email_behavior.request_read_receipt.label', "Request read receipts by default")}
description={t('settings.email_behavior.request_read_receipt.description', "Pre-enable the read-receipt request when composing a new message.")}