react-bootstrap 0.30.6 → 0.30.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. package/CHANGELOG.md +64 -0
  2. package/LICENSE +2 -2
  3. package/dist/react-bootstrap.js +3161 -1664
  4. package/dist/react-bootstrap.min.js +9 -9
  5. package/dist/react-bootstrap.min.js.map +1 -1
  6. package/es/Alert.js +3 -2
  7. package/es/Badge.js +2 -1
  8. package/es/BreadcrumbItem.js +5 -4
  9. package/es/Button.js +7 -6
  10. package/es/ButtonGroup.js +4 -3
  11. package/es/Carousel.js +17 -16
  12. package/es/CarouselItem.js +7 -6
  13. package/es/Checkbox.js +5 -4
  14. package/es/Clearfix.js +5 -4
  15. package/es/Col.js +21 -20
  16. package/es/Collapse.js +20 -13
  17. package/es/ControlLabel.js +4 -3
  18. package/es/Dropdown.js +34 -22
  19. package/es/DropdownButton.js +6 -5
  20. package/es/DropdownMenu.js +19 -14
  21. package/es/DropdownToggle.js +5 -4
  22. package/es/Fade.js +17 -10
  23. package/es/Form.js +3 -2
  24. package/es/FormControl.js +27 -6
  25. package/es/FormControlFeedback.js +2 -1
  26. package/es/FormGroup.js +4 -3
  27. package/es/Glyphicon.js +3 -2
  28. package/es/Grid.js +2 -1
  29. package/es/Image.js +5 -4
  30. package/es/ListGroupItem.js +8 -7
  31. package/es/MediaLeft.js +2 -1
  32. package/es/MediaRight.js +2 -1
  33. package/es/MenuItem.js +9 -8
  34. package/es/Modal.js +22 -15
  35. package/es/ModalBody.js +15 -2
  36. package/es/ModalDialog.js +2 -1
  37. package/es/ModalFooter.js +15 -2
  38. package/es/ModalHeader.js +7 -6
  39. package/es/ModalTitle.js +15 -2
  40. package/es/Nav.js +20 -19
  41. package/es/NavDropdown.js +5 -4
  42. package/es/NavItem.js +8 -7
  43. package/es/Navbar.js +17 -15
  44. package/es/NavbarBrand.js +3 -2
  45. package/es/NavbarCollapse.js +2 -1
  46. package/es/NavbarHeader.js +3 -2
  47. package/es/NavbarToggle.js +2 -1
  48. package/es/Overlay.js +18 -11
  49. package/es/OverlayTrigger.js +20 -18
  50. package/es/Pager.js +2 -1
  51. package/es/PagerItem.js +7 -6
  52. package/es/Pagination.js +54 -60
  53. package/es/PaginationButton.js +7 -6
  54. package/es/Panel.js +17 -20
  55. package/es/PanelGroup.js +6 -5
  56. package/es/Popover.js +8 -7
  57. package/es/ProgressBar.js +2 -1
  58. package/es/Radio.js +5 -4
  59. package/es/ResponsiveEmbed.js +2 -1
  60. package/es/SafeAnchor.js +6 -5
  61. package/es/SplitButton.js +8 -7
  62. package/es/Tab.js +4 -3
  63. package/es/TabContainer.js +3 -2
  64. package/es/TabContent.js +12 -2
  65. package/es/TabPane.js +15 -5
  66. package/es/Table.js +6 -5
  67. package/es/Tabs.js +16 -7
  68. package/es/Thumbnail.js +4 -3
  69. package/es/Tooltip.js +7 -6
  70. package/es/index.js +2 -0
  71. package/es/utils/bootstrapUtils.js +1 -1
  72. package/lib/Alert.js +6 -2
  73. package/lib/Badge.js +5 -1
  74. package/lib/BreadcrumbItem.js +8 -4
  75. package/lib/Button.js +10 -6
  76. package/lib/ButtonGroup.js +7 -3
  77. package/lib/Carousel.js +20 -16
  78. package/lib/CarouselItem.js +10 -6
  79. package/lib/Checkbox.js +8 -4
  80. package/lib/Clearfix.js +8 -4
  81. package/lib/Col.js +24 -20
  82. package/lib/Collapse.js +23 -13
  83. package/lib/ControlLabel.js +7 -3
  84. package/lib/Dropdown.js +37 -22
  85. package/lib/DropdownButton.js +9 -5
  86. package/lib/DropdownMenu.js +21 -13
  87. package/lib/DropdownToggle.js +8 -4
  88. package/lib/Fade.js +20 -10
  89. package/lib/Form.js +6 -2
  90. package/lib/FormControl.js +29 -5
  91. package/lib/FormControlFeedback.js +5 -1
  92. package/lib/FormGroup.js +7 -3
  93. package/lib/Glyphicon.js +6 -2
  94. package/lib/Grid.js +5 -1
  95. package/lib/Image.js +8 -4
  96. package/lib/ListGroupItem.js +11 -7
  97. package/lib/MediaLeft.js +5 -1
  98. package/lib/MediaRight.js +5 -1
  99. package/lib/MenuItem.js +12 -8
  100. package/lib/Modal.js +25 -15
  101. package/lib/ModalBody.js +18 -2
  102. package/lib/ModalDialog.js +5 -1
  103. package/lib/ModalFooter.js +18 -2
  104. package/lib/ModalHeader.js +10 -6
  105. package/lib/ModalTitle.js +18 -2
  106. package/lib/Nav.js +23 -19
  107. package/lib/NavDropdown.js +8 -4
  108. package/lib/NavItem.js +11 -7
  109. package/lib/Navbar.js +27 -25
  110. package/lib/NavbarBrand.js +6 -2
  111. package/lib/NavbarCollapse.js +7 -3
  112. package/lib/NavbarHeader.js +6 -2
  113. package/lib/NavbarToggle.js +10 -6
  114. package/lib/Overlay.js +21 -11
  115. package/lib/OverlayTrigger.js +23 -18
  116. package/lib/Pager.js +5 -1
  117. package/lib/PagerItem.js +10 -6
  118. package/lib/Pagination.js +58 -61
  119. package/lib/PaginationButton.js +10 -6
  120. package/lib/Panel.js +20 -20
  121. package/lib/PanelGroup.js +9 -5
  122. package/lib/Popover.js +11 -7
  123. package/lib/ProgressBar.js +12 -8
  124. package/lib/Radio.js +8 -4
  125. package/lib/ResponsiveEmbed.js +7 -3
  126. package/lib/SafeAnchor.js +9 -5
  127. package/lib/SplitButton.js +11 -7
  128. package/lib/Tab.js +7 -3
  129. package/lib/TabContainer.js +13 -9
  130. package/lib/TabContent.js +26 -13
  131. package/lib/TabPane.js +38 -25
  132. package/lib/Table.js +9 -5
  133. package/lib/Tabs.js +19 -7
  134. package/lib/Thumbnail.js +7 -3
  135. package/lib/Tooltip.js +10 -6
  136. package/lib/index.js +6 -1
  137. package/lib/utils/bootstrapUtils.js +6 -4
  138. package/package.json +10 -8
@@ -30,13 +30,17 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _bootstrapUtils = require('./utils/bootstrapUtils');
34
38
 
35
39
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
36
40
 
37
41
  var contextTypes = {
38
- $bs_navbar: _react2['default'].PropTypes.shape({
39
- bsClass: _react2['default'].PropTypes.string
42
+ $bs_navbar: _propTypes2['default'].shape({
43
+ bsClass: _propTypes2['default'].string
40
44
  })
41
45
  };
42
46
 
@@ -26,6 +26,10 @@ var _react = require('react');
26
26
 
27
27
  var _react2 = _interopRequireDefault(_react);
28
28
 
29
+ var _propTypes = require('prop-types');
30
+
31
+ var _propTypes2 = _interopRequireDefault(_propTypes);
32
+
29
33
  var _Collapse = require('./Collapse');
30
34
 
31
35
  var _Collapse2 = _interopRequireDefault(_Collapse);
@@ -35,9 +39,9 @@ var _bootstrapUtils = require('./utils/bootstrapUtils');
35
39
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
36
40
 
37
41
  var contextTypes = {
38
- $bs_navbar: _react.PropTypes.shape({
39
- bsClass: _react.PropTypes.string,
40
- expanded: _react.PropTypes.bool
42
+ $bs_navbar: _propTypes2['default'].shape({
43
+ bsClass: _propTypes2['default'].string,
44
+ expanded: _propTypes2['default'].bool
41
45
  })
42
46
  };
43
47
 
@@ -30,13 +30,17 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _bootstrapUtils = require('./utils/bootstrapUtils');
34
38
 
35
39
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
36
40
 
37
41
  var contextTypes = {
38
- $bs_navbar: _react2['default'].PropTypes.shape({
39
- bsClass: _react2['default'].PropTypes.string
42
+ $bs_navbar: _propTypes2['default'].shape({
43
+ bsClass: _propTypes2['default'].string
40
44
  })
41
45
  };
42
46
 
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _bootstrapUtils = require('./utils/bootstrapUtils');
34
38
 
35
39
  var _createChainedFunction = require('./utils/createChainedFunction');
@@ -39,18 +43,18 @@ var _createChainedFunction2 = _interopRequireDefault(_createChainedFunction);
39
43
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
40
44
 
41
45
  var propTypes = {
42
- onClick: _react.PropTypes.func,
46
+ onClick: _propTypes2['default'].func,
43
47
  /**
44
48
  * The toggle content, if left empty it will render the default toggle (seen above).
45
49
  */
46
- children: _react.PropTypes.node
50
+ children: _propTypes2['default'].node
47
51
  };
48
52
 
49
53
  var contextTypes = {
50
- $bs_navbar: _react.PropTypes.shape({
51
- bsClass: _react.PropTypes.string,
52
- expanded: _react.PropTypes.bool,
53
- onToggle: _react.PropTypes.func.isRequired
54
+ $bs_navbar: _propTypes2['default'].shape({
55
+ bsClass: _propTypes2['default'].string,
56
+ expanded: _propTypes2['default'].bool,
57
+ onToggle: _propTypes2['default'].func.isRequired
54
58
  })
55
59
  };
56
60
 
package/lib/Overlay.js CHANGED
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _Overlay = require('react-overlays/lib/Overlay');
34
38
 
35
39
  var _Overlay2 = _interopRequireDefault(_Overlay);
@@ -49,57 +53,63 @@ var propTypes = (0, _extends3['default'])({}, _Overlay2['default'].propTypes, {
49
53
  /**
50
54
  * Set the visibility of the Overlay
51
55
  */
52
- show: _react2['default'].PropTypes.bool,
56
+ show: _propTypes2['default'].bool,
53
57
  /**
54
58
  * Specify whether the overlay should trigger onHide when the user clicks outside the overlay
55
59
  */
56
- rootClose: _react2['default'].PropTypes.bool,
60
+ rootClose: _propTypes2['default'].bool,
57
61
  /**
58
62
  * A callback invoked by the overlay when it wishes to be hidden. Required if
59
63
  * `rootClose` is specified.
60
64
  */
61
- onHide: _react2['default'].PropTypes.func,
65
+ onHide: _propTypes2['default'].func,
62
66
 
63
67
  /**
64
68
  * Use animation
65
69
  */
66
- animation: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.bool, _elementType2['default']]),
70
+ animation: _propTypes2['default'].oneOfType([_propTypes2['default'].bool, _elementType2['default']]),
67
71
 
68
72
  /**
69
73
  * Callback fired before the Overlay transitions in
70
74
  */
71
- onEnter: _react2['default'].PropTypes.func,
75
+ onEnter: _propTypes2['default'].func,
72
76
 
73
77
  /**
74
78
  * Callback fired as the Overlay begins to transition in
75
79
  */
76
- onEntering: _react2['default'].PropTypes.func,
80
+ onEntering: _propTypes2['default'].func,
77
81
 
78
82
  /**
79
83
  * Callback fired after the Overlay finishes transitioning in
80
84
  */
81
- onEntered: _react2['default'].PropTypes.func,
85
+ onEntered: _propTypes2['default'].func,
82
86
 
83
87
  /**
84
88
  * Callback fired right before the Overlay transitions out
85
89
  */
86
- onExit: _react2['default'].PropTypes.func,
90
+ onExit: _propTypes2['default'].func,
87
91
 
88
92
  /**
89
93
  * Callback fired as the Overlay begins to transition out
90
94
  */
91
- onExiting: _react2['default'].PropTypes.func,
95
+ onExiting: _propTypes2['default'].func,
92
96
 
93
97
  /**
94
98
  * Callback fired after the Overlay finishes transitioning out
95
99
  */
96
- onExited: _react2['default'].PropTypes.func
100
+ onExited: _propTypes2['default'].func,
101
+
102
+ /**
103
+ * Sets the direction of the Overlay.
104
+ */
105
+ placement: _propTypes2['default'].oneOf(['top', 'right', 'bottom', 'left'])
97
106
  });
98
107
 
99
108
  var defaultProps = {
100
109
  animation: _Fade2['default'],
101
110
  rootClose: false,
102
- show: false
111
+ show: false,
112
+ placement: 'right'
103
113
  };
104
114
 
105
115
  var Overlay = function (_React$Component) {
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _reactDom = require('react-dom');
34
38
 
35
39
  var _reactDom2 = _interopRequireDefault(_reactDom);
@@ -62,74 +66,74 @@ function isOneOf(one, of) {
62
66
  return one === of;
63
67
  }
64
68
 
65
- var triggerType = _react2['default'].PropTypes.oneOf(['click', 'hover', 'focus']);
69
+ var triggerType = _propTypes2['default'].oneOf(['click', 'hover', 'focus']);
66
70
 
67
71
  var propTypes = (0, _extends3['default'])({}, _Overlay2['default'].propTypes, {
68
72
 
69
73
  /**
70
74
  * Specify which action or actions trigger Overlay visibility
71
75
  */
72
- trigger: _react2['default'].PropTypes.oneOfType([triggerType, _react2['default'].PropTypes.arrayOf(triggerType)]),
76
+ trigger: _propTypes2['default'].oneOfType([triggerType, _propTypes2['default'].arrayOf(triggerType)]),
73
77
 
74
78
  /**
75
79
  * A millisecond delay amount to show and hide the Overlay once triggered
76
80
  */
77
- delay: _react2['default'].PropTypes.number,
81
+ delay: _propTypes2['default'].number,
78
82
  /**
79
83
  * A millisecond delay amount before showing the Overlay once triggered.
80
84
  */
81
- delayShow: _react2['default'].PropTypes.number,
85
+ delayShow: _propTypes2['default'].number,
82
86
  /**
83
87
  * A millisecond delay amount before hiding the Overlay once triggered.
84
88
  */
85
- delayHide: _react2['default'].PropTypes.number,
89
+ delayHide: _propTypes2['default'].number,
86
90
 
87
91
  // FIXME: This should be `defaultShow`.
88
92
  /**
89
93
  * The initial visibility state of the Overlay. For more nuanced visibility
90
94
  * control, consider using the Overlay component directly.
91
95
  */
92
- defaultOverlayShown: _react2['default'].PropTypes.bool,
96
+ defaultOverlayShown: _propTypes2['default'].bool,
93
97
 
94
98
  /**
95
99
  * An element or text to overlay next to the target.
96
100
  */
97
- overlay: _react2['default'].PropTypes.node.isRequired,
101
+ overlay: _propTypes2['default'].node.isRequired,
98
102
 
99
103
  /**
100
104
  * @private
101
105
  */
102
- onBlur: _react2['default'].PropTypes.func,
106
+ onBlur: _propTypes2['default'].func,
103
107
  /**
104
108
  * @private
105
109
  */
106
- onClick: _react2['default'].PropTypes.func,
110
+ onClick: _propTypes2['default'].func,
107
111
  /**
108
112
  * @private
109
113
  */
110
- onFocus: _react2['default'].PropTypes.func,
114
+ onFocus: _propTypes2['default'].func,
111
115
  /**
112
116
  * @private
113
117
  */
114
- onMouseOut: _react2['default'].PropTypes.func,
118
+ onMouseOut: _propTypes2['default'].func,
115
119
  /**
116
120
  * @private
117
121
  */
118
- onMouseOver: _react2['default'].PropTypes.func,
122
+ onMouseOver: _propTypes2['default'].func,
119
123
 
120
124
  // Overridden props from `<Overlay>`.
121
125
  /**
122
126
  * @private
123
127
  */
124
- target: _react2['default'].PropTypes.oneOf([null]),
128
+ target: _propTypes2['default'].oneOf([null]),
125
129
  /**
126
130
  * @private
127
131
  */
128
- onHide: _react2['default'].PropTypes.oneOf([null]),
132
+ onHide: _propTypes2['default'].oneOf([null]),
129
133
  /**
130
134
  * @private
131
135
  */
132
- show: _react2['default'].PropTypes.oneOf([null])
136
+ show: _propTypes2['default'].oneOf([null])
133
137
  });
134
138
 
135
139
  var defaultProps = {
@@ -305,10 +309,11 @@ var OverlayTrigger = function (_React$Component) {
305
309
 
306
310
  var child = _react2['default'].Children.only(children);
307
311
  var childProps = child.props;
312
+ var triggerProps = {};
308
313
 
309
- var triggerProps = {
310
- 'aria-describedby': overlay.props.id
311
- };
314
+ if (this.state.show) {
315
+ triggerProps['aria-describedby'] = overlay.props.id;
316
+ }
312
317
 
313
318
  // FIXME: The logic here for passing through handlers on this component is
314
319
  // inconsistent. We shouldn't be passing any of these props through.
package/lib/Pager.js CHANGED
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _PagerItem = require('./PagerItem');
34
38
 
35
39
  var _PagerItem2 = _interopRequireDefault(_PagerItem);
@@ -47,7 +51,7 @@ var _ValidComponentChildren2 = _interopRequireDefault(_ValidComponentChildren);
47
51
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
48
52
 
49
53
  var propTypes = {
50
- onSelect: _react2['default'].PropTypes.func
54
+ onSelect: _propTypes2['default'].func
51
55
  };
52
56
 
53
57
  var Pager = function (_React$Component) {
package/lib/PagerItem.js CHANGED
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _SafeAnchor = require('./SafeAnchor');
34
38
 
35
39
  var _SafeAnchor2 = _interopRequireDefault(_SafeAnchor);
@@ -41,12 +45,12 @@ var _createChainedFunction2 = _interopRequireDefault(_createChainedFunction);
41
45
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
46
 
43
47
  var propTypes = {
44
- disabled: _react2['default'].PropTypes.bool,
45
- previous: _react2['default'].PropTypes.bool,
46
- next: _react2['default'].PropTypes.bool,
47
- onClick: _react2['default'].PropTypes.func,
48
- onSelect: _react2['default'].PropTypes.func,
49
- eventKey: _react2['default'].PropTypes.any
48
+ disabled: _propTypes2['default'].bool,
49
+ previous: _propTypes2['default'].bool,
50
+ next: _propTypes2['default'].bool,
51
+ onClick: _propTypes2['default'].func,
52
+ onSelect: _propTypes2['default'].func,
53
+ eventKey: _propTypes2['default'].any
50
54
  };
51
55
 
52
56
  var defaultProps = {
package/lib/Pagination.js CHANGED
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _elementType = require('react-prop-types/lib/elementType');
34
38
 
35
39
  var _elementType2 = _interopRequireDefault(_elementType);
@@ -43,46 +47,47 @@ var _bootstrapUtils = require('./utils/bootstrapUtils');
43
47
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
44
48
 
45
49
  var propTypes = {
46
- activePage: _react2['default'].PropTypes.number,
47
- items: _react2['default'].PropTypes.number,
48
- maxButtons: _react2['default'].PropTypes.number,
50
+ activePage: _propTypes2['default'].number,
51
+ items: _propTypes2['default'].number,
52
+ maxButtons: _propTypes2['default'].number,
49
53
 
50
54
  /**
51
- * When `true`, will display the first and the last button page
55
+ * When `true`, will display the first and the last button page when
56
+ * displaying ellipsis.
52
57
  */
53
- boundaryLinks: _react2['default'].PropTypes.bool,
58
+ boundaryLinks: _propTypes2['default'].bool,
54
59
 
55
60
  /**
56
61
  * When `true`, will display the default node value ('&hellip;').
57
62
  * Otherwise, will display provided node (when specified).
58
63
  */
59
- ellipsis: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.bool, _react2['default'].PropTypes.node]),
64
+ ellipsis: _propTypes2['default'].oneOfType([_propTypes2['default'].bool, _propTypes2['default'].node]),
60
65
 
61
66
  /**
62
67
  * When `true`, will display the default node value ('&laquo;').
63
68
  * Otherwise, will display provided node (when specified).
64
69
  */
65
- first: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.bool, _react2['default'].PropTypes.node]),
70
+ first: _propTypes2['default'].oneOfType([_propTypes2['default'].bool, _propTypes2['default'].node]),
66
71
 
67
72
  /**
68
73
  * When `true`, will display the default node value ('&raquo;').
69
74
  * Otherwise, will display provided node (when specified).
70
75
  */
71
- last: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.bool, _react2['default'].PropTypes.node]),
76
+ last: _propTypes2['default'].oneOfType([_propTypes2['default'].bool, _propTypes2['default'].node]),
72
77
 
73
78
  /**
74
79
  * When `true`, will display the default node value ('&lsaquo;').
75
80
  * Otherwise, will display provided node (when specified).
76
81
  */
77
- prev: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.bool, _react2['default'].PropTypes.node]),
82
+ prev: _propTypes2['default'].oneOfType([_propTypes2['default'].bool, _propTypes2['default'].node]),
78
83
 
79
84
  /**
80
85
  * When `true`, will display the default node value ('&rsaquo;').
81
86
  * Otherwise, will display provided node (when specified).
82
87
  */
83
- next: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.bool, _react2['default'].PropTypes.node]),
88
+ next: _propTypes2['default'].oneOfType([_propTypes2['default'].bool, _propTypes2['default'].node]),
84
89
 
85
- onSelect: _react2['default'].PropTypes.func,
90
+ onSelect: _propTypes2['default'].func,
86
91
 
87
92
  /**
88
93
  * You can use a custom element for the buttons
@@ -115,53 +120,43 @@ var Pagination = function (_React$Component) {
115
120
 
116
121
  var startPage = void 0;
117
122
  var endPage = void 0;
118
- var hasHiddenPagesAfter = void 0;
119
-
120
- if (maxButtons) {
121
- var hiddenPagesBefore = activePage - parseInt(maxButtons / 2, 10);
122
- startPage = Math.max(hiddenPagesBefore, 1);
123
- hasHiddenPagesAfter = items >= startPage + maxButtons;
124
-
125
- if (!hasHiddenPagesAfter) {
126
- endPage = items;
127
- startPage = items - maxButtons + 1;
128
- if (startPage < 1) {
129
- startPage = 1;
130
- }
131
- } else {
132
- endPage = startPage + maxButtons - 1;
133
- }
123
+
124
+ if (maxButtons && maxButtons < items) {
125
+ startPage = Math.max(Math.min(activePage - Math.floor(maxButtons / 2, 10), items - maxButtons + 1), 1);
126
+ endPage = startPage + maxButtons - 1;
134
127
  } else {
135
128
  startPage = 1;
136
129
  endPage = items;
137
130
  }
138
131
 
139
- for (var pagenumber = startPage; pagenumber <= endPage; pagenumber++) {
132
+ for (var page = startPage; page <= endPage; ++page) {
140
133
  pageButtons.push(_react2['default'].createElement(
141
134
  _PaginationButton2['default'],
142
135
  (0, _extends3['default'])({}, buttonProps, {
143
- key: pagenumber,
144
- eventKey: pagenumber,
145
- active: pagenumber === activePage
136
+ key: page,
137
+ eventKey: page,
138
+ active: page === activePage
146
139
  }),
147
- pagenumber
140
+ page
148
141
  ));
149
142
  }
150
143
 
151
- if (boundaryLinks && ellipsis && startPage !== 1) {
152
- pageButtons.unshift(_react2['default'].createElement(
153
- _PaginationButton2['default'],
154
- {
155
- key: 'ellipsisFirst',
156
- disabled: true,
157
- componentClass: buttonProps.componentClass
158
- },
159
- _react2['default'].createElement(
160
- 'span',
161
- { 'aria-label': 'More' },
162
- ellipsis === true ? '\u2026' : ellipsis
163
- )
164
- ));
144
+ if (ellipsis && boundaryLinks && startPage > 1) {
145
+ if (startPage > 2) {
146
+ pageButtons.unshift(_react2['default'].createElement(
147
+ _PaginationButton2['default'],
148
+ {
149
+ key: 'ellipsisFirst',
150
+ disabled: true,
151
+ componentClass: buttonProps.componentClass
152
+ },
153
+ _react2['default'].createElement(
154
+ 'span',
155
+ { 'aria-label': 'More' },
156
+ ellipsis === true ? '\u2026' : ellipsis
157
+ )
158
+ ));
159
+ }
165
160
 
166
161
  pageButtons.unshift(_react2['default'].createElement(
167
162
  _PaginationButton2['default'],
@@ -174,22 +169,24 @@ var Pagination = function (_React$Component) {
174
169
  ));
175
170
  }
176
171
 
177
- if (maxButtons && hasHiddenPagesAfter && ellipsis) {
178
- pageButtons.push(_react2['default'].createElement(
179
- _PaginationButton2['default'],
180
- {
181
- key: 'ellipsis',
182
- disabled: true,
183
- componentClass: buttonProps.componentClass
184
- },
185
- _react2['default'].createElement(
186
- 'span',
187
- { 'aria-label': 'More' },
188
- ellipsis === true ? '\u2026' : ellipsis
189
- )
190
- ));
172
+ if (ellipsis && endPage < items) {
173
+ if (!boundaryLinks || endPage < items - 1) {
174
+ pageButtons.push(_react2['default'].createElement(
175
+ _PaginationButton2['default'],
176
+ {
177
+ key: 'ellipsis',
178
+ disabled: true,
179
+ componentClass: buttonProps.componentClass
180
+ },
181
+ _react2['default'].createElement(
182
+ 'span',
183
+ { 'aria-label': 'More' },
184
+ ellipsis === true ? '\u2026' : ellipsis
185
+ )
186
+ ));
187
+ }
191
188
 
192
- if (boundaryLinks && endPage !== items) {
189
+ if (boundaryLinks) {
193
190
  pageButtons.push(_react2['default'].createElement(
194
191
  _PaginationButton2['default'],
195
192
  (0, _extends3['default'])({}, buttonProps, {
@@ -30,6 +30,10 @@ var _react = require('react');
30
30
 
31
31
  var _react2 = _interopRequireDefault(_react);
32
32
 
33
+ var _propTypes = require('prop-types');
34
+
35
+ var _propTypes2 = _interopRequireDefault(_propTypes);
36
+
33
37
  var _elementType = require('react-prop-types/lib/elementType');
34
38
 
35
39
  var _elementType2 = _interopRequireDefault(_elementType);
@@ -50,12 +54,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
50
54
 
51
55
  var propTypes = {
52
56
  componentClass: _elementType2['default'],
53
- className: _react2['default'].PropTypes.string,
54
- eventKey: _react2['default'].PropTypes.any,
55
- onSelect: _react2['default'].PropTypes.func,
56
- disabled: _react2['default'].PropTypes.bool,
57
- active: _react2['default'].PropTypes.bool,
58
- onClick: _react2['default'].PropTypes.func
57
+ className: _propTypes2['default'].string,
58
+ eventKey: _propTypes2['default'].any,
59
+ onSelect: _propTypes2['default'].func,
60
+ disabled: _propTypes2['default'].bool,
61
+ active: _propTypes2['default'].bool,
62
+ onClick: _propTypes2['default'].func
59
63
  };
60
64
 
61
65
  var defaultProps = {
package/lib/Panel.js CHANGED
@@ -34,6 +34,10 @@ var _react = require('react');
34
34
 
35
35
  var _react2 = _interopRequireDefault(_react);
36
36
 
37
+ var _propTypes = require('prop-types');
38
+
39
+ var _propTypes2 = _interopRequireDefault(_propTypes);
40
+
37
41
  var _Collapse = require('./Collapse');
38
42
 
39
43
  var _Collapse2 = _interopRequireDefault(_Collapse);
@@ -47,24 +51,24 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
47
51
  // TODO: Use uncontrollable.
48
52
 
49
53
  var propTypes = {
50
- collapsible: _react2['default'].PropTypes.bool,
51
- onSelect: _react2['default'].PropTypes.func,
52
- header: _react2['default'].PropTypes.node,
53
- id: _react2['default'].PropTypes.oneOfType([_react2['default'].PropTypes.string, _react2['default'].PropTypes.number]),
54
- footer: _react2['default'].PropTypes.node,
55
- defaultExpanded: _react2['default'].PropTypes.bool,
56
- expanded: _react2['default'].PropTypes.bool,
57
- eventKey: _react2['default'].PropTypes.any,
58
- headerRole: _react2['default'].PropTypes.string,
59
- panelRole: _react2['default'].PropTypes.string,
54
+ collapsible: _propTypes2['default'].bool,
55
+ onSelect: _propTypes2['default'].func,
56
+ header: _propTypes2['default'].node,
57
+ id: _propTypes2['default'].oneOfType([_propTypes2['default'].string, _propTypes2['default'].number]),
58
+ footer: _propTypes2['default'].node,
59
+ defaultExpanded: _propTypes2['default'].bool,
60
+ expanded: _propTypes2['default'].bool,
61
+ eventKey: _propTypes2['default'].any,
62
+ headerRole: _propTypes2['default'].string,
63
+ panelRole: _propTypes2['default'].string,
60
64
 
61
65
  // From Collapse.
62
- onEnter: _react2['default'].PropTypes.func,
63
- onEntering: _react2['default'].PropTypes.func,
64
- onEntered: _react2['default'].PropTypes.func,
65
- onExit: _react2['default'].PropTypes.func,
66
- onExiting: _react2['default'].PropTypes.func,
67
- onExited: _react2['default'].PropTypes.func
66
+ onEnter: _propTypes2['default'].func,
67
+ onEntering: _propTypes2['default'].func,
68
+ onEntered: _propTypes2['default'].func,
69
+ onExit: _propTypes2['default'].func,
70
+ onExiting: _propTypes2['default'].func,
71
+ onExited: _propTypes2['default'].func
68
72
  };
69
73
 
70
74
  var defaultProps = {
@@ -103,10 +107,6 @@ var Panel = function (_React$Component) {
103
107
  }
104
108
  };
105
109
 
106
- Panel.prototype.shouldRenderFill = function shouldRenderFill(child) {
107
- return _react2['default'].isValidElement(child) && child.props.fill != null;
108
- };
109
-
110
110
  Panel.prototype.renderHeader = function renderHeader(collapsible, header, id, role, expanded, bsProps) {
111
111
  var titleClassName = (0, _bootstrapUtils.prefix)(bsProps, 'title');
112
112