react-bootstrap 1.0.0-beta.16 → 1.0.0-beta.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Container.d.ts +1 -1
- package/ListGroup.d.ts +1 -0
- package/Modal.d.ts +1 -0
- package/Overlay.d.ts +1 -1
- package/cjs/Alert.js +2 -2
- package/cjs/Container.js +3 -3
- package/cjs/FormLabel.js +3 -1
- package/cjs/Modal.js +19 -7
- package/cjs/OverlayTrigger.js +130 -182
- package/cjs/Row.js +1 -0
- package/cjs/SplitButton.js +9 -3
- package/cjs/Tooltip.js +2 -1
- package/cjs/index.js +4 -0
- package/dist/react-bootstrap.js +453 -444
- package/dist/react-bootstrap.min.js +4 -4
- package/esm/Alert.js +2 -2
- package/esm/Container.d.ts +1 -1
- package/esm/Container.js +3 -3
- package/esm/FormLabel.js +3 -1
- package/esm/ListGroup.d.ts +1 -0
- package/esm/Modal.d.ts +1 -0
- package/esm/Modal.js +19 -7
- package/esm/Overlay.d.ts +1 -1
- package/esm/OverlayTrigger.js +129 -183
- package/esm/Row.js +1 -0
- package/esm/SplitButton.js +9 -3
- package/esm/Tooltip.js +2 -1
- package/esm/index.js +2 -0
- package/package.json +7 -11
package/Container.d.ts
CHANGED
package/ListGroup.d.ts
CHANGED
package/Modal.d.ts
CHANGED
package/Overlay.d.ts
CHANGED
|
@@ -27,7 +27,7 @@ export interface OverlayProps extends TransitionCallbacks {
|
|
|
27
27
|
popperConfig?: object;
|
|
28
28
|
rootClose?: boolean;
|
|
29
29
|
rootCloseEvent?: 'click' | 'mousedown';
|
|
30
|
-
onHide?: () => void;
|
|
30
|
+
onHide?: (event: React.SyntheticEvent) => void;
|
|
31
31
|
transition?: boolean | React.ElementType;
|
|
32
32
|
placement?: Placement;
|
|
33
33
|
}
|
package/cjs/Alert.js
CHANGED
|
@@ -59,6 +59,7 @@ var Alert = _react.default.forwardRef(function (uncontrolledProps, ref) {
|
|
|
59
59
|
var alert = _react.default.createElement("div", (0, _extends2.default)({
|
|
60
60
|
role: "alert"
|
|
61
61
|
}, Transition ? props : undefined, {
|
|
62
|
+
ref: ref,
|
|
62
63
|
className: (0, _classnames.default)(className, prefix, variant && prefix + "-" + variant, dismissible && prefix + "-dismissible")
|
|
63
64
|
}), dismissible && _react.default.createElement(_CloseButton.default, {
|
|
64
65
|
onClick: handleClose,
|
|
@@ -67,8 +68,7 @@ var Alert = _react.default.forwardRef(function (uncontrolledProps, ref) {
|
|
|
67
68
|
|
|
68
69
|
if (!Transition) return show ? alert : null;
|
|
69
70
|
return _react.default.createElement(Transition, (0, _extends2.default)({
|
|
70
|
-
unmountOnExit: true
|
|
71
|
-
ref: ref
|
|
71
|
+
unmountOnExit: true
|
|
72
72
|
}, props, {
|
|
73
73
|
in: show
|
|
74
74
|
}), alert);
|
package/cjs/Container.js
CHANGED
|
@@ -19,8 +19,7 @@ var defaultProps = {
|
|
|
19
19
|
fluid: false
|
|
20
20
|
};
|
|
21
21
|
|
|
22
|
-
var Container = _react.default.forwardRef(
|
|
23
|
-
function (_ref, ref) {
|
|
22
|
+
var Container = _react.default.forwardRef(function (_ref, ref) {
|
|
24
23
|
var bsPrefix = _ref.bsPrefix,
|
|
25
24
|
fluid = _ref.fluid,
|
|
26
25
|
_ref$as = _ref.as,
|
|
@@ -28,10 +27,11 @@ function (_ref, ref) {
|
|
|
28
27
|
className = _ref.className,
|
|
29
28
|
props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "fluid", "as", "className"]);
|
|
30
29
|
var prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'container');
|
|
30
|
+
var suffix = typeof fluid === 'string' ? "-" + fluid : '-fluid';
|
|
31
31
|
return _react.default.createElement(Component, (0, _extends2.default)({
|
|
32
32
|
ref: ref
|
|
33
33
|
}, props, {
|
|
34
|
-
className: (0, _classnames.default)(className, fluid ? prefix +
|
|
34
|
+
className: (0, _classnames.default)(className, fluid ? "" + prefix + suffix : prefix)
|
|
35
35
|
}));
|
|
36
36
|
});
|
|
37
37
|
|
package/cjs/FormLabel.js
CHANGED
|
@@ -40,7 +40,9 @@ var FormLabel = _react.default.forwardRef(function (_ref, ref) {
|
|
|
40
40
|
controlId = _useContext.controlId;
|
|
41
41
|
|
|
42
42
|
bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'form-label');
|
|
43
|
-
var
|
|
43
|
+
var columnClass = 'col-form-label';
|
|
44
|
+
if (typeof column === 'string') columnClass = columnClass + "-" + column;
|
|
45
|
+
var classes = (0, _classnames.default)(className, bsPrefix, srOnly && 'sr-only', column && columnClass);
|
|
44
46
|
process.env.NODE_ENV !== "production" ? (0, _warning.default)(controlId == null || !htmlFor, '`controlId` is ignored on `<FormLabel>` when `htmlFor` is specified.') : void 0;
|
|
45
47
|
htmlFor = htmlFor || controlId;
|
|
46
48
|
if (column) return _react.default.createElement(_Col.default, (0, _extends2.default)({
|
package/cjs/Modal.js
CHANGED
|
@@ -45,6 +45,7 @@ var _ModalTitle = _interopRequireDefault(require("./ModalTitle"));
|
|
|
45
45
|
|
|
46
46
|
var _ThemeProvider = require("./ThemeProvider");
|
|
47
47
|
|
|
48
|
+
var manager;
|
|
48
49
|
var defaultProps = {
|
|
49
50
|
show: false,
|
|
50
51
|
backdrop: true,
|
|
@@ -53,8 +54,7 @@ var defaultProps = {
|
|
|
53
54
|
enforceFocus: true,
|
|
54
55
|
restoreFocus: true,
|
|
55
56
|
animation: true,
|
|
56
|
-
dialogAs: _ModalDialog.default
|
|
57
|
-
manager: new _BootstrapModalManager.default()
|
|
57
|
+
dialogAs: _ModalDialog.default
|
|
58
58
|
};
|
|
59
59
|
/* eslint-disable no-use-before-define, react/no-multi-comp */
|
|
60
60
|
|
|
@@ -161,6 +161,18 @@ function (_React$Component) {
|
|
|
161
161
|
_this.updateDialogStyle(_this._modal.dialog);
|
|
162
162
|
};
|
|
163
163
|
|
|
164
|
+
_this.getModalManager = function () {
|
|
165
|
+
if (_this.props.manager) {
|
|
166
|
+
return _this.props.manager;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
if (!manager) {
|
|
170
|
+
manager = new _BootstrapModalManager.default();
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
return manager;
|
|
174
|
+
};
|
|
175
|
+
|
|
164
176
|
_this.renderBackdrop = function (props) {
|
|
165
177
|
var _this$props4 = _this.props,
|
|
166
178
|
bsPrefix = _this$props4.bsPrefix,
|
|
@@ -183,8 +195,7 @@ function (_React$Component) {
|
|
|
183
195
|
|
|
184
196
|
_proto.updateDialogStyle = function updateDialogStyle(node) {
|
|
185
197
|
if (!_canUseDOM.default) return;
|
|
186
|
-
var
|
|
187
|
-
var containerIsOverflowing = manager.isContainerOverflowing(this._modal);
|
|
198
|
+
var containerIsOverflowing = this.getModalManager().isContainerOverflowing(this._modal);
|
|
188
199
|
var modalIsOverflowing = node.scrollHeight > (0, _ownerDocument.default)(node).documentElement.clientHeight;
|
|
189
200
|
this.setState({
|
|
190
201
|
style: {
|
|
@@ -206,7 +217,6 @@ function (_React$Component) {
|
|
|
206
217
|
animation = _this$props5.animation,
|
|
207
218
|
backdrop = _this$props5.backdrop,
|
|
208
219
|
keyboard = _this$props5.keyboard,
|
|
209
|
-
manager = _this$props5.manager,
|
|
210
220
|
onEscapeKeyDown = _this$props5.onEscapeKeyDown,
|
|
211
221
|
onShow = _this$props5.onShow,
|
|
212
222
|
onHide = _this$props5.onHide,
|
|
@@ -214,6 +224,7 @@ function (_React$Component) {
|
|
|
214
224
|
autoFocus = _this$props5.autoFocus,
|
|
215
225
|
enforceFocus = _this$props5.enforceFocus,
|
|
216
226
|
restoreFocus = _this$props5.restoreFocus,
|
|
227
|
+
restoreFocusOptions = _this$props5.restoreFocusOptions,
|
|
217
228
|
onEntered = _this$props5.onEntered,
|
|
218
229
|
onExit = _this$props5.onExit,
|
|
219
230
|
onExiting = _this$props5.onExiting,
|
|
@@ -222,7 +233,7 @@ function (_React$Component) {
|
|
|
222
233
|
_6 = _this$props5.onEnter,
|
|
223
234
|
_4 = _this$props5.onEntering,
|
|
224
235
|
_2 = _this$props5.backdropClassName,
|
|
225
|
-
props = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["bsPrefix", "className", "style", "dialogClassName", "children", "dialogAs", "show", "animation", "backdrop", "keyboard", "
|
|
236
|
+
props = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["bsPrefix", "className", "style", "dialogClassName", "children", "dialogAs", "show", "animation", "backdrop", "keyboard", "onEscapeKeyDown", "onShow", "onHide", "container", "autoFocus", "enforceFocus", "restoreFocus", "restoreFocusOptions", "onEntered", "onExit", "onExiting", "onExited", "onEntering", "onEnter", "onEntering", "backdropClassName"]);
|
|
226
237
|
var clickHandler = backdrop === true ? this.handleClick : null;
|
|
227
238
|
var baseModalStyle = (0, _extends2.default)({}, style, {}, this.state.style); // Sets `display` always block when `animation` is false
|
|
228
239
|
|
|
@@ -237,13 +248,14 @@ function (_React$Component) {
|
|
|
237
248
|
autoFocus: autoFocus,
|
|
238
249
|
enforceFocus: enforceFocus,
|
|
239
250
|
restoreFocus: restoreFocus,
|
|
251
|
+
restoreFocusOptions: restoreFocusOptions,
|
|
240
252
|
onEscapeKeyDown: onEscapeKeyDown,
|
|
241
253
|
onShow: onShow,
|
|
242
254
|
onHide: onHide,
|
|
243
255
|
onEntered: onEntered,
|
|
244
256
|
onExit: onExit,
|
|
245
257
|
onExiting: onExiting,
|
|
246
|
-
manager:
|
|
258
|
+
manager: this.getModalManager(),
|
|
247
259
|
ref: this.setModalRef,
|
|
248
260
|
style: baseModalStyle,
|
|
249
261
|
className: (0, _classnames.default)(className, bsPrefix),
|
package/cjs/OverlayTrigger.js
CHANGED
|
@@ -17,13 +17,14 @@ var _contains = _interopRequireDefault(require("dom-helpers/contains"));
|
|
|
17
17
|
|
|
18
18
|
var _react = _interopRequireWildcard(require("react"));
|
|
19
19
|
|
|
20
|
+
var _useTimeout = _interopRequireDefault(require("@restart/hooks/useTimeout"));
|
|
21
|
+
|
|
20
22
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
21
23
|
|
|
22
24
|
var _warning = _interopRequireDefault(require("warning"));
|
|
23
25
|
|
|
24
26
|
var _Overlay = _interopRequireDefault(require("./Overlay"));
|
|
25
27
|
|
|
26
|
-
/* eslint-disable max-classes-per-file */
|
|
27
28
|
var RefHolder =
|
|
28
29
|
/*#__PURE__*/
|
|
29
30
|
function (_React$Component) {
|
|
@@ -42,207 +43,154 @@ function (_React$Component) {
|
|
|
42
43
|
return RefHolder;
|
|
43
44
|
}(_react.default.Component);
|
|
44
45
|
|
|
45
|
-
|
|
46
|
+
function normalizeDelay(delay) {
|
|
46
47
|
return delay && typeof delay === 'object' ? delay : {
|
|
47
48
|
show: delay,
|
|
48
49
|
hide: delay
|
|
49
50
|
};
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
trigger: ['hover', 'focus']
|
|
55
|
-
}; // eslint-disable-next-line react/no-multi-comp
|
|
56
|
-
|
|
57
|
-
var OverlayTrigger =
|
|
58
|
-
/*#__PURE__*/
|
|
59
|
-
function (_React$Component2) {
|
|
60
|
-
(0, _inheritsLoose2.default)(OverlayTrigger, _React$Component2);
|
|
61
|
-
|
|
62
|
-
function OverlayTrigger(props, context) {
|
|
63
|
-
var _this;
|
|
64
|
-
|
|
65
|
-
_this = _React$Component2.call(this, props, context) || this;
|
|
66
|
-
|
|
67
|
-
_this.getTarget = function () {
|
|
68
|
-
return _reactDom.default.findDOMNode(_this.trigger.current);
|
|
69
|
-
};
|
|
70
|
-
|
|
71
|
-
_this.handleShow = function () {
|
|
72
|
-
clearTimeout(_this._timeout);
|
|
73
|
-
_this._hoverState = 'show';
|
|
74
|
-
var delay = normalizeDelay(_this.props.delay);
|
|
75
|
-
|
|
76
|
-
if (!delay.show) {
|
|
77
|
-
_this.show();
|
|
78
|
-
|
|
79
|
-
return;
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
_this._timeout = setTimeout(function () {
|
|
83
|
-
if (_this._hoverState === 'show') _this.show();
|
|
84
|
-
}, delay.show);
|
|
85
|
-
};
|
|
86
|
-
|
|
87
|
-
_this.handleHide = function () {
|
|
88
|
-
clearTimeout(_this._timeout);
|
|
89
|
-
_this._hoverState = 'hide';
|
|
90
|
-
var delay = normalizeDelay(_this.props.delay);
|
|
91
|
-
|
|
92
|
-
if (!delay.hide) {
|
|
93
|
-
_this.hide();
|
|
94
|
-
|
|
95
|
-
return;
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
_this._timeout = setTimeout(function () {
|
|
99
|
-
if (_this._hoverState === 'hide') _this.hide();
|
|
100
|
-
}, delay.hide);
|
|
101
|
-
};
|
|
102
|
-
|
|
103
|
-
_this.handleFocus = function (e) {
|
|
104
|
-
var _this$getChildProps = _this.getChildProps(),
|
|
105
|
-
onFocus = _this$getChildProps.onFocus;
|
|
106
|
-
|
|
107
|
-
_this.handleShow(e);
|
|
108
|
-
|
|
109
|
-
if (onFocus) onFocus(e);
|
|
110
|
-
};
|
|
111
|
-
|
|
112
|
-
_this.handleBlur = function (e) {
|
|
113
|
-
var _this$getChildProps2 = _this.getChildProps(),
|
|
114
|
-
onBlur = _this$getChildProps2.onBlur;
|
|
115
|
-
|
|
116
|
-
_this.handleHide(e);
|
|
117
|
-
|
|
118
|
-
if (onBlur) onBlur(e);
|
|
119
|
-
};
|
|
120
|
-
|
|
121
|
-
_this.handleClick = function (e) {
|
|
122
|
-
var _this$getChildProps3 = _this.getChildProps(),
|
|
123
|
-
onClick = _this$getChildProps3.onClick;
|
|
124
|
-
|
|
125
|
-
if (_this.state.show) _this.hide();else _this.show();
|
|
126
|
-
if (onClick) onClick(e);
|
|
127
|
-
};
|
|
128
|
-
|
|
129
|
-
_this.handleMouseOver = function (e) {
|
|
130
|
-
_this.handleMouseOverOut(_this.handleShow, e, 'fromElement');
|
|
131
|
-
};
|
|
132
|
-
|
|
133
|
-
_this.handleMouseOut = function (e) {
|
|
134
|
-
return _this.handleMouseOverOut(_this.handleHide, e, 'toElement');
|
|
135
|
-
};
|
|
51
|
+
} // Simple implementation of mouseEnter and mouseLeave.
|
|
52
|
+
// React's built version is broken: https://github.com/facebook/react/issues/4251
|
|
53
|
+
// for cases when the trigger is disabled and mouseOut/Over can cause flicker
|
|
54
|
+
// moving from one child element to another.
|
|
136
55
|
|
|
137
|
-
_this.trigger = _react.default.createRef();
|
|
138
|
-
_this.state = {
|
|
139
|
-
show: !!props.defaultShow
|
|
140
|
-
}; // We add aria-describedby in the case where the overlay is a role="tooltip"
|
|
141
|
-
// for other cases describedby isn't appropriate (e.g. a popover with inputs) so we don't add it.
|
|
142
56
|
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
fn: function fn(data) {
|
|
147
|
-
var popper = data.instance.popper;
|
|
57
|
+
function handleMouseOverOut(handler, e, relatedNative) {
|
|
58
|
+
var target = e.currentTarget;
|
|
59
|
+
var related = e.relatedTarget || e.nativeEvent[relatedNative];
|
|
148
60
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
if (!_this.state.show || !target) return data;
|
|
152
|
-
var role = popper.getAttribute('role') || '';
|
|
153
|
-
|
|
154
|
-
if (popper.id && role.toLowerCase() === 'tooltip') {
|
|
155
|
-
target.setAttribute('aria-describedby', popper.id);
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
return data;
|
|
159
|
-
}
|
|
160
|
-
};
|
|
161
|
-
return _this;
|
|
61
|
+
if ((!related || related !== target) && !(0, _contains.default)(target, related)) {
|
|
62
|
+
handler(e);
|
|
162
63
|
}
|
|
64
|
+
}
|
|
163
65
|
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
};
|
|
169
|
-
|
|
170
|
-
_proto2.getChildProps = function getChildProps() {
|
|
171
|
-
return _react.default.Children.only(this.props.children).props;
|
|
172
|
-
};
|
|
173
|
-
|
|
174
|
-
// Simple implementation of mouseEnter and mouseLeave.
|
|
175
|
-
// React's built version is broken: https://github.com/facebook/react/issues/4251
|
|
176
|
-
// for cases when the trigger is disabled and mouseOut/Over can cause flicker
|
|
177
|
-
// moving from one child element to another.
|
|
178
|
-
_proto2.handleMouseOverOut = function handleMouseOverOut(handler, e, relatedNative) {
|
|
179
|
-
var target = e.currentTarget;
|
|
180
|
-
var related = e.relatedTarget || e.nativeEvent[relatedNative];
|
|
66
|
+
var defaultProps = {
|
|
67
|
+
defaultShow: false,
|
|
68
|
+
trigger: ['hover', 'focus']
|
|
69
|
+
};
|
|
181
70
|
|
|
182
|
-
|
|
183
|
-
|
|
71
|
+
function OverlayTrigger(_ref) {
|
|
72
|
+
var trigger = _ref.trigger,
|
|
73
|
+
overlay = _ref.overlay,
|
|
74
|
+
children = _ref.children,
|
|
75
|
+
_ref$popperConfig = _ref.popperConfig,
|
|
76
|
+
popperConfig = _ref$popperConfig === void 0 ? {} : _ref$popperConfig,
|
|
77
|
+
defaultShow = _ref.defaultShow,
|
|
78
|
+
propsDelay = _ref.delay,
|
|
79
|
+
props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["trigger", "overlay", "children", "popperConfig", "defaultShow", "delay"]);
|
|
80
|
+
var triggerNodeRef = (0, _react.useRef)(null);
|
|
81
|
+
var timeout = (0, _useTimeout.default)();
|
|
82
|
+
var hoverStateRef = (0, _react.useRef)();
|
|
83
|
+
|
|
84
|
+
var _useState = (0, _react.useState)(!!defaultShow),
|
|
85
|
+
show = _useState[0],
|
|
86
|
+
setShow = _useState[1];
|
|
87
|
+
|
|
88
|
+
var delay = normalizeDelay(propsDelay);
|
|
89
|
+
|
|
90
|
+
var child = _react.default.Children.only(children);
|
|
91
|
+
|
|
92
|
+
var _child$props = child.props,
|
|
93
|
+
onFocus = _child$props.onFocus,
|
|
94
|
+
onBlur = _child$props.onBlur,
|
|
95
|
+
onClick = _child$props.onClick;
|
|
96
|
+
var getTarget = (0, _react.useCallback)(function () {
|
|
97
|
+
return _reactDom.default.findDOMNode(triggerNodeRef.current);
|
|
98
|
+
}, []);
|
|
99
|
+
var handleShow = (0, _react.useCallback)(function () {
|
|
100
|
+
timeout.clear();
|
|
101
|
+
hoverStateRef.current = 'show';
|
|
102
|
+
|
|
103
|
+
if (!delay.show) {
|
|
104
|
+
setShow(true);
|
|
105
|
+
return;
|
|
184
106
|
}
|
|
185
|
-
};
|
|
186
107
|
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
108
|
+
timeout.set(function () {
|
|
109
|
+
if (hoverStateRef.current === 'show') setShow(true);
|
|
110
|
+
}, delay.show);
|
|
111
|
+
}, [delay.show, timeout]);
|
|
112
|
+
var handleHide = (0, _react.useCallback)(function () {
|
|
113
|
+
timeout.clear();
|
|
114
|
+
hoverStateRef.current = 'hide';
|
|
115
|
+
|
|
116
|
+
if (!delay.hide) {
|
|
117
|
+
setShow(false);
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
192
120
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
121
|
+
timeout.set(function () {
|
|
122
|
+
if (hoverStateRef.current === 'hide') setShow(false);
|
|
123
|
+
}, delay.hide);
|
|
124
|
+
}, [delay.hide, timeout]);
|
|
125
|
+
var handleFocus = (0, _react.useCallback)(function (e) {
|
|
126
|
+
handleShow(e);
|
|
127
|
+
if (onFocus) onFocus(e);
|
|
128
|
+
}, [handleShow, onFocus]);
|
|
129
|
+
var handleBlur = (0, _react.useCallback)(function (e) {
|
|
130
|
+
handleHide(e);
|
|
131
|
+
if (onBlur) onBlur(e);
|
|
132
|
+
}, [handleHide, onBlur]);
|
|
133
|
+
var handleClick = (0, _react.useCallback)(function (e) {
|
|
134
|
+
setShow(function (prevShow) {
|
|
135
|
+
return !prevShow;
|
|
196
136
|
});
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
137
|
+
if (onClick) onClick(e);
|
|
138
|
+
}, [onClick]);
|
|
139
|
+
var handleMouseOver = (0, _react.useCallback)(function (e) {
|
|
140
|
+
handleMouseOverOut(handleShow, e, 'fromElement');
|
|
141
|
+
}, [handleShow]);
|
|
142
|
+
var handleMouseOut = (0, _react.useCallback)(function (e) {
|
|
143
|
+
handleMouseOverOut(handleHide, e, 'toElement');
|
|
144
|
+
}, [handleHide]); // We add aria-describedby in the case where the overlay is a role="tooltip"
|
|
145
|
+
// for other cases describedby isn't appropriate (e.g. a popover with inputs) so we don't add it.
|
|
146
|
+
|
|
147
|
+
var ariaModifier = {
|
|
148
|
+
enabled: true,
|
|
149
|
+
order: 900,
|
|
150
|
+
fn: function fn(data) {
|
|
151
|
+
var popper = data.instance.popper;
|
|
152
|
+
var target = getTarget();
|
|
153
|
+
if (!show || !target) return data;
|
|
154
|
+
var role = popper.getAttribute('role') || '';
|
|
155
|
+
|
|
156
|
+
if (popper.id && role.toLowerCase() === 'tooltip') {
|
|
157
|
+
target.setAttribute('aria-describedby', popper.id);
|
|
158
|
+
}
|
|
214
159
|
|
|
215
|
-
|
|
216
|
-
triggerProps.onClick = this.handleClick;
|
|
160
|
+
return data;
|
|
217
161
|
}
|
|
162
|
+
};
|
|
163
|
+
var triggers = trigger == null ? [] : [].concat(trigger);
|
|
164
|
+
var triggerProps = {};
|
|
218
165
|
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
}
|
|
166
|
+
if (triggers.indexOf('click') !== -1) {
|
|
167
|
+
triggerProps.onClick = handleClick;
|
|
168
|
+
}
|
|
223
169
|
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
170
|
+
if (triggers.indexOf('focus') !== -1) {
|
|
171
|
+
triggerProps.onFocus = handleFocus;
|
|
172
|
+
triggerProps.onBlur = handleBlur;
|
|
173
|
+
}
|
|
229
174
|
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
ariaModifier: this.ariaModifier
|
|
236
|
-
})
|
|
237
|
-
}),
|
|
238
|
-
show: this.state.show,
|
|
239
|
-
onHide: this.handleHide,
|
|
240
|
-
target: this.getTarget
|
|
241
|
-
}), overlay));
|
|
242
|
-
};
|
|
175
|
+
if (triggers.indexOf('hover') !== -1) {
|
|
176
|
+
process.env.NODE_ENV !== "production" ? (0, _warning.default)(triggers.length > 1, '[react-bootstrap] Specifying only the `"hover"` trigger limits the visibility of the overlay to just mouse users. Consider also including the `"focus"` trigger so that touch and keyboard only users can see the overlay as well.') : void 0;
|
|
177
|
+
triggerProps.onMouseOver = handleMouseOver;
|
|
178
|
+
triggerProps.onMouseOut = handleMouseOut;
|
|
179
|
+
}
|
|
243
180
|
|
|
244
|
-
return
|
|
245
|
-
|
|
181
|
+
return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement(RefHolder, {
|
|
182
|
+
ref: triggerNodeRef
|
|
183
|
+
}, (0, _react.cloneElement)(child, triggerProps)), _react.default.createElement(_Overlay.default, (0, _extends2.default)({}, props, {
|
|
184
|
+
popperConfig: (0, _extends2.default)({}, popperConfig, {
|
|
185
|
+
modifiers: (0, _extends2.default)({}, popperConfig.modifiers, {
|
|
186
|
+
ariaModifier: ariaModifier
|
|
187
|
+
})
|
|
188
|
+
}),
|
|
189
|
+
show: show,
|
|
190
|
+
onHide: handleHide,
|
|
191
|
+
target: getTarget
|
|
192
|
+
}), overlay));
|
|
193
|
+
}
|
|
246
194
|
|
|
247
195
|
OverlayTrigger.defaultProps = defaultProps;
|
|
248
196
|
var _default = OverlayTrigger;
|
package/cjs/Row.js
CHANGED
package/cjs/SplitButton.js
CHANGED
|
@@ -44,6 +44,9 @@ var propTypes = {
|
|
|
44
44
|
/** The content of the non-toggle Button. */
|
|
45
45
|
title: _propTypes.default.node.isRequired,
|
|
46
46
|
|
|
47
|
+
/** A `type` passed to the non-toggle Button */
|
|
48
|
+
type: _propTypes.default.string,
|
|
49
|
+
|
|
47
50
|
/** Disables both Buttons */
|
|
48
51
|
disabled: _propTypes.default.bool,
|
|
49
52
|
|
|
@@ -67,7 +70,8 @@ var propTypes = {
|
|
|
67
70
|
size: _propTypes.default.string
|
|
68
71
|
};
|
|
69
72
|
var defaultProps = {
|
|
70
|
-
toggleLabel: 'Toggle dropdown'
|
|
73
|
+
toggleLabel: 'Toggle dropdown',
|
|
74
|
+
type: 'button'
|
|
71
75
|
};
|
|
72
76
|
|
|
73
77
|
var SplitButton = _react.default.forwardRef(function (_ref, ref) {
|
|
@@ -76,6 +80,7 @@ var SplitButton = _react.default.forwardRef(function (_ref, ref) {
|
|
|
76
80
|
size = _ref.size,
|
|
77
81
|
variant = _ref.variant,
|
|
78
82
|
title = _ref.title,
|
|
83
|
+
type = _ref.type,
|
|
79
84
|
toggleLabel = _ref.toggleLabel,
|
|
80
85
|
children = _ref.children,
|
|
81
86
|
onClick = _ref.onClick,
|
|
@@ -83,7 +88,7 @@ var SplitButton = _react.default.forwardRef(function (_ref, ref) {
|
|
|
83
88
|
target = _ref.target,
|
|
84
89
|
menuRole = _ref.menuRole,
|
|
85
90
|
rootCloseEvent = _ref.rootCloseEvent,
|
|
86
|
-
props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["id", "bsPrefix", "size", "variant", "title", "toggleLabel", "children", "onClick", "href", "target", "menuRole", "rootCloseEvent"]);
|
|
91
|
+
props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["id", "bsPrefix", "size", "variant", "title", "type", "toggleLabel", "children", "onClick", "href", "target", "menuRole", "rootCloseEvent"]);
|
|
87
92
|
return _react.default.createElement(_Dropdown.default, (0, _extends2.default)({
|
|
88
93
|
ref: ref
|
|
89
94
|
}, props, {
|
|
@@ -95,7 +100,8 @@ var SplitButton = _react.default.forwardRef(function (_ref, ref) {
|
|
|
95
100
|
bsPrefix: bsPrefix,
|
|
96
101
|
href: href,
|
|
97
102
|
target: target,
|
|
98
|
-
onClick: onClick
|
|
103
|
+
onClick: onClick,
|
|
104
|
+
type: type
|
|
99
105
|
}, title), _react.default.createElement(_Dropdown.default.Toggle, {
|
|
100
106
|
split: true,
|
|
101
107
|
id: id,
|
package/cjs/Tooltip.js
CHANGED
|
@@ -30,7 +30,8 @@ var Tooltip = _react.default.forwardRef(function (_ref, ref) {
|
|
|
30
30
|
arrowProps = _ref.arrowProps,
|
|
31
31
|
_ = _ref.scheduleUpdate,
|
|
32
32
|
_1 = _ref.outOfBoundaries,
|
|
33
|
-
|
|
33
|
+
_2 = _ref.show,
|
|
34
|
+
props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["bsPrefix", "placement", "className", "style", "children", "arrowProps", "scheduleUpdate", "outOfBoundaries", "show"]);
|
|
34
35
|
bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'tooltip');
|
|
35
36
|
return _react.default.createElement("div", (0, _extends2.default)({
|
|
36
37
|
ref: ref,
|
package/cjs/index.js
CHANGED
|
@@ -204,6 +204,10 @@ var _NavItem2 = _interopRequireDefault(require("./NavItem"));
|
|
|
204
204
|
|
|
205
205
|
exports.NavItem = _NavItem2.default;
|
|
206
206
|
|
|
207
|
+
var _NavLink2 = _interopRequireDefault(require("./NavLink"));
|
|
208
|
+
|
|
209
|
+
exports.NavLink = _NavLink2.default;
|
|
210
|
+
|
|
207
211
|
var _Overlay2 = _interopRequireDefault(require("./Overlay"));
|
|
208
212
|
|
|
209
213
|
exports.Overlay = _Overlay2.default;
|