RedMadRobot · Apr 19, 2023 · May 1, 2023 · May 1, 2023 · May 5, 2023 · May 5, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # 𝌡Changelog
 
+## 7.3.2
+
+**⤵️ Added:**
+
+* Full **macOS** support: a brand new `TextViewListener` class for `NSTextView` instances 
+
+## 7.2.8
+
+**⤵️ Added:**
+
+* `MaskedTextInputListener` now provides call forwarding to its corresponding `textFieldDelegate` and `textViewDelegate`
+
+## 7.2.6
+
+**🔄 Modified:**
+
+* `Country::findCountries` → fix bloomer
+
+## 7.2.1
+
+**🔄 Modified:**
+* `NumberInputListener` was made available to iOS 15.6
+
 ## 7.2.0
 
 **🔄 Modified:**

diff --git a/InputMask.podspec b/InputMask.podspec
@@ -1,14 +1,15 @@
 Pod::Spec.new do |spec|
-  spec.name             = "InputMask"
-  spec.version          = "7.2.1"
-  spec.summary          = "InputMask"
-  spec.description      = "User input masking library."
-  spec.homepage         = "https://github.com/RedMadRobot/input-mask-ios"
-  spec.license          = "MIT"
-  spec.author           = { "Egor Taflanidi" => "et@redmadrobot.com" }
-  spec.source           = { :git => "https://github.com/RedMadRobot/input-mask-ios.git", :tag => spec.version.to_s }
-  spec.platform         = :ios, "15.6"
-  spec.requires_arc     = true
-  spec.source_files     = "Source/InputMask/InputMask/Classes/**/*"
-  spec.swift_version    = '5.7'
+  spec.name                  = "InputMask"
+  spec.version               = "7.3.2"
+  spec.summary               = "InputMask"
+  spec.description           = "User input masking library."
+  spec.homepage              = "https://github.com/RedMadRobot/input-mask-ios"
+  spec.license               = "MIT"
+  spec.author                = { "Yehor Taflanidi" => "jeorge.morpheus@gmail.com" }
+  spec.source                = { :git => "https://github.com/RedMadRobot/input-mask-ios.git", :tag => spec.version.to_s }
+  spec.ios.deployment_target = "15.6"
+  spec.osx.deployment_target = "10.13"
+  spec.requires_arc          = true
+  spec.source_files          = "Source/InputMask/InputMask/Classes/**/*"
+  spec.swift_version         = '5.7'
 end
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-<img src="Documentation/Assets/logo.png" alt="Input Mask" height="102" />
+<img src="Documentation/Assets/logo.png" alt="Input Mask" />
 
-[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FRedMadRobot%2Finput-mask-ios%2Fbadge%3Ftype%3Dswift-versions&style=for-the-badge)](https://swiftpackageindex.com/RedMadRobot/input-mask-ios) [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FRedMadRobot%2Finput-mask-ios%2Fbadge%3Ftype%3Dplatforms&style=for-the-badge)](https://swiftpackageindex.com/RedMadRobot/input-mask-ios) [![Pod Version Badge](https://img.shields.io/badge/POD-v7.2.1-blue?logo=cocoapods&style=for-the-badge)](https://cocoapods.org/pods/InputMask) [![Awesome](https://img.shields.io/badge/-mentioned_in_awesome_iOS-CCA6C4.svg?colorA=CCA6C4&colorB=261120&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMTAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI%2BICAgIDxwYXRoIGZpbGw9IiMyNjExMjAiIGQ9Ik0xOS4xNCA0LjVMMTQuMjMgMGwtLjY5Ljc1IDQuMDkgMy43NUgxLjUxTDUuNi43NSA0LjkxIDAgMCA0LjV2Mi45N0MwIDguODEgMS4yOSA5LjkgMi44OCA5LjloMy4wM2MxLjU5IDAgMi44OC0xLjA5IDIuODgtMi40M1Y1LjUyaDEuNTd2MS45NWMwIDEuMzQgMS4yOSAyLjQzIDIuODggMi40M2gzLjAzYzEuNTkgMCAyLjg4LTEuMDkgMi44OC0yLjQzbC0uMDEtMi45N3oiLz48L3N2Zz4%3D&style=for-the-badge)](https://github.com/vsouza/awesome-ios) [![Actions](https://img.shields.io/github/actions/workflow/status/RedMadRobot/input-mask-ios/swift.yml?style=for-the-badge)](https://github.com/RedMadRobot/input-mask-ios/actions/workflows/swift.yml) [![Android](https://img.shields.io/badge/-android_version-red?color=teal&logo=android&style=for-the-badge)](https://github.com/RedMadRobot/input-mask-android) [![Telegram](https://img.shields.io/badge/-telegram_author-red?color=blue&logo=telegram&style=for-the-badge)](https://t.me/jeorge_taflanidi) [![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=for-the-badge)](#license)
+[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FRedMadRobot%2Finput-mask-ios%2Fbadge%3Ftype%3Dswift-versions&style=for-the-badge)](https://swiftpackageindex.com/RedMadRobot/input-mask-ios) [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FRedMadRobot%2Finput-mask-ios%2Fbadge%3Ftype%3Dplatforms&style=for-the-badge)](https://swiftpackageindex.com/RedMadRobot/input-mask-ios) [![Pod Version Badge](https://img.shields.io/badge/POD-v7.3.2-blue?logo=cocoapods&style=for-the-badge)](https://cocoapods.org/pods/InputMask) [![Awesome](https://img.shields.io/badge/-mentioned_in_awesome_iOS-CCA6C4.svg?colorA=CCA6C4&colorB=261120&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMTAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI%2BICAgIDxwYXRoIGZpbGw9IiMyNjExMjAiIGQ9Ik0xOS4xNCA0LjVMMTQuMjMgMGwtLjY5Ljc1IDQuMDkgMy43NUgxLjUxTDUuNi43NSA0LjkxIDAgMCA0LjV2Mi45N0MwIDguODEgMS4yOSA5LjkgMi44OCA5LjloMy4wM2MxLjU5IDAgMi44OC0xLjA5IDIuODgtMi40M1Y1LjUyaDEuNTd2MS45NWMwIDEuMzQgMS4yOSAyLjQzIDIuODggMi40M2gzLjAzYzEuNTkgMCAyLjg4LTEuMDkgMi44OC0yLjQzbC0uMDEtMi45N3oiLz48L3N2Zz4%3D&style=for-the-badge)](https://github.com/vsouza/awesome-ios) [![Actions](https://img.shields.io/github/actions/workflow/status/RedMadRobot/input-mask-ios/swift.yml?style=for-the-badge)](https://github.com/RedMadRobot/input-mask-ios/actions/workflows/swift.yml) [![Android](https://img.shields.io/badge/-android_version-red?color=teal&logo=android&style=for-the-badge)](https://github.com/RedMadRobot/input-mask-android) [![Telegram](https://img.shields.io/badge/-telegram_author-red?color=blue&logo=telegram&style=for-the-badge)](https://t.me/jeorge_taflanidi) [![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=for-the-badge)](#license)
 
 Input masks restrict data input and allow you to guide users to enter correct values.  
 Check out our [wiki](https://github.com/RedMadRobot/input-mask-ios/wiki) for quick start and further reading.  
@@ -14,6 +14,7 @@ Check out our [wiki](https://github.com/RedMadRobot/input-mask-ios/wiki) for qui
     - apply corresponding value restrictions (e.g. a 🇺🇸US phone will have a format like `+1 201 456-7890`)
 - Apply number/currency formatting 
 - SwiftUI support
+- macOS support
 
 <a name="examples" />
 

diff --git a/Source/InputMask/InputMask.xcodeproj/project.pbxproj b/Source/InputMask/InputMask.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -24,11 +24,9 @@
 		518F8AC51F36AAB000065733 /* Mask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1E3C531D64807800589799 /* Mask.swift */; };
 		8A0185471D6498F9007B5EBD /* FreeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0185461D6498F9007B5EBD /* FreeState.swift */; };
 		8A01854A1D649BC9007B5EBD /* PhoneCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0185491D649BC9007B5EBD /* PhoneCase.swift */; };
-		8A01854D1D64ABCC007B5EBD /* MaskedTextFieldDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A01854C1D64ABCC007B5EBD /* MaskedTextFieldDelegate.swift */; };
 		8A076E0220923F830056476F /* Notation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A076E0120923F830056476F /* Notation.swift */; };
 		8A076E04209275750056476F /* DecimalNumberCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A076E03209275750056476F /* DecimalNumberCase.swift */; };
 		8A1256F220BE95CB005E3324 /* CustomNotationEllipticalCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1256F120BE95CB005E3324 /* CustomNotationEllipticalCase.swift */; };
-		8A1DD0B1210108A7008BAE2A /* MaskedTextViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1DD0B0210108A7008BAE2A /* MaskedTextViewDelegate.swift */; };
 		8A1E3C4D1D64649200589799 /* CaretStringIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1E3C4C1D64649200589799 /* CaretStringIterator.swift */; };
 		8A1E3C501D647BA800589799 /* DayMonthYearCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1E3C4F1D647BA800589799 /* DayMonthYearCase.swift */; };
 		8A1E3C521D647E1700589799 /* MonthYearDoubleSlashCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1E3C511D647E1700589799 /* MonthYearDoubleSlashCase.swift */; };
@@ -84,11 +82,9 @@
 		518F8AB61F36A9B300065733 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8A0185461D6498F9007B5EBD /* FreeState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FreeState.swift; sourceTree = "<group>"; };
 		8A0185491D649BC9007B5EBD /* PhoneCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhoneCase.swift; sourceTree = "<group>"; };
-		8A01854C1D64ABCC007B5EBD /* MaskedTextFieldDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaskedTextFieldDelegate.swift; sourceTree = "<group>"; };
 		8A076E0120923F830056476F /* Notation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notation.swift; sourceTree = "<group>"; };
 		8A076E03209275750056476F /* DecimalNumberCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecimalNumberCase.swift; sourceTree = "<group>"; };
 		8A1256F120BE95CB005E3324 /* CustomNotationEllipticalCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomNotationEllipticalCase.swift; sourceTree = "<group>"; };
-		8A1DD0B0210108A7008BAE2A /* MaskedTextViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaskedTextViewDelegate.swift; sourceTree = "<group>"; };
 		8A1E3C4C1D64649200589799 /* CaretStringIterator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretStringIterator.swift; sourceTree = "<group>"; };
 		8A1E3C4F1D647BA800589799 /* DayMonthYearCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DayMonthYearCase.swift; sourceTree = "<group>"; };
 		8A1E3C511D647E1700589799 /* MonthYearDoubleSlashCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MonthYearDoubleSlashCase.swift; sourceTree = "<group>"; };
@@ -175,9 +171,7 @@
 		8A01854B1D64AB9B007B5EBD /* View */ = {
 			isa = PBXGroup;
 			children = (
-				8A01854C1D64ABCC007B5EBD /* MaskedTextFieldDelegate.swift */,
 				8A4CDCD021099B6D005B2FA6 /* MaskedTextInputListener.swift */,
-				8A1DD0B0210108A7008BAE2A /* MaskedTextViewDelegate.swift */,
 				8ADB578A20FE2E1C0095417D /* UITextInput.swift */,
 			);
 			path = View;
@@ -420,8 +414,9 @@
 		8A808EC21D5B0FEC00A75B9C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1420;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "Egor Taflanidi";
 				TargetAttributes = {
 					518F8AAC1F36A98400065733 = {
@@ -513,12 +508,10 @@
 				8A3C8C1121B1993B00CDBDE1 /* RTLCaretStringIterator.swift in Sources */,
 				8A1E3C541D64807800589799 /* Mask.swift in Sources */,
 				8AB1E8991D637BFD00892C3B /* FixedState.swift in Sources */,
-				8A1DD0B1210108A7008BAE2A /* MaskedTextViewDelegate.swift in Sources */,
 				8A1E3C571D64847D00589799 /* OptionalValueState.swift in Sources */,
 				8AB1E8901D6375FC00892C3B /* EOLState.swift in Sources */,
 				8A3C8C0F21B1841500CDBDE1 /* RTLMask.swift in Sources */,
 				8A83CCB31D5B5E1F00C0184F /* String.swift in Sources */,
-				8A01854D1D64ABCC007B5EBD /* MaskedTextFieldDelegate.swift in Sources */,
 				8A1E3C4D1D64649200589799 /* CaretStringIterator.swift in Sources */,
 				8AB1E8891D63753E00892C3B /* Compiler.swift in Sources */,
 				8A076E0220923F830056476F /* Notation.swift in Sources */,
@@ -585,12 +578,19 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "$(SRCROOT)/InputMaskMac/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.InputMaskMac;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = macosx;
@@ -615,17 +615,25 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "$(SRCROOT)/InputMaskMac/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.InputMaskMac;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
@@ -751,15 +759,22 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/InputMask/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.InputMask;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -772,19 +787,27 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/InputMask/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.InputMask;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -793,7 +816,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "InputMaskTests/Supporting Files/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.InputMaskTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -804,10 +831,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "InputMaskTests/Supporting Files/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.InputMaskTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;

diff --git a/Source/InputMask/InputMask.xcodeproj/xcshareddata/xcschemes/InputMask.xcscheme b/Source/InputMask/InputMask.xcodeproj/xcshareddata/xcschemes/InputMask.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Source/InputMask/InputMask/Classes/InputMask.h b/Source/InputMask/InputMask/Classes/InputMask.h
@@ -3,7 +3,7 @@
 // Created by Jeorge Taflanidi
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for InputMask.
 FOUNDATION_EXPORT double InputMaskVersionNumber;

diff --git a/Source/InputMask/InputMask/Classes/Model/Country.swift b/Source/InputMask/InputMask/Classes/Model/Country.swift
@@ -111,7 +111,7 @@ public struct Country {
         let excludingTermsLowercased = (excludingTerms ?? []).map { $0.lowercased() }
         let phoneDigits = phone.extractDigits()
 
-        return customCountries ?? all.filter { country in
+        return (customCountries ?? all).filter { country in
             var include: Bool = false
 
             if includingTerms != nil {

diff --git a/Source/InputMask/InputMask/Classes/View/MaskedTextField.swift b/Source/InputMask/InputMask/Classes/View/MaskedTextField.swift
@@ -332,9 +332,9 @@ public struct MaskedTextField: UIViewRepresentable {
             )
         }
 
-        public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        public override func textFieldShouldReturn(_ textField: UITextField) -> Bool {
             onSubmit?(textField)
-            return true
+            return super.textFieldShouldReturn(textField)
         }
 
         public override func textFieldDidBeginEditing(_ textField: UITextField) {