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
@@ -7,11 +7,10 @@ export interface AccordionToggleProps {
7
7
  onClick?: (event?: React.SyntheticEvent) => void;
8
8
  }
9
9
 
10
- export interface useAccordionToggle {
11
- (eventKey: string, onClick: (event?: React.SyntheticEvent) => void): (
12
- event?: React.SyntheticEvent,
13
- ) => void;
14
- }
10
+ export function useAccordionToggle(
11
+ eventKey: string,
12
+ onClick: (event?: React.SyntheticEvent) => void,
13
+ ): (event?: React.SyntheticEvent) => void;
15
14
 
16
15
  declare class AccordionToggle<
17
16
  As extends React.ElementType = 'button'
@@ -0,0 +1,6 @@
1
+ {
2
+ "name": "react-bootstrap/BootstrapModalManager",
3
+ "private": true,
4
+ "main": "../cjs/BootstrapModalManager.js",
5
+ "module": "../esm/BootstrapModalManager.js"
6
+ }
package/Container.d.ts CHANGED
@@ -3,7 +3,7 @@ import * as React from 'react';
3
3
  import { BsPrefixComponent } from './helpers';
4
4
 
5
5
  export interface ContainerProps {
6
- fluid?: boolean;
6
+ fluid?: boolean | 'sm' | 'md' | 'lg' | 'xl';
7
7
  }
8
8
 
9
9
  declare class Container<
@@ -0,0 +1,6 @@
1
+ {
2
+ "name": "react-bootstrap/ElementChildren",
3
+ "private": true,
4
+ "main": "../cjs/ElementChildren.js",
5
+ "module": "../esm/ElementChildren.js"
6
+ }
package/FormControl.d.ts CHANGED
@@ -2,14 +2,19 @@ import * as React from 'react';
2
2
  import Feedback from './Feedback';
3
3
  import { BsPrefixComponent } from './helpers';
4
4
 
5
+ type FormControlElement =
6
+ | HTMLInputElement
7
+ | HTMLSelectElement
8
+ | HTMLTextAreaElement;
9
+
5
10
  export interface FormControlProps {
6
- innerRef?: React.LegacyRef<this>;
11
+ innerRef?: React.LegacyRef<FormControlElement>;
7
12
  size?: 'sm' | 'lg';
8
13
  plaintext?: boolean;
9
14
  readOnly?: boolean;
10
15
  disabled?: boolean;
11
16
  value?: string;
12
- onChange?: React.FormEventHandler<this>;
17
+ onChange?: React.FormEventHandler<FormControlElement>;
13
18
  type?: string;
14
19
  id?: string;
15
20
  isValid?: boolean;
package/ListGroup.d.ts CHANGED
@@ -6,6 +6,7 @@ import { BsPrefixComponent, SelectCallback } from './helpers';
6
6
 
7
7
  export interface ListGroupProps {
8
8
  variant?: 'flush';
9
+ horizontal?: boolean | 'sm' | 'md' | 'lg' | 'xl';
9
10
  activeKey?: unknown;
10
11
  defaultActiveKey?: unknown;
11
12
  onSelect?: SelectCallback;
package/Modal.d.ts CHANGED
@@ -20,6 +20,7 @@ export interface ModalProps extends TransitionCallbacks {
20
20
  autoFocus?: boolean;
21
21
  enforceFocus?: boolean;
22
22
  restoreFocus?: boolean;
23
+ restoreFocusOptions?: FocusOptions;
23
24
  show?: boolean;
24
25
  onShow?: () => void;
25
26
  onHide?: () => void;
package/Overlay.d.ts CHANGED
@@ -27,7 +27,7 @@ export interface OverlayProps extends TransitionCallbacks {
27
27
  popperConfig?: object;
28
28
  rootClose?: boolean;
29
29
  rootCloseEvent?: 'click' | 'mousedown';
30
- onHide?: () => void;
30
+ onHide?: (event: React.SyntheticEvent) => void;
31
31
  transition?: boolean | React.ElementType;
32
32
  placement?: Placement;
33
33
  }
@@ -10,6 +10,7 @@ export interface OverlayTriggerProps
10
10
  trigger?: TriggerType | TriggerType[];
11
11
  delay?: number | { show: number; hide: number };
12
12
  defaultShow?: boolean;
13
+ flip?: boolean;
13
14
  overlay: React.ReactNode | (() => React.ReactNode);
14
15
  target?: never;
15
16
  onHide?: never;
package/ToggleButton.d.ts CHANGED
@@ -12,7 +12,6 @@ export interface ToggleButtonProps {
12
12
  onChange?: React.ChangeEventHandler<this>;
13
13
  value: unknown;
14
14
  inputRef?: React.LegacyRef<this>;
15
- innerRef?: React.LegacyRef<this>;
16
15
  }
17
16
 
18
17
  declare class ToggleButton<
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
13
13
 
14
- var _querySelectorAll = _interopRequireDefault(require("dom-helpers/query/querySelectorAll"));
14
+ var _querySelectorAll = _interopRequireDefault(require("dom-helpers/querySelectorAll"));
15
15
 
16
16
  var _react = _interopRequireWildcard(require("react"));
17
17
 
package/cjs/Alert.js CHANGED
@@ -17,9 +17,9 @@ var _uncontrollable = require("uncontrollable");
17
17
 
18
18
  var _useEventCallback = _interopRequireDefault(require("@restart/hooks/useEventCallback"));
19
19
 
20
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
20
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
21
21
 
22
- var _divWithClassName = _interopRequireDefault(require("./utils/divWithClassName"));
22
+ var _divWithClassName = _interopRequireDefault(require("./divWithClassName"));
23
23
 
24
24
  var _ThemeProvider = require("./ThemeProvider");
25
25
 
@@ -59,6 +59,7 @@ var Alert = _react.default.forwardRef(function (uncontrolledProps, ref) {
59
59
  var alert = _react.default.createElement("div", (0, _extends2.default)({
60
60
  role: "alert"
61
61
  }, Transition ? props : undefined, {
62
+ ref: ref,
62
63
  className: (0, _classnames.default)(className, prefix, variant && prefix + "-" + variant, dismissible && prefix + "-dismissible")
63
64
  }), dismissible && _react.default.createElement(_CloseButton.default, {
64
65
  onClick: handleClose,
@@ -67,8 +68,7 @@ var Alert = _react.default.forwardRef(function (uncontrolledProps, ref) {
67
68
 
68
69
  if (!Transition) return show ? alert : null;
69
70
  return _react.default.createElement(Transition, (0, _extends2.default)({
70
- unmountOnExit: true,
71
- ref: ref
71
+ unmountOnExit: true
72
72
  }, props, {
73
73
  in: show
74
74
  }), alert);
@@ -7,11 +7,11 @@ exports.default = void 0;
7
7
 
8
8
  var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
9
9
 
10
- var _querySelectorAll = _interopRequireDefault(require("dom-helpers/query/querySelectorAll"));
10
+ var _css3 = _interopRequireDefault(require("dom-helpers/css"));
11
11
 
12
- var _style = _interopRequireDefault(require("dom-helpers/style"));
12
+ var _querySelectorAll = _interopRequireDefault(require("dom-helpers/querySelectorAll"));
13
13
 
14
- var _scrollbarSize = _interopRequireDefault(require("dom-helpers/util/scrollbarSize"));
14
+ var _scrollbarSize = _interopRequireDefault(require("dom-helpers/scrollbarSize"));
15
15
 
16
16
  var _ModalManager2 = _interopRequireDefault(require("react-overlays/ModalManager"));
17
17
 
@@ -36,17 +36,21 @@ function (_ModalManager) {
36
36
  _this = _ModalManager.call.apply(_ModalManager, [this].concat(args)) || this;
37
37
 
38
38
  _this.adjustAndStore = function (prop, element, adjust) {
39
+ var _css;
40
+
39
41
  var actual = element.style[prop];
40
42
  element.dataset[prop] = actual;
41
- (0, _style.default)(element, prop, parseFloat((0, _style.default)(element, prop)) + adjust + "px");
43
+ (0, _css3.default)(element, (_css = {}, _css[prop] = parseFloat((0, _css3.default)(element, prop)) + adjust + "px", _css));
42
44
  };
43
45
 
44
46
  _this.restore = function (prop, element) {
45
47
  var value = element.dataset[prop];
46
48
 
47
49
  if (value !== undefined) {
50
+ var _css2;
51
+
48
52
  delete element.dataset[prop];
49
- (0, _style.default)(element, prop, value);
53
+ (0, _css3.default)(element, (_css2 = {}, _css2[prop] = value, _css2));
50
54
  }
51
55
  };
52
56
 
package/cjs/Card.js CHANGED
@@ -17,9 +17,9 @@ var _react = _interopRequireWildcard(require("react"));
17
17
 
18
18
  var _ThemeProvider = require("./ThemeProvider");
19
19
 
20
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
20
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
21
21
 
22
- var _divWithClassName = _interopRequireDefault(require("./utils/divWithClassName"));
22
+ var _divWithClassName = _interopRequireDefault(require("./divWithClassName"));
23
23
 
24
24
  var _CardContext = _interopRequireDefault(require("./CardContext"));
25
25
 
@@ -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)('card-columns');
11
11
 
package/cjs/CardDeck.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)('card-deck');
11
11
 
package/cjs/CardGroup.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)('card-group');
11
11
 
package/cjs/Carousel.js CHANGED
@@ -15,9 +15,9 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
15
15
 
16
16
  var _classnames = _interopRequireDefault(require("classnames"));
17
17
 
18
- var _style = _interopRequireDefault(require("dom-helpers/style"));
18
+ var _css = _interopRequireDefault(require("dom-helpers/css"));
19
19
 
20
- var _transition = _interopRequireDefault(require("dom-helpers/transition"));
20
+ var _transitionEnd = _interopRequireDefault(require("dom-helpers/transitionEnd"));
21
21
 
22
22
  var _react = _interopRequireWildcard(require("react"));
23
23
 
@@ -27,14 +27,14 @@ var _CarouselCaption = _interopRequireDefault(require("./CarouselCaption"));
27
27
 
28
28
  var _CarouselItem = _interopRequireDefault(require("./CarouselItem"));
29
29
 
30
- var _SafeAnchor = _interopRequireDefault(require("./SafeAnchor"));
31
-
32
- var _ElementChildren = require("./utils/ElementChildren");
30
+ var _ElementChildren = require("./ElementChildren");
33
31
 
34
- var _triggerBrowserReflow = _interopRequireDefault(require("./utils/triggerBrowserReflow"));
32
+ var _SafeAnchor = _interopRequireDefault(require("./SafeAnchor"));
35
33
 
36
34
  var _ThemeProvider = require("./ThemeProvider");
37
35
 
36
+ var _triggerBrowserReflow = _interopRequireDefault(require("./triggerBrowserReflow"));
37
+
38
38
  var countChildren = function countChildren(c) {
39
39
  return _react.default.Children.toArray(c).filter(_react.default.isValidElement).length;
40
40
  };
@@ -143,7 +143,7 @@ function (_React$Component) {
143
143
  };
144
144
 
145
145
  _this.handleNextWhenVisible = function () {
146
- if (!_this.isUnmounted && !document.hidden && (0, _style.default)(_this.carousel.current, 'visibility') !== 'hidden') {
146
+ if (!_this.isUnmounted && !document.hidden && (0, _css.default)(_this.carousel.current, 'visibility') !== 'hidden') {
147
147
  _this.handleNext();
148
148
  }
149
149
  };
@@ -248,7 +248,7 @@ function (_React$Component) {
248
248
  prevClasses: (0, _classnames.default)('active', directionalClassName),
249
249
  currentClasses: (0, _classnames.default)(orderClassName, directionalClassName)
250
250
  }, function () {
251
- return _transition.default.end(nextElement, function () {
251
+ return (0, _transitionEnd.default)(nextElement, function () {
252
252
  _this2.safeSetState({
253
253
  prevClasses: '',
254
254
  currentClasses: 'active'
@@ -416,7 +416,7 @@ function (_React$Component) {
416
416
  var current = index === activeIndex;
417
417
  var previous = index === previousActiveIndex;
418
418
  return (0, _react.cloneElement)(child, {
419
- className: (0, _classnames.default)(child.props.className, bsPrefix + "-item", current && currentClasses, previous && prevClasses)
419
+ className: (0, _classnames.default)(child.props.className, current && currentClasses, previous && prevClasses)
420
420
  });
421
421
  })), controls && this.renderControls({
422
422
  wrap: wrap,
@@ -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)('carousel-caption', {
11
11
  Component: 'div'
@@ -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)('carousel-item');
11
11
 
package/cjs/Collapse.js CHANGED
@@ -15,17 +15,17 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
15
15
 
16
16
  var _classnames = _interopRequireDefault(require("classnames"));
17
17
 
18
- var _style = _interopRequireDefault(require("dom-helpers/style"));
18
+ var _css = _interopRequireDefault(require("dom-helpers/css"));
19
19
 
20
- var _react = _interopRequireDefault(require("react"));
20
+ var _transitionEnd = _interopRequireDefault(require("dom-helpers/transitionEnd"));
21
21
 
22
- var _end = _interopRequireDefault(require("dom-helpers/transition/end"));
22
+ var _react = _interopRequireDefault(require("react"));
23
23
 
24
24
  var _Transition = _interopRequireWildcard(require("react-transition-group/Transition"));
25
25
 
26
- var _triggerBrowserReflow = _interopRequireDefault(require("./utils/triggerBrowserReflow"));
26
+ var _createChainedFunction = _interopRequireDefault(require("./createChainedFunction"));
27
27
 
28
- var _createChainedFunction = _interopRequireDefault(require("./utils/createChainedFunction"));
28
+ var _triggerBrowserReflow = _interopRequireDefault(require("./triggerBrowserReflow"));
29
29
 
30
30
  var _collapseStyles;
31
31
 
@@ -38,7 +38,7 @@ function getDimensionValue(dimension, elem) {
38
38
  var offset = "offset" + dimension[0].toUpperCase() + dimension.slice(1);
39
39
  var value = elem[offset];
40
40
  var margins = MARGINS[dimension];
41
- return value + parseInt((0, _style.default)(elem, margins[0]), 10) + parseInt((0, _style.default)(elem, margins[1]), 10);
41
+ return value + parseInt((0, _css.default)(elem, margins[0]), 10) + parseInt((0, _css.default)(elem, margins[1]), 10);
42
42
  }
43
43
 
44
44
  var collapseStyles = (_collapseStyles = {}, _collapseStyles[_Transition.EXITED] = 'collapse', _collapseStyles[_Transition.EXITING] = 'collapsing', _collapseStyles[_Transition.ENTERING] = 'collapsing', _collapseStyles[_Transition.ENTERED] = 'collapse show', _collapseStyles);
@@ -128,7 +128,7 @@ function (_React$Component) {
128
128
  var handleExit = (0, _createChainedFunction.default)(this.handleExit, onExit);
129
129
  var handleExiting = (0, _createChainedFunction.default)(this.handleExiting, onExiting);
130
130
  return _react.default.createElement(_Transition.default, (0, _extends2.default)({
131
- addEndListener: _end.default
131
+ addEndListener: _transitionEnd.default
132
132
  }, props, {
133
133
  "aria-expanded": props.role ? props.in : null,
134
134
  onEnter: handleEnter,
package/cjs/Container.js CHANGED
@@ -19,8 +19,7 @@ var defaultProps = {
19
19
  fluid: false
20
20
  };
21
21
 
22
- var Container = _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
- function (_ref, ref) {
22
+ var Container = _react.default.forwardRef(function (_ref, ref) {
24
23
  var bsPrefix = _ref.bsPrefix,
25
24
  fluid = _ref.fluid,
26
25
  _ref$as = _ref.as,
@@ -28,10 +27,11 @@ function (_ref, ref) {
28
27
  className = _ref.className,
29
28
  props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "fluid", "as", "className"]);
30
29
  var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'container');
30
+ var suffix = typeof fluid === 'string' ? "-" + fluid : '-fluid';
31
31
  return _react.default.createElement(Component, (0, _extends2.default)({
32
32
  ref: ref
33
33
  }, props, {
34
- className: (0, _classnames.default)(className, fluid ? prefix + "-fluid" : prefix)
34
+ className: (0, _classnames.default)(className, fluid ? "" + prefix + suffix : prefix)
35
35
  }));
36
36
  });
37
37
 
package/cjs/Dropdown.js CHANGED
@@ -21,17 +21,17 @@ var _uncontrollable = require("uncontrollable");
21
21
 
22
22
  var _useEventCallback = _interopRequireDefault(require("@restart/hooks/useEventCallback"));
23
23
 
24
- var _ThemeProvider = require("./ThemeProvider");
24
+ var _DropdownItem = _interopRequireDefault(require("./DropdownItem"));
25
25
 
26
26
  var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
27
27
 
28
28
  var _DropdownToggle = _interopRequireDefault(require("./DropdownToggle"));
29
29
 
30
- var _DropdownItem = _interopRequireDefault(require("./DropdownItem"));
31
-
32
30
  var _SelectableContext = _interopRequireDefault(require("./SelectableContext"));
33
31
 
34
- var _createWithBsPrefix = _interopRequireDefault(require("./utils/createWithBsPrefix"));
32
+ var _ThemeProvider = require("./ThemeProvider");
33
+
34
+ var _createWithBsPrefix = _interopRequireDefault(require("./createWithBsPrefix"));
35
35
 
36
36
  var defaultProps = {
37
37
  navbar: false
@@ -73,7 +73,7 @@ var Dropdown = _react.default.forwardRef(function (uncontrolledProps, ref) {
73
73
  });
74
74
  return _react.default.createElement(_SelectableContext.default.Provider, {
75
75
  value: handleSelect
76
- }, _react.default.createElement(_Dropdown.default.ControlledComponent, {
76
+ }, _react.default.createElement(_Dropdown.default, {
77
77
  drop: drop,
78
78
  show: show,
79
79
  alignEnd: alignRight,
@@ -13,25 +13,17 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
16
- var _reactDom = require("react-dom");
17
-
18
16
  var _react = _interopRequireWildcard(require("react"));
19
17
 
20
- var _DropdownMenu = _interopRequireDefault(require("react-overlays/DropdownMenu"));
18
+ var _DropdownMenu = require("react-overlays/DropdownMenu");
19
+
20
+ var _useMergedRefs = _interopRequireDefault(require("@restart/hooks/useMergedRefs"));
21
21
 
22
22
  var _NavbarContext = _interopRequireDefault(require("./NavbarContext"));
23
23
 
24
24
  var _ThemeProvider = require("./ThemeProvider");
25
25
 
26
- var wrapRef = function wrapRef(props) {
27
- var ref = props.ref;
28
-
29
- props.ref = ref.__wrapped || (ref.__wrapped = function (r) {
30
- return ref((0, _reactDom.findDOMNode)(r));
31
- });
32
-
33
- return props;
34
- };
26
+ var _useWrappedRefWithWarning = _interopRequireDefault(require("./useWrappedRefWithWarning"));
35
27
 
36
28
  var defaultProps = {
37
29
  alignRight: false,
@@ -51,43 +43,44 @@ var DropdownMenu = _react.default.forwardRef(function (_ref, ref) {
51
43
  props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "className", "alignRight", "rootCloseEvent", "flip", "popperConfig", "show", "as"]);
52
44
  var isNavbar = (0, _react.useContext)(_NavbarContext.default);
53
45
  var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'dropdown-menu');
54
- return _react.default.createElement(_DropdownMenu.default, {
55
- ref: ref // FIXME: the ref situation is out of hand here
56
- ,
46
+
47
+ var _useDropdownMenu = (0, _DropdownMenu.useDropdownMenu)({
57
48
  flip: flip,
49
+ popperConfig: popperConfig,
50
+ rootCloseEvent: rootCloseEvent,
58
51
  show: showProps,
59
52
  alignEnd: alignRight,
60
- usePopper: !isNavbar,
61
- popperConfig: popperConfig,
62
- rootCloseEvent: rootCloseEvent
63
- }, function (_ref2) {
64
- var placement = _ref2.placement,
65
- show = _ref2.show,
66
- alignEnd = _ref2.alignEnd,
67
- close = _ref2.close,
68
- menuProps = _ref2.props;
69
- wrapRef(menuProps); // For custom components provide additional, non-DOM, props;
70
-
71
- if (typeof Component !== 'string') {
72
- menuProps.show = show;
73
- menuProps.close = close;
74
- menuProps.alignRight = alignEnd;
75
- }
76
-
77
- var style = props.style;
78
-
79
- if (placement) {
80
- // we don't need the default popper style,
81
- // menus are display: none when not shown.
82
- style = (0, _extends2.default)({}, style, {}, menuProps.style);
83
- props['x-placement'] = placement;
84
- }
85
-
86
- return _react.default.createElement(Component, (0, _extends2.default)({}, props, menuProps, {
87
- style: style,
88
- className: (0, _classnames.default)(className, prefix, show && 'show', alignEnd && prefix + "-right")
89
- }));
90
- });
53
+ usePopper: !isNavbar
54
+ }),
55
+ hasShown = _useDropdownMenu.hasShown,
56
+ placement = _useDropdownMenu.placement,
57
+ show = _useDropdownMenu.show,
58
+ alignEnd = _useDropdownMenu.alignEnd,
59
+ close = _useDropdownMenu.close,
60
+ menuProps = _useDropdownMenu.props;
61
+
62
+ menuProps.ref = (0, _useMergedRefs.default)(menuProps.ref, (0, _useWrappedRefWithWarning.default)(ref, 'DropdownMenu'));
63
+ if (!hasShown) return null; // For custom components provide additional, non-DOM, props;
64
+
65
+ if (typeof Component !== 'string') {
66
+ menuProps.show = show;
67
+ menuProps.close = close;
68
+ menuProps.alignRight = alignEnd;
69
+ }
70
+
71
+ var style = props.style;
72
+
73
+ if (placement) {
74
+ // we don't need the default popper style,
75
+ // menus are display: none when not shown.
76
+ style = (0, _extends2.default)({}, style, {}, menuProps.style);
77
+ props['x-placement'] = placement;
78
+ }
79
+
80
+ return _react.default.createElement(Component, (0, _extends2.default)({}, props, menuProps, {
81
+ style: style,
82
+ className: (0, _classnames.default)(className, prefix, show && 'show', alignEnd && prefix + "-right")
83
+ }));
91
84
  });
92
85
 
93
86
  DropdownMenu.displayName = 'DropdownMenu';
@@ -9,78 +9,51 @@ 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 _classnames = _interopRequireDefault(require("classnames"));
15
13
 
16
- var _reactDom = require("react-dom");
17
-
18
14
  var _isRequiredForA11y = _interopRequireDefault(require("prop-types-extra/lib/isRequiredForA11y"));
19
15
 
20
- var _DropdownToggle = _interopRequireDefault(require("react-overlays/DropdownToggle"));
21
-
22
16
  var _react = _interopRequireDefault(require("react"));
23
17
 
24
- var _Button = _interopRequireDefault(require("./Button"));
25
-
26
- var _ThemeProvider = require("./ThemeProvider");
27
-
28
- var wrapRef = function wrapRef(props) {
29
- var ref = props.ref;
18
+ var _DropdownToggle = require("react-overlays/DropdownToggle");
30
19
 
31
- props.ref = ref.__wrapped || (ref.__wrapped = function (r) {
32
- return ref((0, _reactDom.findDOMNode)(r));
33
- });
20
+ var _useMergedRefs = _interopRequireDefault(require("@restart/hooks/useMergedRefs"));
34
21
 
35
- return props;
36
- };
22
+ var _Button = _interopRequireDefault(require("./Button"));
37
23
 
38
- var DropdownToggle =
39
- /*#__PURE__*/
40
- function (_React$Component) {
41
- (0, _inheritsLoose2.default)(DropdownToggle, _React$Component);
24
+ var _ThemeProvider = require("./ThemeProvider");
42
25
 
43
- function DropdownToggle() {
44
- return _React$Component.apply(this, arguments) || this;
26
+ var _useWrappedRefWithWarning = _interopRequireDefault(require("./useWrappedRefWithWarning"));
27
+
28
+ var DropdownToggle = _react.default.forwardRef(function (_ref, ref) {
29
+ var bsPrefix = _ref.bsPrefix,
30
+ split = _ref.split,
31
+ className = _ref.className,
32
+ children = _ref.children,
33
+ childBsPrefix = _ref.childBsPrefix,
34
+ _ref$as = _ref.as,
35
+ Component = _ref$as === void 0 ? _Button.default : _ref$as,
36
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "split", "className", "children", "childBsPrefix", "as"]);
37
+ var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'dropdown-toggle');
38
+
39
+ if (childBsPrefix !== undefined) {
40
+ props.bsPrefix = childBsPrefix;
45
41
  }
46
42
 
47
- var _proto = DropdownToggle.prototype;
48
-
49
- _proto.render = function render() {
50
- var _this$props = this.props,
51
- bsPrefix = _this$props.bsPrefix,
52
- split = _this$props.split,
53
- className = _this$props.className,
54
- children = _this$props.children,
55
- childBsPrefix = _this$props.childBsPrefix,
56
- Component = _this$props.as,
57
- props = (0, _objectWithoutPropertiesLoose2.default)(_this$props, ["bsPrefix", "split", "className", "children", "childBsPrefix", "as"]);
58
-
59
- if (childBsPrefix !== undefined) {
60
- props.bsPrefix = childBsPrefix;
61
- } // This intentionally forwards size and variant (if set) to the
62
- // underlying component, to allow it to render size and style variants.
63
-
64
-
65
- return _react.default.createElement(_DropdownToggle.default, null, function (_ref) {
66
- var toggle = _ref.toggle,
67
- toggleProps = _ref.props;
68
- return _react.default.createElement(Component, (0, _extends2.default)({
69
- onClick: toggle,
70
- className: (0, _classnames.default)(className, bsPrefix, split && bsPrefix + "-split")
71
- }, wrapRef(toggleProps), props), children);
72
- });
73
- };
74
-
75
- return DropdownToggle;
76
- }(_react.default.Component); // Needs to be a class FTM, because it needs to accept a ref that can be used with findDOMNode
77
-
43
+ var _useDropdownToggle = (0, _DropdownToggle.useDropdownToggle)(),
44
+ toggleProps = _useDropdownToggle[0],
45
+ toggle = _useDropdownToggle[1].toggle;
78
46
 
79
- DropdownToggle.defaultProps = {
80
- as: _Button.default
81
- };
47
+ toggleProps.ref = (0, _useMergedRefs.default)(toggleProps.ref, (0, _useWrappedRefWithWarning.default)(ref, 'DropdownToggle')); // This intentionally forwards size and variant (if set) to the
48
+ // underlying component, to allow it to render size and style variants.
82
49
 
83
- var _default = (0, _ThemeProvider.createBootstrapComponent)(DropdownToggle, 'dropdown-toggle');
50
+ return _react.default.createElement(Component, (0, _extends2.default)({
51
+ onClick: toggle,
52
+ className: (0, _classnames.default)(className, prefix, split && prefix + "-split")
53
+ }, toggleProps, props), children);
54
+ });
84
55
 
56
+ DropdownToggle.displayName = 'DropdownToggle';
57
+ var _default = DropdownToggle;
85
58
  exports.default = _default;
86
59
  module.exports = exports["default"];