fix(ios): fix 'dateTimeColor' for iOS 14+ (#12167)

Fixes TIMOB-28181
tidev · Oct 23, 2020 · 88005a3 · 88005a3
1 parent 35f59c4
commit 88005a3
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 1 deletion.
diff --git a/apidoc/Titanium/UI/Picker.yml b/apidoc/Titanium/UI/Picker.yml
@@ -252,6 +252,9 @@ properties:
         Applicable to <Titanium.UI.PICKER_TYPE_TIME> and <Titanium.UI.PICKER_TYPE_DATE_AND_TIME> picker types.
         The picker type <Titanium.UI.PICKER_TYPE_DATE> does not support text customizing as stated in the
         [UIKit User Interface Catalog](https://developer.apple.com/documentation/uikit/uidatepicker).
+
+        Important: On iOS 14+, you also have to set the <Titanium.UI.Picker.datePickerStyle> to <Titanium.UI.iOS.DATE_PICKER_STYLE_WHEELS>
+        in order to use this property.
     type: [String, Titanium.UI.Color]
     platforms: [iphone, ipad, macos]
     since: "5.2.0"

diff --git a/iphone/Classes/TiUIPicker.m b/iphone/Classes/TiUIPicker.m
@@ -232,7 +232,19 @@ - (void)setBackgroundColor_:(id)value
 
 - (void)setDateTimeColor_:(id)value
 {
-  [[self proxy] replaceValue:value forKey:@"dateTimeColor" notification:NO];
+  // Guard date picker and iOS 14+ date picker style
+  if (![self isDatePicker]) {
+    return;
+  }
+#if IS_SDK_IOS_13_4
+  if (((UIDatePicker *)[self picker]).preferredDatePickerStyle != UIDatePickerStyleWheels) {
+    return;
+  }
+#endif
+
+  [[self proxy] replaceValue:value
+                      forKey:@"dateTimeColor"
+                notification:NO];
 
   if (picker != nil) {
     [(UIDatePicker *)[self picker] setValue:[[TiUtils colorValue:value] _color] forKeyPath:@"textColor"];

diff --git a/tests/Resources/ti.ui.picker.test.js b/tests/Resources/ti.ui.picker.test.js
@@ -300,6 +300,45 @@ describe('Titanium.UI.Picker', function () {
 		win.open();
 	});
 
+	it('DatePicker dateTimeColor (invalid "type" - TIMOB-28181)', function (finish) {
+		const dp = Ti.UI.createPicker({
+			type: Ti.UI.PICKER_TYPE_PLAIN,
+			dateTimeColor: 'red'
+		});
+
+		win = Ti.UI.createWindow();
+		win.addEventListener('open', function () {
+			try {
+				should(dp.dateTimeColor).be.eql('red');
+				finish();
+			} catch (err) {
+				return finish(err);
+			}
+		});
+		win.add(dp);
+		win.open();
+	});
+
+	it('DatePicker dateTimeColor (valid "type" + "datePickerStyle" - TIMOB-28181)', function (finish) {
+		const dp = Ti.UI.createPicker({
+			type: Ti.UI.PICKER_TYPE_DATE,
+			datePickerStyle: Ti.UI.iOS.DATE_PICKER_STYLE_WHEELS,
+			dateTimeColor: 'red'
+		});
+
+		win = Ti.UI.createWindow();
+		win.addEventListener('open', function () {
+			try {
+				should(dp.dateTimeColor).be.eql('red');
+				finish();
+			} catch (err) {
+				return finish(err);
+			}
+		});
+		win.add(dp);
+		win.open();
+	});
+
 	it('DatePicker postlayout event', function (finish) {
 		const dp = Ti.UI.createPicker({
 			type: Ti.UI.PICKER_TYPE_DATE