Adding a locale prop to DatePickerIOS exporting the prop in RCTDatePi…

…ckerManager. Adding an NSLocale conversion method to RCTConver.
facebook · Nov 2, 2017 · 8ede1ce · 8ede1ce
1 parent cf8dc89
commit 8ede1ce
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -78,6 +78,11 @@ const DatePickerIOS = createReactClass({
      */
     mode: PropTypes.oneOf(['date', 'time', 'datetime']),
 
+    /**
+     * The date picker locale.
+     */
+    locale: PropTypes.string,
+
     /**
      * The interval at which minutes can be selected.
      */
@@ -127,6 +132,7 @@ const DatePickerIOS = createReactClass({
           ref={ picker => { this._picker = picker; } }
           style={styles.datePickerIOS}
           date={props.date.getTime()}
+          locale={props.locale ? props.locale : undefined}
           maximumDate={
             props.maximumDate ? props.maximumDate.getTime() : undefined
           }
@@ -155,6 +161,7 @@ const RCTDatePickerIOS = requireNativeComponent('RCTDatePicker', {
   propTypes: {
     ...DatePickerIOS.propTypes,
     date: PropTypes.number,
+    locale: PropTypes.string,
     minimumDate: PropTypes.number,
     maximumDate: PropTypes.number,
     onDateChange: () => null,

diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
@@ -55,6 +55,7 @@ typedef NSURL RCTFileURL;
 + (RCTFileURL *)RCTFileURL:(id)json;
 
 + (NSDate *)NSDate:(id)json;
++ (NSLocale *)NSLocale:(id)json;
 + (NSTimeZone *)NSTimeZone:(id)json;
 + (NSTimeInterval)NSTimeInterval:(id)json;
 

diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
@@ -222,6 +222,20 @@ + (NSDate *)NSDate:(id)json
   return nil;
 }
 
++ (NSLocale *)NSLocale:(id)json
+{
+  if ([json isKindOfClass:[NSString class]]) {
+    NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:json];
+    if (!locale) {
+      RCTLogError(@"JSON String '%@' could not be interpreted as a valid locale. ", json);
+    }
+    return locale;
+  } else if (json) {
+    RCTLogConvertError(json, @"a locale");
+  }
+  return nil;
+}
+
 // JS Standard for time is milliseconds
 RCT_CUSTOM_CONVERTER(NSTimeInterval, NSTimeInterval, [self double:json] / 1000.0)
 

diff --git a/React/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m
@@ -35,6 +35,7 @@ - (UIView *)view
 }
 
 RCT_EXPORT_VIEW_PROPERTY(date, NSDate)
+RCT_EXPORT_VIEW_PROPERTY(locale, NSLocale)
 RCT_EXPORT_VIEW_PROPERTY(minimumDate, NSDate)
 RCT_EXPORT_VIEW_PROPERTY(maximumDate, NSDate)
 RCT_EXPORT_VIEW_PROPERTY(minuteInterval, NSInteger)