react-bootstrap 1.2.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 (145) hide show
  1. package/README.md +1 -1
  2. package/cjs/AccordionCollapse.js +9 -3
  3. package/cjs/Alert.d.ts +2 -2
  4. package/cjs/Button.d.ts +2 -1
  5. package/cjs/Button.js +1 -1
  6. package/cjs/Card.d.ts +8 -8
  7. package/cjs/CardColumns.d.ts +1 -1
  8. package/cjs/CardDeck.d.ts +1 -1
  9. package/cjs/CardGroup.d.ts +1 -1
  10. package/cjs/Carousel.d.ts +1 -1
  11. package/cjs/Carousel.js +22 -4
  12. package/cjs/CarouselCaption.d.ts +1 -1
  13. package/cjs/CarouselItem.d.ts +7 -2
  14. package/cjs/CarouselItem.js +25 -2
  15. package/cjs/Dropdown.d.ts +4 -2
  16. package/cjs/Dropdown.js +4 -0
  17. package/cjs/DropdownButton.d.ts +3 -2
  18. package/cjs/DropdownButton.js +16 -3
  19. package/cjs/DropdownItem.js +3 -2
  20. package/cjs/DropdownMenu.d.ts +24 -3
  21. package/cjs/DropdownMenu.js +47 -9
  22. package/cjs/DropdownToggle.js +2 -3
  23. package/cjs/Fade.d.ts +6 -3
  24. package/cjs/Figure.d.ts +2 -2
  25. package/cjs/FigureCaption.d.ts +1 -1
  26. package/cjs/Form.d.ts +4 -4
  27. package/cjs/Form.js +12 -12
  28. package/cjs/FormCheck.d.ts +1 -3
  29. package/cjs/FormCheck.js +1 -1
  30. package/cjs/FormFile.js +2 -0
  31. package/cjs/FormLabel.js +1 -1
  32. package/cjs/InputGroup.d.ts +4 -3
  33. package/cjs/ListGroupItem.js +2 -1
  34. package/cjs/Media.d.ts +1 -1
  35. package/cjs/Modal.d.ts +1 -0
  36. package/cjs/Modal.js +4 -2
  37. package/cjs/ModalBody.d.ts +1 -1
  38. package/cjs/ModalDialog.d.ts +2 -1
  39. package/cjs/ModalDialog.js +3 -2
  40. package/cjs/ModalFooter.d.ts +1 -1
  41. package/cjs/ModalTitle.d.ts +1 -1
  42. package/cjs/NavContext.js +1 -0
  43. package/cjs/NavDropdown.d.ts +4 -3
  44. package/cjs/NavDropdown.js +1 -0
  45. package/cjs/Navbar.d.ts +1 -1
  46. package/cjs/Overlay.d.ts +6 -5
  47. package/cjs/Overlay.js +8 -6
  48. package/cjs/OverlayTrigger.d.ts +5 -2
  49. package/cjs/OverlayTrigger.js +29 -50
  50. package/cjs/PageItem.d.ts +3 -2
  51. package/cjs/Popover.d.ts +2 -5
  52. package/cjs/Popover.js +1 -6
  53. package/cjs/ProgressBar.d.ts +1 -2
  54. package/cjs/SafeAnchor.d.ts +1 -3
  55. package/cjs/Spinner.d.ts +1 -1
  56. package/cjs/SplitButton.d.ts +4 -1
  57. package/cjs/SplitButton.js +15 -2
  58. package/cjs/TabContainer.d.ts +1 -1
  59. package/cjs/TabPane.d.ts +0 -1
  60. package/cjs/Tabs.d.ts +1 -1
  61. package/cjs/ThemeProvider.d.ts +1 -1
  62. package/cjs/Toast.d.ts +1 -1
  63. package/cjs/ToastBody.d.ts +1 -1
  64. package/cjs/ToggleButton.d.ts +2 -2
  65. package/cjs/ToggleButtonGroup.d.ts +4 -3
  66. package/cjs/ToggleButtonGroup.js +2 -1
  67. package/cjs/Tooltip.d.ts +4 -7
  68. package/cjs/helpers.d.ts +3 -3
  69. package/cjs/index.d.ts +1 -0
  70. package/cjs/usePopperMarginModifiers.d.ts +4 -1
  71. package/cjs/usePopperMarginModifiers.js +41 -5
  72. package/dist/react-bootstrap.js +757 -484
  73. package/dist/react-bootstrap.min.js +2 -2
  74. package/esm/AccordionCollapse.js +8 -3
  75. package/esm/Alert.d.ts +2 -2
  76. package/esm/Button.d.ts +2 -1
  77. package/esm/Button.js +1 -1
  78. package/esm/Card.d.ts +8 -8
  79. package/esm/CardColumns.d.ts +1 -1
  80. package/esm/CardDeck.d.ts +1 -1
  81. package/esm/CardGroup.d.ts +1 -1
  82. package/esm/Carousel.d.ts +1 -1
  83. package/esm/Carousel.js +23 -5
  84. package/esm/CarouselCaption.d.ts +1 -1
  85. package/esm/CarouselItem.d.ts +7 -2
  86. package/esm/CarouselItem.js +22 -2
  87. package/esm/Dropdown.d.ts +4 -2
  88. package/esm/Dropdown.js +4 -0
  89. package/esm/DropdownButton.d.ts +3 -2
  90. package/esm/DropdownButton.js +14 -3
  91. package/esm/DropdownItem.js +3 -2
  92. package/esm/DropdownMenu.d.ts +24 -3
  93. package/esm/DropdownMenu.js +40 -6
  94. package/esm/DropdownToggle.js +2 -3
  95. package/esm/Fade.d.ts +6 -3
  96. package/esm/Figure.d.ts +2 -2
  97. package/esm/FigureCaption.d.ts +1 -1
  98. package/esm/Form.d.ts +4 -4
  99. package/esm/Form.js +12 -12
  100. package/esm/FormCheck.d.ts +1 -3
  101. package/esm/FormCheck.js +1 -1
  102. package/esm/FormFile.js +2 -0
  103. package/esm/FormLabel.js +1 -1
  104. package/esm/InputGroup.d.ts +4 -3
  105. package/esm/ListGroupItem.js +2 -1
  106. package/esm/Media.d.ts +1 -1
  107. package/esm/Modal.d.ts +1 -0
  108. package/esm/Modal.js +4 -2
  109. package/esm/ModalBody.d.ts +1 -1
  110. package/esm/ModalDialog.d.ts +2 -1
  111. package/esm/ModalDialog.js +3 -2
  112. package/esm/ModalFooter.d.ts +1 -1
  113. package/esm/ModalTitle.d.ts +1 -1
  114. package/esm/NavContext.js +1 -0
  115. package/esm/NavDropdown.d.ts +4 -3
  116. package/esm/NavDropdown.js +1 -0
  117. package/esm/Navbar.d.ts +1 -1
  118. package/esm/Overlay.d.ts +6 -5
  119. package/esm/Overlay.js +8 -6
  120. package/esm/OverlayTrigger.d.ts +5 -2
  121. package/esm/OverlayTrigger.js +31 -50
  122. package/esm/PageItem.d.ts +3 -2
  123. package/esm/Popover.d.ts +2 -5
  124. package/esm/Popover.js +1 -6
  125. package/esm/ProgressBar.d.ts +1 -2
  126. package/esm/SafeAnchor.d.ts +1 -3
  127. package/esm/Spinner.d.ts +1 -1
  128. package/esm/SplitButton.d.ts +4 -1
  129. package/esm/SplitButton.js +14 -2
  130. package/esm/TabContainer.d.ts +1 -1
  131. package/esm/TabContext.js +1 -3
  132. package/esm/TabPane.d.ts +0 -1
  133. package/esm/Tabs.d.ts +1 -1
  134. package/esm/ThemeProvider.d.ts +1 -1
  135. package/esm/Toast.d.ts +1 -1
  136. package/esm/ToastBody.d.ts +1 -1
  137. package/esm/ToggleButton.d.ts +2 -2
  138. package/esm/ToggleButtonGroup.d.ts +4 -3
  139. package/esm/ToggleButtonGroup.js +2 -1
  140. package/esm/Tooltip.d.ts +4 -7
  141. package/esm/helpers.d.ts +3 -3
  142. package/esm/index.d.ts +1 -0
  143. package/esm/usePopperMarginModifiers.d.ts +4 -1
  144. package/esm/usePopperMarginModifiers.js +40 -5
  145. package/package.json +26 -26
@@ -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/Figure.d.ts CHANGED
@@ -1,7 +1,7 @@
1
- /// <reference types="react" />
1
+ import { BsPrefixRefForwardingComponent } from './helpers';
2
2
  import FigureImage from './FigureImage';
3
3
  import FigureCaption from './FigureCaption';
4
- declare type Figure = React.ComponentType & {
4
+ declare type Figure = BsPrefixRefForwardingComponent<'figure'> & {
5
5
  Image: typeof FigureImage;
6
6
  Caption: typeof FigureCaption;
7
7
  };
@@ -1,2 +1,2 @@
1
- declare const FigureCaption: import("./helpers").BsPrefixRefForwardingComponent<"figcaption", {}>;
1
+ declare const FigureCaption: import("./helpers").BsPrefixRefForwardingComponent<"figcaption", unknown>;
2
2
  export default FigureCaption;
package/cjs/Form.d.ts CHANGED
@@ -7,8 +7,8 @@ import FormLabel from './FormLabel';
7
7
  import FormText from './FormText';
8
8
  import Switch from './Switch';
9
9
  import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
10
- declare const FormRow: BsPrefixRefForwardingComponent<"div", {}>;
11
- export interface FormProps extends React.HTMLAttributes<HTMLElement>, BsPrefixProps {
10
+ declare const FormRow: BsPrefixRefForwardingComponent<"div", unknown>;
11
+ export interface FormProps extends React.HTMLAttributes<HTMLFormElement>, BsPrefixProps {
12
12
  inline?: boolean;
13
13
  validated?: boolean;
14
14
  }
@@ -22,5 +22,5 @@ declare type Form = BsPrefixRefForwardingComponent<'form', FormProps> & {
22
22
  Label: typeof FormLabel;
23
23
  Text: typeof FormText;
24
24
  };
25
- declare const Form: Form;
26
- export default Form;
25
+ declare const FormImpl: Form;
26
+ export default FormImpl;
package/cjs/Form.js CHANGED
@@ -36,7 +36,7 @@ var defaultProps = {
36
36
  inline: false
37
37
  };
38
38
 
39
- var Form = _react.default.forwardRef(function (_ref, ref) {
39
+ var FormImpl = _react.default.forwardRef(function (_ref, ref) {
40
40
  var bsPrefix = _ref.bsPrefix,
41
41
  inline = _ref.inline,
42
42
  className = _ref.className,
@@ -51,16 +51,16 @@ var Form = _react.default.forwardRef(function (_ref, ref) {
51
51
  }));
52
52
  });
53
53
 
54
- Form.displayName = 'Form';
55
- Form.defaultProps = defaultProps;
56
- Form.Row = FormRow;
57
- Form.Group = _FormGroup.default;
58
- Form.Control = _FormControl.default;
59
- Form.Check = _FormCheck.default;
60
- Form.File = _FormFile.default;
61
- Form.Switch = _Switch.default;
62
- Form.Label = _FormLabel.default;
63
- Form.Text = _FormText.default;
64
- var _default = Form;
54
+ FormImpl.displayName = 'Form';
55
+ FormImpl.defaultProps = defaultProps;
56
+ FormImpl.Row = FormRow;
57
+ FormImpl.Group = _FormGroup.default;
58
+ FormImpl.Control = _FormControl.default;
59
+ FormImpl.Check = _FormCheck.default;
60
+ FormImpl.File = _FormFile.default;
61
+ FormImpl.Switch = _Switch.default;
62
+ FormImpl.Label = _FormLabel.default;
63
+ FormImpl.Text = _FormText.default;
64
+ var _default = FormImpl;
65
65
  exports.default = _default;
66
66
  module.exports = exports["default"];
@@ -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/FormFile.js CHANGED
@@ -94,6 +94,8 @@ var FormFile = _react.default.forwardRef(function (_ref, ref) {
94
94
  });
95
95
 
96
96
  FormFile.displayName = 'FormFile';
97
+ FormFile.Input = _FormFileInput.default;
98
+ FormFile.Label = _FormFileLabel.default;
97
99
  var _default = FormFile;
98
100
  exports.default = _default;
99
101
  module.exports = exports["default"];
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;
@@ -1,7 +1,8 @@
1
+ /// <reference types="react" />
1
2
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
2
- declare const InputGroupAppend: BsPrefixRefForwardingComponent<"div", {}>;
3
- declare const InputGroupPrepend: BsPrefixRefForwardingComponent<"div", {}>;
4
- declare const InputGroupText: BsPrefixRefForwardingComponent<"span", {}>;
3
+ declare const InputGroupAppend: BsPrefixRefForwardingComponent<"div", unknown>;
4
+ declare const InputGroupPrepend: BsPrefixRefForwardingComponent<"div", unknown>;
5
+ declare const InputGroupText: BsPrefixRefForwardingComponent<"span", unknown>;
5
6
  declare const InputGroupCheckbox: (props: any) => JSX.Element;
6
7
  declare const InputGroupRadio: (props: any) => JSX.Element;
7
8
  export interface InputGroupProps extends BsPrefixPropsWithChildren {
@@ -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/Media.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
2
- declare const MediaBody: BsPrefixRefForwardingComponent<"div", {}>;
2
+ declare const MediaBody: BsPrefixRefForwardingComponent<"div", unknown>;
3
3
  declare type MediaProps = BsPrefixProps;
4
4
  declare type Media = BsPrefixRefForwardingComponent<'div', MediaProps> & {
5
5
  Body: typeof MediaBody;
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
 
@@ -1,2 +1,2 @@
1
- declare const _default: import("./helpers").BsPrefixRefForwardingComponent<"div", {}>;
1
+ declare const _default: import("./helpers").BsPrefixRefForwardingComponent<"div", unknown>;
2
2
  export default _default;
@@ -1,9 +1,10 @@
1
1
  import React from 'react';
2
2
  import { BsPrefixPropsWithChildren } from './helpers';
3
- export interface ModalDialogProps extends BsPrefixPropsWithChildren {
3
+ export interface ModalDialogProps extends React.HTMLAttributes<HTMLDivElement>, BsPrefixPropsWithChildren {
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,2 +1,2 @@
1
- declare const _default: import("./helpers").BsPrefixRefForwardingComponent<"div", {}>;
1
+ declare const _default: import("./helpers").BsPrefixRefForwardingComponent<"div", unknown>;
2
2
  export default _default;
@@ -1,3 +1,3 @@
1
1
  /// <reference types="react" />
2
- declare const _default: import("./helpers").BsPrefixRefForwardingComponent<import("react").ForwardRefExoticComponent<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "slot" | "style" | "title" | "className" | "key" | "onKeyDown" | "onSelect" | "role" | "color" | "id" | "lang" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is"> & import("react").RefAttributes<HTMLDivElement>>, {}>;
2
+ declare const _default: import("./helpers").BsPrefixRefForwardingComponent<import("react").ForwardRefExoticComponent<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "slot" | "style" | "title" | "className" | "key" | "onKeyDown" | "onSelect" | "role" | "color" | "id" | "lang" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is"> & import("react").RefAttributes<HTMLDivElement>>, unknown>;
3
3
  export default _default;
package/cjs/NavContext.js CHANGED
@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var NavContext = _react.default.createContext(null);
11
11
 
12
+ NavContext.displayName = 'NavContext';
12
13
  var _default = NavContext;
13
14
  exports.default = _default;
14
15
  module.exports = exports["default"];
@@ -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;
@@ -12,6 +12,7 @@ export interface NavDropdownProps extends BsPrefixPropsWithChildren {
12
12
  }
13
13
  declare type NavDropdown = BsPrefixRefForwardingComponent<'div', NavDropdownProps> & {
14
14
  Item: typeof Dropdown.Item;
15
+ ItemText: typeof Dropdown.ItemText;
15
16
  Divider: typeof Dropdown.Divider;
16
17
  Header: typeof Dropdown.Header;
17
18
  };
@@ -88,6 +88,7 @@ var NavDropdown = _react.default.forwardRef(function (_ref, ref) {
88
88
  NavDropdown.displayName = 'NavDropdown';
89
89
  NavDropdown.propTypes = propTypes;
90
90
  NavDropdown.Item = _Dropdown.default.Item;
91
+ NavDropdown.ItemText = _Dropdown.default.ItemText;
91
92
  NavDropdown.Divider = _Dropdown.default.Divider;
92
93
  NavDropdown.Header = _Dropdown.default.Header;
93
94
  var _default = NavDropdown;
package/cjs/Navbar.d.ts CHANGED
@@ -2,7 +2,7 @@ import NavbarBrand from './NavbarBrand';
2
2
  import NavbarCollapse from './NavbarCollapse';
3
3
  import NavbarToggle from './NavbarToggle';
4
4
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent, SelectCallback } from './helpers';
5
- declare const NavbarText: BsPrefixRefForwardingComponent<"span", {}>;
5
+ declare const NavbarText: BsPrefixRefForwardingComponent<"span", unknown>;
6
6
  export interface NavbarProps extends BsPrefixPropsWithChildren {
7
7
  variant?: 'light' | 'dark';
8
8
  expand?: boolean | 'sm' | 'md' | 'lg' | 'xl';
package/cjs/Overlay.d.ts CHANGED
@@ -3,14 +3,15 @@ import PropTypes from 'prop-types';
3
3
  import { OverlayProps as BaseOverlayProps } from 'react-overlays/Overlay';
4
4
  import { TransitionType } from './helpers';
5
5
  export declare type Placement = import('react-overlays/usePopper').Placement;
6
+ export declare type ArrowProps = {
7
+ ref: React.RefCallback<HTMLElement>;
8
+ style: React.CSSProperties;
9
+ };
6
10
  export interface OverlayInjectedProps {
7
11
  ref: React.RefCallback<HTMLElement>;
8
12
  style: React.CSSProperties;
9
13
  'aria-labelledby'?: string;
10
- arrowProps: {
11
- ref: React.RefCallback<HTMLElement>;
12
- style: React.CSSProperties;
13
- };
14
+ arrowProps: ArrowProps;
14
15
  show: boolean;
15
16
  placement: Placement;
16
17
  popper: {
@@ -96,7 +97,7 @@ declare namespace Overlay {
96
97
  placement: PropTypes.Requireable<string>;
97
98
  };
98
99
  var defaultProps: {
99
- 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>>>;
100
101
  rootClose: boolean;
101
102
  show: boolean;
102
103
  placement: string;
package/cjs/Overlay.js CHANGED
@@ -63,20 +63,22 @@ function Overlay(_ref) {
63
63
  }),
64
64
  transition: actualTransition
65
65
  }), function (_ref2) {
66
+ var _state$modifiersData$;
67
+
66
68
  var overlayProps = _ref2.props,
67
69
  arrowProps = _ref2.arrowProps,
68
70
  show = _ref2.show,
69
- state = _ref2.state,
70
- scheduleUpdate = _ref2.scheduleUpdate,
71
+ update = _ref2.update,
72
+ _ = _ref2.forceUpdate,
71
73
  placement = _ref2.placement,
72
- outOfBoundaries = _ref2.outOfBoundaries,
73
- props = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["props", "arrowProps", "show", "state", "scheduleUpdate", "placement", "outOfBoundaries"]);
74
+ state = _ref2.state,
75
+ props = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["props", "arrowProps", "show", "update", "forceUpdate", "placement", "state"]);
74
76
  wrapRefs(overlayProps, arrowProps);
75
77
  var popper = Object.assign(popperRef.current, {
76
78
  state: state,
77
- scheduleUpdate: scheduleUpdate,
79
+ scheduleUpdate: update,
78
80
  placement: placement,
79
- outOfBoundaries: outOfBoundaries
81
+ outOfBoundaries: (state == null ? void 0 : (_state$modifiersData$ = state.modifiersData.hide) == null ? void 0 : _state$modifiersData$.isReferenceHidden) || false
80
82
  });
81
83
  if (typeof overlay === 'function') return overlay((0, _extends2.default)({}, props, {}, overlayProps, {
82
84
  placement: placement,
@@ -9,8 +9,11 @@ export declare type OverlayDelay = number | {
9
9
  export declare type OverlayInjectedProps = {
10
10
  onFocus?: (...args: any[]) => any;
11
11
  };
12
+ export declare type OverlayTriggerRenderProps = OverlayInjectedProps & {
13
+ ref: React.Ref<any>;
14
+ };
12
15
  export interface OverlayTriggerProps extends Omit<OverlayProps, 'children' | 'target'> {
13
- children: React.ReactElement;
16
+ children: React.ReactElement | ((props: OverlayTriggerRenderProps) => React.ReactNode);
14
17
  trigger?: OverlayTriggerType | OverlayTriggerType[];
15
18
  delay?: OverlayDelay;
16
19
  show?: boolean;
@@ -24,7 +27,7 @@ export interface OverlayTriggerProps extends Omit<OverlayProps, 'children' | 'ta
24
27
  declare function OverlayTrigger({ trigger, overlay, children, popperConfig, show: propsShow, defaultShow, onToggle, delay: propsDelay, placement, flip, ...props }: OverlayTriggerProps): JSX.Element;
25
28
  declare namespace OverlayTrigger {
26
29
  var propTypes: {
27
- children: PropTypes.Validator<PropTypes.ReactElementLike>;
30
+ children: PropTypes.Validator<((...args: any[]) => any) | PropTypes.ReactElementLike>;
28
31
  /**
29
32
  * Specify which action or actions trigger Overlay visibility
30
33
  *
@@ -94,12 +94,11 @@ function OverlayTrigger(_ref) {
94
94
 
95
95
  var delay = normalizeDelay(propsDelay);
96
96
 
97
- var child = _react.default.Children.only(children);
97
+ var _ref2 = typeof children !== 'function' ? _react.default.Children.only(children).props : {},
98
+ onFocus = _ref2.onFocus,
99
+ onBlur = _ref2.onBlur,
100
+ onClick = _ref2.onClick;
98
101
 
99
- var _child$props = child.props,
100
- onFocus = _child$props.onFocus,
101
- onBlur = _child$props.onBlur,
102
- onClick = _child$props.onClick;
103
102
  var getTarget = (0, _react.useCallback)(function () {
104
103
  return (0, _safeFindDOMNode.default)(triggerNodeRef.current);
105
104
  }, []);
@@ -131,55 +130,40 @@ function OverlayTrigger(_ref) {
131
130
  }, [delay.hide, setShow, timeout]);
132
131
  var handleFocus = (0, _react.useCallback)(function () {
133
132
  handleShow();
134
- if (onFocus) onFocus.apply(void 0, arguments);
133
+
134
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
135
+ args[_key] = arguments[_key];
136
+ }
137
+
138
+ onFocus == null ? void 0 : onFocus.apply(void 0, args);
135
139
  }, [handleShow, onFocus]);
136
140
  var handleBlur = (0, _react.useCallback)(function () {
137
141
  handleHide();
138
- if (onBlur) onBlur.apply(void 0, arguments);
142
+
143
+ for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
144
+ args[_key2] = arguments[_key2];
145
+ }
146
+
147
+ onBlur == null ? void 0 : onBlur.apply(void 0, args);
139
148
  }, [handleHide, onBlur]);
140
149
  var handleClick = (0, _react.useCallback)(function () {
141
150
  setShow(!show);
142
151
  if (onClick) onClick.apply(void 0, arguments);
143
152
  }, [onClick, setShow, show]);
144
153
  var handleMouseOver = (0, _react.useCallback)(function () {
145
- for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
146
- args[_key] = arguments[_key];
154
+ for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
155
+ args[_key3] = arguments[_key3];
147
156
  }
148
157
 
149
158
  handleMouseOverOut(handleShow, args, 'fromElement');
150
159
  }, [handleShow]);
151
160
  var handleMouseOut = (0, _react.useCallback)(function () {
152
- for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
153
- args[_key2] = arguments[_key2];
161
+ for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
162
+ args[_key4] = arguments[_key4];
154
163
  }
155
164
 
156
165
  handleMouseOverOut(handleHide, args, 'toElement');
157
- }, [handleHide]); // We add aria-describedby in the case where the overlay is a role="tooltip"
158
- // for other cases describedby isn't appropriate (e.g. a popover with inputs) so we don't add it.
159
-
160
- var ariaModifier = {
161
- name: 'ariaDescribedBy',
162
- enabled: true,
163
- phase: 'afterWrite',
164
- effect: function effect(_ref2) {
165
- var state = _ref2.state;
166
- return function () {
167
- state.elements.reference.removeAttribute('aria-describedby');
168
- };
169
- },
170
- fn: function fn(_ref3) {
171
- var state = _ref3.state;
172
- var _state$elements = state.elements,
173
- popper = _state$elements.popper,
174
- reference = _state$elements.reference;
175
- if (!show || !reference) return;
176
- var role = popper.getAttribute('role') || '';
177
-
178
- if (popper.id && role.toLowerCase() === 'tooltip') {
179
- reference.setAttribute('aria-describedby', popper.id);
180
- }
181
- }
182
- };
166
+ }, [handleHide]);
183
167
  var triggers = trigger == null ? [] : [].concat(trigger);
184
168
  var triggerProps = {};
185
169
 
@@ -196,24 +180,19 @@ function OverlayTrigger(_ref) {
196
180
  process.env.NODE_ENV !== "production" ? (0, _warning.default)(triggers.length > 1, '[react-bootstrap] Specifying only the `"hover"` trigger limits the visibility of the overlay to just mouse users. Consider also including the `"focus"` trigger so that touch and keyboard only users can see the overlay as well.') : void 0;
197
181
  triggerProps.onMouseOver = handleMouseOver;
198
182
  triggerProps.onMouseOut = handleMouseOut;
199
- } // TODO: fix typing
200
- // @ts-ignore
201
-
183
+ }
202
184
 
203
- var modifiers = [ariaModifier].concat(popperConfig.modifiers || []);
204
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(RefHolder, {
185
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, typeof children === 'function' ? children((0, _extends2.default)({}, triggerProps, {
186
+ ref: triggerNodeRef
187
+ })) : /*#__PURE__*/_react.default.createElement(RefHolder, {
205
188
  ref: triggerNodeRef
206
- }, (0, _react.cloneElement)(child, triggerProps)), /*#__PURE__*/_react.default.createElement(_Overlay.default, (0, _extends2.default)({}, props, {
207
- popperConfig: (0, _extends2.default)({}, popperConfig, {
208
- // TODO: fix typing
209
- // @ts-ignore
210
- modifiers: modifiers
211
- }),
189
+ }, (0, _react.cloneElement)(children, triggerProps)), /*#__PURE__*/_react.default.createElement(_Overlay.default, (0, _extends2.default)({}, props, {
212
190
  show: show,
213
191
  onHide: handleHide,
214
- target: getTarget,
192
+ flip: flip,
215
193
  placement: placement,
216
- flip: flip
194
+ popperConfig: popperConfig,
195
+ target: getTarget
217
196
  }), overlay));
218
197
  }
219
198
 
package/cjs/PageItem.d.ts CHANGED
@@ -1,9 +1,10 @@
1
+ import React from 'react';
1
2
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
2
- export interface PageItemProps extends BsPrefixPropsWithChildren {
3
- style?: any;
3
+ export interface PageItemProps extends React.HTMLAttributes<HTMLElement>, BsPrefixPropsWithChildren {
4
4
  disabled?: boolean;
5
5
  active?: boolean;
6
6
  activeLabel?: string;
7
+ href?: string;
7
8
  }
8
9
  declare type PageItem = BsPrefixRefForwardingComponent<'li', PageItemProps>;
9
10
  declare const PageItem: PageItem;
package/cjs/Popover.d.ts CHANGED
@@ -1,16 +1,13 @@
1
1
  import React from 'react';
2
2
  import PopoverTitle from './PopoverTitle';
3
3
  import PopoverContent from './PopoverContent';
4
- import { Placement } from './Overlay';
4
+ import { ArrowProps, Placement } from './Overlay';
5
5
  import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
6
6
  export interface PopoverProps extends React.ComponentPropsWithoutRef<'div'>, BsPrefixPropsWithChildren {
7
7
  id: string;
8
8
  placement?: Placement;
9
9
  title?: string;
10
- arrowProps?: {
11
- ref: any;
12
- style: object;
13
- };
10
+ arrowProps?: ArrowProps;
14
11
  content?: boolean;
15
12
  popper?: any;
16
13
  show?: boolean;
package/cjs/Popover.js CHANGED
@@ -49,12 +49,7 @@ var Popover = _react.default.forwardRef(function (_ref, ref) {
49
49
  className: (0, _classnames.default)(className, decoratedBsPrefix, primaryPlacement && "bs-popover-" + primaryPlacement)
50
50
  }, props), /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
51
51
  className: "arrow"
52
- }, arrowProps, {
53
- // this prevents an error if you render a Popover without arrow props, like in a test
54
- style: arrowProps ? (0, _extends2.default)({}, arrowProps.style, {
55
- margin: 0
56
- }) : undefined
57
- })), content ? /*#__PURE__*/_react.default.createElement(_PopoverContent.default, null, children) : children);
52
+ }, arrowProps)), content ? /*#__PURE__*/_react.default.createElement(_PopoverContent.default, null, children) : children);
58
53
  });
59
54
 
60
55
  Popover.defaultProps = defaultProps;
@@ -1,7 +1,6 @@
1
1
  import React from 'react';
2
2
  import { BsPrefixPropsWithChildren } from './helpers';
3
- export interface ProgressBarProps extends BsPrefixPropsWithChildren {
4
- style?: any;
3
+ export interface ProgressBarProps extends React.HTMLAttributes<HTMLDivElement>, BsPrefixPropsWithChildren {
5
4
  min?: number;
6
5
  now?: number;
7
6
  max?: number;