diff --git a/packages/react-native/Libraries/Components/TextInput/TextInput.d.ts b/packages/react-native/Libraries/Components/TextInput/TextInput.d.ts index fa196a19491..80db8f0a652 100644 --- a/packages/react-native/Libraries/Components/TextInput/TextInput.d.ts +++ b/packages/react-native/Libraries/Components/TextInput/TextInput.d.ts @@ -84,6 +84,9 @@ type DataDetectorTypes = | 'link' | 'address' | 'calendarEvent' + | 'trackingNumber' + | 'flightNumber' + | 'lookupSuggestion' | 'none' | 'all'; diff --git a/packages/react-native/Libraries/Components/TextInput/TextInput.flow.js b/packages/react-native/Libraries/Components/TextInput/TextInput.flow.js index 39ba481b7e4..0eb8f578d65 100644 --- a/packages/react-native/Libraries/Components/TextInput/TextInput.flow.js +++ b/packages/react-native/Libraries/Components/TextInput/TextInput.flow.js @@ -99,6 +99,9 @@ type DataDetectorTypesType = | 'link' | 'address' | 'calendarEvent' + | 'trackingNumber' + | 'flightNumber' + | 'lookupSuggestion' | 'none' | 'all'; diff --git a/packages/react-native/Libraries/Components/TextInput/TextInput.js b/packages/react-native/Libraries/Components/TextInput/TextInput.js index 2dddd7ae6bf..f0416dce6c6 100644 --- a/packages/react-native/Libraries/Components/TextInput/TextInput.js +++ b/packages/react-native/Libraries/Components/TextInput/TextInput.js @@ -137,6 +137,9 @@ type DataDetectorTypesType = | 'link' | 'address' | 'calendarEvent' + | 'trackingNumber' + | 'flightNumber' + | 'lookupSuggestion' | 'none' | 'all'; diff --git a/packages/react-native/React/Base/RCTConvert.h b/packages/react-native/React/Base/RCTConvert.h index 5b4559d94b1..7a6ca764191 100644 --- a/packages/react-native/React/Base/RCTConvert.h +++ b/packages/react-native/React/Base/RCTConvert.h @@ -16,9 +16,6 @@ #import #import #import -#if TARGET_OS_IPHONE -#import -#endif /** * This class provides a collection of conversion functions for mapping @@ -78,10 +75,6 @@ typedef NSURL RCTFileURL; + (UIDataDetectorTypes)UIDataDetectorTypes:(id)json; #endif -#if TARGET_OS_IPHONE -+ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json; -#endif - + (UIViewContentMode)UIViewContentMode:(id)json; #if !TARGET_OS_TV + (UIBarStyle)UIBarStyle:(id)json; diff --git a/packages/react-native/React/Base/RCTConvert.m b/packages/react-native/React/Base/RCTConvert.m index 3a7d2b4fc35..34822463593 100644 --- a/packages/react-native/React/Base/RCTConvert.m +++ b/packages/react-native/React/Base/RCTConvert.m @@ -450,28 +450,15 @@ RCT_MULTI_ENUM_CONVERTER( @"link" : @(UIDataDetectorTypeLink), @"address" : @(UIDataDetectorTypeAddress), @"calendarEvent" : @(UIDataDetectorTypeCalendarEvent), + @"trackingNumber" : @(UIDataDetectorTypeShipmentTrackingNumber), + @"flightNumber" : @(UIDataDetectorTypeFlightNumber), + @"lookupSuggestion" : @(UIDataDetectorTypeLookupSuggestion), @"none" : @(UIDataDetectorTypeNone), @"all" : @(UIDataDetectorTypeAll), }), UIDataDetectorTypePhoneNumber, unsignedLongLongValue) -RCT_MULTI_ENUM_CONVERTER( - WKDataDetectorTypes, - (@{ - @"phoneNumber" : @(WKDataDetectorTypePhoneNumber), - @"link" : @(WKDataDetectorTypeLink), - @"address" : @(WKDataDetectorTypeAddress), - @"calendarEvent" : @(WKDataDetectorTypeCalendarEvent), - @"trackingNumber" : @(WKDataDetectorTypeTrackingNumber), - @"flightNumber" : @(WKDataDetectorTypeFlightNumber), - @"lookupSuggestion" : @(WKDataDetectorTypeLookupSuggestion), - @"none" : @(WKDataDetectorTypeNone), - @"all" : @(WKDataDetectorTypeAll), - }), - WKDataDetectorTypePhoneNumber, - unsignedLongLongValue) - RCT_ENUM_CONVERTER( UIKeyboardAppearance, (@{