react-bootstrap 2.10.5 → 2.10.6

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.
@@ -14,6 +14,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
14
14
  const AccordionHeader = /*#__PURE__*/React.forwardRef(({
15
15
  // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
16
16
  as: Component = 'h2',
17
+ 'aria-controls': ariaControls,
17
18
  bsPrefix,
18
19
  className,
19
20
  children,
@@ -27,6 +28,7 @@ const AccordionHeader = /*#__PURE__*/React.forwardRef(({
27
28
  className: (0, _classnames.default)(className, bsPrefix),
28
29
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_AccordionButton.default, {
29
30
  onClick: onClick,
31
+ "aria-controls": ariaControls,
30
32
  children: children
31
33
  })
32
34
  });
package/cjs/Collapse.js CHANGED
@@ -7,6 +7,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
7
7
  var _css = _interopRequireDefault(require("dom-helpers/css"));
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _Transition = require("react-transition-group/Transition");
10
+ var _utils = require("@restart/ui/utils");
10
11
  var _transitionEndListener = _interopRequireDefault(require("./transitionEndListener"));
11
12
  var _createChainedFunction = _interopRequireDefault(require("./createChainedFunction"));
12
13
  var _triggerBrowserReflow = _interopRequireDefault(require("./triggerBrowserReflow"));
@@ -84,7 +85,7 @@ const Collapse = /*#__PURE__*/_react.default.forwardRef(({
84
85
  onEntered: handleEntered,
85
86
  onExit: handleExit,
86
87
  onExiting: handleExiting,
87
- childRef: children.ref,
88
+ childRef: (0, _utils.getChildRef)(children),
88
89
  in: inProp,
89
90
  timeout: timeout,
90
91
  mountOnEnter: mountOnEnter,
package/cjs/Fade.js CHANGED
@@ -37,16 +37,12 @@ const Fade = /*#__PURE__*/React.forwardRef(({
37
37
  (0, _triggerBrowserReflow.default)(node);
38
38
  onEnter == null || onEnter(node, isAppearing);
39
39
  }, [onEnter]);
40
- const {
41
- major
42
- } = (0, _utils.getReactVersion)();
43
- const childRef = major >= 19 ? children.props.ref : children.ref;
44
40
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TransitionWrapper.default, {
45
41
  ref: ref,
46
42
  addEndListener: _transitionEndListener.default,
47
43
  ...props,
48
44
  onEnter: handleEnter,
49
- childRef: childRef,
45
+ childRef: (0, _utils.getChildRef)(children),
50
46
  children: (status, innerProps) => /*#__PURE__*/React.cloneElement(children, {
51
47
  ...innerProps,
52
48
  className: (0, _classnames.default)('fade', className, children.props.className, fadeStyles[status], transitionClasses[status])
package/cjs/Nav.js CHANGED
@@ -5,7 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports.default = void 0;
7
7
  var _classnames = _interopRequireDefault(require("classnames"));
8
- var _all = _interopRequireDefault(require("prop-types-extra/lib/all"));
9
8
  var _react = _interopRequireWildcard(require("react"));
10
9
  var React = _react;
11
10
  var _uncontrollable = require("uncontrollable");
@@ -7,6 +7,7 @@ exports.default = void 0;
7
7
  var _classnames = _interopRequireDefault(require("classnames"));
8
8
  var React = _interopRequireWildcard(require("react"));
9
9
  var _Transition = require("react-transition-group/Transition");
10
+ var _utils = require("@restart/ui/utils");
10
11
  var _transitionEndListener = _interopRequireDefault(require("./transitionEndListener"));
11
12
  var _TransitionWrapper = _interopRequireDefault(require("./TransitionWrapper"));
12
13
  var _ThemeProvider = require("./ThemeProvider");
@@ -36,7 +37,7 @@ const OffcanvasToggling = /*#__PURE__*/React.forwardRef(({
36
37
  unmountOnExit: unmountOnExit,
37
38
  appear: appear,
38
39
  ...props,
39
- childRef: children.ref,
40
+ childRef: (0, _utils.getChildRef)(children),
40
41
  children: (status, innerProps) => /*#__PURE__*/React.cloneElement(children, {
41
42
  ...innerProps,
42
43
  className: (0, _classnames.default)(className, children.props.className, (status === _Transition.ENTERING || status === _Transition.EXITING) && `${bsPrefix}-toggling`, transitionStyles[status])
@@ -12,6 +12,7 @@ var _useTimeout = _interopRequireDefault(require("@restart/hooks/useTimeout"));
12
12
  var _warning = _interopRequireDefault(require("warning"));
13
13
  var _uncontrollable = require("uncontrollable");
14
14
  var _useMergedRefs = _interopRequireDefault(require("@restart/hooks/useMergedRefs"));
15
+ var _utils = require("@restart/ui/utils");
15
16
  var _Overlay = _interopRequireDefault(require("./Overlay"));
16
17
  var _safeFindDOMNode = _interopRequireDefault(require("./safeFindDOMNode"));
17
18
  var _jsxRuntime = require("react/jsx-runtime");
@@ -53,7 +54,7 @@ const OverlayTrigger = ({
53
54
  ...props
54
55
  }) => {
55
56
  const triggerNodeRef = (0, _react.useRef)(null);
56
- const mergedRef = (0, _useMergedRefs.default)(triggerNodeRef, children.ref);
57
+ const mergedRef = (0, _useMergedRefs.default)(triggerNodeRef, (0, _utils.getChildRef)(children));
57
58
  const timeout = (0, _useTimeout.default)();
58
59
  const hoverStateRef = (0, _react.useRef)('');
59
60
  const [show, setShow] = (0, _uncontrollable.useUncontrolledProp)(propsShow, defaultShow, onToggle);
@@ -227,7 +227,7 @@ var __webpack_unused_export__;
227
227
  __webpack_unused_export__ = ({
228
228
  value: true
229
229
  });
230
- __webpack_unused_export__ = exports.rk = __webpack_unused_export__ = exports.NP = __webpack_unused_export__ = undefined;
230
+ __webpack_unused_export__ = exports.rk = __webpack_unused_export__ = exports.NP = exports.Q7 = undefined;
231
231
  var _all = __webpack_require__(526);
232
232
  var _all2 = _interopRequireDefault(_all);
233
233
  var _componentOrElement = __webpack_require__(387);
@@ -243,7 +243,7 @@ function _interopRequireDefault(obj) {
243
243
  default: obj
244
244
  };
245
245
  }
246
- __webpack_unused_export__ = _all2.default;
246
+ exports.Q7 = _all2.default;
247
247
  exports.NP = _componentOrElement2.default;
248
248
  __webpack_unused_export__ = _deprecated2.default;
249
249
  exports.rk = _elementType2.default;
@@ -2037,6 +2037,29 @@ Transition.ENTERING = ENTERING;
2037
2037
  Transition.ENTERED = ENTERED;
2038
2038
  Transition.EXITING = EXITING;
2039
2039
  /* harmony default export */ const esm_Transition = (Transition);
2040
+ ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/utils.js
2041
+
2042
+ function isEscKey(e) {
2043
+ return e.code === 'Escape' || e.keyCode === 27;
2044
+ }
2045
+ function getReactVersion() {
2046
+ const parts = external_root_React_commonjs2_react_commonjs_react_amd_react_.version.split('.');
2047
+ return {
2048
+ major: +parts[0],
2049
+ minor: +parts[1],
2050
+ patch: +parts[2]
2051
+ };
2052
+ }
2053
+ function getChildRef(element) {
2054
+ if (!element || typeof element === 'function') {
2055
+ return null;
2056
+ }
2057
+ const {
2058
+ major
2059
+ } = getReactVersion();
2060
+ const childRef = major >= 19 ? element.props.ref : element.ref;
2061
+ return childRef;
2062
+ }
2040
2063
  ;// CONCATENATED MODULE: ./node_modules/dom-helpers/esm/canUseDOM.js
2041
2064
  /* harmony default export */ const canUseDOM = (!!(typeof window !== 'undefined' && window.document && window.document.createElement));
2042
2065
  ;// CONCATENATED MODULE: ./node_modules/dom-helpers/esm/addEventListener.js
@@ -2343,6 +2366,7 @@ var Collapse_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap
2343
2366
 
2344
2367
 
2345
2368
 
2369
+
2346
2370
  const MARGINS = {
2347
2371
  height: ['marginTop', 'marginBottom'],
2348
2372
  width: ['marginLeft', 'marginRight']
@@ -2485,7 +2509,7 @@ const Collapse = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react
2485
2509
  onEntered: handleEntered,
2486
2510
  onExit: handleExit,
2487
2511
  onExiting: handleExiting,
2488
- childRef: children.ref,
2512
+ childRef: getChildRef(children),
2489
2513
  in: inProp,
2490
2514
  timeout: timeout,
2491
2515
  mountOnEnter: mountOnEnter,
@@ -2497,7 +2521,7 @@ const Collapse = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react
2497
2521
  })
2498
2522
  }, void 0, false, {
2499
2523
  fileName: Collapse_jsxFileName,
2500
- lineNumber: 222,
2524
+ lineNumber: 223,
2501
2525
  columnNumber: 7
2502
2526
  }, undefined);
2503
2527
  });
@@ -2759,6 +2783,7 @@ const AccordionHeader_propTypes = {
2759
2783
  const AccordionHeader = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_.forwardRef(({
2760
2784
  // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
2761
2785
  as: Component = 'h2',
2786
+ 'aria-controls': ariaControls,
2762
2787
  bsPrefix,
2763
2788
  className,
2764
2789
  children,
@@ -2772,15 +2797,16 @@ const AccordionHeader = /*#__PURE__*/external_root_React_commonjs2_react_commonj
2772
2797
  className: classnames_default()(className, bsPrefix),
2773
2798
  children: /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)(src_AccordionButton, {
2774
2799
  onClick: onClick,
2800
+ "aria-controls": ariaControls,
2775
2801
  children: children
2776
2802
  }, void 0, false, {
2777
2803
  fileName: AccordionHeader_jsxFileName,
2778
- lineNumber: 47,
2804
+ lineNumber: 48,
2779
2805
  columnNumber: 9
2780
2806
  }, undefined)
2781
2807
  }, void 0, false, {
2782
2808
  fileName: AccordionHeader_jsxFileName,
2783
- lineNumber: 42,
2809
+ lineNumber: 43,
2784
2810
  columnNumber: 7
2785
2811
  }, undefined);
2786
2812
  });
@@ -3445,17 +3471,14 @@ function useResizeObserver(element) {
3445
3471
  var jsx_runtime = __webpack_require__(74);
3446
3472
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/Button.js
3447
3473
  const _excluded = ["as", "disabled"];
3448
- function Button_objectWithoutPropertiesLoose(source, excluded) {
3449
- if (source == null) return {};
3450
- var target = {};
3451
- var sourceKeys = Object.keys(source);
3452
- var key, i;
3453
- for (i = 0; i < sourceKeys.length; i++) {
3454
- key = sourceKeys[i];
3455
- if (excluded.indexOf(key) >= 0) continue;
3456
- target[key] = source[key];
3474
+ function Button_objectWithoutPropertiesLoose(r, e) {
3475
+ if (null == r) return {};
3476
+ var t = {};
3477
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
3478
+ if (e.indexOf(n) >= 0) continue;
3479
+ t[n] = r[n];
3457
3480
  }
3458
- return target;
3481
+ return t;
3459
3482
  }
3460
3483
 
3461
3484
 
@@ -3546,17 +3569,14 @@ Button.displayName = 'Button';
3546
3569
  /* harmony default export */ const esm_Button = (Button);
3547
3570
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/Anchor.js
3548
3571
  const Anchor_excluded = ["onKeyDown"];
3549
- function Anchor_objectWithoutPropertiesLoose(source, excluded) {
3550
- if (source == null) return {};
3551
- var target = {};
3552
- var sourceKeys = Object.keys(source);
3553
- var key, i;
3554
- for (i = 0; i < sourceKeys.length; i++) {
3555
- key = sourceKeys[i];
3556
- if (excluded.indexOf(key) >= 0) continue;
3557
- target[key] = source[key];
3572
+ function Anchor_objectWithoutPropertiesLoose(r, e) {
3573
+ if (null == r) return {};
3574
+ var t = {};
3575
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
3576
+ if (e.indexOf(n) >= 0) continue;
3577
+ t[n] = r[n];
3558
3578
  }
3559
- return target;
3579
+ return t;
3560
3580
  }
3561
3581
  /* eslint-disable jsx-a11y/no-static-element-interactions */
3562
3582
  /* eslint-disable jsx-a11y/anchor-has-content */
@@ -3625,19 +3645,6 @@ const AlertLink = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_reac
3625
3645
  });
3626
3646
  AlertLink.displayName = 'AlertLink';
3627
3647
  /* harmony default export */ const src_AlertLink = (AlertLink);
3628
- ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/utils.js
3629
-
3630
- function isEscKey(e) {
3631
- return e.code === 'Escape' || e.keyCode === 27;
3632
- }
3633
- function getReactVersion() {
3634
- const parts = external_root_React_commonjs2_react_commonjs_react_amd_react_.version.split('.');
3635
- return {
3636
- major: +parts[0],
3637
- minor: +parts[1],
3638
- patch: +parts[2]
3639
- };
3640
- }
3641
3648
  ;// CONCATENATED MODULE: ./src/Fade.tsx
3642
3649
  var Fade_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap/src/Fade.tsx";
3643
3650
 
@@ -3731,23 +3738,19 @@ const Fade = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd
3731
3738
  triggerBrowserReflow(node);
3732
3739
  onEnter == null || onEnter(node, isAppearing);
3733
3740
  }, [onEnter]);
3734
- const {
3735
- major
3736
- } = getReactVersion();
3737
- const childRef = major >= 19 ? children.props.ref : children.ref;
3738
3741
  return /*#__PURE__*/(0,jsx_dev_runtime.jsxDEV)(src_TransitionWrapper, {
3739
3742
  ref: ref,
3740
3743
  addEndListener: transitionEndListener,
3741
3744
  ...props,
3742
3745
  onEnter: handleEnter,
3743
- childRef: childRef,
3746
+ childRef: getChildRef(children),
3744
3747
  children: (status, innerProps) => /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement(children, {
3745
3748
  ...innerProps,
3746
3749
  className: classnames_default()('fade', className, children.props.className, fadeStyles[status], transitionClasses[status])
3747
3750
  })
3748
3751
  }, void 0, false, {
3749
3752
  fileName: Fade_jsxFileName,
3750
- lineNumber: 121,
3753
+ lineNumber: 118,
3751
3754
  columnNumber: 7
3752
3755
  }, undefined);
3753
3756
  });
@@ -7468,17 +7471,14 @@ const popper_createPopper = popperGenerator({
7468
7471
 
7469
7472
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/usePopper.js
7470
7473
  const usePopper_excluded = ["enabled", "placement", "strategy", "modifiers"];
7471
- function usePopper_objectWithoutPropertiesLoose(source, excluded) {
7472
- if (source == null) return {};
7473
- var target = {};
7474
- var sourceKeys = Object.keys(source);
7475
- var key, i;
7476
- for (i = 0; i < sourceKeys.length; i++) {
7477
- key = sourceKeys[i];
7478
- if (excluded.indexOf(key) >= 0) continue;
7479
- target[key] = source[key];
7474
+ function usePopper_objectWithoutPropertiesLoose(r, e) {
7475
+ if (null == r) return {};
7476
+ var t = {};
7477
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
7478
+ if (e.indexOf(n) >= 0) continue;
7479
+ t[n] = r[n];
7480
7480
  }
7481
- return target;
7481
+ return t;
7482
7482
  }
7483
7483
 
7484
7484
 
@@ -7701,6 +7701,11 @@ function useClickOutside(ref, onClickOutside = useClickOutside_noop, {
7701
7701
  const currentTarget = getRefTarget(ref);
7702
7702
  if (currentTarget && contains_contains(currentTarget, e.target)) {
7703
7703
  waitingForTrigger.current = true;
7704
+ } else {
7705
+ // When clicking on scrollbars within current target, click events are not triggered, so this ref
7706
+ // is never reset inside `handleMouseCapture`. This would cause a bug where it requires 2 clicks
7707
+ // to close the overlay.
7708
+ waitingForTrigger.current = false;
7704
7709
  }
7705
7710
  });
7706
7711
  const handleMouse = useEventCallback(e => {
@@ -7815,17 +7820,14 @@ function mergeOptionsWithPopperConfig({
7815
7820
  }
7816
7821
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/DropdownMenu.js
7817
7822
  const DropdownMenu_excluded = ["children", "usePopper"];
7818
- function DropdownMenu_objectWithoutPropertiesLoose(source, excluded) {
7819
- if (source == null) return {};
7820
- var target = {};
7821
- var sourceKeys = Object.keys(source);
7822
- var key, i;
7823
- for (i = 0; i < sourceKeys.length; i++) {
7824
- key = sourceKeys[i];
7825
- if (excluded.indexOf(key) >= 0) continue;
7826
- target[key] = source[key];
7823
+ function DropdownMenu_objectWithoutPropertiesLoose(r, e) {
7824
+ if (null == r) return {};
7825
+ var t = {};
7826
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
7827
+ if (e.indexOf(n) >= 0) continue;
7828
+ t[n] = r[n];
7827
7829
  }
7828
- return target;
7830
+ return t;
7829
7831
  }
7830
7832
 
7831
7833
 
@@ -7835,7 +7837,6 @@ function DropdownMenu_objectWithoutPropertiesLoose(source, excluded) {
7835
7837
 
7836
7838
 
7837
7839
 
7838
-
7839
7840
  const DropdownMenu_noop = () => {};
7840
7841
 
7841
7842
  /**
@@ -8096,7 +8097,6 @@ function $b5e257d569688ac6$export$535bd6ca7f90a273() {
8096
8097
 
8097
8098
 
8098
8099
 
8099
-
8100
8100
  const isRoleMenu = el => {
8101
8101
  var _el$getAttribute;
8102
8102
  return ((_el$getAttribute = el.getAttribute('role')) == null ? void 0 : _el$getAttribute.toLowerCase()) === 'menu';
@@ -8180,17 +8180,14 @@ function dataProp(property) {
8180
8180
  }
8181
8181
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/DropdownItem.js
8182
8182
  const DropdownItem_excluded = ["eventKey", "disabled", "onClick", "active", "as"];
8183
- function DropdownItem_objectWithoutPropertiesLoose(source, excluded) {
8184
- if (source == null) return {};
8185
- var target = {};
8186
- var sourceKeys = Object.keys(source);
8187
- var key, i;
8188
- for (i = 0; i < sourceKeys.length; i++) {
8189
- key = sourceKeys[i];
8190
- if (excluded.indexOf(key) >= 0) continue;
8191
- target[key] = source[key];
8183
+ function DropdownItem_objectWithoutPropertiesLoose(r, e) {
8184
+ if (null == r) return {};
8185
+ var t = {};
8186
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
8187
+ if (e.indexOf(n) >= 0) continue;
8188
+ t[n] = r[n];
8192
8189
  }
8193
- return target;
8190
+ return t;
8194
8191
  }
8195
8192
 
8196
8193
 
@@ -10361,17 +10358,14 @@ const TabContext = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_rea
10361
10358
  /* harmony default export */ const esm_TabContext = (TabContext);
10362
10359
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/NavItem.js
10363
10360
  const NavItem_excluded = ["as", "active", "eventKey"];
10364
- function NavItem_objectWithoutPropertiesLoose(source, excluded) {
10365
- if (source == null) return {};
10366
- var target = {};
10367
- var sourceKeys = Object.keys(source);
10368
- var key, i;
10369
- for (i = 0; i < sourceKeys.length; i++) {
10370
- key = sourceKeys[i];
10371
- if (excluded.indexOf(key) >= 0) continue;
10372
- target[key] = source[key];
10361
+ function NavItem_objectWithoutPropertiesLoose(r, e) {
10362
+ if (null == r) return {};
10363
+ var t = {};
10364
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
10365
+ if (e.indexOf(n) >= 0) continue;
10366
+ t[n] = r[n];
10373
10367
  }
10374
- return target;
10368
+ return t;
10375
10369
  }
10376
10370
 
10377
10371
 
@@ -10464,17 +10458,14 @@ NavItem.displayName = 'NavItem';
10464
10458
  /* harmony default export */ const esm_NavItem = (NavItem);
10465
10459
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/Nav.js
10466
10460
  const Nav_excluded = ["as", "onSelect", "activeKey", "role", "onKeyDown"];
10467
- function Nav_objectWithoutPropertiesLoose(source, excluded) {
10468
- if (source == null) return {};
10469
- var target = {};
10470
- var sourceKeys = Object.keys(source);
10471
- var key, i;
10472
- for (i = 0; i < sourceKeys.length; i++) {
10473
- key = sourceKeys[i];
10474
- if (excluded.indexOf(key) >= 0) continue;
10475
- target[key] = source[key];
10461
+ function Nav_objectWithoutPropertiesLoose(r, e) {
10462
+ if (null == r) return {};
10463
+ var t = {};
10464
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
10465
+ if (e.indexOf(n) >= 0) continue;
10466
+ t[n] = r[n];
10476
10467
  }
10477
- return target;
10468
+ return t;
10478
10469
  }
10479
10470
 
10480
10471
 
@@ -10978,17 +10969,14 @@ function NoopTransition({
10978
10969
  /* harmony default export */ const esm_NoopTransition = (NoopTransition);
10979
10970
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/useRTGTransitionProps.js
10980
10971
  const useRTGTransitionProps_excluded = ["onEnter", "onEntering", "onEntered", "onExit", "onExiting", "onExited", "addEndListener", "children"];
10981
- function useRTGTransitionProps_objectWithoutPropertiesLoose(source, excluded) {
10982
- if (source == null) return {};
10983
- var target = {};
10984
- var sourceKeys = Object.keys(source);
10985
- var key, i;
10986
- for (i = 0; i < sourceKeys.length; i++) {
10987
- key = sourceKeys[i];
10988
- if (excluded.indexOf(key) >= 0) continue;
10989
- target[key] = source[key];
10972
+ function useRTGTransitionProps_objectWithoutPropertiesLoose(r, e) {
10973
+ if (null == r) return {};
10974
+ var t = {};
10975
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
10976
+ if (e.indexOf(n) >= 0) continue;
10977
+ t[n] = r[n];
10990
10978
  }
10991
- return target;
10979
+ return t;
10992
10980
  }
10993
10981
 
10994
10982
 
@@ -11012,12 +11000,8 @@ function useRTGTransitionProps(_ref) {
11012
11000
  children
11013
11001
  } = _ref,
11014
11002
  props = useRTGTransitionProps_objectWithoutPropertiesLoose(_ref, useRTGTransitionProps_excluded);
11015
- const {
11016
- major
11017
- } = getReactVersion();
11018
- const childRef = major >= 19 ? children.props.ref : children.ref;
11019
11003
  const nodeRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
11020
- const mergedRef = esm_useMergedRefs(nodeRef, typeof children === 'function' ? null : childRef);
11004
+ const mergedRef = esm_useMergedRefs(nodeRef, getChildRef(children));
11021
11005
  const normalize = callback => param => {
11022
11006
  if (callback && nodeRef.current) {
11023
11007
  callback(nodeRef.current, param);
@@ -11062,17 +11046,14 @@ function useRTGTransitionProps(_ref) {
11062
11046
  }
11063
11047
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/RTGTransition.js
11064
11048
  const RTGTransition_excluded = ["component"];
11065
- function RTGTransition_objectWithoutPropertiesLoose(source, excluded) {
11066
- if (source == null) return {};
11067
- var target = {};
11068
- var sourceKeys = Object.keys(source);
11069
- var key, i;
11070
- for (i = 0; i < sourceKeys.length; i++) {
11071
- key = sourceKeys[i];
11072
- if (excluded.indexOf(key) >= 0) continue;
11073
- target[key] = source[key];
11049
+ function RTGTransition_objectWithoutPropertiesLoose(r, e) {
11050
+ if (null == r) return {};
11051
+ var t = {};
11052
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
11053
+ if (e.indexOf(n) >= 0) continue;
11054
+ t[n] = r[n];
11074
11055
  }
11075
- return target;
11056
+ return t;
11076
11057
  }
11077
11058
 
11078
11059
 
@@ -11185,17 +11166,14 @@ function renderTransition(component, runTransition, props) {
11185
11166
  }
11186
11167
  ;// CONCATENATED MODULE: ./node_modules/@restart/ui/esm/Modal.js
11187
11168
  const Modal_excluded = ["show", "role", "className", "style", "children", "backdrop", "keyboard", "onBackdropClick", "onEscapeKeyDown", "transition", "runTransition", "backdropTransition", "runBackdropTransition", "autoFocus", "enforceFocus", "restoreFocus", "restoreFocusOptions", "renderDialog", "renderBackdrop", "manager", "container", "onShow", "onHide", "onExit", "onExited", "onExiting", "onEnter", "onEntering", "onEntered"];
11188
- function Modal_objectWithoutPropertiesLoose(source, excluded) {
11189
- if (source == null) return {};
11190
- var target = {};
11191
- var sourceKeys = Object.keys(source);
11192
- var key, i;
11193
- for (i = 0; i < sourceKeys.length; i++) {
11194
- key = sourceKeys[i];
11195
- if (excluded.indexOf(key) >= 0) continue;
11196
- target[key] = source[key];
11169
+ function Modal_objectWithoutPropertiesLoose(r, e) {
11170
+ if (null == r) return {};
11171
+ var t = {};
11172
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
11173
+ if (e.indexOf(n) >= 0) continue;
11174
+ t[n] = r[n];
11197
11175
  }
11198
- return target;
11176
+ return t;
11199
11177
  }
11200
11178
  /* eslint-disable @typescript-eslint/no-use-before-define, react/prop-types */
11201
11179
 
@@ -11216,9 +11194,13 @@ function Modal_objectWithoutPropertiesLoose(source, excluded) {
11216
11194
 
11217
11195
 
11218
11196
 
11197
+ let manager;
11219
11198
 
11199
+ /*
11200
+ Modal props are split into a version with and without index signature so that you can fully use them in another projects
11201
+ This is due to Typescript not playing well with index signatures e.g. when using Omit
11202
+ */
11220
11203
 
11221
- let manager;
11222
11204
  function getManager(window) {
11223
11205
  if (!manager) manager = new esm_ModalManager({
11224
11206
  ownerDocument: window == null ? void 0 : window.document
@@ -12236,9 +12218,6 @@ Modal_Modal.propTypes = Modal_propTypes;
12236
12218
  TRANSITION_DURATION: 300,
12237
12219
  BACKDROP_TRANSITION_DURATION: 150
12238
12220
  }));
12239
- // EXTERNAL MODULE: ./node_modules/prop-types-extra/lib/all.js
12240
- var lib_all = __webpack_require__(526);
12241
- var all_default = /*#__PURE__*/__webpack_require__.n(lib_all);
12242
12221
  ;// CONCATENATED MODULE: ./src/NavItem.tsx
12243
12222
  var NavItem_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-bootstrap/src/NavItem.tsx";
12244
12223
 
@@ -12384,7 +12363,7 @@ const Nav_propTypes = {
12384
12363
  *
12385
12364
  * @type {boolean}
12386
12365
  */
12387
- justify: all_default()((prop_types_default()).bool, ({
12366
+ justify: (0,lib/* all */.Q7)((prop_types_default()).bool, ({
12388
12367
  justify,
12389
12368
  navbar
12390
12369
  }) => justify && navbar ? Error('justify navbar `Nav`s are not supported') : null),
@@ -12837,6 +12816,7 @@ var OffcanvasToggling_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-
12837
12816
 
12838
12817
 
12839
12818
 
12819
+
12840
12820
  const OffcanvasToggling_propTypes = {
12841
12821
  /**
12842
12822
  * Show the component; triggers the fade in or fade out animation
@@ -12909,14 +12889,14 @@ const OffcanvasToggling = /*#__PURE__*/external_root_React_commonjs2_react_commo
12909
12889
  unmountOnExit: unmountOnExit,
12910
12890
  appear: appear,
12911
12891
  ...props,
12912
- childRef: children.ref,
12892
+ childRef: getChildRef(children),
12913
12893
  children: (status, innerProps) => /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement(children, {
12914
12894
  ...innerProps,
12915
12895
  className: classnames_default()(className, children.props.className, (status === ENTERING || status === EXITING) && `${bsPrefix}-toggling`, transitionStyles[status])
12916
12896
  })
12917
12897
  }, void 0, false, {
12918
12898
  fileName: OffcanvasToggling_jsxFileName,
12919
- lineNumber: 108,
12899
+ lineNumber: 109,
12920
12900
  columnNumber: 7
12921
12901
  }, undefined);
12922
12902
  });
@@ -14294,6 +14274,7 @@ var OverlayTrigger_jsxFileName = "/Users/kyletsang/Documents/Kyle/Code/react-boo
14294
14274
 
14295
14275
 
14296
14276
 
14277
+
14297
14278
  function normalizeDelay(delay) {
14298
14279
  return delay && typeof delay === 'object' ? delay : {
14299
14280
  show: delay,
@@ -14395,7 +14376,7 @@ const OverlayTrigger = ({
14395
14376
  ...props
14396
14377
  }) => {
14397
14378
  const triggerNodeRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
14398
- const mergedRef = esm_useMergedRefs(triggerNodeRef, children.ref);
14379
+ const mergedRef = esm_useMergedRefs(triggerNodeRef, getChildRef(children));
14399
14380
  const timeout = useTimeout();
14400
14381
  const hoverStateRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)('');
14401
14382
  const [show, setShow] = useUncontrolledProp(propsShow, defaultShow, onToggle);
@@ -14476,7 +14457,7 @@ const OverlayTrigger = ({
14476
14457
  children: overlay
14477
14458
  }, void 0, false, {
14478
14459
  fileName: OverlayTrigger_jsxFileName,
14479
- lineNumber: 307,
14460
+ lineNumber: 308,
14480
14461
  columnNumber: 7
14481
14462
  }, undefined)]
14482
14463
  }, void 0, true);
@@ -15403,17 +15384,14 @@ Stack.propTypes = Stack_propTypes;
15403
15384
  const TabPanel_excluded = ["active", "eventKey", "mountOnEnter", "transition", "unmountOnExit", "role", "onEnter", "onEntering", "onEntered", "onExit", "onExiting", "onExited"],
15404
15385
  _excluded2 = ["activeKey", "getControlledId", "getControllerId"],
15405
15386
  _excluded3 = ["as"];
15406
- function TabPanel_objectWithoutPropertiesLoose(source, excluded) {
15407
- if (source == null) return {};
15408
- var target = {};
15409
- var sourceKeys = Object.keys(source);
15410
- var key, i;
15411
- for (i = 0; i < sourceKeys.length; i++) {
15412
- key = sourceKeys[i];
15413
- if (excluded.indexOf(key) >= 0) continue;
15414
- target[key] = source[key];
15387
+ function TabPanel_objectWithoutPropertiesLoose(r, e) {
15388
+ if (null == r) return {};
15389
+ var t = {};
15390
+ for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
15391
+ if (e.indexOf(n) >= 0) continue;
15392
+ t[n] = r[n];
15415
15393
  }
15416
- return target;
15394
+ return t;
15417
15395
  }
15418
15396
 
15419
15397