Skip to content

Commit 3ae69a4

Browse files
committed
feat(Datepicker): support minuteInterval property in ios #46
1 parent df91a40 commit 3ae69a4

File tree

9 files changed

+39
-1
lines changed

9 files changed

+39
-1
lines changed
Binary file not shown.
205 Bytes
Binary file not shown.
517 Bytes
Binary file not shown.

index.android.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class datepicker extends Component {
4747
format="HH:mm"
4848
confirmBtnText="Confirm"
4949
cancelBtnText="Cancel"
50+
minuteInterval={10}
5051
onDateChange={(time) => {this.setState({time: time});}}
5152
/>
5253
<Text style={styles.instructions}>time: {this.state.time}</Text>
@@ -79,6 +80,7 @@ class datepicker extends Component {
7980
marginLeft: 36
8081
}
8182
}}
83+
minuteInterval={10}
8284
onDateChange={(datetime) => {this.setState({datetime1: datetime});}}
8385
/>
8486
<Text style={styles.instructions}>datetime: {this.state.datetime1}</Text>

index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@ class DatePicker extends Component {
263263
minimumDate={this.props.minDate && this.getDate(this.props.minDate)}
264264
maximumDate={this.props.maxDate && this.getDate(this.props.maxDate)}
265265
onDateChange={(date) => this.setState({date: date})}
266+
minuteInterval={this.props.minuteInterval}
267+
timeZoneOffsetInMinutes={this.props.timeZoneOffsetInMinutes}
266268
style={[Style.datePicker, customStyles.datePicker]}
267269
/>
268270
<TouchableHighlight

ios/datepicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>datepicker.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>00E356ED1AD99517003FC87E</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
<key>13B07F861A680F5B00A75B9A</key>
21+
<dict>
22+
<key>primary</key>
23+
<true/>
24+
</dict>
25+
</dict>
26+
</dict>
27+
</plist>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"devDependencies": {
3131
"react": "~15.3.1",
32-
"react-native": "^0.33.0",
32+
"react-native": "^0.36.0",
3333

3434
"babel-core": "^6.5.2",
3535
"babel-preset-react-native": "^1.8.0",

0 commit comments

Comments
 (0)