Fix #451 no flag change for different regionCode (#550)

EverlongProject · Aug 18, 2022 · d8c0069 · d8c0069
1 parent 104a53d
commit d8c0069
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/PhoneNumberKit/UI/PhoneNumberTextField.swift b/PhoneNumberKit/UI/PhoneNumberTextField.swift
@@ -277,6 +277,11 @@ open class PhoneNumberTextField: UITextField, UITextFieldDelegate {
 
     open func updateFlag() {
         guard self.withFlag else { return }
+        if let phoneNumber = phoneNumber, let regionCode = phoneNumberKit.getRegionCode(of: phoneNumber) {
+            _defaultRegion = regionCode
+            partialFormatter.defaultRegion = regionCode
+        }
+
         let flagBase = UnicodeScalar("🇦").value - UnicodeScalar("A").value
 
         let flag = self.currentRegion

diff --git a/PhoneNumberKitTests/PhoneNumberTextFieldTests.swift b/PhoneNumberKitTests/PhoneNumberTextFieldTests.swift
@@ -40,6 +40,27 @@ class PhoneNumberTextFieldTests: XCTestCase {
 		tf.text = ""
 		XCTAssertNil(tf.phoneNumber)
 	}
+
+
+    func testUSPhoneNumberWithFlag() {
+        let pnk = PhoneNumberKit()
+        let tf = PhoneNumberTextField(withPhoneNumberKit: pnk)
+        tf.partialFormatter.defaultRegion = "US"
+        tf.withFlag = true
+        tf.text = "4125551212"
+        XCTAssertNotNil(tf.flagButton)
+        XCTAssertEqual(tf.flagButton.titleLabel?.text, "🇺🇸 ")
+    }
+
+    func testNonUSPhoneNumberWithFlag() {
+        let pnk = PhoneNumberKit()
+        let tf = PhoneNumberTextField(withPhoneNumberKit: pnk)
+        tf.partialFormatter.defaultRegion = "US"
+        tf.withFlag = true
+        tf.text = "5872170177"
+        XCTAssertNotNil(tf.flagButton)
+        XCTAssertEqual(tf.flagButton.titleLabel?.text, "🇨🇦 ")
+    }
 }
 
 #endif