Merge pull request react-native-text-input-mask#38 from leoneparise/fix-for-rn-54

Fix build for RN 0.54 and Cocoapods

Author: ivanzotov

.gitignore

@@ -1 +1,2 @@
 .DS_Store
+xcuserdata/

ios/RNTextInputMask/RNTextInputMask.xcodeproj/project.pbxproj

@@ -287,7 +287,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEVELOPMENT_TEAM = YRYY3MUZEK;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../react-native/Libraries/Text";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../react-native/Libraries/Text/**";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -299,7 +299,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEVELOPMENT_TEAM = YRYY3MUZEK;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../react-native/Libraries/Text";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../react-native/Libraries/Text/**";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

ios/RNTextInputMask/RNTextInputMask/RNTextInputMask.m

@@ -10,8 +10,8 @@
 #import <React/RCTConvert.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTEventDispatcher.h>
-#import <RCTText/RCTSinglelineTextInputView.h>
-#import <RCTText/RCTUITextField.h>
+#import "RCTSinglelineTextInputView.h"
+#import "RCTUITextField.h"
 #import "RNTextInputMask.h"
 
 @import InputMask;
@@ -43,17 +43,17 @@ - (dispatch_queue_t)methodQueue {
         dispatch_async(dispatch_get_main_queue(), ^{
             RCTSinglelineTextInputView *view = viewRegistry[reactNode];
             RCTUITextField *textView = [view backedTextInputView];
-
+            
             if (!masks) {
                 masks = [[NSMutableDictionary alloc] init];
             }
-
+            
             NSString *key = [NSString stringWithFormat:@"%@", reactNode];
             MaskedTextFieldDelegate* maskedDelegate = [[MaskedTextFieldDelegate alloc] initWithFormat:mask];
             masks[key] = maskedDelegate;
             [masks[key] setListener:self];
             textView.delegate = masks[key];
-
+            
             [self updateTextField:maskedDelegate textView:textView];
         });
     }];
@@ -62,17 +62,17 @@ - (dispatch_queue_t)methodQueue {
 - (void)textField:(RCTUITextField *)textField didFillMandatoryCharacters:(BOOL)complete didExtractValue:(NSString *)value
 {
     [self.bridge.eventDispatcher sendTextEventWithType:RCTTextEventTypeChange
-                                   reactTag:[[textField reactSuperview] reactTag]
-                                       text:textField.text
-                                        key:nil
-                                 eventCount:1];
+                                              reactTag:[[textField reactSuperview] reactTag]
+                                                  text:textField.attributedText.string
+                                                   key:nil
+                                            eventCount:1];
 }
 
 - (void)textFieldDidBeginEditing:(UITextField *)textField
 {
     [self.bridge.eventDispatcher sendTextEventWithType:RCTTextEventTypeFocus
                                               reactTag:[[textField reactSuperview] reactTag]
-                                                  text:textField.text
+                                                  text:textField.attributedText.string
                                                    key:nil
                                             eventCount:1];
 }
@@ -81,24 +81,25 @@ - (void)textFieldDidEndEditing:(RCTUITextField *)textField
 {
     [self.bridge.eventDispatcher sendTextEventWithType:RCTTextEventTypeBlur
                                               reactTag:[[textField reactSuperview] reactTag]
-                                                  text:textField.text
+                                                  text:textField.attributedText.string
                                                    key:nil
                                             eventCount:1];
 }
 
 
 - (void)updateTextField:(MaskedTextFieldDelegate *)maskedDelegate textView:(RCTUITextField *)textView {
-    if(textView.text.length> 0){
-        NSString *originalString = textView.text;
+    if(textView.attributedText.string.length> 0){
+        NSString *originalString = textView.attributedText.string;
         NSString *croppedText = [originalString substringToIndex:[originalString length] -1];
-
-        [textView setText:croppedText];
+        
+        [textView setAttributedText:[[NSAttributedString alloc] initWithString:croppedText]];
         NSString *last = [originalString substringFromIndex:[originalString length] - 1];
-
+        
         [maskedDelegate textField:(UITextField*)textView
-    shouldChangeCharactersInRange: (NSRange){[textView.text length], 0}
+    shouldChangeCharactersInRange: (NSRange){[textView.attributedText.string length], 0}
                 replacementString:last];
     }
 }
 
 @end
+