Skip to content
This repository was archived by the owner on May 19, 2025. It is now read-only.

Commit 9c11e61

Browse files
mkg0mkg0
committed
merge
2 parents 37c51dc + 7bc692c commit 9c11e61

File tree

18 files changed

+5461
-168
lines changed

18 files changed

+5461
-168
lines changed

‎.babelrc‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"presets": [
3+
"env",
4+
"react"
5+
],
6+
"plugins": [
7+
[
8+
"transform-object-rest-spread",
9+
"add-module-exports"
10+
]
11+
]
12+
}

‎.npmignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ node_modules/
55
.git/
66
src/
77
demo/
8+
webpack.config.js
9+
yarn.lock.js
10+
.postcssconfig
11+
.babelrc

‎README.md‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
# react-date-range
2-
![](https://badge.fury.io/js/react-date-range.svg)
3-
![](https://david-dm.org/Adphorus/react-date-range.svg)
4-
![](https://david-dm.org/Adphorus/react-date-range/dev-status.svg)
2+
[![npm](https://img.shields.io/npm/v/react-date-range.svg?style=flat-square)](https://www.npmjs.com/package/react-date-range)
3+
![](https://img.shields.io/bithound/dependencies/github/adphorus/react-date-range.svg?style=flat-square)
4+
5+
[![npm](https://img.shields.io/npm/l/react-date-range.svg?style=flat-square)]()
6+
[![npm](https://img.shields.io/npm/dm/localeval.svg?style=flat-square)](https://www.npmjs.com/package/react-date-range)
7+
58

69
A React component for choosing dates and date ranges. Uses [Moment.js](http://momentjs.com/) for date operations.
710

811
**Live Demo :** [http://adphorus.github.io/react-date-range](http://adphorus.github.io/react-date-range)
912

1013
![](https://cdn.pbrd.co/images/1fjQlZzy.png)
1114

15+
## React Range Picker v2 is coming!
16+
17+
** Want to help us testing the next version? Let's go
18+
[next branch](https://github.com/adphorus/react-date-range/tree/next)!**
19+
This version will be depricated soon.
20+
1221
## Getting Started
1322
### Installation
1423

‎demo/.babelrc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"presets": [
3+
["env", { "modules": false }],
4+
"react"
5+
],
6+
"plugins": [
7+
["transform-object-rest-spread"]
8+
],
9+
"env": {
10+
"development": {
11+
"plugins": ["react-hot-loader/babel"]
12+
}
13+
}
14+
}

‎demo/build.js‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎demo/index.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<meta http-equiv="X-UA-Compatible" content="ie=edge">
7+
<title>React Date Range Demo</title>
8+
</head>
9+
<body>
10+
<div id="root"></div>
11+
<script src="/main.js"></script>
12+
</body>
13+
</html>

‎demo/package.json‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎demo/src/components/Main.js‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import React, { Component } from 'react';
22
import moment from 'moment';
3-
import { defaultRanges, Calendar, DateRange } from '../../../lib';
4-
import Section from 'components/Section';
3+
import { defaultRanges, Calendar, DateRange } from '../../../src';
4+
import Section from './Section';
55

66
import 'normalize.css';
7-
import 'styles/global'
8-
import styles from 'styles/main';
9-
import '../../../src/styles.scss'
7+
import '../styles/global.css'
8+
import styles from '../styles/main.css';
109

1110
export default class Main extends Component {
1211
constructor(props, context) {
@@ -52,12 +51,12 @@ export default class Main extends Component {
5251
<input
5352
type='text'
5453
readOnly
55-
value={ rangePicker['startDate'] && rangePicker['startDate'].format(format).toString() }
54+
value={ rangePicker['startDate'] && rangePicker['startDate'].format(format).toString() || ''}
5655
/>
5756
<input
5857
type='text'
5958
readOnly
60-
value={ rangePicker['endDate'] && rangePicker['endDate'].format(format).toString() }
59+
value={ rangePicker['endDate'] && rangePicker['endDate'].format(format).toString() || ''}
6160
/>
6261
</div>
6362

@@ -76,12 +75,12 @@ export default class Main extends Component {
7675
<input
7776
type='text'
7877
readOnly
79-
value={ linked['startDate'] && linked['startDate'].format(format).toString() }
78+
value={ linked['startDate'] && linked['startDate'].format(format).toString() || ''}
8079
/>
8180
<input
8281
type='text'
8382
readOnly
84-
value={ linked['endDate'] && linked['endDate'].format(format).toString() }
83+
value={ linked['endDate'] && linked['endDate'].format(format).toString() || ''}
8584
/>
8685
</div>
8786
<DateRange
@@ -102,7 +101,7 @@ export default class Main extends Component {
102101
<input
103102
type='text'
104103
readOnly
105-
value={ datePicker && datePicker.format(format).toString() }
104+
value={ datePicker && datePicker.format(format).toString() || ''}
106105
/>
107106
</div>
108107
<Calendar
@@ -117,7 +116,7 @@ export default class Main extends Component {
117116
<input
118117
type='text'
119118
readOnly
120-
value={ datePickerInternational && datePickerInternational.format(format).toString() }
119+
value={ datePickerInternational && datePickerInternational.format(format).toString() || '' }
121120
/>
122121
</div>
123122
<Calendar
@@ -134,7 +133,7 @@ export default class Main extends Component {
134133
<input
135134
type='text'
136135
readOnly
137-
value={ firstDayOfWeek && firstDayOfWeek.format(format).toString() }
136+
value={ firstDayOfWeek && firstDayOfWeek.format(format).toString() || '' }
138137
/>
139138
</div>
140139
<Calendar
@@ -150,12 +149,12 @@ export default class Main extends Component {
150149
<input
151150
type='text'
152151
readOnly
153-
value={ predefined['startDate'] && predefined['startDate'].format(format).toString() }
152+
value={ predefined['startDate'] && predefined['startDate'].format(format).toString() || '' }
154153
/>
155154
<input
156155
type='text'
157156
readOnly
158-
value={ predefined['endDate'] && predefined['endDate'].format(format).toString() }
157+
value={ predefined['endDate'] && predefined['endDate'].format(format).toString() || '' }
159158
/>
160159
</div>
161160
<DateRange
@@ -228,12 +227,12 @@ export default class Main extends Component {
228227
<input
229228
type='text'
230229
readOnly
231-
value={ rangePickerMobile['startDate'] && rangePickerMobile['startDate'].format(format).toString() }
230+
value={ rangePickerMobile['startDate'] && rangePickerMobile['startDate'].format(format).toString() || '' }
232231
/>
233232
<input
234233
type='text'
235234
readOnly
236-
value={ rangePickerMobile['endDate'] && rangePickerMobile['endDate'].format(format).toString() }
235+
value={ rangePickerMobile['endDate'] && rangePickerMobile['endDate'].format(format).toString() || '' }
237236
/>
238237
</div>
239238
<div className={styles['Mobile-Container']}>

‎demo/src/components/Section.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react';
2-
import styles from 'styles/main';
2+
import styles from '../styles/main.css';
33

44
export default class Section extends Component {
55
render() {

‎demo/src/index.html‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)