react-bootstrap 1.3.0 → 1.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/cjs/AbstractNav.js +1 -1
- package/cjs/AbstractNavItem.js +6 -2
- package/cjs/Accordion.js +1 -1
- package/cjs/AccordionCollapse.js +10 -4
- package/cjs/AccordionContext.js +1 -1
- package/cjs/AccordionToggle.js +1 -1
- package/cjs/Alert.js +2 -2
- package/cjs/Badge.js +1 -1
- package/cjs/Breadcrumb.js +1 -1
- package/cjs/BreadcrumbItem.js +1 -1
- package/cjs/Button.js +2 -2
- package/cjs/ButtonGroup.js +1 -1
- package/cjs/ButtonToolbar.js +1 -1
- package/cjs/Card.js +1 -1
- package/cjs/CardContext.js +1 -1
- package/cjs/CardImg.js +1 -1
- package/cjs/Carousel.js +52 -40
- package/cjs/CarouselItem.d.ts +7 -2
- package/cjs/CarouselItem.js +25 -2
- package/cjs/CloseButton.js +1 -1
- package/cjs/Col.js +1 -1
- package/cjs/Collapse.js +2 -2
- package/cjs/Container.js +1 -1
- package/cjs/Dropdown.js +1 -1
- package/cjs/DropdownButton.d.ts +9 -5
- package/cjs/DropdownButton.js +20 -6
- package/cjs/DropdownItem.js +4 -3
- package/cjs/DropdownMenu.d.ts +22 -0
- package/cjs/DropdownMenu.js +50 -8
- package/cjs/DropdownToggle.js +3 -4
- package/cjs/ElementChildren.js +2 -2
- package/cjs/Fade.d.ts +6 -3
- package/cjs/Fade.js +2 -2
- package/cjs/Feedback.js +1 -1
- package/cjs/FigureImage.js +1 -1
- package/cjs/Form.d.ts +1 -1
- package/cjs/Form.js +1 -1
- package/cjs/FormCheck.d.ts +1 -3
- package/cjs/FormCheck.js +2 -2
- package/cjs/FormCheckInput.js +1 -1
- package/cjs/FormCheckLabel.js +1 -1
- package/cjs/FormContext.js +1 -1
- package/cjs/FormControl.js +1 -1
- package/cjs/FormFile.js +1 -1
- package/cjs/FormFileInput.js +1 -1
- package/cjs/FormFileLabel.js +1 -1
- package/cjs/FormGroup.js +1 -1
- package/cjs/FormLabel.js +2 -2
- package/cjs/FormText.js +1 -1
- package/cjs/Image.js +1 -1
- package/cjs/InputGroup.js +1 -1
- package/cjs/Jumbotron.js +1 -1
- package/cjs/ListGroup.js +1 -1
- package/cjs/ListGroupItem.d.ts +1 -1
- package/cjs/ListGroupItem.js +9 -2
- package/cjs/Media.js +1 -1
- package/cjs/Modal.d.ts +1 -0
- package/cjs/Modal.js +6 -5
- package/cjs/ModalContext.js +1 -1
- package/cjs/ModalDialog.d.ts +1 -0
- package/cjs/ModalDialog.js +4 -3
- package/cjs/ModalHeader.js +1 -1
- package/cjs/Nav.js +1 -1
- package/cjs/NavContext.js +1 -1
- package/cjs/NavDropdown.d.ts +3 -3
- package/cjs/NavDropdown.js +1 -1
- package/cjs/NavItem.js +1 -1
- package/cjs/NavLink.js +1 -1
- package/cjs/Navbar.js +1 -1
- package/cjs/NavbarBrand.js +1 -1
- package/cjs/NavbarCollapse.js +1 -1
- package/cjs/NavbarContext.js +1 -1
- package/cjs/NavbarToggle.js +1 -1
- package/cjs/Overlay.d.ts +1 -1
- package/cjs/Overlay.js +3 -3
- package/cjs/OverlayTrigger.d.ts +1 -1
- package/cjs/OverlayTrigger.js +1 -1
- package/cjs/PageItem.js +1 -1
- package/cjs/Pagination.js +1 -1
- package/cjs/Popover.js +1 -1
- package/cjs/PopoverContent.js +1 -1
- package/cjs/PopoverTitle.js +1 -1
- package/cjs/ProgressBar.js +3 -3
- package/cjs/ResponsiveEmbed.js +2 -2
- package/cjs/Row.js +1 -1
- package/cjs/SafeAnchor.js +1 -1
- package/cjs/SelectableContext.js +1 -1
- package/cjs/Spinner.js +1 -1
- package/cjs/SplitButton.d.ts +16 -5
- package/cjs/SplitButton.js +27 -4
- package/cjs/Switch.js +1 -1
- package/cjs/TabContent.js +1 -1
- package/cjs/TabContext.js +1 -1
- package/cjs/TabPane.js +1 -1
- package/cjs/Table.js +1 -1
- package/cjs/ThemeProvider.js +2 -2
- package/cjs/Toast.js +1 -1
- package/cjs/ToastContext.js +1 -1
- package/cjs/ToastHeader.js +1 -1
- package/cjs/ToggleButton.d.ts +2 -2
- package/cjs/ToggleButton.js +1 -1
- package/cjs/ToggleButtonGroup.d.ts +4 -3
- package/cjs/ToggleButtonGroup.js +4 -3
- package/cjs/Tooltip.js +1 -1
- package/cjs/createWithBsPrefix.js +1 -1
- package/cjs/divWithClassName.js +1 -1
- package/cjs/index.d.ts +1 -0
- package/cjs/usePopperMarginModifiers.d.ts +4 -1
- package/cjs/usePopperMarginModifiers.js +8 -4
- package/dist/react-bootstrap.js +931 -615
- package/dist/react-bootstrap.min.js +2 -2
- package/esm/AbstractNav.js +1 -1
- package/esm/AbstractNavItem.js +6 -2
- package/esm/Accordion.js +1 -1
- package/esm/AccordionCollapse.js +9 -4
- package/esm/AccordionContext.js +1 -1
- package/esm/AccordionToggle.js +1 -1
- package/esm/Alert.js +2 -2
- package/esm/Badge.js +1 -1
- package/esm/Breadcrumb.js +1 -1
- package/esm/BreadcrumbItem.js +1 -1
- package/esm/Button.js +2 -2
- package/esm/ButtonGroup.js +1 -1
- package/esm/ButtonToolbar.js +1 -1
- package/esm/Card.js +1 -1
- package/esm/CardContext.js +1 -1
- package/esm/CardImg.js +1 -1
- package/esm/Carousel.js +53 -41
- package/esm/CarouselItem.d.ts +7 -2
- package/esm/CarouselItem.js +22 -2
- package/esm/CloseButton.js +1 -1
- package/esm/Col.js +1 -1
- package/esm/Collapse.js +2 -2
- package/esm/Container.js +1 -1
- package/esm/Dropdown.js +1 -1
- package/esm/DropdownButton.d.ts +9 -5
- package/esm/DropdownButton.js +18 -6
- package/esm/DropdownItem.js +4 -3
- package/esm/DropdownMenu.d.ts +22 -0
- package/esm/DropdownMenu.js +43 -5
- package/esm/DropdownToggle.js +3 -4
- package/esm/ElementChildren.js +2 -2
- package/esm/Fade.d.ts +6 -3
- package/esm/Fade.js +2 -2
- package/esm/Feedback.js +1 -1
- package/esm/FigureImage.js +1 -1
- package/esm/Form.d.ts +1 -1
- package/esm/Form.js +1 -1
- package/esm/FormCheck.d.ts +1 -3
- package/esm/FormCheck.js +2 -2
- package/esm/FormCheckInput.js +1 -1
- package/esm/FormCheckLabel.js +1 -1
- package/esm/FormContext.js +1 -1
- package/esm/FormControl.js +1 -1
- package/esm/FormFile.js +1 -1
- package/esm/FormFileInput.js +1 -1
- package/esm/FormFileLabel.js +1 -1
- package/esm/FormGroup.js +1 -1
- package/esm/FormLabel.js +2 -2
- package/esm/FormText.js +1 -1
- package/esm/Image.js +1 -1
- package/esm/InputGroup.js +1 -1
- package/esm/Jumbotron.js +1 -1
- package/esm/ListGroup.js +1 -1
- package/esm/ListGroupItem.d.ts +1 -1
- package/esm/ListGroupItem.js +9 -2
- package/esm/Media.js +1 -1
- package/esm/Modal.d.ts +1 -0
- package/esm/Modal.js +6 -5
- package/esm/ModalContext.js +1 -1
- package/esm/ModalDialog.d.ts +1 -0
- package/esm/ModalDialog.js +4 -3
- package/esm/ModalHeader.js +1 -1
- package/esm/Nav.js +1 -1
- package/esm/NavContext.js +1 -1
- package/esm/NavDropdown.d.ts +3 -3
- package/esm/NavDropdown.js +1 -1
- package/esm/NavItem.js +1 -1
- package/esm/NavLink.js +1 -1
- package/esm/Navbar.js +1 -1
- package/esm/NavbarBrand.js +1 -1
- package/esm/NavbarCollapse.js +1 -1
- package/esm/NavbarContext.js +1 -1
- package/esm/NavbarToggle.js +1 -1
- package/esm/Overlay.d.ts +1 -1
- package/esm/Overlay.js +3 -3
- package/esm/OverlayTrigger.d.ts +1 -1
- package/esm/OverlayTrigger.js +1 -1
- package/esm/PageItem.js +1 -1
- package/esm/Pagination.js +1 -1
- package/esm/Popover.js +1 -1
- package/esm/PopoverContent.js +1 -1
- package/esm/PopoverTitle.js +1 -1
- package/esm/ProgressBar.js +3 -3
- package/esm/ResponsiveEmbed.js +2 -2
- package/esm/Row.js +1 -1
- package/esm/SafeAnchor.js +1 -1
- package/esm/SelectableContext.js +1 -1
- package/esm/Spinner.js +1 -1
- package/esm/SplitButton.d.ts +16 -5
- package/esm/SplitButton.js +26 -3
- package/esm/Switch.js +1 -1
- package/esm/TabContent.js +1 -1
- package/esm/TabContext.js +1 -1
- package/esm/TabPane.js +1 -1
- package/esm/Table.js +1 -1
- package/esm/ThemeProvider.js +2 -2
- package/esm/Toast.js +1 -1
- package/esm/ToastContext.js +1 -1
- package/esm/ToastHeader.js +1 -1
- package/esm/ToggleButton.d.ts +2 -2
- package/esm/ToggleButton.js +1 -1
- package/esm/ToggleButtonGroup.d.ts +4 -3
- package/esm/ToggleButtonGroup.js +4 -3
- package/esm/Tooltip.js +1 -1
- package/esm/createWithBsPrefix.js +1 -1
- package/esm/divWithClassName.js +1 -1
- package/esm/index.d.ts +1 -0
- package/esm/usePopperMarginModifiers.d.ts +4 -1
- package/esm/usePopperMarginModifiers.js +7 -4
- package/package.json +25 -25
package/esm/AbstractNav.js
CHANGED
|
@@ -11,7 +11,7 @@ import TabContext from './TabContext';
|
|
|
11
11
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
12
12
|
var noop = function noop() {};
|
|
13
13
|
|
|
14
|
-
var AbstractNav = React.forwardRef(function (_ref, ref) {
|
|
14
|
+
var AbstractNav = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
15
15
|
var _ref$as = _ref.as,
|
|
16
16
|
Component = _ref$as === void 0 ? 'ul' : _ref$as,
|
|
17
17
|
onSelect = _ref.onSelect,
|
package/esm/AbstractNavItem.js
CHANGED
|
@@ -9,7 +9,7 @@ import SelectableContext, { makeEventKey } from './SelectableContext';
|
|
|
9
9
|
var defaultProps = {
|
|
10
10
|
disabled: false
|
|
11
11
|
};
|
|
12
|
-
var AbstractNavItem = React.forwardRef(function (_ref, ref) {
|
|
12
|
+
var AbstractNavItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
13
13
|
var active = _ref.active,
|
|
14
14
|
className = _ref.className,
|
|
15
15
|
eventKey = _ref.eventKey,
|
|
@@ -36,7 +36,11 @@ var AbstractNavItem = React.forwardRef(function (_ref, ref) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
if (props.role === 'tab') {
|
|
39
|
-
|
|
39
|
+
if (props.disabled) {
|
|
40
|
+
props.tabIndex = -1;
|
|
41
|
+
props['aria-disabled'] = true;
|
|
42
|
+
}
|
|
43
|
+
|
|
40
44
|
props['aria-selected'] = isActive;
|
|
41
45
|
}
|
|
42
46
|
|
package/esm/Accordion.js
CHANGED
|
@@ -8,7 +8,7 @@ import AccordionToggle from './AccordionToggle';
|
|
|
8
8
|
import SelectableContext from './SelectableContext';
|
|
9
9
|
import AccordionCollapse from './AccordionCollapse';
|
|
10
10
|
import AccordionContext from './AccordionContext';
|
|
11
|
-
var Accordion = React.forwardRef(function (props, ref) {
|
|
11
|
+
var Accordion = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
12
12
|
var _useUncontrolled = useUncontrolled(props, {
|
|
13
13
|
activeKey: 'onSelect'
|
|
14
14
|
}),
|
package/esm/AccordionCollapse.js
CHANGED
|
@@ -3,16 +3,21 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
|
|
|
3
3
|
import React, { useContext } from 'react';
|
|
4
4
|
import Collapse from './Collapse';
|
|
5
5
|
import AccordionContext from './AccordionContext';
|
|
6
|
-
|
|
6
|
+
import SelectableContext from './SelectableContext';
|
|
7
|
+
var AccordionCollapse = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
7
8
|
var children = _ref.children,
|
|
8
9
|
eventKey = _ref.eventKey,
|
|
9
10
|
props = _objectWithoutPropertiesLoose(_ref, ["children", "eventKey"]);
|
|
10
11
|
|
|
11
|
-
var contextEventKey = useContext(AccordionContext);
|
|
12
|
-
|
|
12
|
+
var contextEventKey = useContext(AccordionContext); // Empty SelectableContext is to prevent elements in the collapse
|
|
13
|
+
// from collapsing the accordion when clicked.
|
|
14
|
+
|
|
15
|
+
return /*#__PURE__*/React.createElement(SelectableContext.Provider, {
|
|
16
|
+
value: null
|
|
17
|
+
}, /*#__PURE__*/React.createElement(Collapse, _extends({
|
|
13
18
|
ref: ref,
|
|
14
19
|
in: contextEventKey === eventKey
|
|
15
|
-
}, props), /*#__PURE__*/React.createElement("div", null, React.Children.only(children)));
|
|
20
|
+
}, props), /*#__PURE__*/React.createElement("div", null, React.Children.only(children))));
|
|
16
21
|
});
|
|
17
22
|
AccordionCollapse.displayName = 'AccordionCollapse';
|
|
18
23
|
export default AccordionCollapse;
|
package/esm/AccordionContext.js
CHANGED
package/esm/AccordionToggle.js
CHANGED
|
@@ -16,7 +16,7 @@ export function useAccordionToggle(eventKey, onClick) {
|
|
|
16
16
|
if (onClick) onClick(e);
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
|
-
var AccordionToggle = React.forwardRef(function (_ref, ref) {
|
|
19
|
+
var AccordionToggle = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
20
20
|
var _ref$as = _ref.as,
|
|
21
21
|
Component = _ref$as === void 0 ? 'button' : _ref$as,
|
|
22
22
|
children = _ref.children,
|
package/esm/Alert.js
CHANGED
|
@@ -23,7 +23,7 @@ var defaultProps = {
|
|
|
23
23
|
transition: Fade,
|
|
24
24
|
closeLabel: 'Close alert'
|
|
25
25
|
};
|
|
26
|
-
var Alert = React.forwardRef(function (uncontrolledProps, ref) {
|
|
26
|
+
var Alert = /*#__PURE__*/React.forwardRef(function (uncontrolledProps, ref) {
|
|
27
27
|
var _useUncontrolled = useUncontrolled(uncontrolledProps, {
|
|
28
28
|
show: 'onClose'
|
|
29
29
|
}),
|
|
@@ -47,7 +47,7 @@ var Alert = React.forwardRef(function (uncontrolledProps, ref) {
|
|
|
47
47
|
var Transition = transition === true ? Fade : transition;
|
|
48
48
|
var alert = /*#__PURE__*/React.createElement("div", _extends({
|
|
49
49
|
role: "alert"
|
|
50
|
-
}, Transition ? props : undefined, {
|
|
50
|
+
}, !Transition ? props : undefined, {
|
|
51
51
|
ref: ref,
|
|
52
52
|
className: classNames(className, prefix, variant && prefix + "-" + variant, dismissible && prefix + "-dismissible")
|
|
53
53
|
}), dismissible && /*#__PURE__*/React.createElement(CloseButton, {
|
package/esm/Badge.js
CHANGED
|
@@ -6,7 +6,7 @@ import { useBootstrapPrefix } from './ThemeProvider';
|
|
|
6
6
|
var defaultProps = {
|
|
7
7
|
pill: false
|
|
8
8
|
};
|
|
9
|
-
var Badge = React.forwardRef(function (_ref, ref) {
|
|
9
|
+
var Badge = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
10
10
|
var bsPrefix = _ref.bsPrefix,
|
|
11
11
|
variant = _ref.variant,
|
|
12
12
|
pill = _ref.pill,
|
package/esm/Breadcrumb.js
CHANGED
|
@@ -8,7 +8,7 @@ var defaultProps = {
|
|
|
8
8
|
label: 'breadcrumb',
|
|
9
9
|
listProps: {}
|
|
10
10
|
};
|
|
11
|
-
var Breadcrumb = React.forwardRef(function (_ref, ref) {
|
|
11
|
+
var Breadcrumb = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
12
12
|
var bsPrefix = _ref.bsPrefix,
|
|
13
13
|
className = _ref.className,
|
|
14
14
|
listProps = _ref.listProps,
|
package/esm/BreadcrumbItem.js
CHANGED
|
@@ -8,7 +8,7 @@ var defaultProps = {
|
|
|
8
8
|
active: false,
|
|
9
9
|
linkProps: {}
|
|
10
10
|
};
|
|
11
|
-
var BreadcrumbItem = React.forwardRef(function (_ref, ref) {
|
|
11
|
+
var BreadcrumbItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
12
12
|
var bsPrefix = _ref.bsPrefix,
|
|
13
13
|
active = _ref.active,
|
|
14
14
|
children = _ref.children,
|
package/esm/Button.js
CHANGED
|
@@ -9,7 +9,7 @@ var defaultProps = {
|
|
|
9
9
|
active: false,
|
|
10
10
|
disabled: false
|
|
11
11
|
};
|
|
12
|
-
var Button = React.forwardRef(function (_ref, ref) {
|
|
12
|
+
var Button = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
13
13
|
var bsPrefix = _ref.bsPrefix,
|
|
14
14
|
variant = _ref.variant,
|
|
15
15
|
size = _ref.size,
|
|
@@ -21,7 +21,7 @@ var Button = React.forwardRef(function (_ref, ref) {
|
|
|
21
21
|
props = _objectWithoutPropertiesLoose(_ref, ["bsPrefix", "variant", "size", "active", "className", "block", "type", "as"]);
|
|
22
22
|
|
|
23
23
|
var prefix = useBootstrapPrefix(bsPrefix, 'btn');
|
|
24
|
-
var classes = classNames(className, prefix, active && 'active', prefix + "-" + variant, block && prefix + "-block", size && prefix + "-" + size);
|
|
24
|
+
var classes = classNames(className, prefix, active && 'active', variant && prefix + "-" + variant, block && prefix + "-block", size && prefix + "-" + size);
|
|
25
25
|
|
|
26
26
|
if (props.href) {
|
|
27
27
|
return /*#__PURE__*/React.createElement(SafeAnchor, _extends({}, props, {
|
package/esm/ButtonGroup.js
CHANGED
|
@@ -8,7 +8,7 @@ var defaultProps = {
|
|
|
8
8
|
toggle: false,
|
|
9
9
|
role: 'group'
|
|
10
10
|
};
|
|
11
|
-
var ButtonGroup = React.forwardRef(function (_ref, ref) {
|
|
11
|
+
var ButtonGroup = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
12
12
|
var bsPrefix = _ref.bsPrefix,
|
|
13
13
|
size = _ref.size,
|
|
14
14
|
toggle = _ref.toggle,
|
package/esm/ButtonToolbar.js
CHANGED
|
@@ -6,7 +6,7 @@ import { useBootstrapPrefix } from './ThemeProvider';
|
|
|
6
6
|
var defaultProps = {
|
|
7
7
|
role: 'toolbar'
|
|
8
8
|
};
|
|
9
|
-
var ButtonToolbar = React.forwardRef(function (_ref, ref) {
|
|
9
|
+
var ButtonToolbar = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
10
10
|
var bsPrefix = _ref.bsPrefix,
|
|
11
11
|
className = _ref.className,
|
|
12
12
|
props = _objectWithoutPropertiesLoose(_ref, ["bsPrefix", "className"]);
|
package/esm/Card.js
CHANGED
|
@@ -28,7 +28,7 @@ var CardImgOverlay = createWithBsPrefix('card-img-overlay');
|
|
|
28
28
|
var defaultProps = {
|
|
29
29
|
body: false
|
|
30
30
|
};
|
|
31
|
-
var Card = React.forwardRef(function (_ref, ref) {
|
|
31
|
+
var Card = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
32
32
|
var bsPrefix = _ref.bsPrefix,
|
|
33
33
|
className = _ref.className,
|
|
34
34
|
bg = _ref.bg,
|
package/esm/CardContext.js
CHANGED
package/esm/CardImg.js
CHANGED
|
@@ -6,7 +6,7 @@ import { useBootstrapPrefix } from './ThemeProvider';
|
|
|
6
6
|
var defaultProps = {
|
|
7
7
|
variant: null
|
|
8
8
|
};
|
|
9
|
-
var CardImg = React.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
|
|
9
|
+
var CardImg = /*#__PURE__*/React.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
|
|
10
10
|
function (_ref, ref) {
|
|
11
11
|
var bsPrefix = _ref.bsPrefix,
|
|
12
12
|
className = _ref.className,
|
package/esm/Carousel.js
CHANGED
|
@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
|
|
|
2
2
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
3
|
import useEventCallback from '@restart/hooks/useEventCallback';
|
|
4
4
|
import useUpdateEffect from '@restart/hooks/useUpdateEffect';
|
|
5
|
+
import useCommittedRef from '@restart/hooks/useCommittedRef';
|
|
5
6
|
import useTimeout from '@restart/hooks/useTimeout';
|
|
6
7
|
import classNames from 'classnames';
|
|
7
8
|
import transitionEnd from 'dom-helpers/transitionEnd';
|
|
@@ -11,7 +12,7 @@ import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, us
|
|
|
11
12
|
import { useUncontrolled } from 'uncontrollable';
|
|
12
13
|
import CarouselCaption from './CarouselCaption';
|
|
13
14
|
import CarouselItem from './CarouselItem';
|
|
14
|
-
import { map } from './ElementChildren';
|
|
15
|
+
import { map, forEach } from './ElementChildren';
|
|
15
16
|
import SafeAnchor from './SafeAnchor';
|
|
16
17
|
import { useBootstrapPrefix } from './ThemeProvider';
|
|
17
18
|
import triggerBrowserReflow from './triggerBrowserReflow';
|
|
@@ -192,17 +193,20 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
192
193
|
setDirection = _useState[1];
|
|
193
194
|
|
|
194
195
|
var _useState2 = useState(false),
|
|
195
|
-
|
|
196
|
-
|
|
196
|
+
paused = _useState2[0],
|
|
197
|
+
setPaused = _useState2[1];
|
|
197
198
|
|
|
198
|
-
var _useState3 = useState(
|
|
199
|
-
|
|
200
|
-
|
|
199
|
+
var _useState3 = useState(false),
|
|
200
|
+
isSliding = _useState3[0],
|
|
201
|
+
setIsSliding = _useState3[1];
|
|
202
|
+
|
|
203
|
+
var _useState4 = useState(activeIndex || 0),
|
|
204
|
+
renderedActiveIndex = _useState4[0],
|
|
205
|
+
setRenderedActiveIndex = _useState4[1];
|
|
201
206
|
|
|
202
207
|
if (!isSliding && activeIndex !== renderedActiveIndex) {
|
|
203
208
|
if (nextDirectionRef.current) {
|
|
204
209
|
setDirection(nextDirectionRef.current);
|
|
205
|
-
nextDirectionRef.current = null;
|
|
206
210
|
} else {
|
|
207
211
|
setDirection((activeIndex || 0) > renderedActiveIndex ? 'next' : 'prev');
|
|
208
212
|
}
|
|
@@ -214,7 +218,23 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
214
218
|
setRenderedActiveIndex(activeIndex || 0);
|
|
215
219
|
}
|
|
216
220
|
|
|
217
|
-
|
|
221
|
+
useEffect(function () {
|
|
222
|
+
if (nextDirectionRef.current) {
|
|
223
|
+
nextDirectionRef.current = null;
|
|
224
|
+
}
|
|
225
|
+
});
|
|
226
|
+
var numChildren = 0;
|
|
227
|
+
var activeChildInterval; // Iterate to grab all of the children's interval values
|
|
228
|
+
// (and count them, too)
|
|
229
|
+
|
|
230
|
+
forEach(children, function (child, index) {
|
|
231
|
+
++numChildren;
|
|
232
|
+
|
|
233
|
+
if (index === activeIndex) {
|
|
234
|
+
activeChildInterval = child.props.interval;
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
var activeChildIntervalRef = useCommittedRef(activeChildInterval);
|
|
218
238
|
var prev = useCallback(function (event) {
|
|
219
239
|
if (isSliding) {
|
|
220
240
|
return;
|
|
@@ -324,14 +344,9 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
324
344
|
onKeyDown(event);
|
|
325
345
|
}
|
|
326
346
|
}, [keyboard, onKeyDown, prev, next]);
|
|
327
|
-
|
|
328
|
-
var _useState4 = useState(false),
|
|
329
|
-
pausedOnHover = _useState4[0],
|
|
330
|
-
setPausedOnHover = _useState4[1];
|
|
331
|
-
|
|
332
347
|
var handleMouseOver = useCallback(function (event) {
|
|
333
348
|
if (pause === 'hover') {
|
|
334
|
-
|
|
349
|
+
setPaused(true);
|
|
335
350
|
}
|
|
336
351
|
|
|
337
352
|
if (onMouseOver) {
|
|
@@ -339,7 +354,7 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
339
354
|
}
|
|
340
355
|
}, [pause, onMouseOver]);
|
|
341
356
|
var handleMouseOut = useCallback(function (event) {
|
|
342
|
-
|
|
357
|
+
setPaused(false);
|
|
343
358
|
|
|
344
359
|
if (onMouseOut) {
|
|
345
360
|
onMouseOut(event);
|
|
@@ -347,24 +362,19 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
347
362
|
}, [onMouseOut]);
|
|
348
363
|
var touchStartXRef = useRef(0);
|
|
349
364
|
var touchDeltaXRef = useRef(0);
|
|
350
|
-
|
|
351
|
-
var _useState5 = useState(false),
|
|
352
|
-
pausedOnTouch = _useState5[0],
|
|
353
|
-
setPausedOnTouch = _useState5[1];
|
|
354
|
-
|
|
355
365
|
var touchUnpauseTimeout = useTimeout();
|
|
356
366
|
var handleTouchStart = useCallback(function (event) {
|
|
357
367
|
touchStartXRef.current = event.touches[0].clientX;
|
|
358
368
|
touchDeltaXRef.current = 0;
|
|
359
369
|
|
|
360
|
-
if (
|
|
361
|
-
|
|
370
|
+
if (pause === 'hover') {
|
|
371
|
+
setPaused(true);
|
|
362
372
|
}
|
|
363
373
|
|
|
364
374
|
if (onTouchStart) {
|
|
365
375
|
onTouchStart(event);
|
|
366
376
|
}
|
|
367
|
-
}, [
|
|
377
|
+
}, [pause, onTouchStart]);
|
|
368
378
|
var handleTouchMove = useCallback(function (event) {
|
|
369
379
|
if (event.touches && event.touches.length > 1) {
|
|
370
380
|
touchDeltaXRef.current = 0;
|
|
@@ -380,39 +390,41 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
380
390
|
if (touch) {
|
|
381
391
|
var touchDeltaX = touchDeltaXRef.current;
|
|
382
392
|
|
|
383
|
-
if (Math.abs(touchDeltaX)
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
} else {
|
|
390
|
-
next(event);
|
|
393
|
+
if (Math.abs(touchDeltaX) > SWIPE_THRESHOLD) {
|
|
394
|
+
if (touchDeltaX > 0) {
|
|
395
|
+
prev(event);
|
|
396
|
+
} else {
|
|
397
|
+
next(event);
|
|
398
|
+
}
|
|
391
399
|
}
|
|
392
400
|
}
|
|
393
401
|
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
402
|
+
if (pause === 'hover') {
|
|
403
|
+
touchUnpauseTimeout.set(function () {
|
|
404
|
+
setPaused(false);
|
|
405
|
+
}, interval || undefined);
|
|
406
|
+
}
|
|
397
407
|
|
|
398
408
|
if (onTouchEnd) {
|
|
399
409
|
onTouchEnd(event);
|
|
400
410
|
}
|
|
401
|
-
}, [touch, prev, next, touchUnpauseTimeout, interval, onTouchEnd]);
|
|
402
|
-
var shouldPlay = interval != null && !
|
|
411
|
+
}, [touch, pause, prev, next, touchUnpauseTimeout, interval, onTouchEnd]);
|
|
412
|
+
var shouldPlay = interval != null && !paused && !isSliding;
|
|
403
413
|
var intervalHandleRef = useRef();
|
|
404
414
|
useEffect(function () {
|
|
415
|
+
var _ref, _activeChildIntervalR;
|
|
416
|
+
|
|
405
417
|
if (!shouldPlay) {
|
|
406
418
|
return undefined;
|
|
407
419
|
}
|
|
408
420
|
|
|
409
|
-
intervalHandleRef.current = window.setInterval(document.visibilityState ? nextWhenVisible : next, interval
|
|
421
|
+
intervalHandleRef.current = window.setInterval(document.visibilityState ? nextWhenVisible : next, (_ref = (_activeChildIntervalR = activeChildIntervalRef.current) != null ? _activeChildIntervalR : interval) != null ? _ref : undefined);
|
|
410
422
|
return function () {
|
|
411
423
|
if (intervalHandleRef.current !== null) {
|
|
412
424
|
clearInterval(intervalHandleRef.current);
|
|
413
425
|
}
|
|
414
426
|
};
|
|
415
|
-
}, [shouldPlay, next, interval, nextWhenVisible]);
|
|
427
|
+
}, [shouldPlay, next, activeChildIntervalRef, interval, nextWhenVisible]);
|
|
416
428
|
var indicatorOnClicks = useMemo(function () {
|
|
417
429
|
return indicators && Array.from({
|
|
418
430
|
length: numChildren
|
|
@@ -452,10 +464,10 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
452
464
|
onEntered: isActive ? handleEntered : undefined,
|
|
453
465
|
addEndListener: transitionEnd
|
|
454
466
|
}, function (status) {
|
|
455
|
-
return React.cloneElement(child, {
|
|
467
|
+
return /*#__PURE__*/React.cloneElement(child, {
|
|
456
468
|
className: classNames(child.props.className, isActive && status !== 'entered' && orderClassName, (status === 'entered' || status === 'exiting') && 'active', (status === 'entering' || status === 'exiting') && directionalClassName)
|
|
457
469
|
});
|
|
458
|
-
}) : React.cloneElement(child, {
|
|
470
|
+
}) : /*#__PURE__*/React.cloneElement(child, {
|
|
459
471
|
className: classNames(child.props.className, isActive && 'active')
|
|
460
472
|
});
|
|
461
473
|
})), controls && /*#__PURE__*/React.createElement(React.Fragment, null, (wrap || activeIndex !== 0) && /*#__PURE__*/React.createElement(SafeAnchor, {
|
|
@@ -471,7 +483,7 @@ function CarouselFunc(uncontrolledProps, ref) {
|
|
|
471
483
|
}, nextLabel))));
|
|
472
484
|
}
|
|
473
485
|
|
|
474
|
-
var Carousel = React.forwardRef(CarouselFunc);
|
|
486
|
+
var Carousel = /*#__PURE__*/React.forwardRef(CarouselFunc);
|
|
475
487
|
Carousel.displayName = 'Carousel';
|
|
476
488
|
Carousel.propTypes = propTypes;
|
|
477
489
|
Carousel.defaultProps = defaultProps;
|
package/esm/CarouselItem.d.ts
CHANGED
|
@@ -1,2 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
1
|
+
import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
|
|
2
|
+
export interface CarouselItemProps extends BsPrefixPropsWithChildren {
|
|
3
|
+
interval?: number;
|
|
4
|
+
}
|
|
5
|
+
declare type CarouselItem = BsPrefixRefForwardingComponent<'div', CarouselItemProps>;
|
|
6
|
+
declare const CarouselItem: CarouselItem;
|
|
7
|
+
export default CarouselItem;
|
package/esm/CarouselItem.js
CHANGED
|
@@ -1,2 +1,22 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
1
|
+
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
|
+
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
|
+
import classNames from 'classnames';
|
|
4
|
+
import React from 'react';
|
|
5
|
+
import { useBootstrapPrefix } from './ThemeProvider';
|
|
6
|
+
var CarouselItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
7
|
+
var _ref$as = _ref.as,
|
|
8
|
+
Component = _ref$as === void 0 ? 'div' : _ref$as,
|
|
9
|
+
bsPrefix = _ref.bsPrefix,
|
|
10
|
+
children = _ref.children,
|
|
11
|
+
className = _ref.className,
|
|
12
|
+
props = _objectWithoutPropertiesLoose(_ref, ["as", "bsPrefix", "children", "className"]);
|
|
13
|
+
|
|
14
|
+
var finalClassName = classNames(className, useBootstrapPrefix(bsPrefix, 'carousel-item'));
|
|
15
|
+
return /*#__PURE__*/React.createElement(Component, _extends({
|
|
16
|
+
ref: ref
|
|
17
|
+
}, props, {
|
|
18
|
+
className: finalClassName
|
|
19
|
+
}), children);
|
|
20
|
+
});
|
|
21
|
+
CarouselItem.displayName = 'CarouselItem';
|
|
22
|
+
export default CarouselItem;
|
package/esm/CloseButton.js
CHANGED
|
@@ -10,7 +10,7 @@ var propTypes = {
|
|
|
10
10
|
var defaultProps = {
|
|
11
11
|
label: 'Close'
|
|
12
12
|
};
|
|
13
|
-
var CloseButton = React.forwardRef(function (_ref, ref) {
|
|
13
|
+
var CloseButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
14
14
|
var label = _ref.label,
|
|
15
15
|
onClick = _ref.onClick,
|
|
16
16
|
className = _ref.className,
|
package/esm/Col.js
CHANGED
|
@@ -4,7 +4,7 @@ import classNames from 'classnames';
|
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { useBootstrapPrefix } from './ThemeProvider';
|
|
6
6
|
var DEVICE_SIZES = ['xl', 'lg', 'md', 'sm', 'xs'];
|
|
7
|
-
var Col = React.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
|
|
7
|
+
var Col = /*#__PURE__*/React.forwardRef( // Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
|
|
8
8
|
function (_ref, ref) {
|
|
9
9
|
var bsPrefix = _ref.bsPrefix,
|
|
10
10
|
className = _ref.className,
|
package/esm/Collapse.js
CHANGED
|
@@ -33,7 +33,7 @@ var defaultProps = {
|
|
|
33
33
|
appear: false,
|
|
34
34
|
getDimensionValue: getDefaultDimensionValue
|
|
35
35
|
};
|
|
36
|
-
var Collapse = React.forwardRef(function (_ref, ref) {
|
|
36
|
+
var Collapse = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
37
37
|
var onEnter = _ref.onEnter,
|
|
38
38
|
onEntering = _ref.onEntering,
|
|
39
39
|
onEntered = _ref.onEntered,
|
|
@@ -92,7 +92,7 @@ var Collapse = React.forwardRef(function (_ref, ref) {
|
|
|
92
92
|
onExit: handleExit,
|
|
93
93
|
onExiting: handleExiting
|
|
94
94
|
}), function (state, innerProps) {
|
|
95
|
-
return React.cloneElement(children, _extends({}, innerProps, {
|
|
95
|
+
return /*#__PURE__*/React.cloneElement(children, _extends({}, innerProps, {
|
|
96
96
|
className: classNames(className, children.props.className, collapseStyles[state], computedDimension === 'width' && 'width')
|
|
97
97
|
}));
|
|
98
98
|
});
|
package/esm/Container.js
CHANGED
|
@@ -6,7 +6,7 @@ import { useBootstrapPrefix } from './ThemeProvider';
|
|
|
6
6
|
var defaultProps = {
|
|
7
7
|
fluid: false
|
|
8
8
|
};
|
|
9
|
-
var Container = React.forwardRef(function (_ref, ref) {
|
|
9
|
+
var Container = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
10
10
|
var bsPrefix = _ref.bsPrefix,
|
|
11
11
|
fluid = _ref.fluid,
|
|
12
12
|
_ref$as = _ref.as,
|
package/esm/Dropdown.js
CHANGED
|
@@ -27,7 +27,7 @@ var DropdownItemText = createWithBsPrefix('dropdown-item-text', {
|
|
|
27
27
|
var defaultProps = {
|
|
28
28
|
navbar: false
|
|
29
29
|
};
|
|
30
|
-
var Dropdown = React.forwardRef(function (pProps, ref) {
|
|
30
|
+
var Dropdown = /*#__PURE__*/React.forwardRef(function (pProps, ref) {
|
|
31
31
|
var _useUncontrolled = useUncontrolled(pProps, {
|
|
32
32
|
show: 'onToggle'
|
|
33
33
|
}),
|
package/esm/DropdownButton.d.ts
CHANGED
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { DropdownProps } from './Dropdown';
|
|
3
3
|
import { PropsFromToggle } from './DropdownToggle';
|
|
4
|
-
|
|
4
|
+
import { AlignType } from './DropdownMenu';
|
|
5
|
+
import { BsPrefixPropsWithChildren, BsPrefixRefForwardingComponent } from './helpers';
|
|
6
|
+
export interface DropdownButtonProps extends DropdownProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'title'>, PropsFromToggle, BsPrefixPropsWithChildren {
|
|
5
7
|
title: React.ReactNode;
|
|
8
|
+
menuAlign?: AlignType;
|
|
6
9
|
menuRole?: string;
|
|
7
10
|
renderMenuOnMount?: boolean;
|
|
8
11
|
rootCloseEvent?: 'click' | 'mousedown';
|
|
9
|
-
bsPrefix?: string;
|
|
10
12
|
}
|
|
13
|
+
declare type DropdownButton = BsPrefixRefForwardingComponent<'div', DropdownButtonProps>;
|
|
11
14
|
/**
|
|
12
15
|
* A convenience component for simple or general use dropdowns. Renders a `Button` toggle and all `children`
|
|
13
|
-
* are passed directly to the default `Dropdown.Menu`.
|
|
16
|
+
* are passed directly to the default `Dropdown.Menu`. This component accepts all of
|
|
17
|
+
* [`Dropdown`'s props](#dropdown-props).
|
|
14
18
|
*
|
|
15
19
|
* _All unknown props are passed through to the `Dropdown` component._ Only
|
|
16
20
|
* the Button `variant`, `size` and `bsPrefix` props are passed to the toggle,
|
|
17
|
-
* along with menu
|
|
21
|
+
* along with menu-related props are passed to the `Dropdown.Menu`
|
|
18
22
|
*/
|
|
19
|
-
declare const DropdownButton:
|
|
23
|
+
declare const DropdownButton: DropdownButton;
|
|
20
24
|
export default DropdownButton;
|
package/esm/DropdownButton.js
CHANGED
|
@@ -4,7 +4,7 @@ import React from 'react';
|
|
|
4
4
|
import PropTypes from 'prop-types';
|
|
5
5
|
import Dropdown from './Dropdown';
|
|
6
6
|
import DropdownToggle from './DropdownToggle';
|
|
7
|
-
import DropdownMenu from './DropdownMenu';
|
|
7
|
+
import DropdownMenu, { alignPropType } from './DropdownMenu';
|
|
8
8
|
var propTypes = {
|
|
9
9
|
/**
|
|
10
10
|
* An html id attribute for the Toggle button, necessary for assistive technologies, such as screen readers.
|
|
@@ -25,6 +25,15 @@ var propTypes = {
|
|
|
25
25
|
/** Disables both Buttons */
|
|
26
26
|
disabled: PropTypes.bool,
|
|
27
27
|
|
|
28
|
+
/**
|
|
29
|
+
* Aligns the dropdown menu responsively.
|
|
30
|
+
*
|
|
31
|
+
* _see [DropdownMenu](#dropdown-menu-props) for more details_
|
|
32
|
+
*
|
|
33
|
+
* @type {"left"|"right"|{ sm: "left"|"right" }|{ md: "left"|"right" }|{ lg: "left"|"right" }|{ xl: "left"|"right"} }
|
|
34
|
+
*/
|
|
35
|
+
menuAlign: alignPropType,
|
|
36
|
+
|
|
28
37
|
/** An ARIA accessible role applied to the Menu component. When set to 'menu', The dropdown */
|
|
29
38
|
menuRole: PropTypes.string,
|
|
30
39
|
|
|
@@ -34,7 +43,7 @@ var propTypes = {
|
|
|
34
43
|
/**
|
|
35
44
|
* Which event when fired outside the component will cause it to be closed.
|
|
36
45
|
*
|
|
37
|
-
* _see [DropdownMenu](#menu-props) for more details_
|
|
46
|
+
* _see [DropdownMenu](#dropdown-menu-props) for more details_
|
|
38
47
|
*/
|
|
39
48
|
rootCloseEvent: PropTypes.string,
|
|
40
49
|
|
|
@@ -49,26 +58,28 @@ var propTypes = {
|
|
|
49
58
|
};
|
|
50
59
|
/**
|
|
51
60
|
* A convenience component for simple or general use dropdowns. Renders a `Button` toggle and all `children`
|
|
52
|
-
* are passed directly to the default `Dropdown.Menu`.
|
|
61
|
+
* are passed directly to the default `Dropdown.Menu`. This component accepts all of
|
|
62
|
+
* [`Dropdown`'s props](#dropdown-props).
|
|
53
63
|
*
|
|
54
64
|
* _All unknown props are passed through to the `Dropdown` component._ Only
|
|
55
65
|
* the Button `variant`, `size` and `bsPrefix` props are passed to the toggle,
|
|
56
|
-
* along with menu
|
|
66
|
+
* along with menu-related props are passed to the `Dropdown.Menu`
|
|
57
67
|
*/
|
|
58
68
|
|
|
59
|
-
var DropdownButton = React.forwardRef(function (_ref, ref) {
|
|
69
|
+
var DropdownButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
60
70
|
var title = _ref.title,
|
|
61
71
|
children = _ref.children,
|
|
62
72
|
bsPrefix = _ref.bsPrefix,
|
|
63
73
|
rootCloseEvent = _ref.rootCloseEvent,
|
|
64
74
|
variant = _ref.variant,
|
|
65
75
|
size = _ref.size,
|
|
76
|
+
menuAlign = _ref.menuAlign,
|
|
66
77
|
menuRole = _ref.menuRole,
|
|
67
78
|
renderMenuOnMount = _ref.renderMenuOnMount,
|
|
68
79
|
disabled = _ref.disabled,
|
|
69
80
|
href = _ref.href,
|
|
70
81
|
id = _ref.id,
|
|
71
|
-
props = _objectWithoutPropertiesLoose(_ref, ["title", "children", "bsPrefix", "rootCloseEvent", "variant", "size", "menuRole", "renderMenuOnMount", "disabled", "href", "id"]);
|
|
82
|
+
props = _objectWithoutPropertiesLoose(_ref, ["title", "children", "bsPrefix", "rootCloseEvent", "variant", "size", "menuAlign", "menuRole", "renderMenuOnMount", "disabled", "href", "id"]);
|
|
72
83
|
|
|
73
84
|
return /*#__PURE__*/React.createElement(Dropdown, _extends({
|
|
74
85
|
ref: ref
|
|
@@ -80,6 +91,7 @@ var DropdownButton = React.forwardRef(function (_ref, ref) {
|
|
|
80
91
|
disabled: disabled,
|
|
81
92
|
childBsPrefix: bsPrefix
|
|
82
93
|
}, title), /*#__PURE__*/React.createElement(DropdownMenu, {
|
|
94
|
+
align: menuAlign,
|
|
83
95
|
role: menuRole,
|
|
84
96
|
renderOnMount: renderMenuOnMount,
|
|
85
97
|
rootCloseEvent: rootCloseEvent
|
package/esm/DropdownItem.js
CHANGED
|
@@ -11,7 +11,7 @@ var defaultProps = {
|
|
|
11
11
|
as: SafeAnchor,
|
|
12
12
|
disabled: false
|
|
13
13
|
};
|
|
14
|
-
var DropdownItem = React.forwardRef(function (_ref, ref) {
|
|
14
|
+
var DropdownItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
|
|
15
15
|
var bsPrefix = _ref.bsPrefix,
|
|
16
16
|
className = _ref.className,
|
|
17
17
|
children = _ref.children,
|
|
@@ -29,9 +29,10 @@ var DropdownItem = React.forwardRef(function (_ref, ref) {
|
|
|
29
29
|
var navContext = useContext(NavContext);
|
|
30
30
|
|
|
31
31
|
var _ref2 = navContext || {},
|
|
32
|
-
activeKey = _ref2.activeKey;
|
|
32
|
+
activeKey = _ref2.activeKey; // TODO: Restrict eventKey to string in v5?
|
|
33
33
|
|
|
34
|
-
|
|
34
|
+
|
|
35
|
+
var key = makeEventKey(eventKey, href);
|
|
35
36
|
var active = propActive == null && key != null ? makeEventKey(activeKey) === key : propActive;
|
|
36
37
|
var handleClick = useEventCallback(function (event) {
|
|
37
38
|
// SafeAnchor handles the disabled case, but we handle it here
|