Ignoring international numbers on PhoneNumberTextField (#654)

Fix #653
marmelroy · Jun 12, 2023 · 0688c44 · 0688c44
1 parent da2e787
commit 0688c44
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/PhoneNumberKit/PartialFormatter.swift b/PhoneNumberKit/PartialFormatter.swift
@@ -17,11 +17,28 @@ public final class PartialFormatter {
     weak var parser: PhoneNumberParser?
     weak var regexManager: RegexManager?
 
-    public convenience init(phoneNumberKit: PhoneNumberKit = PhoneNumberKit(), defaultRegion: String = PhoneNumberKit.defaultRegionCode(), withPrefix: Bool = true, maxDigits: Int? = nil) {
-        self.init(phoneNumberKit: phoneNumberKit, regexManager: phoneNumberKit.regexManager, metadataManager: phoneNumberKit.metadataManager, parser: phoneNumberKit.parseManager.parser, defaultRegion: defaultRegion, withPrefix: withPrefix, maxDigits: maxDigits)
+    public convenience init(phoneNumberKit: PhoneNumberKit = PhoneNumberKit(),
+                            defaultRegion: String = PhoneNumberKit.defaultRegionCode(),
+                            withPrefix: Bool = true,
+                            maxDigits: Int? = nil,
+                            ignoreIntlNumbers: Bool = false) {
+        self.init(phoneNumberKit: phoneNumberKit,
+                  regexManager: phoneNumberKit.regexManager,
+                  metadataManager: phoneNumberKit.metadataManager,
+                  parser: phoneNumberKit.parseManager.parser,
+                  defaultRegion: defaultRegion,
+                  withPrefix: withPrefix,
+                  maxDigits: maxDigits,
+                  ignoreIntlNumbers: ignoreIntlNumbers)
     }
 
-    init(phoneNumberKit: PhoneNumberKit, regexManager: RegexManager, metadataManager: MetadataManager, parser: PhoneNumberParser, defaultRegion: String, withPrefix: Bool = true, maxDigits: Int? = nil) {
+    init(phoneNumberKit: PhoneNumberKit,
+         regexManager: RegexManager,
+         metadataManager: MetadataManager,
+         parser: PhoneNumberParser, defaultRegion: String,
+         withPrefix: Bool = true,
+         maxDigits: Int? = nil,
+         ignoreIntlNumbers: Bool = false) {
         self.phoneNumberKit = phoneNumberKit
         self.regexManager = regexManager
         self.metadataManager = metadataManager
@@ -30,6 +47,7 @@ public final class PartialFormatter {
         self.updateMetadataForDefaultRegion()
         self.withPrefix = withPrefix
         self.maxDigits = maxDigits
+        self.ignoreIntlNumbers = ignoreIntlNumbers
     }
 
     public var defaultRegion: String {
@@ -55,11 +73,14 @@ public final class PartialFormatter {
     var prefixBeforeNationalNumber = String()
     var shouldAddSpaceAfterNationalPrefix = false
     var withPrefix = true
+    var ignoreIntlNumbers = false
 
     // MARK: Status
 
     public var currentRegion: String {
-        if self.phoneNumberKit.countryCode(for: self.defaultRegion) != 1 {
+        if ignoreIntlNumbers, currentMetadata?.codeID == "001" {
+            return defaultRegion
+        } else if self.phoneNumberKit.countryCode(for: self.defaultRegion) != 1 {
             return currentMetadata?.codeID ?? "US"
         } else {
             return self.currentMetadata?.countryCode == 1

diff --git a/PhoneNumberKit/UI/PhoneNumberTextField.swift b/PhoneNumberKit/UI/PhoneNumberTextField.swift
@@ -146,7 +146,8 @@ open class PhoneNumberTextField: UITextField, UITextFieldDelegate {
     public private(set) lazy var partialFormatter: PartialFormatter = PartialFormatter(
         phoneNumberKit: phoneNumberKit,
         defaultRegion: defaultRegion,
-        withPrefix: withPrefix
+        withPrefix: withPrefix,
+        ignoreIntlNumbers: true
     )
 
     let nonNumericSet: CharacterSet = {