react-bootstrap 1.3.0 → 1.4.3

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 (222) hide show
  1. package/README.md +2 -2
  2. package/cjs/AbstractNav.js +1 -1
  3. package/cjs/AbstractNavItem.js +6 -2
  4. package/cjs/Accordion.js +1 -1
  5. package/cjs/AccordionCollapse.js +10 -4
  6. package/cjs/AccordionContext.js +1 -1
  7. package/cjs/AccordionToggle.js +1 -1
  8. package/cjs/Alert.js +2 -2
  9. package/cjs/Badge.js +1 -1
  10. package/cjs/Breadcrumb.js +1 -1
  11. package/cjs/BreadcrumbItem.js +1 -1
  12. package/cjs/Button.js +2 -2
  13. package/cjs/ButtonGroup.js +1 -1
  14. package/cjs/ButtonToolbar.js +1 -1
  15. package/cjs/Card.js +1 -1
  16. package/cjs/CardContext.js +1 -1
  17. package/cjs/CardImg.js +1 -1
  18. package/cjs/Carousel.js +52 -40
  19. package/cjs/CarouselItem.d.ts +7 -2
  20. package/cjs/CarouselItem.js +25 -2
  21. package/cjs/CloseButton.js +1 -1
  22. package/cjs/Col.js +1 -1
  23. package/cjs/Collapse.js +2 -2
  24. package/cjs/Container.js +1 -1
  25. package/cjs/Dropdown.js +1 -1
  26. package/cjs/DropdownButton.d.ts +9 -5
  27. package/cjs/DropdownButton.js +20 -6
  28. package/cjs/DropdownItem.js +4 -3
  29. package/cjs/DropdownMenu.d.ts +22 -0
  30. package/cjs/DropdownMenu.js +50 -8
  31. package/cjs/DropdownToggle.js +3 -4
  32. package/cjs/ElementChildren.js +2 -2
  33. package/cjs/Fade.d.ts +6 -3
  34. package/cjs/Fade.js +2 -2
  35. package/cjs/Feedback.js +1 -1
  36. package/cjs/FigureImage.js +1 -1
  37. package/cjs/Form.d.ts +1 -1
  38. package/cjs/Form.js +1 -1
  39. package/cjs/FormCheck.d.ts +1 -3
  40. package/cjs/FormCheck.js +2 -2
  41. package/cjs/FormCheckInput.js +1 -1
  42. package/cjs/FormCheckLabel.js +1 -1
  43. package/cjs/FormContext.js +1 -1
  44. package/cjs/FormControl.js +1 -1
  45. package/cjs/FormFile.js +1 -1
  46. package/cjs/FormFileInput.js +1 -1
  47. package/cjs/FormFileLabel.js +1 -1
  48. package/cjs/FormGroup.js +1 -1
  49. package/cjs/FormLabel.js +2 -2
  50. package/cjs/FormText.js +1 -1
  51. package/cjs/Image.js +1 -1
  52. package/cjs/InputGroup.js +1 -1
  53. package/cjs/Jumbotron.js +1 -1
  54. package/cjs/ListGroup.js +1 -1
  55. package/cjs/ListGroupItem.d.ts +1 -1
  56. package/cjs/ListGroupItem.js +9 -2
  57. package/cjs/Media.js +1 -1
  58. package/cjs/Modal.d.ts +1 -0
  59. package/cjs/Modal.js +6 -5
  60. package/cjs/ModalContext.js +1 -1
  61. package/cjs/ModalDialog.d.ts +1 -0
  62. package/cjs/ModalDialog.js +4 -3
  63. package/cjs/ModalHeader.js +1 -1
  64. package/cjs/Nav.js +1 -1
  65. package/cjs/NavContext.js +1 -1
  66. package/cjs/NavDropdown.d.ts +3 -3
  67. package/cjs/NavDropdown.js +1 -1
  68. package/cjs/NavItem.js +1 -1
  69. package/cjs/NavLink.js +1 -1
  70. package/cjs/Navbar.js +1 -1
  71. package/cjs/NavbarBrand.js +1 -1
  72. package/cjs/NavbarCollapse.js +1 -1
  73. package/cjs/NavbarContext.js +1 -1
  74. package/cjs/NavbarToggle.js +1 -1
  75. package/cjs/Overlay.d.ts +1 -1
  76. package/cjs/Overlay.js +3 -3
  77. package/cjs/OverlayTrigger.d.ts +1 -1
  78. package/cjs/OverlayTrigger.js +1 -1
  79. package/cjs/PageItem.js +1 -1
  80. package/cjs/Pagination.js +1 -1
  81. package/cjs/Popover.js +1 -1
  82. package/cjs/PopoverContent.js +1 -1
  83. package/cjs/PopoverTitle.js +1 -1
  84. package/cjs/ProgressBar.js +3 -3
  85. package/cjs/ResponsiveEmbed.js +2 -2
  86. package/cjs/Row.js +1 -1
  87. package/cjs/SafeAnchor.js +1 -1
  88. package/cjs/SelectableContext.js +1 -1
  89. package/cjs/Spinner.js +1 -1
  90. package/cjs/SplitButton.d.ts +16 -5
  91. package/cjs/SplitButton.js +27 -4
  92. package/cjs/Switch.js +1 -1
  93. package/cjs/TabContent.js +1 -1
  94. package/cjs/TabContext.js +1 -1
  95. package/cjs/TabPane.js +1 -1
  96. package/cjs/Table.js +1 -1
  97. package/cjs/ThemeProvider.js +2 -2
  98. package/cjs/Toast.js +1 -1
  99. package/cjs/ToastContext.js +1 -1
  100. package/cjs/ToastHeader.js +1 -1
  101. package/cjs/ToggleButton.d.ts +2 -2
  102. package/cjs/ToggleButton.js +1 -1
  103. package/cjs/ToggleButtonGroup.d.ts +4 -3
  104. package/cjs/ToggleButtonGroup.js +4 -3
  105. package/cjs/Tooltip.js +1 -1
  106. package/cjs/createWithBsPrefix.js +1 -1
  107. package/cjs/divWithClassName.js +1 -1
  108. package/cjs/index.d.ts +1 -0
  109. package/cjs/usePopperMarginModifiers.d.ts +4 -1
  110. package/cjs/usePopperMarginModifiers.js +8 -4
  111. package/dist/react-bootstrap.js +931 -615
  112. package/dist/react-bootstrap.min.js +2 -2
  113. package/esm/AbstractNav.js +1 -1
  114. package/esm/AbstractNavItem.js +6 -2
  115. package/esm/Accordion.js +1 -1
  116. package/esm/AccordionCollapse.js +9 -4
  117. package/esm/AccordionContext.js +1 -1
  118. package/esm/AccordionToggle.js +1 -1
  119. package/esm/Alert.js +2 -2
  120. package/esm/Badge.js +1 -1
  121. package/esm/Breadcrumb.js +1 -1
  122. package/esm/BreadcrumbItem.js +1 -1
  123. package/esm/Button.js +2 -2
  124. package/esm/ButtonGroup.js +1 -1
  125. package/esm/ButtonToolbar.js +1 -1
  126. package/esm/Card.js +1 -1
  127. package/esm/CardContext.js +1 -1
  128. package/esm/CardImg.js +1 -1
  129. package/esm/Carousel.js +53 -41
  130. package/esm/CarouselItem.d.ts +7 -2
  131. package/esm/CarouselItem.js +22 -2
  132. package/esm/CloseButton.js +1 -1
  133. package/esm/Col.js +1 -1
  134. package/esm/Collapse.js +2 -2
  135. package/esm/Container.js +1 -1
  136. package/esm/Dropdown.js +1 -1
  137. package/esm/DropdownButton.d.ts +9 -5
  138. package/esm/DropdownButton.js +18 -6
  139. package/esm/DropdownItem.js +4 -3
  140. package/esm/DropdownMenu.d.ts +22 -0
  141. package/esm/DropdownMenu.js +43 -5
  142. package/esm/DropdownToggle.js +3 -4
  143. package/esm/ElementChildren.js +2 -2
  144. package/esm/Fade.d.ts +6 -3
  145. package/esm/Fade.js +2 -2
  146. package/esm/Feedback.js +1 -1
  147. package/esm/FigureImage.js +1 -1
  148. package/esm/Form.d.ts +1 -1
  149. package/esm/Form.js +1 -1
  150. package/esm/FormCheck.d.ts +1 -3
  151. package/esm/FormCheck.js +2 -2
  152. package/esm/FormCheckInput.js +1 -1
  153. package/esm/FormCheckLabel.js +1 -1
  154. package/esm/FormContext.js +1 -1
  155. package/esm/FormControl.js +1 -1
  156. package/esm/FormFile.js +1 -1
  157. package/esm/FormFileInput.js +1 -1
  158. package/esm/FormFileLabel.js +1 -1
  159. package/esm/FormGroup.js +1 -1
  160. package/esm/FormLabel.js +2 -2
  161. package/esm/FormText.js +1 -1
  162. package/esm/Image.js +1 -1
  163. package/esm/InputGroup.js +1 -1
  164. package/esm/Jumbotron.js +1 -1
  165. package/esm/ListGroup.js +1 -1
  166. package/esm/ListGroupItem.d.ts +1 -1
  167. package/esm/ListGroupItem.js +9 -2
  168. package/esm/Media.js +1 -1
  169. package/esm/Modal.d.ts +1 -0
  170. package/esm/Modal.js +6 -5
  171. package/esm/ModalContext.js +1 -1
  172. package/esm/ModalDialog.d.ts +1 -0
  173. package/esm/ModalDialog.js +4 -3
  174. package/esm/ModalHeader.js +1 -1
  175. package/esm/Nav.js +1 -1
  176. package/esm/NavContext.js +1 -1
  177. package/esm/NavDropdown.d.ts +3 -3
  178. package/esm/NavDropdown.js +1 -1
  179. package/esm/NavItem.js +1 -1
  180. package/esm/NavLink.js +1 -1
  181. package/esm/Navbar.js +1 -1
  182. package/esm/NavbarBrand.js +1 -1
  183. package/esm/NavbarCollapse.js +1 -1
  184. package/esm/NavbarContext.js +1 -1
  185. package/esm/NavbarToggle.js +1 -1
  186. package/esm/Overlay.d.ts +1 -1
  187. package/esm/Overlay.js +3 -3
  188. package/esm/OverlayTrigger.d.ts +1 -1
  189. package/esm/OverlayTrigger.js +1 -1
  190. package/esm/PageItem.js +1 -1
  191. package/esm/Pagination.js +1 -1
  192. package/esm/Popover.js +1 -1
  193. package/esm/PopoverContent.js +1 -1
  194. package/esm/PopoverTitle.js +1 -1
  195. package/esm/ProgressBar.js +3 -3
  196. package/esm/ResponsiveEmbed.js +2 -2
  197. package/esm/Row.js +1 -1
  198. package/esm/SafeAnchor.js +1 -1
  199. package/esm/SelectableContext.js +1 -1
  200. package/esm/Spinner.js +1 -1
  201. package/esm/SplitButton.d.ts +16 -5
  202. package/esm/SplitButton.js +26 -3
  203. package/esm/Switch.js +1 -1
  204. package/esm/TabContent.js +1 -1
  205. package/esm/TabContext.js +1 -1
  206. package/esm/TabPane.js +1 -1
  207. package/esm/Table.js +1 -1
  208. package/esm/ThemeProvider.js +2 -2
  209. package/esm/Toast.js +1 -1
  210. package/esm/ToastContext.js +1 -1
  211. package/esm/ToastHeader.js +1 -1
  212. package/esm/ToggleButton.d.ts +2 -2
  213. package/esm/ToggleButton.js +1 -1
  214. package/esm/ToggleButtonGroup.d.ts +4 -3
  215. package/esm/ToggleButtonGroup.js +4 -3
  216. package/esm/Tooltip.js +1 -1
  217. package/esm/createWithBsPrefix.js +1 -1
  218. package/esm/divWithClassName.js +1 -1
  219. package/esm/index.d.ts +1 -0
  220. package/esm/usePopperMarginModifiers.d.ts +4 -1
  221. package/esm/usePopperMarginModifiers.js +7 -4
  222. package/package.json +25 -25
@@ -30,7 +30,7 @@ var defaultProps = {
30
30
  disabled: false
31
31
  };
32
32
 
33
- var DropdownItem = _react.default.forwardRef(function (_ref, ref) {
33
+ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
34
34
  var bsPrefix = _ref.bsPrefix,
35
35
  className = _ref.className,
36
36
  children = _ref.children,
@@ -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,14 +31,29 @@ 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
34
52
 
35
- var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
53
+ var DropdownMenu = /*#__PURE__*/_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
  })
@@ -77,20 +117,22 @@ var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
77
117
  menuProps.alignRight = alignEnd;
78
118
  }
79
119
 
120
+ var style = props.style;
121
+
80
122
  if (placement) {
81
123
  // we don't need the default popper style,
82
124
  // menus are display: none when not shown.
83
- props.style = (0, _extends2.default)({}, props.style, {}, menuProps.style);
125
+ style = (0, _extends2.default)({}, props.style, menuProps.style);
84
126
  props['x-placement'] = placement;
85
127
  }
86
128
 
87
129
  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, props, menuProps, {
88
- className: (0, _classnames.default)(className, prefix, show && 'show', alignEnd && prefix + "-right")
130
+ style: style,
131
+ className: _classnames.default.apply(void 0, [className, prefix, show && 'show', alignEnd && prefix + "-right"].concat(alignClasses))
89
132
  }));
90
133
  });
91
134
 
92
135
  DropdownMenu.displayName = 'DropdownMenu';
93
136
  DropdownMenu.defaultProps = defaultProps;
94
137
  var _default = DropdownMenu;
95
- exports.default = _default;
96
- module.exports = exports["default"];
138
+ exports.default = _default;
@@ -25,15 +25,14 @@ var _ThemeProvider = require("./ThemeProvider");
25
25
 
26
26
  var _useWrappedRefWithWarning = _interopRequireDefault(require("./useWrappedRefWithWarning"));
27
27
 
28
- var DropdownToggle = _react.default.forwardRef(function (_ref, ref) {
28
+ var DropdownToggle = /*#__PURE__*/_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';
@@ -19,7 +19,7 @@ var _react = _interopRequireDefault(require("react"));
19
19
  function map(children, func) {
20
20
  var index = 0;
21
21
  return _react.default.Children.map(children, function (child) {
22
- return _react.default.isValidElement(child) ? func(child, index++) : child;
22
+ return /*#__PURE__*/_react.default.isValidElement(child) ? func(child, index++) : child;
23
23
  });
24
24
  }
25
25
  /**
@@ -34,6 +34,6 @@ function forEach(children, func) {
34
34
  var index = 0;
35
35
 
36
36
  _react.default.Children.forEach(children, function (child) {
37
- if (_react.default.isValidElement(child)) func(child, index++);
37
+ if ( /*#__PURE__*/_react.default.isValidElement(child)) func(child, index++);
38
38
  });
39
39
  }
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/Fade.js CHANGED
@@ -32,7 +32,7 @@ var defaultProps = {
32
32
  };
33
33
  var fadeStyles = (_fadeStyles = {}, _fadeStyles[_Transition.ENTERING] = 'show', _fadeStyles[_Transition.ENTERED] = 'show', _fadeStyles);
34
34
 
35
- var Fade = _react.default.forwardRef(function (_ref, ref) {
35
+ var Fade = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
36
36
  var className = _ref.className,
37
37
  children = _ref.children,
38
38
  props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["className", "children"]);
@@ -46,7 +46,7 @@ var Fade = _react.default.forwardRef(function (_ref, ref) {
46
46
  }, props, {
47
47
  onEnter: handleEnter
48
48
  }), function (status, innerProps) {
49
- return _react.default.cloneElement(children, (0, _extends2.default)({}, innerProps, {
49
+ return /*#__PURE__*/_react.default.cloneElement(children, (0, _extends2.default)({}, innerProps, {
50
50
  className: (0, _classnames.default)('fade', className, children.props.className, fadeStyles[status])
51
51
  }));
52
52
  });
package/cjs/Feedback.js CHANGED
@@ -28,7 +28,7 @@ var propTypes = {
28
28
  as: _propTypes.default.elementType
29
29
  };
30
30
 
31
- var Feedback = _react.default.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
31
+ var Feedback = /*#__PURE__*/_react.default.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
32
32
  function (_ref, ref) {
33
33
  var _ref$as = _ref.as,
34
34
  Component = _ref$as === void 0 ? 'div' : _ref$as,
@@ -21,7 +21,7 @@ var defaultProps = {
21
21
  fluid: true
22
22
  };
23
23
 
24
- var FigureImage = _react.default.forwardRef(function (_ref, ref) {
24
+ var FigureImage = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
25
25
  var className = _ref.className,
26
26
  props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["className"]);
27
27
  return /*#__PURE__*/_react.default.createElement(_Image.default, (0, _extends2.default)({
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
  }
package/cjs/Form.js CHANGED
@@ -36,7 +36,7 @@ var defaultProps = {
36
36
  inline: false
37
37
  };
38
38
 
39
- var FormImpl = _react.default.forwardRef(function (_ref, ref) {
39
+ var FormImpl = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
40
40
  var bsPrefix = _ref.bsPrefix,
41
41
  inline = _ref.inline,
42
42
  className = _ref.className,
@@ -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.InputHTMLAttributes<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
@@ -27,7 +27,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
27
27
 
28
28
  var _ThemeProvider = require("./ThemeProvider");
29
29
 
30
- var FormCheck = _react.default.forwardRef(function (_ref, ref) {
30
+ var FormCheck = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
31
31
  var id = _ref.id,
32
32
  bsPrefix = _ref.bsPrefix,
33
33
  bsCustomPrefix = _ref.bsCustomPrefix,
@@ -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,
@@ -19,7 +19,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
19
19
 
20
20
  var _ThemeProvider = require("./ThemeProvider");
21
21
 
22
- var FormCheckInput = _react.default.forwardRef(function (_ref, ref) {
22
+ var FormCheckInput = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
23
23
  var id = _ref.id,
24
24
  bsPrefix = _ref.bsPrefix,
25
25
  bsCustomPrefix = _ref.bsCustomPrefix,
@@ -19,7 +19,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
19
19
 
20
20
  var _ThemeProvider = require("./ThemeProvider");
21
21
 
22
- var FormCheckLabel = _react.default.forwardRef(function (_ref, ref) {
22
+ var FormCheckLabel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
23
23
  var bsPrefix = _ref.bsPrefix,
24
24
  bsCustomPrefix = _ref.bsCustomPrefix,
25
25
  className = _ref.className,
@@ -7,7 +7,7 @@ exports.default = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var FormContext = _react.default.createContext({
10
+ var FormContext = /*#__PURE__*/_react.default.createContext({
11
11
  controlId: undefined
12
12
  });
13
13
 
@@ -25,7 +25,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
25
25
 
26
26
  var _ThemeProvider = require("./ThemeProvider");
27
27
 
28
- var FormControl = _react.default.forwardRef(function (_ref, ref) {
28
+ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
29
29
  var bsPrefix = _ref.bsPrefix,
30
30
  bsCustomPrefix = _ref.bsCustomPrefix,
31
31
  type = _ref.type,
package/cjs/FormFile.js CHANGED
@@ -27,7 +27,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
27
27
 
28
28
  var _ThemeProvider = require("./ThemeProvider");
29
29
 
30
- var FormFile = _react.default.forwardRef(function (_ref, ref) {
30
+ var FormFile = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
31
31
  var id = _ref.id,
32
32
  bsPrefix = _ref.bsPrefix,
33
33
  bsCustomPrefix = _ref.bsCustomPrefix,
@@ -19,7 +19,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
19
19
 
20
20
  var _ThemeProvider = require("./ThemeProvider");
21
21
 
22
- var FormFileInput = _react.default.forwardRef(function (_ref, ref) {
22
+ var FormFileInput = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
23
23
  var id = _ref.id,
24
24
  bsPrefix = _ref.bsPrefix,
25
25
  bsCustomPrefix = _ref.bsCustomPrefix,
@@ -19,7 +19,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
19
19
 
20
20
  var _ThemeProvider = require("./ThemeProvider");
21
21
 
22
- var FormFileLabel = _react.default.forwardRef(function (_ref, ref) {
22
+ var FormFileLabel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
23
23
  var bsPrefix = _ref.bsPrefix,
24
24
  bsCustomPrefix = _ref.bsCustomPrefix,
25
25
  className = _ref.className,
package/cjs/FormGroup.js CHANGED
@@ -19,7 +19,7 @@ var _FormContext = _interopRequireDefault(require("./FormContext"));
19
19
 
20
20
  var _ThemeProvider = require("./ThemeProvider");
21
21
 
22
- var FormGroup = _react.default.forwardRef(function (_ref, ref) {
22
+ var FormGroup = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
23
23
  var bsPrefix = _ref.bsPrefix,
24
24
  className = _ref.className,
25
25
  children = _ref.children,
package/cjs/FormLabel.js CHANGED
@@ -28,7 +28,7 @@ var defaultProps = {
28
28
  srOnly: false
29
29
  };
30
30
 
31
- var FormLabel = _react.default.forwardRef(function (_ref, ref) {
31
+ var FormLabel = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
32
32
  var _ref$as = _ref.as,
33
33
  Component = _ref$as === void 0 ? 'label' : _ref$as,
34
34
  bsPrefix = _ref.bsPrefix,
@@ -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;
package/cjs/FormText.js CHANGED
@@ -15,7 +15,7 @@ var _react = _interopRequireDefault(require("react"));
15
15
 
16
16
  var _ThemeProvider = require("./ThemeProvider");
17
17
 
18
- var FormText = _react.default.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
18
+ var FormText = /*#__PURE__*/_react.default.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
19
19
  function (_ref, ref) {
20
20
  var bsPrefix = _ref.bsPrefix,
21
21
  className = _ref.className,
package/cjs/Image.js CHANGED
@@ -51,7 +51,7 @@ var defaultProps = {
51
51
  thumbnail: false
52
52
  };
53
53
 
54
- var Image = _react.default.forwardRef(function (_ref, ref) {
54
+ var Image = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
55
55
  var bsPrefix = _ref.bsPrefix,
56
56
  className = _ref.className,
57
57
  fluid = _ref.fluid,
package/cjs/InputGroup.js CHANGED
@@ -43,7 +43,7 @@ var InputGroupRadio = function InputGroupRadio(props) {
43
43
  * @property {InputGroupRadio} Radio
44
44
  * @property {InputGroupCheckbox} Checkbox
45
45
  */
46
- var InputGroup = _react.default.forwardRef(function (_ref, ref) {
46
+ var InputGroup = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
47
47
  var bsPrefix = _ref.bsPrefix,
48
48
  size = _ref.size,
49
49
  className = _ref.className,
package/cjs/Jumbotron.js CHANGED
@@ -19,7 +19,7 @@ var defaultProps = {
19
19
  fluid: false
20
20
  };
21
21
 
22
- var Jumbotron = _react.default.forwardRef(function (_ref, ref) {
22
+ var Jumbotron = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
23
23
  var _classes;
24
24
 
25
25
  var _ref$as = _ref.as,
package/cjs/ListGroup.js CHANGED
@@ -28,7 +28,7 @@ var defaultProps = {
28
28
  horizontal: undefined
29
29
  };
30
30
 
31
- var ListGroup = _react.default.forwardRef(function (props, ref) {
31
+ var ListGroup = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
32
32
  var _useUncontrolled = (0, _uncontrollable.useUncontrolled)(props, {
33
33
  activeKey: 'onSelect'
34
34
  }),
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
3
3
  import { Variant } from './types';
4
- export interface ListGroupItemProps extends BsPrefixProps {
4
+ export interface ListGroupItemProps extends Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'>, BsPrefixProps {
5
5
  action?: boolean;
6
6
  active?: boolean;
7
7
  disabled?: boolean;
@@ -27,7 +27,7 @@ var defaultProps = {
27
27
  disabled: false
28
28
  };
29
29
 
30
- var ListGroupItem = _react.default.forwardRef(function (_ref, ref) {
30
+ var ListGroupItem = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
31
31
  var bsPrefix = _ref.bsPrefix,
32
32
  active = _ref.active,
33
33
  disabled = _ref.disabled,
@@ -48,10 +48,17 @@ var ListGroupItem = _react.default.forwardRef(function (_ref, ref) {
48
48
 
49
49
  if (onClick) onClick(event);
50
50
  }, [disabled, onClick]);
51
+
52
+ if (disabled && props.tabIndex === undefined) {
53
+ props.tabIndex = -1;
54
+ props['aria-disabled'] = true;
55
+ }
56
+
51
57
  return /*#__PURE__*/_react.default.createElement(_AbstractNavItem.default, (0, _extends2.default)({
52
58
  ref: ref
53
59
  }, props, {
54
- eventKey: (0, _SelectableContext.makeEventKey)(eventKey || null, props.href) // eslint-disable-next-line no-nested-ternary
60
+ // TODO: Restrict eventKey to string in v5?
61
+ eventKey: (0, _SelectableContext.makeEventKey)(eventKey, props.href) // eslint-disable-next-line no-nested-ternary
55
62
  ,
56
63
  as: as || (action ? props.href ? 'a' : 'button' : 'div'),
57
64
  onClick: handleClick,
package/cjs/Media.js CHANGED
@@ -19,7 +19,7 @@ var _ThemeProvider = require("./ThemeProvider");
19
19
 
20
20
  var MediaBody = (0, _createWithBsPrefix.default)('media-body');
21
21
 
22
- var Media = _react.default.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
22
+ var Media = /*#__PURE__*/_react.default.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
23
23
  function (_ref, ref) {
24
24
  var bsPrefix = _ref.bsPrefix,
25
25
  className = _ref.className,
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
@@ -78,11 +78,12 @@ function BackdropTransition(props) {
78
78
  /* eslint-enable no-use-before-define */
79
79
 
80
80
 
81
- var Modal = _react.default.forwardRef(function (_ref, ref) {
81
+ var Modal = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
82
82
  var bsPrefix = _ref.bsPrefix,
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],
@@ -276,7 +277,7 @@ var Modal = _react.default.forwardRef(function (_ref, ref) {
276
277
  className: (0, _classnames.default)(bsPrefix + "-backdrop", backdropClassName, !animation && 'show')
277
278
  }));
278
279
  }, [animation, backdropClassName, bsPrefix]);
279
- var baseModalStyle = (0, _extends2.default)({}, style, {}, modalStyle); // Sets `display` always block when `animation` is false
280
+ var baseModalStyle = (0, _extends2.default)({}, style, modalStyle); // Sets `display` always block when `animation` is false
280
281
 
281
282
  if (!animation) {
282
283
  baseModalStyle.display = 'block';
@@ -292,9 +293,9 @@ var Modal = _react.default.forwardRef(function (_ref, ref) {
292
293
  onMouseUp: handleMouseUp,
293
294
  "aria-labelledby": ariaLabelledby
294
295
  }), /*#__PURE__*/_react.default.createElement(Dialog, (0, _extends2.default)({}, props, {
295
- role: "document",
296
296
  onMouseDown: handleDialogMouseDown,
297
- className: dialogClassName
297
+ className: dialogClassName,
298
+ contentClassName: contentClassName
298
299
  }), children));
299
300
  };
300
301
 
@@ -7,7 +7,7 @@ exports.default = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var ModalContext = _react.default.createContext({
10
+ var ModalContext = /*#__PURE__*/_react.default.createContext({
11
11
  // eslint-disable-next-line @typescript-eslint/no-empty-function
12
12
  onHide: function onHide() {}
13
13
  });
@@ -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;