fix(ios): guard new picker types (#12020)

Fixes TIMOB-28112
tidev · Sep 9, 2020 · fa8f547 · fa8f547
1 parent 39ef241
commit fa8f547
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/iphone/Classes/TiUIPicker.m b/iphone/Classes/TiUIPicker.m
@@ -177,13 +177,19 @@ - (void)setType_:(id)type_
   }
 }
 
+#if IS_SDK_IOS_13_4
 - (void)setDatePickerStyle_:(id)style
 {
+  if (![TiUtils isIOSVersionOrGreater:@"13.4"]) {
+    DebugLog(@"setDatePickerStyle is only supported on iOS 13.4 and above");
+    return;
+  }
   UIControl *picker = [self picker];
   if ([self isDatePicker]) {
     [(UIDatePicker *)picker setPreferredDatePickerStyle:[TiUtils intValue:style]];
   }
 }
+#endif
 
 // We're order-dependent on type being set first, so we need to make sure that anything that relies
 // on whether or not this is a date picker needs to be set AFTER the initial configuration.

diff --git a/iphone/Classes/TiUIiOSProxy.m b/iphone/Classes/TiUIiOSProxy.m
@@ -192,6 +192,7 @@ - (NSNumber *)ROW_ACTION_STYLE_NORMAL
 
 #ifdef USE_TI_UIPICKER
 
+#if IS_SDK_IOS_13_4
 - (NSNumber *)DATE_PICKER_STYLE_AUTOMATIC
 {
   if (![TiUtils isIOSVersionOrGreater:@"13.4"]) {
@@ -218,6 +219,7 @@ - (NSNumber *)DATE_PICKER_STYLE_COMPACT
 
   return @(UIDatePickerStyleCompact);
 }
+#endif
 
 #if IS_SDK_IOS_14
 - (NSNumber *)DATE_PICKER_STYLE_INLINE

diff --git a/iphone/iphone/Titanium_Prefix.pch b/iphone/iphone/Titanium_Prefix.pch
@@ -17,6 +17,12 @@
 #define IS_SDK_IOS_14 false
 #endif
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400
+#define IS_SDK_IOS_13_4 true
+#else
+#define IS_SDK_IOS_13_4 false
+#endif
+
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
 #define IS_SDK_IOS_13 true
 #else