Skip to content

Commit 8b52dcf

Browse files
committed
Update packages after incorporating pull requests. 5.x release.
1 parent 211c588 commit 8b52dcf

File tree

3 files changed

+1978
-1146
lines changed

3 files changed

+1978
-1146
lines changed

lib/index.js

+27-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,25 @@ var _reactDom = require('react-dom');
1212

1313
var _reactDom2 = _interopRequireDefault(_reactDom);
1414

15-
var _reactBootstrap = require('react-bootstrap');
15+
var _Button = require('react-bootstrap/lib/Button');
16+
17+
var _Button2 = _interopRequireDefault(_Button);
18+
19+
var _FormControl = require('react-bootstrap/lib/FormControl');
20+
21+
var _FormControl2 = _interopRequireDefault(_FormControl);
22+
23+
var _InputGroup = require('react-bootstrap/lib/InputGroup');
24+
25+
var _InputGroup2 = _interopRequireDefault(_InputGroup);
26+
27+
var _Overlay = require('react-bootstrap/lib/Overlay');
28+
29+
var _Overlay2 = _interopRequireDefault(_Overlay);
30+
31+
var _Popover = require('react-bootstrap/lib/Popover');
32+
33+
var _Popover2 = _interopRequireDefault(_Popover);
1634

1735
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1836

@@ -31,11 +49,13 @@ var CalendarHeader = _react2.default.createClass({
3149

3250
handleClickPrevious: function handleClickPrevious() {
3351
var newDisplayDate = new Date(this.props.displayDate);
52+
newDisplayDate.setDate(1);
3453
newDisplayDate.setMonth(newDisplayDate.getMonth() - 1);
3554
this.props.onChange(newDisplayDate);
3655
},
3756
handleClickNext: function handleClickNext() {
3857
var newDisplayDate = new Date(this.props.displayDate);
58+
newDisplayDate.setDate(1);
3959
newDisplayDate.setMonth(newDisplayDate.getMonth() + 1);
4060
this.props.onChange(newDisplayDate);
4161
},
@@ -211,7 +231,7 @@ var Calendar = _react2.default.createClass({
211231
'td',
212232
{ colSpan: this.props.dayLabels.length, style: { paddingTop: '9px' } },
213233
_react2.default.createElement(
214-
_reactBootstrap.Button,
234+
_Button2.default,
215235
{
216236
block: true,
217237
bsSize: 'xsmall',
@@ -557,7 +577,7 @@ exports.default = _react2.default.createClass({
557577
className: this.props.className,
558578
style: this.props.style,
559579
autoComplete: this.props.autoComplete
560-
}) : _react2.default.createElement(_reactBootstrap.FormControl, {
580+
}) : _react2.default.createElement(_FormControl2.default, {
561581
onKeyDown: this.handleKeyDown,
562582
value: this.state.inputValue || '',
563583
required: this.props.required,
@@ -575,15 +595,15 @@ exports.default = _react2.default.createClass({
575595
});
576596

577597
return _react2.default.createElement(
578-
_reactBootstrap.InputGroup,
598+
_InputGroup2.default,
579599
{
580600
ref: 'inputGroup',
581601
bsClass: this.props.showClearButton ? this.props.bsClass : '',
582602
bsSize: this.props.bsSize,
583603
id: this.props.id ? this.props.id + '_group' : null },
584604
control,
585605
_react2.default.createElement(
586-
_reactBootstrap.Overlay,
606+
_Overlay2.default,
587607
{
588608
rootClose: true,
589609
onHide: this.handleHide,
@@ -597,7 +617,7 @@ exports.default = _react2.default.createClass({
597617
placement: this.props.calendarPlacement,
598618
delayHide: 200 },
599619
_react2.default.createElement(
600-
_reactBootstrap.Popover,
620+
_Popover2.default,
601621
{ id: 'date-picker-popover-' + this.props.instanceCount, className: 'date-picker-popover', title: calendarHeader },
602622
_react2.default.createElement(Calendar, {
603623
cellPadding: this.props.cellPadding,
@@ -617,7 +637,7 @@ exports.default = _react2.default.createClass({
617637
_react2.default.createElement('div', { ref: 'overlayContainer', style: { position: 'relative' } }),
618638
_react2.default.createElement('input', { ref: 'hiddenInput', type: 'hidden', id: this.props.id, name: this.props.name, value: this.state.value || '', 'data-formattedvalue': this.state.value ? this.state.inputValue : '' }),
619639
this.props.showClearButton && !this.props.customControl && _react2.default.createElement(
620-
_reactBootstrap.InputGroup.Addon,
640+
_InputGroup2.default.Addon,
621641
{
622642
onClick: this.props.disabled ? null : this.clear,
623643
style: { cursor: this.state.inputValue && !this.props.disabled ? 'pointer' : 'not-allowed' } },

package.json

+42-42
Original file line numberDiff line numberDiff line change
@@ -11,56 +11,56 @@
1111
"picker"
1212
],
1313
"main": "lib/index.js",
14-
"version": "4.0.0",
14+
"version": "5.0.0",
1515
"description": "React-Bootstrap based date picker.",
1616
"directories": {
1717
"test": "test"
1818
},
1919
"peerDependencies": {
2020
"react": ">=0.14.0",
21-
"react-bootstrap": "^0.30.2"
21+
"react-bootstrap": "^0.30.8"
2222
},
2323
"devDependencies": {
24-
"assert": "*",
25-
"babel": "^6.1.18",
26-
"babel-cli": "^6.7.5",
27-
"babel-eslint": "^7.1.1",
28-
"babel-loader": "^6.2.0",
29-
"babel-plugin-add-module-exports": "^0.1.2",
30-
"babel-preset-es2015": "*",
31-
"babel-preset-react": "*",
32-
"babel-preset-stage-1": "*",
33-
"co": "*",
34-
"doctoc": "^1.2.0",
35-
"envify": "*",
36-
"es6-promise": "*",
37-
"eslint": "^3.7.1",
38-
"eslint-loader": "1.5.0",
39-
"eslint-plugin-react": "^6.7.1",
40-
"expose-loader": "*",
41-
"isparta-loader": "*",
42-
"karma": "*",
43-
"karma-browserstack-launcher": "*",
44-
"karma-chrome-launcher": "*",
45-
"karma-coverage": "*",
46-
"karma-coveralls": "*",
47-
"karma-firefox-launcher": "*",
48-
"karma-safari-launcher": "*",
49-
"karma-mocha": "*",
50-
"karma-sourcemap-loader": "*",
51-
"karma-webpack": "*",
52-
"mocha": "*",
53-
"mocha-babel": "*",
54-
"node-uuid": "*",
55-
"react": "^15.0.1",
56-
"react-addons-test-utils": "^15.4.0",
57-
"react-bootstrap": "^0.30.2",
58-
"react-dom": "^15.0.1",
59-
"regenerator": "*",
60-
"regenerator-loader": "*",
61-
"transform-loader": "*",
62-
"webpack": "*",
63-
"webpack-dev-server": "*"
24+
"assert": "^1.4.1",
25+
"babel": "^6.23.0",
26+
"babel-cli": "^6.24.0",
27+
"babel-eslint": "^7.2.0",
28+
"babel-loader": "^6.4.1",
29+
"babel-plugin-add-module-exports": "^0.2.1",
30+
"babel-preset-es2015": "^6.24.0",
31+
"babel-preset-react": "^6.23.0",
32+
"babel-preset-stage-1": "^6.22.0",
33+
"co": "^4.6.0",
34+
"doctoc": "^1.3.0",
35+
"envify": "^4.0.0",
36+
"es6-promise": "^4.1.0",
37+
"eslint": "^3.18.0",
38+
"eslint-loader": "1.6.3",
39+
"eslint-plugin-react": "^6.10.3",
40+
"expose-loader": "^0.7.3",
41+
"isparta-loader": "^2.0.0",
42+
"karma": "^1.5.0",
43+
"karma-browserstack-launcher": "^1.2.0",
44+
"karma-chrome-launcher": "^2.0.0",
45+
"karma-coverage": "^1.1.1",
46+
"karma-coveralls": "^1.1.2",
47+
"karma-firefox-launcher": "^1.0.1",
48+
"karma-mocha": "^1.3.0",
49+
"karma-safari-launcher": "^1.0.0",
50+
"karma-sourcemap-loader": "^0.3.7",
51+
"karma-webpack": "^2.0.3",
52+
"mocha": "^3.2.0",
53+
"mocha-babel": "^3.0.3",
54+
"node-uuid": "^1.4.7",
55+
"react": "^15.4.2",
56+
"react-addons-test-utils": "^15.4.2",
57+
"react-bootstrap": "^0.30.8",
58+
"react-dom": "^15.4.2",
59+
"regenerator": "^0.9.7",
60+
"regenerator-loader": "^3.1.0",
61+
"transform-loader": "^0.2.4",
62+
"webpack": "^2.2.1",
63+
"webpack-dev-server": "^2.4.2"
6464
},
6565
"scripts": {
6666
"example": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --content-base example/ --config ./example/webpack.example.config.js",

0 commit comments

Comments
 (0)