react-bootstrap 2.7.0 → 2.7.2

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 (64) hide show
  1. package/cjs/AccordionButton.js +1 -1
  2. package/cjs/Modal.js +1 -1
  3. package/cjs/Overlay.d.ts +1 -0
  4. package/cjs/Overlay.js +12 -4
  5. package/cjs/Popover.d.ts +1 -0
  6. package/cjs/Popover.js +12 -3
  7. package/cjs/Stack.js +2 -4
  8. package/cjs/Tooltip.d.ts +1 -0
  9. package/cjs/Tooltip.js +12 -3
  10. package/cjs/getInitialPopperStyles.d.ts +2 -0
  11. package/cjs/getInitialPopperStyles.js +14 -0
  12. package/cjs/types.d.ts +2 -1
  13. package/dist/react-bootstrap.js +65 -23
  14. package/dist/react-bootstrap.min.js +1 -1
  15. package/esm/AccordionButton.js +1 -1
  16. package/esm/Modal.js +1 -1
  17. package/esm/Overlay.d.ts +1 -0
  18. package/esm/Overlay.js +13 -5
  19. package/esm/Popover.d.ts +1 -0
  20. package/esm/Popover.js +12 -3
  21. package/esm/Stack.js +2 -4
  22. package/esm/Tooltip.d.ts +1 -0
  23. package/esm/Tooltip.js +12 -3
  24. package/esm/getInitialPopperStyles.d.ts +2 -0
  25. package/esm/getInitialPopperStyles.js +9 -0
  26. package/esm/types.d.ts +2 -1
  27. package/getInitialPopperStyles/package.json +7 -0
  28. package/package.json +1 -1
  29. package/cjs/AbstractNav.d.ts +0 -15
  30. package/cjs/AbstractNavItem.d.ts +0 -19
  31. package/cjs/AccordionToggle.d.ts +0 -11
  32. package/cjs/CardColumns.d.ts +0 -2
  33. package/cjs/CardContext.d.ts +0 -6
  34. package/cjs/CardDeck.d.ts +0 -2
  35. package/cjs/FormFile.d.ts +0 -23
  36. package/cjs/FormFileInput.d.ts +0 -10
  37. package/cjs/FormFileLabel.d.ts +0 -7
  38. package/cjs/Jumbotron.d.ts +0 -7
  39. package/cjs/Media.d.ts +0 -8
  40. package/cjs/PopoverContent.d.ts +0 -5
  41. package/cjs/PopoverTitle.d.ts +0 -5
  42. package/cjs/ResponsiveEmbed.d.ts +0 -9
  43. package/cjs/SafeAnchor.d.ts +0 -17
  44. package/cjs/SelectableContext.d.ts +0 -5
  45. package/cjs/TabContext.d.ts +0 -12
  46. package/cjs/usePopperMarginModifiers.d.ts +0 -4
  47. package/esm/AbstractNav.d.ts +0 -15
  48. package/esm/AbstractNavItem.d.ts +0 -19
  49. package/esm/AccordionToggle.d.ts +0 -11
  50. package/esm/CardColumns.d.ts +0 -2
  51. package/esm/CardContext.d.ts +0 -6
  52. package/esm/CardDeck.d.ts +0 -2
  53. package/esm/FormFile.d.ts +0 -23
  54. package/esm/FormFileInput.d.ts +0 -10
  55. package/esm/FormFileLabel.d.ts +0 -7
  56. package/esm/Jumbotron.d.ts +0 -7
  57. package/esm/Media.d.ts +0 -8
  58. package/esm/PopoverContent.d.ts +0 -5
  59. package/esm/PopoverTitle.d.ts +0 -5
  60. package/esm/ResponsiveEmbed.d.ts +0 -9
  61. package/esm/SafeAnchor.d.ts +0 -17
  62. package/esm/SelectableContext.d.ts +0 -5
  63. package/esm/TabContext.d.ts +0 -12
  64. package/esm/usePopperMarginModifiers.d.ts +0 -4
@@ -63,7 +63,7 @@ const AccordionButton = /*#__PURE__*/React.forwardRef(({
63
63
  ref: ref,
64
64
  onClick: accordionOnClick,
65
65
  ...props,
66
- "aria-expanded": eventKey === activeEventKey,
66
+ "aria-expanded": Array.isArray(activeEventKey) ? activeEventKey.includes(eventKey) : eventKey === activeEventKey,
67
67
  className: (0, _classnames.default)(className, bsPrefix, !(0, _AccordionContext.isAccordionItemSelected)(activeEventKey, eventKey) && 'collapsed')
68
68
  });
69
69
  });
package/cjs/Modal.js CHANGED
@@ -128,7 +128,7 @@ const Modal = /*#__PURE__*/React.forwardRef(({
128
128
  });
129
129
 
130
130
  // We prevent the modal from closing during a drag by detecting where the
131
- // the click originates from. If it starts in the modal and then ends outside
131
+ // click originates from. If it starts in the modal and then ends outside
132
132
  // don't close.
133
133
  const handleDialogMouseDown = () => {
134
134
  waitingForMouseUpRef.current = true;
package/cjs/Overlay.d.ts CHANGED
@@ -10,6 +10,7 @@ export interface OverlayInjectedProps {
10
10
  show: boolean;
11
11
  placement: Placement | undefined;
12
12
  popper: PopperRef;
13
+ hasDoneInitialMeasure?: boolean;
13
14
  [prop: string]: any;
14
15
  }
15
16
  export type OverlayChildren = React.ReactElement<OverlayInjectedProps> | ((injected: OverlayInjectedProps) => React.ReactNode);
package/cjs/Overlay.js CHANGED
@@ -6,7 +6,6 @@ exports.default = void 0;
6
6
  var React = _interopRequireWildcard(require("react"));
7
7
  var _classnames = _interopRequireDefault(require("classnames"));
8
8
  var _Overlay = _interopRequireDefault(require("@restart/ui/Overlay"));
9
- var _useCallbackRef = _interopRequireDefault(require("@restart/hooks/useCallbackRef"));
10
9
  var _useEventCallback = _interopRequireDefault(require("@restart/hooks/useEventCallback"));
11
10
  var _useIsomorphicEffect = _interopRequireDefault(require("@restart/hooks/useIsomorphicEffect"));
12
11
  var _useMergedRefs = _interopRequireDefault(require("@restart/hooks/useMergedRefs"));
@@ -39,7 +38,7 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
39
38
  ...outerProps
40
39
  }, outerRef) => {
41
40
  const popperRef = (0, React.useRef)({});
42
- const [firstRenderedState, setFirstRenderedState] = (0, _useCallbackRef.default)();
41
+ const [firstRenderedState, setFirstRenderedState] = (0, React.useState)(null);
43
42
  const [ref, modifiers] = (0, _useOverlayOffset.default)(outerProps.offset);
44
43
  const mergedRef = (0, _useMergedRefs.default)(outerRef, ref);
45
44
  const actualTransition = transition === true ? _Fade.default : transition || undefined;
@@ -52,6 +51,11 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
52
51
  popperRef.current.scheduleUpdate == null ? void 0 : popperRef.current.scheduleUpdate();
53
52
  }
54
53
  }, [firstRenderedState]);
54
+ (0, React.useEffect)(() => {
55
+ if (!outerProps.show) {
56
+ setFirstRenderedState(null);
57
+ }
58
+ }, [outerProps.show]);
55
59
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Overlay.default, {
56
60
  ...outerProps,
57
61
  ref: mergedRef,
@@ -74,8 +78,10 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
74
78
  state: popperObj == null ? void 0 : popperObj.state,
75
79
  scheduleUpdate: popperObj == null ? void 0 : popperObj.update,
76
80
  placement: updatedPlacement,
77
- outOfBoundaries: (popperObj == null ? void 0 : (_popperObj$state = popperObj.state) == null ? void 0 : (_popperObj$state$modi = _popperObj$state.modifiersData.hide) == null ? void 0 : _popperObj$state$modi.isReferenceHidden) || false
81
+ outOfBoundaries: (popperObj == null ? void 0 : (_popperObj$state = popperObj.state) == null ? void 0 : (_popperObj$state$modi = _popperObj$state.modifiersData.hide) == null ? void 0 : _popperObj$state$modi.isReferenceHidden) || false,
82
+ strategy: popperConfig.strategy
78
83
  });
84
+ const hasDoneInitialMeasure = !!firstRenderedState;
79
85
  if (typeof overlay === 'function') return overlay({
80
86
  ...overlayProps,
81
87
  placement: updatedPlacement,
@@ -84,13 +90,15 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
84
90
  className: 'show'
85
91
  }),
86
92
  popper,
87
- arrowProps
93
+ arrowProps,
94
+ hasDoneInitialMeasure
88
95
  });
89
96
  return /*#__PURE__*/React.cloneElement(overlay, {
90
97
  ...overlayProps,
91
98
  placement: updatedPlacement,
92
99
  arrowProps,
93
100
  popper,
101
+ hasDoneInitialMeasure,
94
102
  className: (0, _classnames.default)(overlay.props.className, !transition && show && 'show'),
95
103
  style: {
96
104
  ...overlay.props.style,
package/cjs/Popover.d.ts CHANGED
@@ -9,6 +9,7 @@ export interface PopoverProps extends React.HTMLAttributes<HTMLDivElement>, BsPr
9
9
  body?: boolean;
10
10
  popper?: PopperRef;
11
11
  show?: boolean;
12
+ hasDoneInitialMeasure?: boolean;
12
13
  }
13
14
  declare const _default: React.ForwardRefExoticComponent<PopoverProps & React.RefAttributes<HTMLDivElement>> & {
14
15
  Header: import("./helpers").BsPrefixRefForwardingComponent<"div", unknown>;
package/cjs/Popover.js CHANGED
@@ -9,6 +9,7 @@ var _ThemeProvider = require("./ThemeProvider");
9
9
  var _PopoverHeader = _interopRequireDefault(require("./PopoverHeader"));
10
10
  var _PopoverBody = _interopRequireDefault(require("./PopoverBody"));
11
11
  var _helpers = require("./helpers");
12
+ var _getInitialPopperStyles = _interopRequireDefault(require("./getInitialPopperStyles"));
12
13
  var _jsxRuntime = require("react/jsx-runtime");
13
14
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
14
15
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -23,18 +24,26 @@ const Popover = /*#__PURE__*/React.forwardRef(({
23
24
  children,
24
25
  body,
25
26
  arrowProps,
26
- popper: _,
27
- show: _1,
27
+ hasDoneInitialMeasure,
28
+ popper,
29
+ show,
28
30
  ...props
29
31
  }, ref) => {
30
32
  const decoratedBsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'popover');
31
33
  const isRTL = (0, _ThemeProvider.useIsRTL)();
32
34
  const [primaryPlacement] = (placement == null ? void 0 : placement.split('-')) || [];
33
35
  const bsDirection = (0, _helpers.getOverlayDirection)(primaryPlacement, isRTL);
36
+ let computedStyle = style;
37
+ if (show && !hasDoneInitialMeasure) {
38
+ computedStyle = {
39
+ ...style,
40
+ ...(0, _getInitialPopperStyles.default)(popper == null ? void 0 : popper.strategy)
41
+ };
42
+ }
34
43
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
35
44
  ref: ref,
36
45
  role: "tooltip",
37
- style: style,
46
+ style: computedStyle,
38
47
  "x-placement": primaryPlacement,
39
48
  className: (0, _classnames.default)(className, decoratedBsPrefix, primaryPlacement && `bs-popover-${bsDirection}`),
40
49
  ...props,
package/cjs/Stack.js CHANGED
@@ -25,10 +25,8 @@ const Stack = /*#__PURE__*/React.forwardRef(({
25
25
  ...props,
26
26
  ref: ref,
27
27
  className: (0, _classnames.default)(className, bsPrefix, ...(0, _createUtilityClasses.default)({
28
- gap,
29
- breakpoints,
30
- minBreakpoint
31
- }))
28
+ gap
29
+ }, breakpoints, minBreakpoint))
32
30
  });
33
31
  });
34
32
  Stack.displayName = 'Stack';
package/cjs/Tooltip.d.ts CHANGED
@@ -7,6 +7,7 @@ export interface TooltipProps extends React.HTMLAttributes<HTMLDivElement>, BsPr
7
7
  arrowProps?: Partial<OverlayArrowProps>;
8
8
  show?: boolean;
9
9
  popper?: PopperRef;
10
+ hasDoneInitialMeasure?: boolean;
10
11
  }
11
12
  declare const Tooltip: React.ForwardRefExoticComponent<TooltipProps & React.RefAttributes<HTMLDivElement>>;
12
13
  export default Tooltip;
package/cjs/Tooltip.js CHANGED
@@ -7,6 +7,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
7
7
  var React = _interopRequireWildcard(require("react"));
8
8
  var _ThemeProvider = require("./ThemeProvider");
9
9
  var _helpers = require("./helpers");
10
+ var _getInitialPopperStyles = _interopRequireDefault(require("./getInitialPopperStyles"));
10
11
  var _jsxRuntime = require("react/jsx-runtime");
11
12
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
12
13
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -20,17 +21,25 @@ const Tooltip = /*#__PURE__*/React.forwardRef(({
20
21
  style,
21
22
  children,
22
23
  arrowProps,
23
- popper: _,
24
- show: _2,
24
+ hasDoneInitialMeasure,
25
+ popper,
26
+ show,
25
27
  ...props
26
28
  }, ref) => {
27
29
  bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'tooltip');
28
30
  const isRTL = (0, _ThemeProvider.useIsRTL)();
29
31
  const [primaryPlacement] = (placement == null ? void 0 : placement.split('-')) || [];
30
32
  const bsDirection = (0, _helpers.getOverlayDirection)(primaryPlacement, isRTL);
33
+ let computedStyle = style;
34
+ if (show && !hasDoneInitialMeasure) {
35
+ computedStyle = {
36
+ ...style,
37
+ ...(0, _getInitialPopperStyles.default)(popper == null ? void 0 : popper.strategy)
38
+ };
39
+ }
31
40
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
32
41
  ref: ref,
33
- style: style,
42
+ style: computedStyle,
34
43
  role: "tooltip",
35
44
  "x-placement": primaryPlacement,
36
45
  className: (0, _classnames.default)(className, bsPrefix, `bs-tooltip-${bsDirection}`),
@@ -0,0 +1,2 @@
1
+ /// <reference types="react" />
2
+ export default function getInitialPopperStyles(position?: React.CSSProperties['position']): Partial<React.CSSProperties>;
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+
3
+ exports.__esModule = true;
4
+ exports.default = getInitialPopperStyles;
5
+ function getInitialPopperStyles(position = 'absolute') {
6
+ return {
7
+ position,
8
+ top: '0',
9
+ left: '0',
10
+ opacity: '0',
11
+ pointerEvents: 'none'
12
+ };
13
+ }
14
+ module.exports = exports.default;
package/cjs/types.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import PropTypes from 'prop-types';
2
- import { State } from '@restart/ui/usePopper';
2
+ import { State, UsePopperOptions } from '@restart/ui/usePopper';
3
3
  export type Variant = 'primary' | 'secondary' | 'success' | 'danger' | 'warning' | 'info' | 'dark' | 'light' | string;
4
4
  export type ButtonVariant = Variant | 'link' | 'outline-primary' | 'outline-secondary' | 'outline-success' | 'outline-danger' | 'outline-warning' | 'outline-info' | 'outline-dark' | 'outline-light';
5
5
  export type Color = 'primary' | 'secondary' | 'success' | 'danger' | 'warning' | 'info' | 'dark' | 'light' | 'white' | 'muted';
@@ -25,4 +25,5 @@ export interface PopperRef {
25
25
  outOfBoundaries: boolean;
26
26
  placement: Placement | undefined;
27
27
  scheduleUpdate?: () => void;
28
+ strategy: UsePopperOptions['strategy'];
28
29
  }
@@ -2675,7 +2675,7 @@ const AccordionButton = /*#__PURE__*/external_root_React_commonjs2_react_commonj
2675
2675
  ref: ref,
2676
2676
  onClick: accordionOnClick,
2677
2677
  ...props,
2678
- "aria-expanded": eventKey === activeEventKey,
2678
+ "aria-expanded": Array.isArray(activeEventKey) ? activeEventKey.includes(eventKey) : eventKey === activeEventKey,
2679
2679
  className: classnames_default()(className, bsPrefix, !isAccordionItemSelected(activeEventKey, eventKey) && 'collapsed')
2680
2680
  }, void 0, false, {
2681
2681
  fileName: AccordionButton_jsxFileName,
@@ -11253,7 +11253,7 @@ const Modal_Modal = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_re
11253
11253
  });
11254
11254
 
11255
11255
  // We prevent the modal from closing during a drag by detecting where the
11256
- // the click originates from. If it starts in the modal and then ends outside
11256
+ // click originates from. If it starts in the modal and then ends outside
11257
11257
  // don't close.
11258
11258
  const handleDialogMouseDown = () => {
11259
11259
  waitingForMouseUpRef.current = true;
@@ -12902,6 +12902,16 @@ function getOverlayDirection(placement, isRTL) {
12902
12902
  }
12903
12903
  return bsDirection;
12904
12904
  }
12905
+ ;// CONCATENATED MODULE: ./src/getInitialPopperStyles.ts
12906
+ function getInitialPopperStyles(position = 'absolute') {
12907
+ return {
12908
+ position,
12909
+ top: '0',
12910
+ left: '0',
12911
+ opacity: '0',
12912
+ pointerEvents: 'none'
12913
+ };
12914
+ }
12905
12915
  ;// CONCATENATED MODULE: ./src/Popover.tsx
12906
12916
  var Popover_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap/src/Popover.tsx";
12907
12917
 
@@ -12912,6 +12922,7 @@ var Popover_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap/
12912
12922
 
12913
12923
 
12914
12924
 
12925
+
12915
12926
  const Popover_propTypes = {
12916
12927
  /**
12917
12928
  * @default 'popover'
@@ -12943,6 +12954,10 @@ const Popover_propTypes = {
12943
12954
  * passing the children directly to it
12944
12955
  */
12945
12956
  body: (prop_types_default()).bool,
12957
+ /**
12958
+ * Whether or not Popper has done its initial measurement and positioning.
12959
+ */
12960
+ hasDoneInitialMeasure: (prop_types_default()).bool,
12946
12961
  /** @private */
12947
12962
  popper: (prop_types_default()).object,
12948
12963
  /** @private */
@@ -12959,18 +12974,26 @@ const Popover = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_
12959
12974
  children,
12960
12975
  body,
12961
12976
  arrowProps,
12962
- popper: _,
12963
- show: _1,
12977
+ hasDoneInitialMeasure,
12978
+ popper,
12979
+ show,
12964
12980
  ...props
12965
12981
  }, ref) => {
12966
12982
  const decoratedBsPrefix = useBootstrapPrefix(bsPrefix, 'popover');
12967
12983
  const isRTL = useIsRTL();
12968
12984
  const [primaryPlacement] = (placement == null ? void 0 : placement.split('-')) || [];
12969
12985
  const bsDirection = getOverlayDirection(primaryPlacement, isRTL);
12986
+ let computedStyle = style;
12987
+ if (show && !hasDoneInitialMeasure) {
12988
+ computedStyle = {
12989
+ ...style,
12990
+ ...getInitialPopperStyles(popper == null ? void 0 : popper.strategy)
12991
+ };
12992
+ }
12970
12993
  return /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)("div", {
12971
12994
  ref: ref,
12972
12995
  role: "tooltip",
12973
- style: style,
12996
+ style: computedStyle,
12974
12997
  "x-placement": primaryPlacement,
12975
12998
  className: classnames_default()(className, decoratedBsPrefix, primaryPlacement && `bs-popover-${bsDirection}`),
12976
12999
  ...props,
@@ -12979,18 +13002,18 @@ const Popover = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_
12979
13002
  ...arrowProps
12980
13003
  }, void 0, false, {
12981
13004
  fileName: Popover_jsxFileName,
12982
- lineNumber: 119,
13005
+ lineNumber: 135,
12983
13006
  columnNumber: 9
12984
13007
  }, undefined), body ? /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)(PopoverBody, {
12985
13008
  children: children
12986
13009
  }, void 0, false, {
12987
13010
  fileName: Popover_jsxFileName,
12988
- lineNumber: 120,
13011
+ lineNumber: 136,
12989
13012
  columnNumber: 17
12990
13013
  }, undefined) : children]
12991
13014
  }, void 0, true, {
12992
13015
  fileName: Popover_jsxFileName,
12993
- lineNumber: 107,
13016
+ lineNumber: 123,
12994
13017
  columnNumber: 7
12995
13018
  }, undefined);
12996
13019
  });
@@ -13042,7 +13065,6 @@ var Overlay_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap/
13042
13065
 
13043
13066
 
13044
13067
 
13045
-
13046
13068
  const Overlay_propTypes = {
13047
13069
  /**
13048
13070
  * A component instance, DOM node, or function that returns either.
@@ -13132,7 +13154,7 @@ const Overlay_Overlay = /*#__PURE__*/external_root_React_commonjs2_react_commonj
13132
13154
  ...outerProps
13133
13155
  }, outerRef) => {
13134
13156
  const popperRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
13135
- const [firstRenderedState, setFirstRenderedState] = useCallbackRef();
13157
+ const [firstRenderedState, setFirstRenderedState] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(null);
13136
13158
  const [ref, modifiers] = useOverlayOffset(outerProps.offset);
13137
13159
  const mergedRef = esm_useMergedRefs(outerRef, ref);
13138
13160
  const actualTransition = transition === true ? src_Fade : transition || undefined;
@@ -13145,6 +13167,11 @@ const Overlay_Overlay = /*#__PURE__*/external_root_React_commonjs2_react_commonj
13145
13167
  popperRef.current.scheduleUpdate == null ? void 0 : popperRef.current.scheduleUpdate();
13146
13168
  }
13147
13169
  }, [firstRenderedState]);
13170
+ (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
13171
+ if (!outerProps.show) {
13172
+ setFirstRenderedState(null);
13173
+ }
13174
+ }, [outerProps.show]);
13148
13175
  return /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)(esm_Overlay, {
13149
13176
  ...outerProps,
13150
13177
  ref: mergedRef,
@@ -13167,8 +13194,10 @@ const Overlay_Overlay = /*#__PURE__*/external_root_React_commonjs2_react_commonj
13167
13194
  state: popperObj == null ? void 0 : popperObj.state,
13168
13195
  scheduleUpdate: popperObj == null ? void 0 : popperObj.update,
13169
13196
  placement: updatedPlacement,
13170
- outOfBoundaries: (popperObj == null ? void 0 : (_popperObj$state = popperObj.state) == null ? void 0 : (_popperObj$state$modi = _popperObj$state.modifiersData.hide) == null ? void 0 : _popperObj$state$modi.isReferenceHidden) || false
13197
+ outOfBoundaries: (popperObj == null ? void 0 : (_popperObj$state = popperObj.state) == null ? void 0 : (_popperObj$state$modi = _popperObj$state.modifiersData.hide) == null ? void 0 : _popperObj$state$modi.isReferenceHidden) || false,
13198
+ strategy: popperConfig.strategy
13171
13199
  });
13200
+ const hasDoneInitialMeasure = !!firstRenderedState;
13172
13201
  if (typeof overlay === 'function') return overlay({
13173
13202
  ...overlayProps,
13174
13203
  placement: updatedPlacement,
@@ -13177,13 +13206,15 @@ const Overlay_Overlay = /*#__PURE__*/external_root_React_commonjs2_react_commonj
13177
13206
  className: 'show'
13178
13207
  }),
13179
13208
  popper,
13180
- arrowProps
13209
+ arrowProps,
13210
+ hasDoneInitialMeasure
13181
13211
  });
13182
13212
  return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement(overlay, {
13183
13213
  ...overlayProps,
13184
13214
  placement: updatedPlacement,
13185
13215
  arrowProps,
13186
13216
  popper,
13217
+ hasDoneInitialMeasure,
13187
13218
  className: classnames_default()(overlay.props.className, !transition && show && 'show'),
13188
13219
  style: {
13189
13220
  ...overlay.props.style,
@@ -13193,7 +13224,7 @@ const Overlay_Overlay = /*#__PURE__*/external_root_React_commonjs2_react_commonj
13193
13224
  }
13194
13225
  }, void 0, false, {
13195
13226
  fileName: Overlay_jsxFileName,
13196
- lineNumber: 184,
13227
+ lineNumber: 193,
13197
13228
  columnNumber: 7
13198
13229
  }, undefined);
13199
13230
  });
@@ -14331,10 +14362,8 @@ const Stack = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_am
14331
14362
  ...props,
14332
14363
  ref: ref,
14333
14364
  className: classnames_default()(className, bsPrefix, ...createUtilityClassName({
14334
- gap,
14335
- breakpoints,
14336
- minBreakpoint
14337
- }))
14365
+ gap
14366
+ }, breakpoints, minBreakpoint))
14338
14367
  }, void 0, false, {
14339
14368
  fileName: Stack_jsxFileName,
14340
14369
  lineNumber: 57,
@@ -15573,6 +15602,7 @@ var Tooltip_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap/
15573
15602
 
15574
15603
 
15575
15604
 
15605
+
15576
15606
  const Tooltip_propTypes = {
15577
15607
  /**
15578
15608
  * @default 'tooltip'
@@ -15601,6 +15631,10 @@ const Tooltip_propTypes = {
15601
15631
  ref: (prop_types_default()).any,
15602
15632
  style: (prop_types_default()).object
15603
15633
  }),
15634
+ /**
15635
+ * Whether or not Popper has done its initial measurement and positioning.
15636
+ */
15637
+ hasDoneInitialMeasure: (prop_types_default()).bool,
15604
15638
  /** @private */
15605
15639
  popper: (prop_types_default()).object,
15606
15640
  /** @private */
@@ -15616,17 +15650,25 @@ const Tooltip = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_
15616
15650
  style,
15617
15651
  children,
15618
15652
  arrowProps,
15619
- popper: _,
15620
- show: _2,
15653
+ hasDoneInitialMeasure,
15654
+ popper,
15655
+ show,
15621
15656
  ...props
15622
15657
  }, ref) => {
15623
15658
  bsPrefix = useBootstrapPrefix(bsPrefix, 'tooltip');
15624
15659
  const isRTL = useIsRTL();
15625
15660
  const [primaryPlacement] = (placement == null ? void 0 : placement.split('-')) || [];
15626
15661
  const bsDirection = getOverlayDirection(primaryPlacement, isRTL);
15662
+ let computedStyle = style;
15663
+ if (show && !hasDoneInitialMeasure) {
15664
+ computedStyle = {
15665
+ ...style,
15666
+ ...getInitialPopperStyles(popper == null ? void 0 : popper.strategy)
15667
+ };
15668
+ }
15627
15669
  return /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)("div", {
15628
15670
  ref: ref,
15629
- style: style,
15671
+ style: computedStyle,
15630
15672
  role: "tooltip",
15631
15673
  "x-placement": primaryPlacement,
15632
15674
  className: classnames_default()(className, bsPrefix, `bs-tooltip-${bsDirection}`),
@@ -15636,19 +15678,19 @@ const Tooltip = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_
15636
15678
  ...arrowProps
15637
15679
  }, void 0, false, {
15638
15680
  fileName: Tooltip_jsxFileName,
15639
- lineNumber: 107,
15681
+ lineNumber: 123,
15640
15682
  columnNumber: 9
15641
15683
  }, undefined), /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)("div", {
15642
15684
  className: `${bsPrefix}-inner`,
15643
15685
  children: children
15644
15686
  }, void 0, false, {
15645
15687
  fileName: Tooltip_jsxFileName,
15646
- lineNumber: 108,
15688
+ lineNumber: 124,
15647
15689
  columnNumber: 9
15648
15690
  }, undefined)]
15649
15691
  }, void 0, true, {
15650
15692
  fileName: Tooltip_jsxFileName,
15651
- lineNumber: 99,
15693
+ lineNumber: 115,
15652
15694
  columnNumber: 7
15653
15695
  }, undefined);
15654
15696
  });