react-bootstrap 1.3.0 → 1.4.0

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 (66) hide show
  1. package/README.md +1 -1
  2. package/cjs/AccordionCollapse.js +9 -3
  3. package/cjs/Button.js +1 -1
  4. package/cjs/Carousel.js +22 -4
  5. package/cjs/CarouselItem.d.ts +7 -2
  6. package/cjs/CarouselItem.js +25 -2
  7. package/cjs/DropdownButton.d.ts +2 -0
  8. package/cjs/DropdownButton.js +16 -3
  9. package/cjs/DropdownItem.js +3 -2
  10. package/cjs/DropdownMenu.d.ts +22 -0
  11. package/cjs/DropdownMenu.js +45 -6
  12. package/cjs/DropdownToggle.js +2 -3
  13. package/cjs/Fade.d.ts +6 -3
  14. package/cjs/Form.d.ts +1 -1
  15. package/cjs/FormCheck.d.ts +1 -3
  16. package/cjs/FormCheck.js +1 -1
  17. package/cjs/FormLabel.js +1 -1
  18. package/cjs/ListGroupItem.js +2 -1
  19. package/cjs/Modal.d.ts +1 -0
  20. package/cjs/Modal.js +4 -2
  21. package/cjs/ModalDialog.d.ts +1 -0
  22. package/cjs/ModalDialog.js +3 -2
  23. package/cjs/NavDropdown.d.ts +3 -3
  24. package/cjs/Overlay.d.ts +1 -1
  25. package/cjs/OverlayTrigger.d.ts +1 -1
  26. package/cjs/SplitButton.d.ts +2 -0
  27. package/cjs/SplitButton.js +15 -2
  28. package/cjs/ToggleButtonGroup.d.ts +4 -3
  29. package/cjs/ToggleButtonGroup.js +2 -1
  30. package/cjs/index.d.ts +1 -0
  31. package/cjs/usePopperMarginModifiers.d.ts +4 -1
  32. package/cjs/usePopperMarginModifiers.js +8 -4
  33. package/dist/react-bootstrap.js +327 -130
  34. package/dist/react-bootstrap.min.js +2 -2
  35. package/esm/AccordionCollapse.js +8 -3
  36. package/esm/Button.js +1 -1
  37. package/esm/Carousel.js +23 -5
  38. package/esm/CarouselItem.d.ts +7 -2
  39. package/esm/CarouselItem.js +22 -2
  40. package/esm/DropdownButton.d.ts +2 -0
  41. package/esm/DropdownButton.js +14 -3
  42. package/esm/DropdownItem.js +3 -2
  43. package/esm/DropdownMenu.d.ts +22 -0
  44. package/esm/DropdownMenu.js +38 -3
  45. package/esm/DropdownToggle.js +2 -3
  46. package/esm/Fade.d.ts +6 -3
  47. package/esm/Form.d.ts +1 -1
  48. package/esm/FormCheck.d.ts +1 -3
  49. package/esm/FormCheck.js +1 -1
  50. package/esm/FormLabel.js +1 -1
  51. package/esm/ListGroupItem.js +2 -1
  52. package/esm/Modal.d.ts +1 -0
  53. package/esm/Modal.js +4 -2
  54. package/esm/ModalDialog.d.ts +1 -0
  55. package/esm/ModalDialog.js +3 -2
  56. package/esm/NavDropdown.d.ts +3 -3
  57. package/esm/Overlay.d.ts +1 -1
  58. package/esm/OverlayTrigger.d.ts +1 -1
  59. package/esm/SplitButton.d.ts +2 -0
  60. package/esm/SplitButton.js +14 -2
  61. package/esm/ToggleButtonGroup.d.ts +4 -3
  62. package/esm/ToggleButtonGroup.js +2 -1
  63. package/esm/index.d.ts +1 -0
  64. package/esm/usePopperMarginModifiers.d.ts +4 -1
  65. package/esm/usePopperMarginModifiers.js +7 -4
  66. package/package.json +24 -24
package/README.md CHANGED
@@ -11,7 +11,7 @@
11
11
 
12
12
  ## Docs
13
13
 
14
- See the [documentation][documentation] with live editable examples and API documention.
14
+ See the [documentation][documentation] with live editable examples and API documentation.
15
15
 
16
16
  To find the documentation for the latest Bootstrap 3 compatible release, [go here](https://react-bootstrap-v3.netlify.com).
17
17
 
@@ -17,15 +17,21 @@ var _Collapse = _interopRequireDefault(require("./Collapse"));
17
17
 
18
18
  var _AccordionContext = _interopRequireDefault(require("./AccordionContext"));
19
19
 
20
+ var _SelectableContext = _interopRequireDefault(require("./SelectableContext"));
21
+
20
22
  var AccordionCollapse = _react.default.forwardRef(function (_ref, ref) {
21
23
  var children = _ref.children,
22
24
  eventKey = _ref.eventKey,
23
25
  props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["children", "eventKey"]);
24
- var contextEventKey = (0, _react.useContext)(_AccordionContext.default);
25
- return /*#__PURE__*/_react.default.createElement(_Collapse.default, (0, _extends2.default)({
26
+ var contextEventKey = (0, _react.useContext)(_AccordionContext.default); // Empty SelectableContext is to prevent elements in the collapse
27
+ // from collapsing the accordion when clicked.
28
+
29
+ return /*#__PURE__*/_react.default.createElement(_SelectableContext.default.Provider, {
30
+ value: null
31
+ }, /*#__PURE__*/_react.default.createElement(_Collapse.default, (0, _extends2.default)({
26
32
  ref: ref,
27
33
  in: contextEventKey === eventKey
28
- }, props), /*#__PURE__*/_react.default.createElement("div", null, _react.default.Children.only(children)));
34
+ }, props), /*#__PURE__*/_react.default.createElement("div", null, _react.default.Children.only(children))));
29
35
  });
30
36
 
31
37
  AccordionCollapse.displayName = 'AccordionCollapse';
package/cjs/Button.js CHANGED
@@ -34,7 +34,7 @@ var Button = _react.default.forwardRef(function (_ref, ref) {
34
34
  as = _ref.as,
35
35
  props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "variant", "size", "active", "className", "block", "type", "as"]);
36
36
  var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'btn');
37
- var classes = (0, _classnames.default)(className, prefix, active && 'active', prefix + "-" + variant, block && prefix + "-block", size && prefix + "-" + size);
37
+ var classes = (0, _classnames.default)(className, prefix, active && 'active', variant && prefix + "-" + variant, block && prefix + "-block", size && prefix + "-" + size);
38
38
 
39
39
  if (props.href) {
40
40
  return /*#__PURE__*/_react.default.createElement(_SafeAnchor.default, (0, _extends2.default)({}, props, {
package/cjs/Carousel.js CHANGED
@@ -15,6 +15,8 @@ var _useEventCallback = _interopRequireDefault(require("@restart/hooks/useEventC
15
15
 
16
16
  var _useUpdateEffect = _interopRequireDefault(require("@restart/hooks/useUpdateEffect"));
17
17
 
18
+ var _useCommittedRef = _interopRequireDefault(require("@restart/hooks/useCommittedRef"));
19
+
18
20
  var _useTimeout = _interopRequireDefault(require("@restart/hooks/useTimeout"));
19
21
 
20
22
  var _classnames = _interopRequireDefault(require("classnames"));
@@ -228,7 +230,6 @@ function CarouselFunc(uncontrolledProps, ref) {
228
230
  if (!isSliding && activeIndex !== renderedActiveIndex) {
229
231
  if (nextDirectionRef.current) {
230
232
  setDirection(nextDirectionRef.current);
231
- nextDirectionRef.current = null;
232
233
  } else {
233
234
  setDirection((activeIndex || 0) > renderedActiveIndex ? 'next' : 'prev');
234
235
  }
@@ -240,8 +241,23 @@ function CarouselFunc(uncontrolledProps, ref) {
240
241
  setRenderedActiveIndex(activeIndex || 0);
241
242
  }
242
243
 
243
- var numChildren = _react.default.Children.toArray(children).filter(_react.default.isValidElement).length;
244
+ (0, _react.useEffect)(function () {
245
+ if (nextDirectionRef.current) {
246
+ nextDirectionRef.current = null;
247
+ }
248
+ });
249
+ var numChildren = 0;
250
+ var activeChildInterval; // Iterate to grab all of the children's interval values
251
+ // (and count them, too)
252
+
253
+ (0, _ElementChildren.forEach)(children, function (child, index) {
254
+ ++numChildren;
244
255
 
256
+ if (index === activeIndex) {
257
+ activeChildInterval = child.props.interval;
258
+ }
259
+ });
260
+ var activeChildIntervalRef = (0, _useCommittedRef.default)(activeChildInterval);
245
261
  var prev = (0, _react.useCallback)(function (event) {
246
262
  if (isSliding) {
247
263
  return;
@@ -429,17 +445,19 @@ function CarouselFunc(uncontrolledProps, ref) {
429
445
  var shouldPlay = interval != null && !pausedOnHover && !pausedOnTouch && !isSliding;
430
446
  var intervalHandleRef = (0, _react.useRef)();
431
447
  (0, _react.useEffect)(function () {
448
+ var _ref, _activeChildIntervalR;
449
+
432
450
  if (!shouldPlay) {
433
451
  return undefined;
434
452
  }
435
453
 
436
- intervalHandleRef.current = window.setInterval(document.visibilityState ? nextWhenVisible : next, interval || undefined);
454
+ intervalHandleRef.current = window.setInterval(document.visibilityState ? nextWhenVisible : next, (_ref = (_activeChildIntervalR = activeChildIntervalRef.current) != null ? _activeChildIntervalR : interval) != null ? _ref : undefined);
437
455
  return function () {
438
456
  if (intervalHandleRef.current !== null) {
439
457
  clearInterval(intervalHandleRef.current);
440
458
  }
441
459
  };
442
- }, [shouldPlay, next, interval, nextWhenVisible]);
460
+ }, [shouldPlay, next, activeChildIntervalRef, interval, nextWhenVisible]);
443
461
  var indicatorOnClicks = (0, _react.useMemo)(function () {
444
462
  return indicators && Array.from({
445
463
  length: numChildren
@@ -1,2 +1,7 @@
1
- declare const _default: import("./helpers").BsPrefixRefForwardingComponent<"div", unknown>;
2
- export default _default;
1
+ import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
2
+ export interface CarouselItemProps extends BsPrefixPropsWithChildren {
3
+ interval?: number;
4
+ }
5
+ declare type CarouselItem = BsPrefixRefForwardingComponent<'div', CarouselItemProps>;
6
+ declare const CarouselItem: CarouselItem;
7
+ export default CarouselItem;
@@ -5,9 +5,32 @@ 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("./createWithBsPrefix"));
8
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
 
10
- var _default = (0, _createWithBsPrefix.default)('carousel-item');
10
+ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
11
11
 
12
+ var _classnames = _interopRequireDefault(require("classnames"));
13
+
14
+ var _react = _interopRequireDefault(require("react"));
15
+
16
+ var _ThemeProvider = require("./ThemeProvider");
17
+
18
+ var CarouselItem = _react.default.forwardRef(function (_ref, ref) {
19
+ var _ref$as = _ref.as,
20
+ Component = _ref$as === void 0 ? 'div' : _ref$as,
21
+ bsPrefix = _ref.bsPrefix,
22
+ children = _ref.children,
23
+ className = _ref.className,
24
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["as", "bsPrefix", "children", "className"]);
25
+ var finalClassName = (0, _classnames.default)(className, (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'carousel-item'));
26
+ return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
27
+ ref: ref
28
+ }, props, {
29
+ className: finalClassName
30
+ }), children);
31
+ });
32
+
33
+ CarouselItem.displayName = 'CarouselItem';
34
+ var _default = CarouselItem;
12
35
  exports.default = _default;
13
36
  module.exports = exports["default"];
@@ -1,8 +1,10 @@
1
1
  import React from 'react';
2
2
  import { DropdownProps } from './Dropdown';
3
3
  import { PropsFromToggle } from './DropdownToggle';
4
+ import { AlignType } from './DropdownMenu';
4
5
  export interface DropdownButtonProps extends DropdownProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'title'>, React.PropsWithChildren<PropsFromToggle> {
5
6
  title: React.ReactNode;
7
+ menuAlign?: AlignType;
6
8
  menuRole?: string;
7
9
  renderMenuOnMount?: boolean;
8
10
  rootCloseEvent?: 'click' | 'mousedown';
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
4
+
3
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
6
 
5
7
  exports.__esModule = true;
@@ -17,7 +19,7 @@ var _Dropdown = _interopRequireDefault(require("./Dropdown"));
17
19
 
18
20
  var _DropdownToggle = _interopRequireDefault(require("./DropdownToggle"));
19
21
 
20
- var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
22
+ var _DropdownMenu = _interopRequireWildcard(require("./DropdownMenu"));
21
23
 
22
24
  var propTypes = {
23
25
  /**
@@ -39,6 +41,15 @@ var propTypes = {
39
41
  /** Disables both Buttons */
40
42
  disabled: _propTypes.default.bool,
41
43
 
44
+ /**
45
+ * Aligns the dropdown menu responsively.
46
+ *
47
+ * _see [DropdownMenu](#dropdown-menu-props) for more details_
48
+ *
49
+ * @type {"left"|"right"|{ sm: "left"|"right" }|{ md: "left"|"right" }|{ lg: "left"|"right" }|{ xl: "left"|"right"} }
50
+ */
51
+ menuAlign: _DropdownMenu.alignPropType,
52
+
42
53
  /** An ARIA accessible role applied to the Menu component. When set to 'menu', The dropdown */
43
54
  menuRole: _propTypes.default.string,
44
55
 
@@ -48,7 +59,7 @@ var propTypes = {
48
59
  /**
49
60
  * Which event when fired outside the component will cause it to be closed.
50
61
  *
51
- * _see [DropdownMenu](#menu-props) for more details_
62
+ * _see [DropdownMenu](#dropdown-menu-props) for more details_
52
63
  */
53
64
  rootCloseEvent: _propTypes.default.string,
54
65
 
@@ -77,12 +88,13 @@ var DropdownButton = _react.default.forwardRef(function (_ref, ref) {
77
88
  rootCloseEvent = _ref.rootCloseEvent,
78
89
  variant = _ref.variant,
79
90
  size = _ref.size,
91
+ menuAlign = _ref.menuAlign,
80
92
  menuRole = _ref.menuRole,
81
93
  renderMenuOnMount = _ref.renderMenuOnMount,
82
94
  disabled = _ref.disabled,
83
95
  href = _ref.href,
84
96
  id = _ref.id,
85
- props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["title", "children", "bsPrefix", "rootCloseEvent", "variant", "size", "menuRole", "renderMenuOnMount", "disabled", "href", "id"]);
97
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["title", "children", "bsPrefix", "rootCloseEvent", "variant", "size", "menuAlign", "menuRole", "renderMenuOnMount", "disabled", "href", "id"]);
86
98
  return /*#__PURE__*/_react.default.createElement(_Dropdown.default, (0, _extends2.default)({
87
99
  ref: ref
88
100
  }, props), /*#__PURE__*/_react.default.createElement(_DropdownToggle.default, {
@@ -93,6 +105,7 @@ var DropdownButton = _react.default.forwardRef(function (_ref, ref) {
93
105
  disabled: disabled,
94
106
  childBsPrefix: bsPrefix
95
107
  }, title), /*#__PURE__*/_react.default.createElement(_DropdownMenu.default, {
108
+ align: menuAlign,
96
109
  role: menuRole,
97
110
  renderOnMount: renderMenuOnMount,
98
111
  rootCloseEvent: rootCloseEvent
@@ -47,9 +47,10 @@ var DropdownItem = _react.default.forwardRef(function (_ref, ref) {
47
47
  var navContext = (0, _react.useContext)(_NavContext.default);
48
48
 
49
49
  var _ref2 = navContext || {},
50
- activeKey = _ref2.activeKey;
50
+ activeKey = _ref2.activeKey; // TODO: Restrict eventKey to string in v5?
51
51
 
52
- var key = (0, _SelectableContext.makeEventKey)(eventKey || null, href);
52
+
53
+ var key = (0, _SelectableContext.makeEventKey)(eventKey, href);
53
54
  var active = propActive == null && key != null ? (0, _SelectableContext.makeEventKey)(activeKey) === key : propActive;
54
55
  var handleClick = (0, _useEventCallback.default)(function (event) {
55
56
  // SafeAnchor handles the disabled case, but we handle it here
@@ -1,14 +1,36 @@
1
+ import PropTypes from 'prop-types';
1
2
  import { UseDropdownMenuOptions } from 'react-overlays/DropdownMenu';
2
3
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent, SelectCallback } from './helpers';
4
+ export declare type AlignDirection = 'left' | 'right';
5
+ export declare type ResponsiveAlignProp = {
6
+ sm: AlignDirection;
7
+ } | {
8
+ md: AlignDirection;
9
+ } | {
10
+ lg: AlignDirection;
11
+ } | {
12
+ xl: AlignDirection;
13
+ };
14
+ export declare type AlignType = AlignDirection | ResponsiveAlignProp;
3
15
  export interface DropdownMenuProps extends BsPrefixPropsWithChildren {
4
16
  show?: boolean;
5
17
  renderOnMount?: boolean;
6
18
  flip?: boolean;
19
+ align?: AlignType;
7
20
  alignRight?: boolean;
8
21
  onSelect?: SelectCallback;
9
22
  rootCloseEvent?: 'click' | 'mousedown';
10
23
  popperConfig?: UseDropdownMenuOptions['popperConfig'];
11
24
  }
12
25
  declare type DropdownMenu = BsPrefixRefForwardingComponent<'div', DropdownMenuProps>;
26
+ export declare const alignPropType: PropTypes.Requireable<string | PropTypes.InferProps<{
27
+ sm: PropTypes.Requireable<string>;
28
+ }> | PropTypes.InferProps<{
29
+ md: PropTypes.Requireable<string>;
30
+ }> | PropTypes.InferProps<{
31
+ lg: PropTypes.Requireable<string>;
32
+ }> | PropTypes.InferProps<{
33
+ xl: PropTypes.Requireable<string>;
34
+ }>>;
13
35
  declare const DropdownMenu: DropdownMenu;
14
36
  export default DropdownMenu;
@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
5
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
6
6
 
7
7
  exports.__esModule = true;
8
- exports.default = void 0;
8
+ exports.default = exports.alignPropType = void 0;
9
9
 
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
11
 
@@ -13,12 +13,16 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
16
+ var _propTypes = _interopRequireDefault(require("prop-types"));
17
+
16
18
  var _react = _interopRequireWildcard(require("react"));
17
19
 
18
20
  var _DropdownMenu = require("react-overlays/DropdownMenu");
19
21
 
20
22
  var _useMergedRefs = _interopRequireDefault(require("@restart/hooks/useMergedRefs"));
21
23
 
24
+ var _warning = _interopRequireDefault(require("warning"));
25
+
22
26
  var _NavbarContext = _interopRequireDefault(require("./NavbarContext"));
23
27
 
24
28
  var _ThemeProvider = require("./ThemeProvider");
@@ -27,7 +31,21 @@ var _useWrappedRefWithWarning = _interopRequireDefault(require("./useWrappedRefW
27
31
 
28
32
  var _usePopperMarginModifiers = _interopRequireDefault(require("./usePopperMarginModifiers"));
29
33
 
34
+ var alignDirection = _propTypes.default.oneOf(['left', 'right']);
35
+
36
+ var alignPropType = _propTypes.default.oneOfType([alignDirection, _propTypes.default.shape({
37
+ sm: alignDirection
38
+ }), _propTypes.default.shape({
39
+ md: alignDirection
40
+ }), _propTypes.default.shape({
41
+ lg: alignDirection
42
+ }), _propTypes.default.shape({
43
+ xl: alignDirection
44
+ })]);
45
+
46
+ exports.alignPropType = alignPropType;
30
47
  var defaultProps = {
48
+ align: 'left',
31
49
  alignRight: false,
32
50
  flip: true
33
51
  }; // TODO: remove this hack
@@ -35,6 +53,7 @@ var defaultProps = {
35
53
  var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
36
54
  var bsPrefix = _ref.bsPrefix,
37
55
  className = _ref.className,
56
+ align = _ref.align,
38
57
  alignRight = _ref.alignRight,
39
58
  rootCloseEvent = _ref.rootCloseEvent,
40
59
  flip = _ref.flip,
@@ -43,7 +62,7 @@ var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
43
62
  _ref$as = _ref.as,
44
63
  Component = _ref$as === void 0 ? 'div' : _ref$as,
45
64
  popperConfig = _ref.popperConfig,
46
- props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "alignRight", "rootCloseEvent", "flip", "show", "renderOnMount", "as", "popperConfig"]);
65
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "align", "alignRight", "rootCloseEvent", "flip", "show", "renderOnMount", "as", "popperConfig"]);
47
66
  var isNavbar = (0, _react.useContext)(_NavbarContext.default);
48
67
  var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'dropdown-menu');
49
68
 
@@ -51,12 +70,33 @@ var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
51
70
  popperRef = _usePopperMarginModif[0],
52
71
  marginModifiers = _usePopperMarginModif[1];
53
72
 
73
+ var alignClasses = [];
74
+
75
+ if (align) {
76
+ if (typeof align === 'object') {
77
+ var keys = Object.keys(align);
78
+ process.env.NODE_ENV !== "production" ? (0, _warning.default)(keys.length === 1, 'There should only be 1 breakpoint when passing an object to `align`') : void 0;
79
+
80
+ if (keys.length) {
81
+ var brkPoint = keys[0];
82
+ var direction = align[brkPoint]; // .dropdown-menu-right is required for responsively aligning
83
+ // left in addition to align left classes.
84
+ // Reuse alignRight to toggle the class below.
85
+
86
+ alignRight = direction === 'left';
87
+ alignClasses.push(prefix + "-" + brkPoint + "-" + direction);
88
+ }
89
+ } else if (align === 'right') {
90
+ alignRight = true;
91
+ }
92
+ }
93
+
54
94
  var _ref2 = (0, _DropdownMenu.useDropdownMenu)({
55
95
  flip: flip,
56
96
  rootCloseEvent: rootCloseEvent,
57
97
  show: showProps,
58
98
  alignEnd: alignRight,
59
- usePopper: !isNavbar,
99
+ usePopper: !isNavbar && alignClasses.length === 0,
60
100
  popperConfig: (0, _extends2.default)({}, popperConfig, {
61
101
  modifiers: marginModifiers.concat((popperConfig == null ? void 0 : popperConfig.modifiers) || [])
62
102
  })
@@ -85,12 +125,11 @@ var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
85
125
  }
86
126
 
87
127
  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, props, menuProps, {
88
- className: (0, _classnames.default)(className, prefix, show && 'show', alignEnd && prefix + "-right")
128
+ className: _classnames.default.apply(void 0, [className, prefix, show && 'show', alignEnd && prefix + "-right"].concat(alignClasses))
89
129
  }));
90
130
  });
91
131
 
92
132
  DropdownMenu.displayName = 'DropdownMenu';
93
133
  DropdownMenu.defaultProps = defaultProps;
94
134
  var _default = DropdownMenu;
95
- exports.default = _default;
96
- module.exports = exports["default"];
135
+ exports.default = _default;
@@ -29,11 +29,10 @@ var DropdownToggle = _react.default.forwardRef(function (_ref, ref) {
29
29
  var bsPrefix = _ref.bsPrefix,
30
30
  split = _ref.split,
31
31
  className = _ref.className,
32
- children = _ref.children,
33
32
  childBsPrefix = _ref.childBsPrefix,
34
33
  _ref$as = _ref.as,
35
34
  Component = _ref$as === void 0 ? _Button.default : _ref$as,
36
- props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "split", "className", "children", "childBsPrefix", "as"]);
35
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "split", "className", "childBsPrefix", "as"]);
37
36
  var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'dropdown-toggle');
38
37
 
39
38
  if (childBsPrefix !== undefined) {
@@ -50,7 +49,7 @@ var DropdownToggle = _react.default.forwardRef(function (_ref, ref) {
50
49
  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
51
50
  onClick: toggle,
52
51
  className: (0, _classnames.default)(className, prefix, split && prefix + "-split")
53
- }, toggleProps, props), children);
52
+ }, toggleProps, props));
54
53
  });
55
54
 
56
55
  DropdownToggle.displayName = 'DropdownToggle';
package/cjs/Fade.d.ts CHANGED
@@ -1,11 +1,14 @@
1
1
  import React from 'react';
2
- import Transition, { TransitionProps } from 'react-transition-group/Transition';
3
- export interface FadeProps extends Omit<TransitionProps, 'addEndListener'> {
2
+ import Transition from 'react-transition-group/Transition';
3
+ import { TransitionCallbacks } from './helpers';
4
+ export interface FadeProps extends TransitionCallbacks {
5
+ className?: string;
4
6
  in?: boolean;
5
7
  mountOnEnter?: boolean;
6
8
  unmountOnExit?: boolean;
7
9
  appear?: boolean;
8
10
  timeout?: number;
11
+ children: React.ReactElement;
9
12
  }
10
- declare const Fade: React.ForwardRefExoticComponent<Pick<FadeProps, React.ReactText> & React.RefAttributes<Transition<any>>>;
13
+ declare const Fade: React.ForwardRefExoticComponent<FadeProps & React.RefAttributes<Transition<any>>>;
11
14
  export default Fade;
package/cjs/Form.d.ts CHANGED
@@ -8,7 +8,7 @@ import FormText from './FormText';
8
8
  import Switch from './Switch';
9
9
  import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
10
10
  declare const FormRow: BsPrefixRefForwardingComponent<"div", unknown>;
11
- export interface FormProps extends React.HTMLAttributes<HTMLElement>, BsPrefixProps {
11
+ export interface FormProps extends React.HTMLAttributes<HTMLFormElement>, BsPrefixProps {
12
12
  inline?: boolean;
13
13
  validated?: boolean;
14
14
  }
@@ -3,12 +3,10 @@ import FormCheckInput from './FormCheckInput';
3
3
  import FormCheckLabel from './FormCheckLabel';
4
4
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
5
5
  export declare type FormCheckType = 'checkbox' | 'radio' | 'switch';
6
- export interface FormCheckProps extends BsPrefixPropsWithChildren, Pick<React.HTMLAttributes<HTMLElement>, 'style'> {
6
+ export interface FormCheckProps extends BsPrefixPropsWithChildren, React.HTMLAttributes<HTMLInputElement> {
7
7
  bsCustomPrefix?: string;
8
- id?: string;
9
8
  inline?: boolean;
10
9
  disabled?: boolean;
11
- title?: string;
12
10
  label?: React.ReactNode;
13
11
  custom?: boolean;
14
12
  type?: FormCheckType;
package/cjs/FormCheck.js CHANGED
@@ -71,7 +71,7 @@ var FormCheck = _react.default.forwardRef(function (_ref, ref) {
71
71
  custom: custom
72
72
  };
73
73
  }, [controlId, custom, id]);
74
- var hasLabel = label != null && label !== false && !children;
74
+ var hasLabel = custom || label != null && label !== false && !children;
75
75
 
76
76
  var input = /*#__PURE__*/_react.default.createElement(_FormCheckInput.default, (0, _extends2.default)({}, props, {
77
77
  type: type === 'switch' ? 'checkbox' : type,
package/cjs/FormLabel.js CHANGED
@@ -43,7 +43,7 @@ var FormLabel = _react.default.forwardRef(function (_ref, ref) {
43
43
 
44
44
  bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'form-label');
45
45
  var columnClass = 'col-form-label';
46
- if (typeof column === 'string') columnClass = columnClass + "-" + column;
46
+ if (typeof column === 'string') columnClass = columnClass + " " + columnClass + "-" + column;
47
47
  var classes = (0, _classnames.default)(className, bsPrefix, srOnly && 'sr-only', column && columnClass);
48
48
  process.env.NODE_ENV !== "production" ? (0, _warning.default)(controlId == null || !htmlFor, '`controlId` is ignored on `<FormLabel>` when `htmlFor` is specified.') : void 0;
49
49
  htmlFor = htmlFor || controlId;
@@ -51,7 +51,8 @@ var ListGroupItem = _react.default.forwardRef(function (_ref, ref) {
51
51
  return /*#__PURE__*/_react.default.createElement(_AbstractNavItem.default, (0, _extends2.default)({
52
52
  ref: ref
53
53
  }, props, {
54
- eventKey: (0, _SelectableContext.makeEventKey)(eventKey || null, props.href) // eslint-disable-next-line no-nested-ternary
54
+ // TODO: Restrict eventKey to string in v5?
55
+ eventKey: (0, _SelectableContext.makeEventKey)(eventKey, props.href) // eslint-disable-next-line no-nested-ternary
55
56
  ,
56
57
  as: as || (action ? props.href ? 'a' : 'button' : 'div'),
57
58
  onClick: handleClick,
package/cjs/Modal.d.ts CHANGED
@@ -13,6 +13,7 @@ export interface ModalProps extends Omit<BaseModalProps, 'role' | 'renderBackdro
13
13
  backdropClassName?: string;
14
14
  animation?: boolean;
15
15
  dialogClassName?: string;
16
+ contentClassName?: string;
16
17
  dialogAs?: React.ElementType;
17
18
  scrollable?: boolean;
18
19
  }
package/cjs/Modal.js CHANGED
@@ -83,6 +83,7 @@ var Modal = _react.default.forwardRef(function (_ref, ref) {
83
83
  className = _ref.className,
84
84
  style = _ref.style,
85
85
  dialogClassName = _ref.dialogClassName,
86
+ contentClassName = _ref.contentClassName,
86
87
  children = _ref.children,
87
88
  Dialog = _ref.dialogAs,
88
89
  ariaLabelledby = _ref['aria-labelledby'],
@@ -106,7 +107,7 @@ var Modal = _react.default.forwardRef(function (_ref, ref) {
106
107
  onExited = _ref.onExited,
107
108
  backdropClassName = _ref.backdropClassName,
108
109
  propsManager = _ref.manager,
109
- props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "style", "dialogClassName", "children", "dialogAs", "aria-labelledby", "show", "animation", "backdrop", "keyboard", "onEscapeKeyDown", "onShow", "onHide", "container", "autoFocus", "enforceFocus", "restoreFocus", "restoreFocusOptions", "onEntered", "onExit", "onExiting", "onEnter", "onEntering", "onExited", "backdropClassName", "manager"]);
110
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "style", "dialogClassName", "contentClassName", "children", "dialogAs", "aria-labelledby", "show", "animation", "backdrop", "keyboard", "onEscapeKeyDown", "onShow", "onHide", "container", "autoFocus", "enforceFocus", "restoreFocus", "restoreFocusOptions", "onEntered", "onExit", "onExiting", "onEnter", "onEntering", "onExited", "backdropClassName", "manager"]);
110
111
 
111
112
  var _useState = (0, _react.useState)({}),
112
113
  modalStyle = _useState[0],
@@ -294,7 +295,8 @@ var Modal = _react.default.forwardRef(function (_ref, ref) {
294
295
  }), /*#__PURE__*/_react.default.createElement(Dialog, (0, _extends2.default)({}, props, {
295
296
  role: "document",
296
297
  onMouseDown: handleDialogMouseDown,
297
- className: dialogClassName
298
+ className: dialogClassName,
299
+ contentClassName: contentClassName
298
300
  }), children));
299
301
  };
300
302
 
@@ -4,6 +4,7 @@ export interface ModalDialogProps extends React.HTMLAttributes<HTMLDivElement>,
4
4
  size?: 'sm' | 'lg' | 'xl';
5
5
  centered?: boolean;
6
6
  scrollable?: boolean;
7
+ contentClassName?: string;
7
8
  }
8
9
  declare const ModalDialog: React.ForwardRefExoticComponent<ModalDialogProps & React.RefAttributes<HTMLDivElement>>;
9
10
  export default ModalDialog;
@@ -18,18 +18,19 @@ var _ThemeProvider = require("./ThemeProvider");
18
18
  var ModalDialog = _react.default.forwardRef(function (_ref, ref) {
19
19
  var bsPrefix = _ref.bsPrefix,
20
20
  className = _ref.className,
21
+ contentClassName = _ref.contentClassName,
21
22
  centered = _ref.centered,
22
23
  size = _ref.size,
23
24
  children = _ref.children,
24
25
  scrollable = _ref.scrollable,
25
- props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "centered", "size", "children", "scrollable"]);
26
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "contentClassName", "centered", "size", "children", "scrollable"]);
26
27
  bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'modal');
27
28
  var dialogClass = bsPrefix + "-dialog";
28
29
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, props, {
29
30
  ref: ref,
30
31
  className: (0, _classnames.default)(dialogClass, className, size && bsPrefix + "-" + size, centered && dialogClass + "-centered", scrollable && dialogClass + "-scrollable")
31
32
  }), /*#__PURE__*/_react.default.createElement("div", {
32
- className: bsPrefix + "-content"
33
+ className: (0, _classnames.default)(bsPrefix + "-content", contentClassName)
33
34
  }, children));
34
35
  });
35
36
 
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
- import Dropdown from './Dropdown';
3
- import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
4
- export interface NavDropdownProps extends BsPrefixPropsWithChildren {
2
+ import Dropdown, { DropdownProps } from './Dropdown';
3
+ import { BsPrefixRefForwardingComponent } from './helpers';
4
+ export interface NavDropdownProps extends DropdownProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'title'> {
5
5
  id: string;
6
6
  title: React.ReactNode;
7
7
  disabled?: boolean;
package/cjs/Overlay.d.ts CHANGED
@@ -97,7 +97,7 @@ declare namespace Overlay {
97
97
  placement: PropTypes.Requireable<string>;
98
98
  };
99
99
  var defaultProps: {
100
- transition: React.ForwardRefExoticComponent<Pick<import("./Fade").FadeProps, React.ReactText> & React.RefAttributes<import("react-transition-group/Transition").default<any>>>;
100
+ transition: React.ForwardRefExoticComponent<import("./Fade").FadeProps & React.RefAttributes<import("react-transition-group/Transition").default<any>>>;
101
101
  rootClose: boolean;
102
102
  show: boolean;
103
103
  placement: string;
@@ -27,7 +27,7 @@ export interface OverlayTriggerProps extends Omit<OverlayProps, 'children' | 'ta
27
27
  declare function OverlayTrigger({ trigger, overlay, children, popperConfig, show: propsShow, defaultShow, onToggle, delay: propsDelay, placement, flip, ...props }: OverlayTriggerProps): JSX.Element;
28
28
  declare namespace OverlayTrigger {
29
29
  var propTypes: {
30
- children: PropTypes.Validator<PropTypes.ReactElementLike>;
30
+ children: PropTypes.Validator<((...args: any[]) => any) | PropTypes.ReactElementLike>;
31
31
  /**
32
32
  * Specify which action or actions trigger Overlay visibility
33
33
  *
@@ -1,9 +1,11 @@
1
1
  import React from 'react';
2
2
  import { ButtonType } from './Button';
3
+ import { AlignType } from './DropdownMenu';
3
4
  import { PropsFromToggle } from './DropdownToggle';
4
5
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
5
6
  export interface SplitButtonProps extends PropsFromToggle, BsPrefixPropsWithChildren {
6
7
  id: string | number;
8
+ menuAlign?: AlignType;
7
9
  menuRole?: string;
8
10
  onClick?: React.MouseEventHandler<this>;
9
11
  renderMenuOnMount?: boolean;