From d3bd6e9c5c03bbc70f8269e779b435f6d77dd305 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Wed, 4 Mar 2026 11:12:53 -0800
Subject: [PATCH] fix(ios): secureWithoutAutofill on TextField

---
 apps/toolbox/src/pages/forms.xml         | 12 ++++--
 packages/core/ui/text-field/index.ios.ts | 50 +++++++++++++++++++-----
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/apps/toolbox/src/pages/forms.xml b/apps/toolbox/src/pages/forms.xml
index cca44dafab..99c0e00fa9 100644
--- a/apps/toolbox/src/pages/forms.xml
+++ b/apps/toolbox/src/pages/forms.xml
@@ -5,23 +5,27 @@
   </Page.actionBar>
   <ScrollView>
     <StackLayout padding="20">
-      <Label text="TextField:" fontWeight="bold" />
+      <Label text="TextField secureWithoutAutofill" fontWeight="bold" />
+      <TextField marginTop="6" backgroundColor="#efefef" padding="8" fontSize="18" secure="true" secureWithoutAutofill="true">
+      </TextField>
+
+      <Label text="TextField" fontWeight="bold" marginTop="12" />
       <TextField textChange="{{ textChange }}" marginTop="6" backgroundColor="#efefef" padding="8" fontSize="18" keyboardType="url" />
 
       <Label text="{{ textInput }}" marginTop="6" />
 
-      <Label text="SSN Formatted input:" fontWeight="bold" marginTop="12" />
+      <Label text="SSN Formatted input" fontWeight="bold" marginTop="12" />
       <TextField hint="XXX-XX-XXXX" style.placeholderColor="silver" textChange="{{textChangeSSN}}" keyboardType="number" color="black" width="80%" borderColor="silver" borderWidth="1" height="40" textAlignment="center" borderRadius="4" valueFormatter="{{valueFormatterSSN}}" padding="5" maxLength="11">
       </TextField>
       <Label text="{{ formattedSSNInput }}" marginTop="6" />
 
-      <Label text="Phone Formatted input:" fontWeight="bold" marginTop="12" />
+      <Label text="Phone Formatted input" fontWeight="bold" marginTop="12" />
       <TextField hint="XXX-XXX-XXXX" style.placeholderColor="silver" textChange="{{textChangePhone}}" keyboardType="number" color="black" width="80%" borderColor="silver" borderWidth="1" height="40" textAlignment="center" borderRadius="4" valueFormatter="{{valueFormatterPhone}}" padding="5" maxLength="12">
       </TextField>
       <Label text="{{ formattedPhoneInput }}" marginTop="6" />
 
       <Label text="TextView" fontWeight="bold" marginTop="12" />
-      <TextView hint="Type text..." style.placeholderColor="silver" textChange="{{textChangeArea}}" color="black" width="80%" borderColor="silver" borderWidth="1" height="200" borderRadius="4" fontSize="14">
+      <TextView hint="Type text..." style.placeholderColor="silver" textChange="{{textChangeArea}}" color="black" width="80%" borderColor="silver" borderWidth="1" height="125" borderRadius="4" fontSize="14">
       </TextView>
 
       <Label text="TextField white-space + text-overflow" fontWeight="bold" marginTop="12" />
diff --git a/packages/core/ui/text-field/index.ios.ts b/packages/core/ui/text-field/index.ios.ts
index 82e0e737c7..d82eb6c8df 100644
--- a/packages/core/ui/text-field/index.ios.ts
+++ b/packages/core/ui/text-field/index.ios.ts
@@ -13,7 +13,6 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
 	public static ObjCProtocols = [UITextFieldDelegate];
 
 	private _owner: WeakRef<TextField>;
-	private firstEdit: boolean;
 
 	public static initWithOwner(owner: WeakRef<TextField>): UITextFieldDelegateImpl {
 		const delegate = <UITextFieldDelegateImpl>UITextFieldDelegateImpl.new();
@@ -125,6 +124,7 @@ export class TextField extends TextFieldBase {
 		super.initNativeView();
 		this._delegate = UITextFieldDelegateImpl.initWithOwner(new WeakRef(this));
 		this.nativeViewProtected.delegate = this._delegate;
+		this._applySecureWithoutAutofillTraits(this.nativeViewProtected);
 	}
 
 	disposeNativeView() {
@@ -140,6 +140,7 @@ export class TextField extends TextFieldBase {
 
 	public textFieldShouldBeginEditing(textField: UITextField): boolean {
 		this._firstEdit = true;
+		this._applySecureWithoutAutofillTraits(textField);
 
 		return this.editable;
 	}
@@ -174,14 +175,7 @@ export class TextField extends TextFieldBase {
 	}
 
 	public textFieldShouldChangeCharactersInRangeReplacementString(textField: UITextField, range: NSRange, replacementString: string): boolean {
-		if (this.secureWithoutAutofill && !textField.secureTextEntry) {
-			/**
-			 * Helps avoid iOS 12+ autofill strong password suggestion prompt
-			 * Discussed in several circles but for example:
-			 * https://github.com/expo/expo/issues/2571#issuecomment-473347380
-			 */
-			textField.secureTextEntry = true;
-		}
+		this._applySecureWithoutAutofillTraits(textField);
 		const delta = replacementString.length - range.length;
 		if (delta > 0) {
 			if (textField.text.length + delta > this.maxLength) {
@@ -243,6 +237,44 @@ export class TextField extends TextFieldBase {
 	}
 	[secureProperty.setNative](value: boolean) {
 		this.nativeTextViewProtected.secureTextEntry = value;
+		this._applySecureWithoutAutofillTraits(this.nativeTextViewProtected);
+	}
+
+	private _applySecureWithoutAutofillTraits(textField: UITextField): void {
+		if (!textField || !this.secureWithoutAutofill) {
+			return;
+		}
+
+		const nativeField = textField as any;
+
+		textField.secureTextEntry = true;
+
+		if (nativeField.textContentType !== undefined) {
+			nativeField.textContentType = typeof UITextContentTypeOneTimeCode !== 'undefined' ? UITextContentTypeOneTimeCode : '';
+		}
+
+		if (nativeField.autocorrectionType !== undefined) {
+			nativeField.autocorrectionType = UITextAutocorrectionType.No;
+		}
+		if (nativeField.spellCheckingType !== undefined) {
+			nativeField.spellCheckingType = UITextSpellCheckingType.No;
+		}
+		if (nativeField.smartDashesType !== undefined) {
+			nativeField.smartDashesType = UITextSmartDashesType.No;
+		}
+		if (nativeField.smartQuotesType !== undefined) {
+			nativeField.smartQuotesType = UITextSmartQuotesType.No;
+		}
+		if (nativeField.smartInsertDeleteType !== undefined) {
+			nativeField.smartInsertDeleteType = UITextSmartInsertDeleteType.No;
+		}
+		if (nativeField.passwordRules !== undefined) {
+			nativeField.passwordRules = null;
+		}
+
+		if (nativeField.reloadInputViews) {
+			nativeField.reloadInputViews();
+		}
 	}
 
 	[colorProperty.getDefault](): { textColor: UIColor; tintColor: UIColor } {