react-bootstrap 1.0.0-beta.13 → 1.0.0-beta.17

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 (134) hide show
  1. package/AccordionToggle.d.ts +4 -5
  2. package/BootstrapModalManager/package.json +6 -0
  3. package/Container.d.ts +1 -1
  4. package/ElementChildren/package.json +6 -0
  5. package/FormControl.d.ts +7 -2
  6. package/ListGroup.d.ts +1 -0
  7. package/Modal.d.ts +1 -0
  8. package/Overlay.d.ts +1 -1
  9. package/OverlayTrigger.d.ts +1 -0
  10. package/ToggleButton.d.ts +0 -1
  11. package/cjs/AbstractNav.js +1 -1
  12. package/cjs/Alert.js +4 -4
  13. package/cjs/{utils/BootstrapModalManager.js → BootstrapModalManager.js} +9 -5
  14. package/cjs/Card.js +2 -2
  15. package/cjs/CardColumns.js +1 -1
  16. package/cjs/CardDeck.js +1 -1
  17. package/cjs/CardGroup.js +1 -1
  18. package/cjs/Carousel.js +9 -9
  19. package/cjs/CarouselCaption.js +1 -1
  20. package/cjs/CarouselItem.js +1 -1
  21. package/cjs/Collapse.js +7 -7
  22. package/cjs/Container.js +3 -3
  23. package/cjs/Dropdown.js +5 -5
  24. package/cjs/DropdownMenu.js +39 -46
  25. package/cjs/DropdownToggle.js +31 -58
  26. package/cjs/{utils/ElementChildren.js → ElementChildren.js} +0 -0
  27. package/cjs/Fade.js +4 -4
  28. package/cjs/Figure.js +1 -1
  29. package/cjs/FigureCaption.js +1 -1
  30. package/cjs/Form.js +1 -1
  31. package/cjs/FormLabel.js +3 -1
  32. package/cjs/InputGroup.js +1 -1
  33. package/cjs/ListGroup.js +16 -3
  34. package/cjs/Media.js +1 -1
  35. package/cjs/Modal.js +32 -18
  36. package/cjs/ModalBody.js +1 -1
  37. package/cjs/ModalDialog.js +1 -1
  38. package/cjs/ModalFooter.js +1 -1
  39. package/cjs/ModalTitle.js +2 -2
  40. package/cjs/NavDropdown.js +64 -41
  41. package/cjs/Navbar.js +1 -1
  42. package/cjs/OverlayTrigger.js +131 -182
  43. package/cjs/PageItem.js +7 -4
  44. package/cjs/Pagination.js +21 -36
  45. package/cjs/Popover.js +9 -10
  46. package/cjs/ProgressBar.js +1 -1
  47. package/cjs/ResponsiveEmbed.js +19 -35
  48. package/cjs/Row.js +1 -0
  49. package/cjs/SafeAnchor.js +1 -1
  50. package/cjs/SplitButton.js +9 -3
  51. package/cjs/TabContent.js +15 -31
  52. package/cjs/Table.js +31 -47
  53. package/cjs/Tabs.js +1 -1
  54. package/cjs/ToastBody.js +1 -1
  55. package/cjs/ToggleButton.js +45 -78
  56. package/cjs/ToggleButtonGroup.js +44 -65
  57. package/cjs/Tooltip.js +2 -1
  58. package/cjs/{utils/createChainedFunction.js → createChainedFunction.js} +0 -0
  59. package/cjs/{utils/createWithBsPrefix.js → createWithBsPrefix.js} +3 -3
  60. package/cjs/{utils/divWithClassName.js → divWithClassName.js} +0 -0
  61. package/cjs/index.js +4 -0
  62. package/cjs/{utils/triggerBrowserReflow.js → triggerBrowserReflow.js} +0 -0
  63. package/cjs/useWrappedRefWithWarning.js +24 -0
  64. package/createChainedFunction/package.json +6 -0
  65. package/createWithBsPrefix/package.json +6 -0
  66. package/dist/react-bootstrap.js +9477 -11933
  67. package/dist/react-bootstrap.min.js +4 -12
  68. package/divWithClassName/package.json +6 -0
  69. package/esm/AbstractNav.js +1 -1
  70. package/esm/AccordionToggle.d.ts +4 -5
  71. package/esm/Alert.js +4 -4
  72. package/esm/{utils/BootstrapModalManager.js → BootstrapModalManager.js} +9 -5
  73. package/esm/Card.js +2 -2
  74. package/esm/CardColumns.js +1 -1
  75. package/esm/CardDeck.js +1 -1
  76. package/esm/CardGroup.js +1 -1
  77. package/esm/Carousel.js +6 -6
  78. package/esm/CarouselCaption.js +1 -1
  79. package/esm/CarouselItem.js +1 -1
  80. package/esm/Collapse.js +6 -6
  81. package/esm/Container.d.ts +1 -1
  82. package/esm/Container.js +3 -3
  83. package/esm/Dropdown.js +4 -4
  84. package/esm/DropdownMenu.js +34 -43
  85. package/esm/DropdownToggle.js +30 -56
  86. package/esm/{utils/ElementChildren.js → ElementChildren.js} +0 -0
  87. package/esm/Fade.js +3 -3
  88. package/esm/Figure.js +1 -1
  89. package/esm/FigureCaption.js +1 -1
  90. package/esm/Form.js +1 -1
  91. package/esm/FormControl.d.ts +7 -2
  92. package/esm/FormLabel.js +3 -1
  93. package/esm/InputGroup.js +1 -1
  94. package/esm/ListGroup.d.ts +1 -0
  95. package/esm/ListGroup.js +15 -3
  96. package/esm/Media.js +1 -1
  97. package/esm/Modal.d.ts +1 -0
  98. package/esm/Modal.js +28 -15
  99. package/esm/ModalBody.js +1 -1
  100. package/esm/ModalDialog.js +1 -1
  101. package/esm/ModalFooter.js +1 -1
  102. package/esm/ModalTitle.js +2 -2
  103. package/esm/NavDropdown.js +61 -41
  104. package/esm/Navbar.js +1 -1
  105. package/esm/Overlay.d.ts +1 -1
  106. package/esm/OverlayTrigger.d.ts +1 -0
  107. package/esm/OverlayTrigger.js +130 -182
  108. package/esm/PageItem.js +5 -2
  109. package/esm/Pagination.js +22 -37
  110. package/esm/Popover.js +10 -13
  111. package/esm/ProgressBar.js +1 -1
  112. package/esm/ResponsiveEmbed.js +18 -33
  113. package/esm/Row.js +1 -0
  114. package/esm/SafeAnchor.js +1 -1
  115. package/esm/SplitButton.js +9 -3
  116. package/esm/TabContent.js +15 -31
  117. package/esm/Table.js +32 -48
  118. package/esm/Tabs.js +1 -1
  119. package/esm/ToastBody.js +1 -1
  120. package/esm/ToggleButton.d.ts +0 -1
  121. package/esm/ToggleButton.js +44 -79
  122. package/esm/ToggleButtonGroup.js +42 -65
  123. package/esm/Tooltip.js +2 -1
  124. package/esm/{utils/createChainedFunction.js → createChainedFunction.js} +0 -0
  125. package/esm/{utils/createWithBsPrefix.js → createWithBsPrefix.js} +2 -2
  126. package/esm/{utils/divWithClassName.js → divWithClassName.js} +0 -0
  127. package/esm/index.d.ts +1 -0
  128. package/esm/index.js +2 -0
  129. package/esm/{utils/triggerBrowserReflow.js → triggerBrowserReflow.js} +0 -0
  130. package/esm/useWrappedRefWithWarning.js +12 -0
  131. package/index.d.ts +1 -0
  132. package/package.json +12 -16
  133. package/triggerBrowserReflow/package.json +6 -0
  134. package/useWrappedRefWithWarning/package.json +6 -0
package/cjs/Fade.js CHANGED
@@ -13,13 +13,13 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
16
+ var _transitionEnd = _interopRequireDefault(require("dom-helpers/transitionEnd"));
17
+
16
18
  var _react = _interopRequireWildcard(require("react"));
17
19
 
18
20
  var _Transition = _interopRequireWildcard(require("react-transition-group/Transition"));
19
21
 
20
- var _end = _interopRequireDefault(require("dom-helpers/transition/end"));
21
-
22
- var _triggerBrowserReflow = _interopRequireDefault(require("./utils/triggerBrowserReflow"));
22
+ var _triggerBrowserReflow = _interopRequireDefault(require("./triggerBrowserReflow"));
23
23
 
24
24
  var _fadeStyles;
25
25
 
@@ -42,7 +42,7 @@ var Fade = _react.default.forwardRef(function (_ref, ref) {
42
42
  }, [props]);
43
43
  return _react.default.createElement(_Transition.default, (0, _extends2.default)({
44
44
  ref: ref,
45
- addEndListener: _end.default
45
+ addEndListener: _transitionEnd.default
46
46
  }, props, {
47
47
  onEnter: handleEnter
48
48
  }), function (status, innerProps) {
package/cjs/Figure.js CHANGED
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.default = void 0;
7
7
 
8
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
8
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
9
9
 
10
10
  var _FigureImage = _interopRequireDefault(require("./FigureImage"));
11
11
 
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.default = void 0;
7
7
 
8
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
8
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
9
9
 
10
10
  var FigureCaption = (0, _createWithBsPrefix.default)('figure-caption', {
11
11
  Component: 'figcaption'
package/cjs/Form.js CHANGED
@@ -27,7 +27,7 @@ var _Switch = _interopRequireDefault(require("./Switch"));
27
27
 
28
28
  var _ThemeProvider = require("./ThemeProvider");
29
29
 
30
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
30
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
31
31
 
32
32
  var defaultProps = {
33
33
  inline: false
package/cjs/FormLabel.js CHANGED
@@ -40,7 +40,9 @@ var FormLabel = _react.default.forwardRef(function (_ref, ref) {
40
40
  controlId = _useContext.controlId;
41
41
 
42
42
  bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'form-label');
43
- var classes = (0, _classnames.default)(className, bsPrefix, srOnly && 'sr-only', column && 'col-form-label');
43
+ var columnClass = 'col-form-label';
44
+ if (typeof column === 'string') columnClass = columnClass + "-" + column;
45
+ var classes = (0, _classnames.default)(className, bsPrefix, srOnly && 'sr-only', column && columnClass);
44
46
  process.env.NODE_ENV !== "production" ? (0, _warning.default)(controlId == null || !htmlFor, '`controlId` is ignored on `<FormLabel>` when `htmlFor` is specified.') : void 0;
45
47
  htmlFor = htmlFor || controlId;
46
48
  if (column) return _react.default.createElement(_Col.default, (0, _extends2.default)({
package/cjs/InputGroup.js CHANGED
@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
14
  var _react = _interopRequireDefault(require("react"));
15
15
 
16
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
16
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
17
17
 
18
18
  var _ThemeProvider = require("./ThemeProvider");
19
19
 
package/cjs/ListGroup.js CHANGED
@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
14
  var _react = _interopRequireDefault(require("react"));
15
15
 
16
+ var _warning = _interopRequireDefault(require("warning"));
17
+
16
18
  var _uncontrollable = require("uncontrollable");
17
19
 
18
20
  var _ThemeProvider = require("./ThemeProvider");
@@ -22,7 +24,8 @@ var _AbstractNav = _interopRequireDefault(require("./AbstractNav"));
22
24
  var _ListGroupItem = _interopRequireDefault(require("./ListGroupItem"));
23
25
 
24
26
  var defaultProps = {
25
- variant: null
27
+ variant: null,
28
+ horizontal: null
26
29
  };
27
30
 
28
31
  var ListGroup = _react.default.forwardRef(function (props, ref) {
@@ -32,16 +35,26 @@ var ListGroup = _react.default.forwardRef(function (props, ref) {
32
35
  className = _useUncontrolled.className,
33
36
  bsPrefix = _useUncontrolled.bsPrefix,
34
37
  variant = _useUncontrolled.variant,
38
+ horizontal = _useUncontrolled.horizontal,
35
39
  _useUncontrolled$as = _useUncontrolled.as,
36
40
  as = _useUncontrolled$as === void 0 ? 'div' : _useUncontrolled$as,
37
- controlledProps = (0, _objectWithoutPropertiesLoose2.default)(_useUncontrolled, ["className", "bsPrefix", "variant", "as"]);
41
+ controlledProps = (0, _objectWithoutPropertiesLoose2.default)(_useUncontrolled, ["className", "bsPrefix", "variant", "horizontal", "as"]);
38
42
 
39
43
  bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'list-group');
44
+ var horizontalVariant;
45
+
46
+ if (horizontal) {
47
+ horizontalVariant = horizontal === true ? 'horizontal' : "horizontal-" + horizontal;
48
+ } else {
49
+ horizontalVariant = null;
50
+ }
51
+
52
+ process.env.NODE_ENV !== "production" ? (0, _warning.default)(!(horizontal && variant === 'flush'), '`variant="flush"` and `horizontal` should not be used together.') : void 0;
40
53
  return _react.default.createElement(_AbstractNav.default, (0, _extends2.default)({
41
54
  ref: ref
42
55
  }, controlledProps, {
43
56
  as: as,
44
- className: (0, _classnames.default)(className, bsPrefix, variant && bsPrefix + "-" + variant)
57
+ className: (0, _classnames.default)(className, bsPrefix, variant && bsPrefix + "-" + variant, horizontalVariant && bsPrefix + "-" + horizontalVariant)
45
58
  }));
46
59
  });
47
60
 
package/cjs/Media.js CHANGED
@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
14
  var _react = _interopRequireDefault(require("react"));
15
15
 
16
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
16
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
17
17
 
18
18
  var _ThemeProvider = require("./ThemeProvider");
19
19
 
package/cjs/Modal.js CHANGED
@@ -13,22 +13,28 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
16
- var _events = _interopRequireDefault(require("dom-helpers/events"));
16
+ var _addEventListener = _interopRequireDefault(require("dom-helpers/addEventListener"));
17
+
18
+ var _canUseDOM = _interopRequireDefault(require("dom-helpers/canUseDOM"));
17
19
 
18
20
  var _ownerDocument = _interopRequireDefault(require("dom-helpers/ownerDocument"));
19
21
 
20
- var _inDOM = _interopRequireDefault(require("dom-helpers/util/inDOM"));
22
+ var _removeEventListener = _interopRequireDefault(require("dom-helpers/removeEventListener"));
21
23
 
22
- var _scrollbarSize = _interopRequireDefault(require("dom-helpers/util/scrollbarSize"));
24
+ var _scrollbarSize = _interopRequireDefault(require("dom-helpers/scrollbarSize"));
23
25
 
24
26
  var _react = _interopRequireDefault(require("react"));
25
27
 
26
28
  var _Modal = _interopRequireDefault(require("react-overlays/Modal"));
27
29
 
30
+ var _BootstrapModalManager = _interopRequireDefault(require("./BootstrapModalManager"));
31
+
28
32
  var _Fade = _interopRequireDefault(require("./Fade"));
29
33
 
30
34
  var _ModalBody = _interopRequireDefault(require("./ModalBody"));
31
35
 
36
+ var _ModalContext = _interopRequireDefault(require("./ModalContext"));
37
+
32
38
  var _ModalDialog = _interopRequireDefault(require("./ModalDialog"));
33
39
 
34
40
  var _ModalFooter = _interopRequireDefault(require("./ModalFooter"));
@@ -37,12 +43,9 @@ var _ModalHeader = _interopRequireDefault(require("./ModalHeader"));
37
43
 
38
44
  var _ModalTitle = _interopRequireDefault(require("./ModalTitle"));
39
45
 
40
- var _BootstrapModalManager = _interopRequireDefault(require("./utils/BootstrapModalManager"));
41
-
42
46
  var _ThemeProvider = require("./ThemeProvider");
43
47
 
44
- var _ModalContext = _interopRequireDefault(require("./ModalContext"));
45
-
48
+ var manager;
46
49
  var defaultProps = {
47
50
  show: false,
48
51
  backdrop: true,
@@ -51,8 +54,7 @@ var defaultProps = {
51
54
  enforceFocus: true,
52
55
  restoreFocus: true,
53
56
  animation: true,
54
- dialogAs: _ModalDialog.default,
55
- manager: new _BootstrapModalManager.default()
57
+ dialogAs: _ModalDialog.default
56
58
  };
57
59
  /* eslint-disable no-use-before-define, react/no-multi-comp */
58
60
 
@@ -138,7 +140,7 @@ function (_React$Component) {
138
140
 
139
141
  if (_this.props.onEntering) (_this$props2 = _this.props).onEntering.apply(_this$props2, [node].concat(args)); // FIXME: This should work even when animation is disabled.
140
142
 
141
- _events.default.on(window, 'resize', _this.handleWindowResize);
143
+ (0, _addEventListener.default)(window, 'resize', _this.handleWindowResize);
142
144
  };
143
145
 
144
146
  _this.handleExited = function (node) {
@@ -152,13 +154,25 @@ function (_React$Component) {
152
154
 
153
155
  if (_this.props.onExited) (_this$props3 = _this.props).onExited.apply(_this$props3, args); // FIXME: This should work even when animation is disabled.
154
156
 
155
- _events.default.off(window, 'resize', _this.handleWindowResize);
157
+ (0, _removeEventListener.default)(window, 'resize', _this.handleWindowResize);
156
158
  };
157
159
 
158
160
  _this.handleWindowResize = function () {
159
161
  _this.updateDialogStyle(_this._modal.dialog);
160
162
  };
161
163
 
164
+ _this.getModalManager = function () {
165
+ if (_this.props.manager) {
166
+ return _this.props.manager;
167
+ }
168
+
169
+ if (!manager) {
170
+ manager = new _BootstrapModalManager.default();
171
+ }
172
+
173
+ return manager;
174
+ };
175
+
162
176
  _this.renderBackdrop = function (props) {
163
177
  var _this$props4 = _this.props,
164
178
  bsPrefix = _this$props4.bsPrefix,
@@ -176,13 +190,12 @@ function (_React$Component) {
176
190
 
177
191
  _proto.componentWillUnmount = function componentWillUnmount() {
178
192
  // Clean up the listener if we need to.
179
- _events.default.off(window, 'resize', this.handleWindowResize);
193
+ (0, _removeEventListener.default)(window, 'resize', this.handleWindowResize);
180
194
  };
181
195
 
182
196
  _proto.updateDialogStyle = function updateDialogStyle(node) {
183
- if (!_inDOM.default) return;
184
- var manager = this.props.manager;
185
- var containerIsOverflowing = manager.isContainerOverflowing(this._modal);
197
+ if (!_canUseDOM.default) return;
198
+ var containerIsOverflowing = this.getModalManager().isContainerOverflowing(this._modal);
186
199
  var modalIsOverflowing = node.scrollHeight > (0, _ownerDocument.default)(node).documentElement.clientHeight;
187
200
  this.setState({
188
201
  style: {
@@ -204,7 +217,6 @@ function (_React$Component) {
204
217
  animation = _this$props5.animation,
205
218
  backdrop = _this$props5.backdrop,
206
219
  keyboard = _this$props5.keyboard,
207
- manager = _this$props5.manager,
208
220
  onEscapeKeyDown = _this$props5.onEscapeKeyDown,
209
221
  onShow = _this$props5.onShow,
210
222
  onHide = _this$props5.onHide,
@@ -212,6 +224,7 @@ function (_React$Component) {
212
224
  autoFocus = _this$props5.autoFocus,
213
225
  enforceFocus = _this$props5.enforceFocus,
214
226
  restoreFocus = _this$props5.restoreFocus,
227
+ restoreFocusOptions = _this$props5.restoreFocusOptions,
215
228
  onEntered = _this$props5.onEntered,
216
229
  onExit = _this$props5.onExit,
217
230
  onExiting = _this$props5.onExiting,
@@ -220,7 +233,7 @@ function (_React$Component) {
220
233
  _6 = _this$props5.onEnter,
221
234
  _4 = _this$props5.onEntering,
222
235
  _2 = _this$props5.backdropClassName,
223
- props = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["bsPrefix", "className", "style", "dialogClassName", "children", "dialogAs", "show", "animation", "backdrop", "keyboard", "manager", "onEscapeKeyDown", "onShow", "onHide", "container", "autoFocus", "enforceFocus", "restoreFocus", "onEntered", "onExit", "onExiting", "onExited", "onEntering", "onEnter", "onEntering", "backdropClassName"]);
236
+ props = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["bsPrefix", "className", "style", "dialogClassName", "children", "dialogAs", "show", "animation", "backdrop", "keyboard", "onEscapeKeyDown", "onShow", "onHide", "container", "autoFocus", "enforceFocus", "restoreFocus", "restoreFocusOptions", "onEntered", "onExit", "onExiting", "onExited", "onEntering", "onEnter", "onEntering", "backdropClassName"]);
224
237
  var clickHandler = backdrop === true ? this.handleClick : null;
225
238
  var baseModalStyle = (0, _extends2.default)({}, style, {}, this.state.style); // Sets `display` always block when `animation` is false
226
239
 
@@ -235,13 +248,14 @@ function (_React$Component) {
235
248
  autoFocus: autoFocus,
236
249
  enforceFocus: enforceFocus,
237
250
  restoreFocus: restoreFocus,
251
+ restoreFocusOptions: restoreFocusOptions,
238
252
  onEscapeKeyDown: onEscapeKeyDown,
239
253
  onShow: onShow,
240
254
  onHide: onHide,
241
255
  onEntered: onEntered,
242
256
  onExit: onExit,
243
257
  onExiting: onExiting,
244
- manager: manager,
258
+ manager: this.getModalManager(),
245
259
  ref: this.setModalRef,
246
260
  style: baseModalStyle,
247
261
  className: (0, _classnames.default)(className, bsPrefix),
package/cjs/ModalBody.js CHANGED
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.default = void 0;
7
7
 
8
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
8
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
9
9
 
10
10
  var _default = (0, _createWithBsPrefix.default)('modal-body');
11
11
 
@@ -29,7 +29,7 @@ var ModalDialog = _react.default.forwardRef(function (_ref, ref) {
29
29
  ref: ref,
30
30
  className: (0, _classnames.default)(dialogClass, className, size && bsPrefix + "-" + size, centered && dialogClass + "-centered", scrollable && dialogClass + "-scrollable")
31
31
  }), _react.default.createElement("div", {
32
- className: (0, _classnames.default)(bsPrefix + "-content")
32
+ className: bsPrefix + "-content"
33
33
  }, children));
34
34
  });
35
35
 
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.default = void 0;
7
7
 
8
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
8
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
9
9
 
10
10
  var _default = (0, _createWithBsPrefix.default)('modal-footer');
11
11
 
package/cjs/ModalTitle.js CHANGED
@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.default = void 0;
7
7
 
8
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
8
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
9
9
 
10
- var _divWithClassName = _interopRequireDefault(require("./utils/divWithClassName"));
10
+ var _divWithClassName = _interopRequireDefault(require("./divWithClassName"));
11
11
 
12
12
  var DivStyledAsH4 = (0, _divWithClassName.default)('h4');
13
13
 
@@ -9,56 +9,79 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
 
10
10
  var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
11
11
 
12
- var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
13
-
14
12
  var _react = _interopRequireDefault(require("react"));
15
13
 
14
+ var _propTypes = _interopRequireDefault(require("prop-types"));
15
+
16
16
  var _Dropdown = _interopRequireDefault(require("./Dropdown"));
17
17
 
18
18
  var _NavItem = _interopRequireDefault(require("./NavItem"));
19
19
 
20
20
  var _NavLink = _interopRequireDefault(require("./NavLink"));
21
21
 
22
- var NavDropdown =
23
- /*#__PURE__*/
24
- function (_React$Component) {
25
- (0, _inheritsLoose2.default)(NavDropdown, _React$Component);
26
-
27
- function NavDropdown() {
28
- return _React$Component.apply(this, arguments) || this;
29
- }
30
-
31
- var _proto = NavDropdown.prototype;
32
-
33
- _proto.render = function render() {
34
- var _this$props = this.props,
35
- id = _this$props.id,
36
- title = _this$props.title,
37
- children = _this$props.children,
38
- bsPrefix = _this$props.bsPrefix,
39
- rootCloseEvent = _this$props.rootCloseEvent,
40
- menuRole = _this$props.menuRole,
41
- disabled = _this$props.disabled,
42
- active = _this$props.active,
43
- props = (0, _objectWithoutPropertiesLoose2.default)(_this$props, ["id", "title", "children", "bsPrefix", "rootCloseEvent", "menuRole", "disabled", "active"]);
44
- return _react.default.createElement(_Dropdown.default, (0, _extends2.default)({}, props, {
45
- as: _NavItem.default
46
- }), _react.default.createElement(_Dropdown.default.Toggle, {
47
- id: id,
48
- eventKey: null,
49
- active: active,
50
- disabled: disabled,
51
- childBsPrefix: bsPrefix,
52
- as: _NavLink.default
53
- }, title), _react.default.createElement(_Dropdown.default.Menu, {
54
- role: menuRole,
55
- rootCloseEvent: rootCloseEvent
56
- }, children));
57
- };
58
-
59
- return NavDropdown;
60
- }(_react.default.Component);
22
+ var propTypes = {
23
+ /**
24
+ * An html id attribute for the Toggle button, necessary for assistive technologies, such as screen readers.
25
+ * @type {string|number}
26
+ * @required
27
+ */
28
+ id: _propTypes.default.any,
29
+
30
+ /** An `onClick` handler passed to the Toggle component */
31
+ onClick: _propTypes.default.func,
32
+
33
+ /** The content of the non-toggle Button. */
34
+ title: _propTypes.default.node.isRequired,
35
+
36
+ /** Disables the toggle NavLink */
37
+ disabled: _propTypes.default.bool,
38
+
39
+ /** Style the toggle NavLink as active */
40
+ active: _propTypes.default.bool,
41
+
42
+ /** An ARIA accessible role applied to the Menu component. When set to 'menu', The dropdown */
43
+ menuRole: _propTypes.default.string,
44
+
45
+ /**
46
+ * Which event when fired outside the component will cause it to be closed.
47
+ *
48
+ * _see [DropdownMenu](#menu-props) for more details_
49
+ */
50
+ rootCloseEvent: _propTypes.default.string,
51
+
52
+ /** @ignore */
53
+ bsPrefix: _propTypes.default.string
54
+ };
55
+
56
+ var NavDropdown = _react.default.forwardRef(function (_ref, ref) {
57
+ var id = _ref.id,
58
+ title = _ref.title,
59
+ children = _ref.children,
60
+ bsPrefix = _ref.bsPrefix,
61
+ rootCloseEvent = _ref.rootCloseEvent,
62
+ menuRole = _ref.menuRole,
63
+ disabled = _ref.disabled,
64
+ active = _ref.active,
65
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["id", "title", "children", "bsPrefix", "rootCloseEvent", "menuRole", "disabled", "active"]);
66
+ return _react.default.createElement(_Dropdown.default, (0, _extends2.default)({
67
+ ref: ref
68
+ }, props, {
69
+ as: _NavItem.default
70
+ }), _react.default.createElement(_Dropdown.default.Toggle, {
71
+ id: id,
72
+ eventKey: null,
73
+ active: active,
74
+ disabled: disabled,
75
+ childBsPrefix: bsPrefix,
76
+ as: _NavLink.default
77
+ }, title), _react.default.createElement(_Dropdown.default.Menu, {
78
+ role: menuRole,
79
+ rootCloseEvent: rootCloseEvent
80
+ }, children));
81
+ });
61
82
 
83
+ NavDropdown.displayName = 'NavDropdown';
84
+ NavDropdown.propTypes = propTypes;
62
85
  NavDropdown.Item = _Dropdown.default.Item;
63
86
  NavDropdown.Divider = _Dropdown.default.Divider;
64
87
  NavDropdown.Header = _Dropdown.default.Header;
package/cjs/Navbar.js CHANGED
@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
17
17
 
18
18
  var _uncontrollable = require("uncontrollable");
19
19
 
20
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
20
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
21
21
 
22
22
  var _NavbarBrand = _interopRequireDefault(require("./NavbarBrand"));
23
23