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/esm/Alert.js
CHANGED
|
@@ -38,6 +38,7 @@ var Alert = React.forwardRef(function (uncontrolledProps, ref) {
|
|
|
38
38
|
var alert = React.createElement("div", _extends({
|
|
39
39
|
role: "alert"
|
|
40
40
|
}, Transition ? props : undefined, {
|
|
41
|
+
ref: ref,
|
|
41
42
|
className: classNames(className, prefix, variant && prefix + "-" + variant, dismissible && prefix + "-dismissible")
|
|
42
43
|
}), dismissible && React.createElement(CloseButton, {
|
|
43
44
|
onClick: handleClose,
|
|
@@ -45,8 +46,7 @@ var Alert = React.forwardRef(function (uncontrolledProps, ref) {
|
|
|
45
46
|
}), children);
|
|
46
47
|
if (!Transition) return show ? alert : null;
|
|
47
48
|
return React.createElement(Transition, _extends({
|
|
48
|
-
unmountOnExit: true
|
|
49
|
-
ref: ref
|
|
49
|
+
unmountOnExit: true
|
|
50
50
|
}, props, {
|
|
51
51
|
in: show
|
|
52
52
|
}), alert);
|
package/esm/Container.d.ts
CHANGED
package/esm/Container.js
CHANGED
|
@@ -6,8 +6,7 @@ import { useBootstrapPrefix } from './ThemeProvider';
|
|
|
6
6
|
var defaultProps = {
|
|
7
7
|
fluid: false
|
|
8
8
|
};
|
|
9
|
-
var Container = React.forwardRef(
|
|
10
|
-
function (_ref, ref) {
|
|
9
|
+
var Container = React.forwardRef(function (_ref, ref) {
|
|
11
10
|
var bsPrefix = _ref.bsPrefix,
|
|
12
11
|
fluid = _ref.fluid,
|
|
13
12
|
_ref$as = _ref.as,
|
|
@@ -16,10 +15,11 @@ function (_ref, ref) {
|
|
|
16
15
|
props = _objectWithoutPropertiesLoose(_ref, ["bsPrefix", "fluid", "as", "className"]);
|
|
17
16
|
|
|
18
17
|
var prefix = useBootstrapPrefix(bsPrefix, 'container');
|
|
18
|
+
var suffix = typeof fluid === 'string' ? "-" + fluid : '-fluid';
|
|
19
19
|
return React.createElement(Component, _extends({
|
|
20
20
|
ref: ref
|
|
21
21
|
}, props, {
|
|
22
|
-
className: classNames(className, fluid ? prefix +
|
|
22
|
+
className: classNames(className, fluid ? "" + prefix + suffix : prefix)
|
|
23
23
|
}));
|
|
24
24
|
});
|
|
25
25
|
Container.displayName = 'Container';
|
package/esm/FormLabel.js
CHANGED
|
@@ -22,7 +22,9 @@ var FormLabel = React.forwardRef(function (_ref, ref) {
|
|
|
22
22
|
controlId = _useContext.controlId;
|
|
23
23
|
|
|
24
24
|
bsPrefix = useBootstrapPrefix(bsPrefix, 'form-label');
|
|
25
|
-
var
|
|
25
|
+
var columnClass = 'col-form-label';
|
|
26
|
+
if (typeof column === 'string') columnClass = columnClass + "-" + column;
|
|
27
|
+
var classes = classNames(className, bsPrefix, srOnly && 'sr-only', column && columnClass);
|
|
26
28
|
process.env.NODE_ENV !== "production" ? warning(controlId == null || !htmlFor, '`controlId` is ignored on `<FormLabel>` when `htmlFor` is specified.') : void 0;
|
|
27
29
|
htmlFor = htmlFor || controlId;
|
|
28
30
|
if (column) return React.createElement(Col, _extends({
|
package/esm/ListGroup.d.ts
CHANGED
package/esm/Modal.d.ts
CHANGED
package/esm/Modal.js
CHANGED
|
@@ -18,6 +18,7 @@ import Footer from './ModalFooter';
|
|
|
18
18
|
import Header from './ModalHeader';
|
|
19
19
|
import Title from './ModalTitle';
|
|
20
20
|
import { createBootstrapComponent } from './ThemeProvider';
|
|
21
|
+
var manager;
|
|
21
22
|
var defaultProps = {
|
|
22
23
|
show: false,
|
|
23
24
|
backdrop: true,
|
|
@@ -26,8 +27,7 @@ var defaultProps = {
|
|
|
26
27
|
enforceFocus: true,
|
|
27
28
|
restoreFocus: true,
|
|
28
29
|
animation: true,
|
|
29
|
-
dialogAs: ModalDialog
|
|
30
|
-
manager: new BootstrapModalManager()
|
|
30
|
+
dialogAs: ModalDialog
|
|
31
31
|
};
|
|
32
32
|
/* eslint-disable no-use-before-define, react/no-multi-comp */
|
|
33
33
|
|
|
@@ -134,6 +134,18 @@ function (_React$Component) {
|
|
|
134
134
|
_this.updateDialogStyle(_this._modal.dialog);
|
|
135
135
|
};
|
|
136
136
|
|
|
137
|
+
_this.getModalManager = function () {
|
|
138
|
+
if (_this.props.manager) {
|
|
139
|
+
return _this.props.manager;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
if (!manager) {
|
|
143
|
+
manager = new BootstrapModalManager();
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
return manager;
|
|
147
|
+
};
|
|
148
|
+
|
|
137
149
|
_this.renderBackdrop = function (props) {
|
|
138
150
|
var _this$props4 = _this.props,
|
|
139
151
|
bsPrefix = _this$props4.bsPrefix,
|
|
@@ -156,8 +168,7 @@ function (_React$Component) {
|
|
|
156
168
|
|
|
157
169
|
_proto.updateDialogStyle = function updateDialogStyle(node) {
|
|
158
170
|
if (!canUseDOM) return;
|
|
159
|
-
var
|
|
160
|
-
var containerIsOverflowing = manager.isContainerOverflowing(this._modal);
|
|
171
|
+
var containerIsOverflowing = this.getModalManager().isContainerOverflowing(this._modal);
|
|
161
172
|
var modalIsOverflowing = node.scrollHeight > ownerDocument(node).documentElement.clientHeight;
|
|
162
173
|
this.setState({
|
|
163
174
|
style: {
|
|
@@ -179,7 +190,6 @@ function (_React$Component) {
|
|
|
179
190
|
animation = _this$props5.animation,
|
|
180
191
|
backdrop = _this$props5.backdrop,
|
|
181
192
|
keyboard = _this$props5.keyboard,
|
|
182
|
-
manager = _this$props5.manager,
|
|
183
193
|
onEscapeKeyDown = _this$props5.onEscapeKeyDown,
|
|
184
194
|
onShow = _this$props5.onShow,
|
|
185
195
|
onHide = _this$props5.onHide,
|
|
@@ -187,6 +197,7 @@ function (_React$Component) {
|
|
|
187
197
|
autoFocus = _this$props5.autoFocus,
|
|
188
198
|
enforceFocus = _this$props5.enforceFocus,
|
|
189
199
|
restoreFocus = _this$props5.restoreFocus,
|
|
200
|
+
restoreFocusOptions = _this$props5.restoreFocusOptions,
|
|
190
201
|
onEntered = _this$props5.onEntered,
|
|
191
202
|
onExit = _this$props5.onExit,
|
|
192
203
|
onExiting = _this$props5.onExiting,
|
|
@@ -195,7 +206,7 @@ function (_React$Component) {
|
|
|
195
206
|
_6 = _this$props5.onEnter,
|
|
196
207
|
_4 = _this$props5.onEntering,
|
|
197
208
|
_2 = _this$props5.backdropClassName,
|
|
198
|
-
props = _objectWithoutPropertiesLoose(_this$props5, ["bsPrefix", "className", "style", "dialogClassName", "children", "dialogAs", "show", "animation", "backdrop", "keyboard", "
|
|
209
|
+
props = _objectWithoutPropertiesLoose(_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"]);
|
|
199
210
|
|
|
200
211
|
var clickHandler = backdrop === true ? this.handleClick : null;
|
|
201
212
|
|
|
@@ -213,13 +224,14 @@ function (_React$Component) {
|
|
|
213
224
|
autoFocus: autoFocus,
|
|
214
225
|
enforceFocus: enforceFocus,
|
|
215
226
|
restoreFocus: restoreFocus,
|
|
227
|
+
restoreFocusOptions: restoreFocusOptions,
|
|
216
228
|
onEscapeKeyDown: onEscapeKeyDown,
|
|
217
229
|
onShow: onShow,
|
|
218
230
|
onHide: onHide,
|
|
219
231
|
onEntered: onEntered,
|
|
220
232
|
onExit: onExit,
|
|
221
233
|
onExiting: onExiting,
|
|
222
|
-
manager:
|
|
234
|
+
manager: this.getModalManager(),
|
|
223
235
|
ref: this.setModalRef,
|
|
224
236
|
style: baseModalStyle,
|
|
225
237
|
className: classNames(className, bsPrefix),
|
package/esm/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/esm/OverlayTrigger.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
|
|
3
3
|
import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
|
|
4
|
-
|
|
5
|
-
/* eslint-disable max-classes-per-file */
|
|
6
4
|
import contains from 'dom-helpers/contains';
|
|
7
|
-
import React, { cloneElement } from 'react';
|
|
5
|
+
import React, { cloneElement, useCallback, useRef, useState } from 'react';
|
|
6
|
+
import useTimeout from '@restart/hooks/useTimeout';
|
|
8
7
|
import ReactDOM from 'react-dom';
|
|
9
8
|
import warning from 'warning';
|
|
10
9
|
import Overlay from './Overlay';
|
|
@@ -27,206 +26,153 @@ function (_React$Component) {
|
|
|
27
26
|
return RefHolder;
|
|
28
27
|
}(React.Component);
|
|
29
28
|
|
|
30
|
-
|
|
29
|
+
function normalizeDelay(delay) {
|
|
31
30
|
return delay && typeof delay === 'object' ? delay : {
|
|
32
31
|
show: delay,
|
|
33
32
|
hide: delay
|
|
34
33
|
};
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
trigger: ['hover', 'focus']
|
|
40
|
-
}; // eslint-disable-next-line react/no-multi-comp
|
|
41
|
-
|
|
42
|
-
var OverlayTrigger =
|
|
43
|
-
/*#__PURE__*/
|
|
44
|
-
function (_React$Component2) {
|
|
45
|
-
_inheritsLoose(OverlayTrigger, _React$Component2);
|
|
46
|
-
|
|
47
|
-
function OverlayTrigger(props, context) {
|
|
48
|
-
var _this;
|
|
49
|
-
|
|
50
|
-
_this = _React$Component2.call(this, props, context) || this;
|
|
51
|
-
|
|
52
|
-
_this.getTarget = function () {
|
|
53
|
-
return ReactDOM.findDOMNode(_this.trigger.current);
|
|
54
|
-
};
|
|
55
|
-
|
|
56
|
-
_this.handleShow = function () {
|
|
57
|
-
clearTimeout(_this._timeout);
|
|
58
|
-
_this._hoverState = 'show';
|
|
59
|
-
var delay = normalizeDelay(_this.props.delay);
|
|
60
|
-
|
|
61
|
-
if (!delay.show) {
|
|
62
|
-
_this.show();
|
|
63
|
-
|
|
64
|
-
return;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
_this._timeout = setTimeout(function () {
|
|
68
|
-
if (_this._hoverState === 'show') _this.show();
|
|
69
|
-
}, delay.show);
|
|
70
|
-
};
|
|
71
|
-
|
|
72
|
-
_this.handleHide = function () {
|
|
73
|
-
clearTimeout(_this._timeout);
|
|
74
|
-
_this._hoverState = 'hide';
|
|
75
|
-
var delay = normalizeDelay(_this.props.delay);
|
|
76
|
-
|
|
77
|
-
if (!delay.hide) {
|
|
78
|
-
_this.hide();
|
|
79
|
-
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
_this._timeout = setTimeout(function () {
|
|
84
|
-
if (_this._hoverState === 'hide') _this.hide();
|
|
85
|
-
}, delay.hide);
|
|
86
|
-
};
|
|
87
|
-
|
|
88
|
-
_this.handleFocus = function (e) {
|
|
89
|
-
var _this$getChildProps = _this.getChildProps(),
|
|
90
|
-
onFocus = _this$getChildProps.onFocus;
|
|
91
|
-
|
|
92
|
-
_this.handleShow(e);
|
|
93
|
-
|
|
94
|
-
if (onFocus) onFocus(e);
|
|
95
|
-
};
|
|
96
|
-
|
|
97
|
-
_this.handleBlur = function (e) {
|
|
98
|
-
var _this$getChildProps2 = _this.getChildProps(),
|
|
99
|
-
onBlur = _this$getChildProps2.onBlur;
|
|
100
|
-
|
|
101
|
-
_this.handleHide(e);
|
|
102
|
-
|
|
103
|
-
if (onBlur) onBlur(e);
|
|
104
|
-
};
|
|
105
|
-
|
|
106
|
-
_this.handleClick = function (e) {
|
|
107
|
-
var _this$getChildProps3 = _this.getChildProps(),
|
|
108
|
-
onClick = _this$getChildProps3.onClick;
|
|
109
|
-
|
|
110
|
-
if (_this.state.show) _this.hide();else _this.show();
|
|
111
|
-
if (onClick) onClick(e);
|
|
112
|
-
};
|
|
34
|
+
} // Simple implementation of mouseEnter and mouseLeave.
|
|
35
|
+
// React's built version is broken: https://github.com/facebook/react/issues/4251
|
|
36
|
+
// for cases when the trigger is disabled and mouseOut/Over can cause flicker
|
|
37
|
+
// moving from one child element to another.
|
|
113
38
|
|
|
114
|
-
_this.handleMouseOver = function (e) {
|
|
115
|
-
_this.handleMouseOverOut(_this.handleShow, e, 'fromElement');
|
|
116
|
-
};
|
|
117
39
|
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
40
|
+
function handleMouseOverOut(handler, e, relatedNative) {
|
|
41
|
+
var target = e.currentTarget;
|
|
42
|
+
var related = e.relatedTarget || e.nativeEvent[relatedNative];
|
|
121
43
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
show: !!props.defaultShow
|
|
125
|
-
}; // We add aria-describedby in the case where the overlay is a role="tooltip"
|
|
126
|
-
// for other cases describedby isn't appropriate (e.g. a popover with inputs) so we don't add it.
|
|
127
|
-
|
|
128
|
-
_this.ariaModifier = {
|
|
129
|
-
enabled: true,
|
|
130
|
-
order: 900,
|
|
131
|
-
fn: function fn(data) {
|
|
132
|
-
var popper = data.instance.popper;
|
|
133
|
-
|
|
134
|
-
var target = _this.getTarget();
|
|
135
|
-
|
|
136
|
-
if (!_this.state.show || !target) return data;
|
|
137
|
-
var role = popper.getAttribute('role') || '';
|
|
138
|
-
|
|
139
|
-
if (popper.id && role.toLowerCase() === 'tooltip') {
|
|
140
|
-
target.setAttribute('aria-describedby', popper.id);
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
return data;
|
|
144
|
-
}
|
|
145
|
-
};
|
|
146
|
-
return _this;
|
|
44
|
+
if ((!related || related !== target) && !contains(target, related)) {
|
|
45
|
+
handler(e);
|
|
147
46
|
}
|
|
47
|
+
}
|
|
148
48
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
};
|
|
154
|
-
|
|
155
|
-
_proto2.getChildProps = function getChildProps() {
|
|
156
|
-
return React.Children.only(this.props.children).props;
|
|
157
|
-
};
|
|
158
|
-
|
|
159
|
-
// Simple implementation of mouseEnter and mouseLeave.
|
|
160
|
-
// React's built version is broken: https://github.com/facebook/react/issues/4251
|
|
161
|
-
// for cases when the trigger is disabled and mouseOut/Over can cause flicker
|
|
162
|
-
// moving from one child element to another.
|
|
163
|
-
_proto2.handleMouseOverOut = function handleMouseOverOut(handler, e, relatedNative) {
|
|
164
|
-
var target = e.currentTarget;
|
|
165
|
-
var related = e.relatedTarget || e.nativeEvent[relatedNative];
|
|
49
|
+
var defaultProps = {
|
|
50
|
+
defaultShow: false,
|
|
51
|
+
trigger: ['hover', 'focus']
|
|
52
|
+
};
|
|
166
53
|
|
|
167
|
-
|
|
168
|
-
|
|
54
|
+
function OverlayTrigger(_ref) {
|
|
55
|
+
var trigger = _ref.trigger,
|
|
56
|
+
overlay = _ref.overlay,
|
|
57
|
+
children = _ref.children,
|
|
58
|
+
_ref$popperConfig = _ref.popperConfig,
|
|
59
|
+
popperConfig = _ref$popperConfig === void 0 ? {} : _ref$popperConfig,
|
|
60
|
+
defaultShow = _ref.defaultShow,
|
|
61
|
+
propsDelay = _ref.delay,
|
|
62
|
+
props = _objectWithoutPropertiesLoose(_ref, ["trigger", "overlay", "children", "popperConfig", "defaultShow", "delay"]);
|
|
63
|
+
|
|
64
|
+
var triggerNodeRef = useRef(null);
|
|
65
|
+
var timeout = useTimeout();
|
|
66
|
+
var hoverStateRef = useRef();
|
|
67
|
+
|
|
68
|
+
var _useState = useState(!!defaultShow),
|
|
69
|
+
show = _useState[0],
|
|
70
|
+
setShow = _useState[1];
|
|
71
|
+
|
|
72
|
+
var delay = normalizeDelay(propsDelay);
|
|
73
|
+
var child = React.Children.only(children);
|
|
74
|
+
var _child$props = child.props,
|
|
75
|
+
onFocus = _child$props.onFocus,
|
|
76
|
+
onBlur = _child$props.onBlur,
|
|
77
|
+
onClick = _child$props.onClick;
|
|
78
|
+
var getTarget = useCallback(function () {
|
|
79
|
+
return ReactDOM.findDOMNode(triggerNodeRef.current);
|
|
80
|
+
}, []);
|
|
81
|
+
var handleShow = useCallback(function () {
|
|
82
|
+
timeout.clear();
|
|
83
|
+
hoverStateRef.current = 'show';
|
|
84
|
+
|
|
85
|
+
if (!delay.show) {
|
|
86
|
+
setShow(true);
|
|
87
|
+
return;
|
|
169
88
|
}
|
|
170
|
-
};
|
|
171
89
|
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
90
|
+
timeout.set(function () {
|
|
91
|
+
if (hoverStateRef.current === 'show') setShow(true);
|
|
92
|
+
}, delay.show);
|
|
93
|
+
}, [delay.show, timeout]);
|
|
94
|
+
var handleHide = useCallback(function () {
|
|
95
|
+
timeout.clear();
|
|
96
|
+
hoverStateRef.current = 'hide';
|
|
97
|
+
|
|
98
|
+
if (!delay.hide) {
|
|
99
|
+
setShow(false);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
177
102
|
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
103
|
+
timeout.set(function () {
|
|
104
|
+
if (hoverStateRef.current === 'hide') setShow(false);
|
|
105
|
+
}, delay.hide);
|
|
106
|
+
}, [delay.hide, timeout]);
|
|
107
|
+
var handleFocus = useCallback(function (e) {
|
|
108
|
+
handleShow(e);
|
|
109
|
+
if (onFocus) onFocus(e);
|
|
110
|
+
}, [handleShow, onFocus]);
|
|
111
|
+
var handleBlur = useCallback(function (e) {
|
|
112
|
+
handleHide(e);
|
|
113
|
+
if (onBlur) onBlur(e);
|
|
114
|
+
}, [handleHide, onBlur]);
|
|
115
|
+
var handleClick = useCallback(function (e) {
|
|
116
|
+
setShow(function (prevShow) {
|
|
117
|
+
return !prevShow;
|
|
181
118
|
});
|
|
182
|
-
|
|
119
|
+
if (onClick) onClick(e);
|
|
120
|
+
}, [onClick]);
|
|
121
|
+
var handleMouseOver = useCallback(function (e) {
|
|
122
|
+
handleMouseOverOut(handleShow, e, 'fromElement');
|
|
123
|
+
}, [handleShow]);
|
|
124
|
+
var handleMouseOut = useCallback(function (e) {
|
|
125
|
+
handleMouseOverOut(handleHide, e, 'toElement');
|
|
126
|
+
}, [handleHide]); // We add aria-describedby in the case where the overlay is a role="tooltip"
|
|
127
|
+
// for other cases describedby isn't appropriate (e.g. a popover with inputs) so we don't add it.
|
|
128
|
+
|
|
129
|
+
var ariaModifier = {
|
|
130
|
+
enabled: true,
|
|
131
|
+
order: 900,
|
|
132
|
+
fn: function fn(data) {
|
|
133
|
+
var popper = data.instance.popper;
|
|
134
|
+
var target = getTarget();
|
|
135
|
+
if (!show || !target) return data;
|
|
136
|
+
var role = popper.getAttribute('role') || '';
|
|
137
|
+
|
|
138
|
+
if (popper.id && role.toLowerCase() === 'tooltip') {
|
|
139
|
+
target.setAttribute('aria-describedby', popper.id);
|
|
140
|
+
}
|
|
183
141
|
|
|
184
|
-
|
|
185
|
-
var _this$props = this.props,
|
|
186
|
-
trigger = _this$props.trigger,
|
|
187
|
-
overlay = _this$props.overlay,
|
|
188
|
-
children = _this$props.children,
|
|
189
|
-
_this$props$popperCon = _this$props.popperConfig,
|
|
190
|
-
popperConfig = _this$props$popperCon === void 0 ? {} : _this$props$popperCon,
|
|
191
|
-
props = _objectWithoutPropertiesLoose(_this$props, ["trigger", "overlay", "children", "popperConfig"]);
|
|
192
|
-
|
|
193
|
-
delete props.delay;
|
|
194
|
-
delete props.defaultShow;
|
|
195
|
-
var child = React.Children.only(children);
|
|
196
|
-
var triggerProps = {};
|
|
197
|
-
var triggers = trigger == null ? [] : [].concat(trigger);
|
|
198
|
-
|
|
199
|
-
if (triggers.indexOf('click') !== -1) {
|
|
200
|
-
triggerProps.onClick = this.handleClick;
|
|
142
|
+
return data;
|
|
201
143
|
}
|
|
144
|
+
};
|
|
145
|
+
var triggers = trigger == null ? [] : [].concat(trigger);
|
|
146
|
+
var triggerProps = {};
|
|
202
147
|
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
}
|
|
148
|
+
if (triggers.indexOf('click') !== -1) {
|
|
149
|
+
triggerProps.onClick = handleClick;
|
|
150
|
+
}
|
|
207
151
|
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
}
|
|
152
|
+
if (triggers.indexOf('focus') !== -1) {
|
|
153
|
+
triggerProps.onFocus = handleFocus;
|
|
154
|
+
triggerProps.onBlur = handleBlur;
|
|
155
|
+
}
|
|
213
156
|
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
ariaModifier: this.ariaModifier
|
|
220
|
-
})
|
|
221
|
-
}),
|
|
222
|
-
show: this.state.show,
|
|
223
|
-
onHide: this.handleHide,
|
|
224
|
-
target: this.getTarget
|
|
225
|
-
}), overlay));
|
|
226
|
-
};
|
|
157
|
+
if (triggers.indexOf('hover') !== -1) {
|
|
158
|
+
process.env.NODE_ENV !== "production" ? warning(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;
|
|
159
|
+
triggerProps.onMouseOver = handleMouseOver;
|
|
160
|
+
triggerProps.onMouseOut = handleMouseOut;
|
|
161
|
+
}
|
|
227
162
|
|
|
228
|
-
return
|
|
229
|
-
|
|
163
|
+
return React.createElement(React.Fragment, null, React.createElement(RefHolder, {
|
|
164
|
+
ref: triggerNodeRef
|
|
165
|
+
}, cloneElement(child, triggerProps)), React.createElement(Overlay, _extends({}, props, {
|
|
166
|
+
popperConfig: _extends({}, popperConfig, {
|
|
167
|
+
modifiers: _extends({}, popperConfig.modifiers, {
|
|
168
|
+
ariaModifier: ariaModifier
|
|
169
|
+
})
|
|
170
|
+
}),
|
|
171
|
+
show: show,
|
|
172
|
+
onHide: handleHide,
|
|
173
|
+
target: getTarget
|
|
174
|
+
}), overlay));
|
|
175
|
+
}
|
|
230
176
|
|
|
231
177
|
OverlayTrigger.defaultProps = defaultProps;
|
|
232
178
|
export default OverlayTrigger;
|
package/esm/Row.js
CHANGED
package/esm/SplitButton.js
CHANGED
|
@@ -30,6 +30,9 @@ var propTypes = {
|
|
|
30
30
|
/** The content of the non-toggle Button. */
|
|
31
31
|
title: PropTypes.node.isRequired,
|
|
32
32
|
|
|
33
|
+
/** A `type` passed to the non-toggle Button */
|
|
34
|
+
type: PropTypes.string,
|
|
35
|
+
|
|
33
36
|
/** Disables both Buttons */
|
|
34
37
|
disabled: PropTypes.bool,
|
|
35
38
|
|
|
@@ -53,7 +56,8 @@ var propTypes = {
|
|
|
53
56
|
size: PropTypes.string
|
|
54
57
|
};
|
|
55
58
|
var defaultProps = {
|
|
56
|
-
toggleLabel: 'Toggle dropdown'
|
|
59
|
+
toggleLabel: 'Toggle dropdown',
|
|
60
|
+
type: 'button'
|
|
57
61
|
};
|
|
58
62
|
var SplitButton = React.forwardRef(function (_ref, ref) {
|
|
59
63
|
var id = _ref.id,
|
|
@@ -61,6 +65,7 @@ var SplitButton = React.forwardRef(function (_ref, ref) {
|
|
|
61
65
|
size = _ref.size,
|
|
62
66
|
variant = _ref.variant,
|
|
63
67
|
title = _ref.title,
|
|
68
|
+
type = _ref.type,
|
|
64
69
|
toggleLabel = _ref.toggleLabel,
|
|
65
70
|
children = _ref.children,
|
|
66
71
|
onClick = _ref.onClick,
|
|
@@ -68,7 +73,7 @@ var SplitButton = React.forwardRef(function (_ref, ref) {
|
|
|
68
73
|
target = _ref.target,
|
|
69
74
|
menuRole = _ref.menuRole,
|
|
70
75
|
rootCloseEvent = _ref.rootCloseEvent,
|
|
71
|
-
props = _objectWithoutPropertiesLoose(_ref, ["id", "bsPrefix", "size", "variant", "title", "toggleLabel", "children", "onClick", "href", "target", "menuRole", "rootCloseEvent"]);
|
|
76
|
+
props = _objectWithoutPropertiesLoose(_ref, ["id", "bsPrefix", "size", "variant", "title", "type", "toggleLabel", "children", "onClick", "href", "target", "menuRole", "rootCloseEvent"]);
|
|
72
77
|
|
|
73
78
|
return React.createElement(Dropdown, _extends({
|
|
74
79
|
ref: ref
|
|
@@ -81,7 +86,8 @@ var SplitButton = React.forwardRef(function (_ref, ref) {
|
|
|
81
86
|
bsPrefix: bsPrefix,
|
|
82
87
|
href: href,
|
|
83
88
|
target: target,
|
|
84
|
-
onClick: onClick
|
|
89
|
+
onClick: onClick,
|
|
90
|
+
type: type
|
|
85
91
|
}, title), React.createElement(Dropdown.Toggle, {
|
|
86
92
|
split: true,
|
|
87
93
|
id: id,
|
package/esm/Tooltip.js
CHANGED
|
@@ -16,7 +16,8 @@ var Tooltip = React.forwardRef(function (_ref, ref) {
|
|
|
16
16
|
arrowProps = _ref.arrowProps,
|
|
17
17
|
_ = _ref.scheduleUpdate,
|
|
18
18
|
_1 = _ref.outOfBoundaries,
|
|
19
|
-
|
|
19
|
+
_2 = _ref.show,
|
|
20
|
+
props = _objectWithoutPropertiesLoose(_ref, ["bsPrefix", "placement", "className", "style", "children", "arrowProps", "scheduleUpdate", "outOfBoundaries", "show"]);
|
|
20
21
|
|
|
21
22
|
bsPrefix = useBootstrapPrefix(bsPrefix, 'tooltip');
|
|
22
23
|
return React.createElement("div", _extends({
|
package/esm/index.js
CHANGED
|
@@ -97,6 +97,8 @@ import _NavDropdown from './NavDropdown';
|
|
|
97
97
|
export { _NavDropdown as NavDropdown };
|
|
98
98
|
import _NavItem from './NavItem';
|
|
99
99
|
export { _NavItem as NavItem };
|
|
100
|
+
import _NavLink from './NavLink';
|
|
101
|
+
export { _NavLink as NavLink };
|
|
100
102
|
import _Overlay from './Overlay';
|
|
101
103
|
export { _Overlay as Overlay };
|
|
102
104
|
import _OverlayTrigger from './OverlayTrigger';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-bootstrap",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.17",
|
|
4
4
|
"description": "Bootstrap 4 components built with React",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -16,14 +16,8 @@
|
|
|
16
16
|
}
|
|
17
17
|
},
|
|
18
18
|
"lint-staged": {
|
|
19
|
-
"*.js":
|
|
20
|
-
|
|
21
|
-
"git add"
|
|
22
|
-
],
|
|
23
|
-
"types/**/*.ts": [
|
|
24
|
-
"prettier --write",
|
|
25
|
-
"git add"
|
|
26
|
-
]
|
|
19
|
+
"*.js": "eslint --fix",
|
|
20
|
+
"types/**/*.ts": "prettier --write"
|
|
27
21
|
},
|
|
28
22
|
"prettier": {
|
|
29
23
|
"singleQuote": true,
|
|
@@ -52,7 +46,6 @@
|
|
|
52
46
|
"classnames": "^2.2.6",
|
|
53
47
|
"dom-helpers": "^5.1.2",
|
|
54
48
|
"invariant": "^2.2.4",
|
|
55
|
-
"keycode": "^2.2.0",
|
|
56
49
|
"popper.js": "^1.16.0",
|
|
57
50
|
"prop-types": "^15.7.2",
|
|
58
51
|
"prop-types-extra": "^1.1.0",
|
|
@@ -64,9 +57,12 @@
|
|
|
64
57
|
"release": {
|
|
65
58
|
"publishDir": "lib"
|
|
66
59
|
},
|
|
60
|
+
"resolutions": {
|
|
61
|
+
"fast-glob": "2.2.7"
|
|
62
|
+
},
|
|
67
63
|
"bugs": {
|
|
68
64
|
"url": "https://github.com/react-bootstrap/react-bootstrap/issues"
|
|
69
65
|
},
|
|
70
66
|
"readme": "ERROR: No README data found!",
|
|
71
|
-
"_id": "react-bootstrap@1.0.0-beta.
|
|
67
|
+
"_id": "react-bootstrap@1.0.0-beta.16"
|
|
72
68
|
}
|