Fix issue with clearing phone numbers

3lvis · Jun 14, 2024 · bcd945e · bcd945e
1 parent 94a715a
commit bcd945e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/FormTextField/Sources/FormTextField/InputValidator/EuropeanPhoneNumberInputValidator.swift b/FormTextField/Sources/FormTextField/InputValidator/EuropeanPhoneNumberInputValidator.swift
@@ -28,6 +28,8 @@ public struct EuropeanPhoneNumberInputValidator: InputValidatable {
     }
 
     private func validatePartialEuropeanPhoneNumber(_ phoneNumber: String) -> Bool {
+        guard !phoneNumber.isEmpty else { return true }
+
         // Allow a single "+" as valid partial input
         if phoneNumber == "+" {
             return true

diff --git a/FormTextField/Sources/FormTextField/InputValidator/NorwegianPhoneNumberInputValidator.swift b/FormTextField/Sources/FormTextField/InputValidator/NorwegianPhoneNumberInputValidator.swift
@@ -28,6 +28,8 @@ public struct NorwegianPhoneNumberInputValidator: InputValidatable {
     }
 
     private func validatePartialNorwegianPhoneNumber(_ phoneNumber: String) -> Bool {
+        guard !phoneNumber.isEmpty else { return true }
+
         if phoneNumber.count == 8 {
             return validateNorwegianPhoneNumber(phoneNumber)
         }

diff --git a/...ld/Tests/FormTextFieldTests/InputValidatorTests/MixedPhoneNumberInputValidatorTests.swift b/...ld/Tests/FormTextFieldTests/InputValidatorTests/MixedPhoneNumberInputValidatorTests.swift
@@ -66,6 +66,7 @@ class MixedPhoneNumberInputValidatorTests: XCTestCase {
         XCTAssertFalse(validator.validateReplacementString("+4479111234567890123456", fullString: "", inRange: NSRange(location: 0, length: 0))) // Too long
 
         // Test partial valid sequences
+        XCTAssertTrue(validator.validateReplacementString("", fullString: "+", inRange: NSRange(location: 0, length: 1))) // Was + to become empty
         XCTAssertTrue(validator.validateReplacementString("+", fullString: "", inRange: NSRange(location: 0, length: 0)))
         XCTAssertTrue(validator.validateReplacementString("4", fullString: "+", inRange: NSRange(location: 1, length: 0)))
         XCTAssertTrue(validator.validateReplacementString("4", fullString: "+4", inRange: NSRange(location: 2, length: 0)))

diff --git a/...ests/FormTextFieldTests/InputValidatorTests/NorwegianPhoneNumberInputValidatorTests.swift b/...ests/FormTextFieldTests/InputValidatorTests/NorwegianPhoneNumberInputValidatorTests.swift
@@ -22,6 +22,7 @@ class NorwegianPhoneNumberInputValidatorTests: XCTestCase {
         XCTAssertFalse(validator.validateReplacementString("123456789", fullString: "", inRange: NSRange(location: 0, length: 0))) // Too long
 
         // Test partial valid sequences
+        XCTAssertTrue(validator.validateReplacementString("", fullString: "2", inRange: NSRange(location: 0, length: 1))) // Was 2 to become empty
         XCTAssertTrue(validator.validateReplacementString("4", fullString: "", inRange: NSRange(location: 0, length: 0))) // Starts with 4
         XCTAssertTrue(validator.validateReplacementString("2", fullString: "", inRange: NSRange(location: 0, length: 0))) // Starts with 2
         XCTAssertTrue(validator.validateReplacementString("9", fullString: "", inRange: NSRange(location: 0, length: 0))) // Starts with 9