Skip to content

Instantly share code, notes, and snippets.

@sbaechler

sbaechler/reactstrap+9.2.2.patch

Last active August 7, 2024 14:58
Show Gist options
  • Save sbaechler/406c8e7130419eef16240aedac3e7934 to your computer and use it in GitHub Desktop.
Save sbaechler/406c8e7130419eef16240aedac3e7934 to your computer and use it in GitHub Desktop.
Download ZIP
Patch to remove default props from Reactstrap 9.2.2.
Raw
reactstrap+9.2.2.patch
diff --git a/node_modules/reactstrap/esm/Alert.js b/node_modules/reactstrap/esm/Alert.js
index 06b5076..db67141 100644
--- a/node_modules/reactstrap/esm/Alert.js
+++ b/node_modules/reactstrap/esm/Alert.js
@@ -9,7 +9,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { mapToCssModules, tagPropType } from './utils';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
var propTypes = {
/** Pass children so this component can wrap the child elements */
children: PropTypes.node,
@@ -50,7 +50,7 @@ function Alert(props) {
toggle = props.toggle,
children = props.children,
_props$transition = props.transition,
- transition = _props$transition === void 0 ? _objectSpread(_objectSpread({}, Fade.defaultProps), {}, {
+ transition = _props$transition === void 0 ? _objectSpread(_objectSpread({}, fadeDefaultProps), {}, {
unmountOnExit: true
}) : _props$transition,
_props$fade = props.fade,
@@ -61,7 +61,7 @@ function Alert(props) {
'alert-dismissible': toggle
}), cssModule);
var closeClasses = mapToCssModules(classNames('btn-close', closeClassName), cssModule);
- var alertTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), transition), {}, {
+ var alertTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), transition), {}, {
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0
});
diff --git a/node_modules/reactstrap/esm/Fade.js b/node_modules/reactstrap/esm/Fade.js
index f3ce4db..c2830b1 100644
--- a/node_modules/reactstrap/esm/Fade.js
+++ b/node_modules/reactstrap/esm/Fade.js
@@ -9,7 +9,7 @@ import React, { useRef } from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { Transition } from 'react-transition-group';
-import { mapToCssModules, omit, pick, TransitionPropTypeKeys, TransitionTimeouts, tagPropType } from './utils';
+import { addDefaultProps, mapToCssModules, omit, pick, tagPropType, TransitionPropTypeKeys, TransitionTimeouts } from './utils';
var propTypes = _objectSpread(_objectSpread({}, Transition.propTypes), {}, {
children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
tag: tagPropType,
@@ -19,7 +19,7 @@ var propTypes = _objectSpread(_objectSpread({}, Transition.propTypes), {}, {
cssModule: PropTypes.object,
innerRef: PropTypes.oneOfType([PropTypes.object, PropTypes.string, PropTypes.func])
});
-var defaultProps = _objectSpread(_objectSpread({}, Transition.defaultProps), {}, {
+export var fadeDefaultProps = _objectSpread(_objectSpread({}, Transition.defaultProps), {}, {
timeout: TransitionTimeouts.Fade,
appear: true,
enter: true,
@@ -40,9 +40,7 @@ function Fade(props) {
_props$innerRef = props.innerRef,
innerRef = _props$innerRef === void 0 ? ref : _props$innerRef,
otherProps = _objectWithoutProperties(props, _excluded);
- var transitionProps = pick(_objectSpread({
- defaultProps: defaultProps
- }, otherProps), TransitionPropTypeKeys);
+ var transitionProps = pick(otherProps, TransitionPropTypeKeys);
var childProps = omit(otherProps, TransitionPropTypeKeys);
return /*#__PURE__*/React.createElement(Transition, _extends({
nodeRef: innerRef
@@ -57,5 +55,9 @@ function Fade(props) {
});
}
Fade.propTypes = propTypes;
-Fade.defaultProps = defaultProps;
-export default Fade;
\ No newline at end of file
+
+// PropTypes did not account for default props
+function FadeWrapper(props) {
+ return /*#__PURE__*/React.createElement(Fade, addDefaultProps(fadeDefaultProps, props));
+}
+export default FadeWrapper;
\ No newline at end of file
diff --git a/node_modules/reactstrap/esm/Modal.js b/node_modules/reactstrap/esm/Modal.js
index 7da94e5..b7654cb 100644
--- a/node_modules/reactstrap/esm/Modal.js
+++ b/node_modules/reactstrap/esm/Modal.js
@@ -17,7 +17,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import Portal from './Portal';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
import { getOriginalBodyPadding, conditionallyUpdateScrollbar, setScrollbarWidth, mapToCssModules, omit, focusableElements, TransitionTimeouts, keyCodes, targetPropType, getTarget } from './utils';
function noop() {}
var FadePropTypes = PropTypes.shape(Fade.propTypes);
@@ -458,11 +458,11 @@ var Modal = /*#__PURE__*/function (_React$Component) {
tabIndex: '-1'
};
var hasTransition = this.props.fade;
- var modalTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), this.props.modalTransition), {}, {
+ var modalTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), this.props.modalTransition), {}, {
baseClass: hasTransition ? this.props.modalTransition.baseClass : '',
timeout: hasTransition ? this.props.modalTransition.timeout : 0
});
- var backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), this.props.backdropTransition), {}, {
+ var backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), this.props.backdropTransition), {}, {
baseClass: hasTransition ? this.props.backdropTransition.baseClass : '',
timeout: hasTransition ? this.props.backdropTransition.timeout : 0
});
diff --git a/node_modules/reactstrap/esm/Offcanvas.js b/node_modules/reactstrap/esm/Offcanvas.js
index 5006e62..8aeb38e 100644
--- a/node_modules/reactstrap/esm/Offcanvas.js
+++ b/node_modules/reactstrap/esm/Offcanvas.js
@@ -17,7 +17,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import Portal from './Portal';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
import { TransitionTimeouts, conditionallyUpdateScrollbar, focusableElements, getOriginalBodyPadding, getTarget, keyCodes, mapToCssModules, omit, setScrollbarWidth, targetPropType } from './utils';
function noop() {}
var FadePropTypes = PropTypes.shape(Fade.propTypes);
@@ -377,11 +377,11 @@ var Offcanvas = /*#__PURE__*/function (_React$Component) {
tabIndex: '-1'
};
var hasTransition = this.props.fade;
- var offcanvasTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), this.props.offcanvasTransition), {}, {
+ var offcanvasTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), this.props.offcanvasTransition), {}, {
baseClass: hasTransition ? this.props.offcanvasTransition.baseClass : '',
timeout: hasTransition ? this.props.offcanvasTransition.timeout : 0
});
- var backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), this.props.backdropTransition), {}, {
+ var backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), this.props.backdropTransition), {}, {
baseClass: hasTransition ? this.props.backdropTransition.baseClass : '',
timeout: hasTransition ? this.props.backdropTransition.timeout : 0
});
diff --git a/node_modules/reactstrap/esm/PlaceholderButton.js b/node_modules/reactstrap/esm/PlaceholderButton.js
index 06f4d4d..25594a4 100644
--- a/node_modules/reactstrap/esm/PlaceholderButton.js
+++ b/node_modules/reactstrap/esm/PlaceholderButton.js
@@ -28,7 +28,7 @@ function PlaceholderButton(props) {
var _getColumnClasses = getColumnClasses(_objectSpread({
color: 'primary'
}, attributes), cssModule),
- modifiedAttributes = _getColumnClasses.attributes,
+ modifiedAttributes = _getColumnClasses.modifiedAttributes,
colClasses = _getColumnClasses.colClasses;
var classes = mapToCssModules(classNames('placeholder', className, colClasses), cssModule);
return /*#__PURE__*/React.createElement(Tag, _extends({}, modifiedAttributes, {
diff --git a/node_modules/reactstrap/esm/Popover.js b/node_modules/reactstrap/esm/Popover.js
index 18f0fc4..a545ef1 100644
--- a/node_modules/reactstrap/esm/Popover.js
+++ b/node_modules/reactstrap/esm/Popover.js
@@ -2,6 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
import React from 'react';
import classNames from 'classnames';
import TooltipPopoverWrapper, { propTypes } from './TooltipPopoverWrapper';
+import { addDefaultProps } from './utils';
var defaultProps = {
placement: 'right',
placementPrefix: 'bs-popover',
@@ -12,12 +13,11 @@ function Popover(props) {
var arrowClasses = classNames('popover-arrow', props.arrowClassName);
var popperClasses = classNames('popover', 'show', props.popperClassName);
var classes = classNames('popover-inner', props.innerClassName);
- return /*#__PURE__*/React.createElement(TooltipPopoverWrapper, _extends({}, props, {
+ return /*#__PURE__*/React.createElement(TooltipPopoverWrapper, _extends({}, addDefaultProps(defaultProps, props), {
arrowClassName: arrowClasses,
popperClassName: popperClasses,
innerClassName: classes
}));
}
Popover.propTypes = propTypes;
-Popover.defaultProps = defaultProps;
export default Popover;
\ No newline at end of file
diff --git a/node_modules/reactstrap/esm/PopperContent.js b/node_modules/reactstrap/esm/PopperContent.js
index ff128f9..841658f 100644
--- a/node_modules/reactstrap/esm/PopperContent.js
+++ b/node_modules/reactstrap/esm/PopperContent.js
@@ -28,7 +28,7 @@ import ReactDOM from 'react-dom';
import classNames from 'classnames';
import { Popper as ReactPopper } from 'react-popper';
import { getTarget, targetPropType, mapToCssModules, DOMElement, tagPropType } from './utils';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
function noop() {}
var propTypes = {
children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
@@ -63,7 +63,7 @@ var defaultProps = {
modifiers: [],
onClosed: noop,
fade: true,
- transition: _objectSpread({}, Fade.defaultProps)
+ transition: _objectSpread({}, fadeDefaultProps)
};
var PopperContent = /*#__PURE__*/function (_React$Component) {
_inherits(PopperContent, _React$Component);
@@ -166,7 +166,7 @@ var PopperContent = /*#__PURE__*/function (_React$Component) {
return !modifierNames.includes(m.name);
});
var extendedModifiers = [].concat(_toConsumableArray(baseModifiers), _toConsumableArray(modifiers));
- var popperTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), transition), {}, {
+ var popperTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), transition), {}, {
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0
});
diff --git a/node_modules/reactstrap/esm/Toast.js b/node_modules/reactstrap/esm/Toast.js
index cb9dbd1..4e82bc3 100644
--- a/node_modules/reactstrap/esm/Toast.js
+++ b/node_modules/reactstrap/esm/Toast.js
@@ -9,7 +9,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { mapToCssModules, tagPropType } from './utils';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
var propTypes = {
children: PropTypes.node,
className: PropTypes.string,
@@ -29,7 +29,7 @@ function Toast(props) {
isOpen = _props$isOpen === void 0 ? true : _props$isOpen,
children = props.children,
_props$transition = props.transition,
- transition = _props$transition === void 0 ? _objectSpread(_objectSpread({}, Fade.defaultProps), {}, {
+ transition = _props$transition === void 0 ? _objectSpread(_objectSpread({}, fadeDefaultProps), {}, {
unmountOnExit: true
}) : _props$transition,
_props$fade = props.fade,
@@ -37,7 +37,7 @@ function Toast(props) {
innerRef = props.innerRef,
attributes = _objectWithoutProperties(props, _excluded);
var classes = mapToCssModules(classNames(className, 'toast'), cssModule);
- var toastTransition = _objectSpread(_objectSpread(_objectSpread({}, Fade.defaultProps), transition), {}, {
+ var toastTransition = _objectSpread(_objectSpread(_objectSpread({}, fadeDefaultProps), transition), {}, {
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0
});
diff --git a/node_modules/reactstrap/esm/Tooltip.js b/node_modules/reactstrap/esm/Tooltip.js
index 0aa15e7..2e2bb49 100644
--- a/node_modules/reactstrap/esm/Tooltip.js
+++ b/node_modules/reactstrap/esm/Tooltip.js
@@ -2,6 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
import React from 'react';
import classNames from 'classnames';
import TooltipPopoverWrapper, { propTypes } from './TooltipPopoverWrapper';
+import { addDefaultProps } from './utils';
var defaultProps = {
placement: 'top',
autohide: true,
@@ -12,12 +13,12 @@ function Tooltip(props) {
var arrowClasses = classNames('tooltip-arrow', props.arrowClassName);
var popperClasses = classNames('tooltip', 'show', props.popperClassName);
var classes = classNames('tooltip-inner', props.innerClassName);
- return /*#__PURE__*/React.createElement(TooltipPopoverWrapper, _extends({}, props, {
+ var _props = addDefaultProps(defaultProps, props);
+ return /*#__PURE__*/React.createElement(TooltipPopoverWrapper, _extends({}, _props, {
arrowClassName: arrowClasses,
popperClassName: popperClasses,
innerClassName: classes
}));
}
Tooltip.propTypes = propTypes;
-Tooltip.defaultProps = defaultProps;
export default Tooltip;
\ No newline at end of file
diff --git a/node_modules/reactstrap/esm/UncontrolledAccordion.js b/node_modules/reactstrap/esm/UncontrolledAccordion.js
index 6115bd1..9c3ec5a 100644
--- a/node_modules/reactstrap/esm/UncontrolledAccordion.js
+++ b/node_modules/reactstrap/esm/UncontrolledAccordion.js
@@ -46,7 +46,7 @@ function UncontrolledAccordion(_ref) {
setOpen([].concat(_toConsumableArray(open), [id]));
}
} else if (open === id) {
- setOpen(undefined);
+ setOpen('');
} else {
setOpen(id);
}
diff --git a/node_modules/reactstrap/esm/utils.js b/node_modules/reactstrap/esm/utils.js
index 62c4145..261ea88 100644
--- a/node_modules/reactstrap/esm/utils.js
+++ b/node_modules/reactstrap/esm/utils.js
@@ -1,3 +1,6 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
import PropTypes from 'prop-types';
@@ -265,3 +268,13 @@ export function addMultipleEventListeners(_els, handler, _events, useCapture) {
};
}
export var focusableElements = ['a[href]', 'area[href]', 'input:not([disabled]):not([type=hidden])', 'select:not([disabled])', 'textarea:not([disabled])', 'button:not([disabled])', 'object', 'embed', '[tabindex]:not(.modal):not(.offcanvas)', 'audio[controls]', 'video[controls]', '[contenteditable]:not([contenteditable="false"])'];
+export function addDefaultProps(defaultProps, props) {
+ if (!defaultProps || !props) return props;
+ var result = _objectSpread({}, props);
+ Object.keys(defaultProps).forEach(function (key) {
+ if (result[key] === undefined) {
+ result[key] = defaultProps[key];
+ }
+ });
+ return result;
+}
\ No newline at end of file
diff --git a/node_modules/reactstrap/lib/Alert.js b/node_modules/reactstrap/lib/Alert.js
index 3907e83..4a3317f 100644
--- a/node_modules/reactstrap/lib/Alert.js
+++ b/node_modules/reactstrap/lib/Alert.js
@@ -8,8 +8,10 @@ var _react = _interopRequireDefault(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _classnames = _interopRequireDefault(require("classnames"));
var _utils = require("./utils");
-var _Fade = _interopRequireDefault(require("./Fade"));
+var _Fade = _interopRequireWildcard(require("./Fade"));
const _excluded = ["className", "closeClassName", "closeAriaLabel", "cssModule", "tag", "color", "isOpen", "toggle", "children", "transition", "fade", "innerRef"];
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -53,7 +55,7 @@ function Alert(props) {
isOpen = true,
toggle,
children,
- transition = _objectSpread(_objectSpread({}, _Fade.default.defaultProps), {}, {
+ transition = _objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), {}, {
unmountOnExit: true
}),
fade = true,
@@ -64,7 +66,7 @@ function Alert(props) {
'alert-dismissible': toggle
}), cssModule);
const closeClasses = (0, _utils.mapToCssModules)((0, _classnames.default)('btn-close', closeClassName), cssModule);
- const alertTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), transition), {}, {
+ const alertTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), transition), {}, {
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0
});
diff --git a/node_modules/reactstrap/lib/Fade.js b/node_modules/reactstrap/lib/Fade.js
index 180602d..51886ed 100644
--- a/node_modules/reactstrap/lib/Fade.js
+++ b/node_modules/reactstrap/lib/Fade.js
@@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.default = void 0;
+exports.fadeDefaultProps = exports.default = void 0;
var _react = _interopRequireWildcard(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _classnames = _interopRequireDefault(require("classnames"));
@@ -28,13 +28,14 @@ const propTypes = _objectSpread(_objectSpread({}, _reactTransitionGroup.Transiti
cssModule: _propTypes.default.object,
innerRef: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string, _propTypes.default.func])
});
-const defaultProps = _objectSpread(_objectSpread({}, _reactTransitionGroup.Transition.defaultProps), {}, {
+const fadeDefaultProps = _objectSpread(_objectSpread({}, _reactTransitionGroup.Transition.defaultProps), {}, {
timeout: _utils.TransitionTimeouts.Fade,
appear: true,
enter: true,
exit: true,
in: true
});
+exports.fadeDefaultProps = fadeDefaultProps;
function Fade(props) {
const ref = (0, _react.useRef)(null);
const {
@@ -47,9 +48,7 @@ function Fade(props) {
innerRef = ref
} = props,
otherProps = _objectWithoutProperties(props, _excluded);
- const transitionProps = (0, _utils.pick)(_objectSpread({
- defaultProps
- }, otherProps), _utils.TransitionPropTypeKeys);
+ const transitionProps = (0, _utils.pick)(otherProps, _utils.TransitionPropTypeKeys);
const childProps = (0, _utils.omit)(otherProps, _utils.TransitionPropTypeKeys);
return /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.Transition, _extends({
nodeRef: innerRef
@@ -64,6 +63,10 @@ function Fade(props) {
});
}
Fade.propTypes = propTypes;
-Fade.defaultProps = defaultProps;
-var _default = Fade;
+
+// PropTypes did not account for default props
+function FadeWrapper(props) {
+ return /*#__PURE__*/_react.default.createElement(Fade, (0, _utils.addDefaultProps)(fadeDefaultProps, props));
+}
+var _default = FadeWrapper;
exports.default = _default;
\ No newline at end of file
diff --git a/node_modules/reactstrap/lib/Modal.js b/node_modules/reactstrap/lib/Modal.js
index d1caa4a..7fb9eb9 100644
--- a/node_modules/reactstrap/lib/Modal.js
+++ b/node_modules/reactstrap/lib/Modal.js
@@ -8,8 +8,10 @@ var _react = _interopRequireDefault(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _classnames = _interopRequireDefault(require("classnames"));
var _Portal = _interopRequireDefault(require("./Portal"));
-var _Fade = _interopRequireDefault(require("./Fade"));
+var _Fade = _interopRequireWildcard(require("./Fade"));
var _utils = require("./utils");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -418,11 +420,11 @@ class Modal extends _react.default.Component {
tabIndex: '-1'
};
const hasTransition = this.props.fade;
- const modalTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), this.props.modalTransition), {}, {
+ const modalTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), this.props.modalTransition), {}, {
baseClass: hasTransition ? this.props.modalTransition.baseClass : '',
timeout: hasTransition ? this.props.modalTransition.timeout : 0
});
- const backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), this.props.backdropTransition), {}, {
+ const backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), this.props.backdropTransition), {}, {
baseClass: hasTransition ? this.props.backdropTransition.baseClass : '',
timeout: hasTransition ? this.props.backdropTransition.timeout : 0
});
diff --git a/node_modules/reactstrap/lib/Offcanvas.js b/node_modules/reactstrap/lib/Offcanvas.js
index 24e5e15..73d5e1f 100644
--- a/node_modules/reactstrap/lib/Offcanvas.js
+++ b/node_modules/reactstrap/lib/Offcanvas.js
@@ -8,8 +8,10 @@ var _react = _interopRequireDefault(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _classnames = _interopRequireDefault(require("classnames"));
var _Portal = _interopRequireDefault(require("./Portal"));
-var _Fade = _interopRequireDefault(require("./Fade"));
+var _Fade = _interopRequireWildcard(require("./Fade"));
var _utils = require("./utils");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -337,11 +339,11 @@ class Offcanvas extends _react.default.Component {
tabIndex: '-1'
};
const hasTransition = this.props.fade;
- const offcanvasTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), this.props.offcanvasTransition), {}, {
+ const offcanvasTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), this.props.offcanvasTransition), {}, {
baseClass: hasTransition ? this.props.offcanvasTransition.baseClass : '',
timeout: hasTransition ? this.props.offcanvasTransition.timeout : 0
});
- const backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), this.props.backdropTransition), {}, {
+ const backdropTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), this.props.backdropTransition), {}, {
baseClass: hasTransition ? this.props.backdropTransition.baseClass : '',
timeout: hasTransition ? this.props.backdropTransition.timeout : 0
});
diff --git a/node_modules/reactstrap/lib/PlaceholderButton.js b/node_modules/reactstrap/lib/PlaceholderButton.js
index 59e56b2..0f4877f 100644
--- a/node_modules/reactstrap/lib/PlaceholderButton.js
+++ b/node_modules/reactstrap/lib/PlaceholderButton.js
@@ -34,7 +34,7 @@ function PlaceholderButton(props) {
} = props,
attributes = _objectWithoutProperties(props, _excluded);
let {
- attributes: modifiedAttributes,
+ modifiedAttributes,
colClasses
} = (0, _Col.getColumnClasses)(_objectSpread({
color: 'primary'
diff --git a/node_modules/reactstrap/lib/Popover.js b/node_modules/reactstrap/lib/Popover.js
index 318f966..e77b2b7 100644
--- a/node_modules/reactstrap/lib/Popover.js
+++ b/node_modules/reactstrap/lib/Popover.js
@@ -7,6 +7,7 @@ exports.default = void 0;
var _react = _interopRequireDefault(require("react"));
var _classnames = _interopRequireDefault(require("classnames"));
var _TooltipPopoverWrapper = _interopRequireWildcard(require("./TooltipPopoverWrapper"));
+var _utils = require("./utils");
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -21,13 +22,12 @@ function Popover(props) {
const arrowClasses = (0, _classnames.default)('popover-arrow', props.arrowClassName);
const popperClasses = (0, _classnames.default)('popover', 'show', props.popperClassName);
const classes = (0, _classnames.default)('popover-inner', props.innerClassName);
- return /*#__PURE__*/_react.default.createElement(_TooltipPopoverWrapper.default, _extends({}, props, {
+ return /*#__PURE__*/_react.default.createElement(_TooltipPopoverWrapper.default, _extends({}, (0, _utils.addDefaultProps)(defaultProps, props), {
arrowClassName: arrowClasses,
popperClassName: popperClasses,
innerClassName: classes
}));
}
Popover.propTypes = _TooltipPopoverWrapper.propTypes;
-Popover.defaultProps = defaultProps;
var _default = Popover;
exports.default = _default;
\ No newline at end of file
diff --git a/node_modules/reactstrap/lib/PopperContent.js b/node_modules/reactstrap/lib/PopperContent.js
index 8912791..640c02b 100644
--- a/node_modules/reactstrap/lib/PopperContent.js
+++ b/node_modules/reactstrap/lib/PopperContent.js
@@ -10,8 +10,10 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
var _classnames = _interopRequireDefault(require("classnames"));
var _reactPopper = require("react-popper");
var _utils = require("./utils");
-var _Fade = _interopRequireDefault(require("./Fade"));
+var _Fade = _interopRequireWildcard(require("./Fade"));
const _excluded = ["cssModule", "children", "isOpen", "flip", "target", "offset", "fallbackPlacements", "placementPrefix", "arrowClassName", "hideArrow", "popperClassName", "tag", "container", "modifiers", "strategy", "boundariesElement", "onClosed", "fade", "transition", "placement"];
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -53,7 +55,7 @@ const defaultProps = {
modifiers: [],
onClosed: noop,
fade: true,
- transition: _objectSpread({}, _Fade.default.defaultProps)
+ transition: _objectSpread({}, _Fade.fadeDefaultProps)
};
class PopperContent extends _react.default.Component {
constructor(props) {
@@ -143,7 +145,7 @@ class PopperContent extends _react.default.Component {
}
}].filter(m => !modifierNames.includes(m.name));
const extendedModifiers = [...baseModifiers, ...modifiers];
- const popperTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), transition), {}, {
+ const popperTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), transition), {}, {
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0
});
diff --git a/node_modules/reactstrap/lib/Toast.js b/node_modules/reactstrap/lib/Toast.js
index 6d823be..378a20c 100644
--- a/node_modules/reactstrap/lib/Toast.js
+++ b/node_modules/reactstrap/lib/Toast.js
@@ -8,8 +8,10 @@ var _react = _interopRequireDefault(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _classnames = _interopRequireDefault(require("classnames"));
var _utils = require("./utils");
-var _Fade = _interopRequireDefault(require("./Fade"));
+var _Fade = _interopRequireWildcard(require("./Fade"));
const _excluded = ["className", "cssModule", "tag", "isOpen", "children", "transition", "fade", "innerRef"];
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -34,7 +36,7 @@ function Toast(props) {
tag: Tag = 'div',
isOpen = true,
children,
- transition = _objectSpread(_objectSpread({}, _Fade.default.defaultProps), {}, {
+ transition = _objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), {}, {
unmountOnExit: true
}),
fade = true,
@@ -42,7 +44,7 @@ function Toast(props) {
} = props,
attributes = _objectWithoutProperties(props, _excluded);
const classes = (0, _utils.mapToCssModules)((0, _classnames.default)(className, 'toast'), cssModule);
- const toastTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.default.defaultProps), transition), {}, {
+ const toastTransition = _objectSpread(_objectSpread(_objectSpread({}, _Fade.fadeDefaultProps), transition), {}, {
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0
});
diff --git a/node_modules/reactstrap/lib/Tooltip.js b/node_modules/reactstrap/lib/Tooltip.js
index b407e8d..951ea60 100644
--- a/node_modules/reactstrap/lib/Tooltip.js
+++ b/node_modules/reactstrap/lib/Tooltip.js
@@ -7,6 +7,7 @@ exports.default = void 0;
var _react = _interopRequireDefault(require("react"));
var _classnames = _interopRequireDefault(require("classnames"));
var _TooltipPopoverWrapper = _interopRequireWildcard(require("./TooltipPopoverWrapper"));
+var _utils = require("./utils");
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -21,13 +22,13 @@ function Tooltip(props) {
const arrowClasses = (0, _classnames.default)('tooltip-arrow', props.arrowClassName);
const popperClasses = (0, _classnames.default)('tooltip', 'show', props.popperClassName);
const classes = (0, _classnames.default)('tooltip-inner', props.innerClassName);
- return /*#__PURE__*/_react.default.createElement(_TooltipPopoverWrapper.default, _extends({}, props, {
+ const _props = (0, _utils.addDefaultProps)(defaultProps, props);
+ return /*#__PURE__*/_react.default.createElement(_TooltipPopoverWrapper.default, _extends({}, _props, {
arrowClassName: arrowClasses,
popperClassName: popperClasses,
innerClassName: classes
}));
}
Tooltip.propTypes = _TooltipPopoverWrapper.propTypes;
-Tooltip.defaultProps = defaultProps;
var _default = Tooltip;
exports.default = _default;
\ No newline at end of file
diff --git a/node_modules/reactstrap/lib/UncontrolledAccordion.js b/node_modules/reactstrap/lib/UncontrolledAccordion.js
index 1397003..0d9959e 100644
--- a/node_modules/reactstrap/lib/UncontrolledAccordion.js
+++ b/node_modules/reactstrap/lib/UncontrolledAccordion.js
@@ -42,7 +42,7 @@ function UncontrolledAccordion(_ref) {
setOpen([...open, id]);
}
} else if (open === id) {
- setOpen(undefined);
+ setOpen('');
} else {
setOpen(id);
}
diff --git a/node_modules/reactstrap/lib/utils.js b/node_modules/reactstrap/lib/utils.js
index 348ce68..31938ea 100644
--- a/node_modules/reactstrap/lib/utils.js
+++ b/node_modules/reactstrap/lib/utils.js
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
});
exports.DOMElement = DOMElement;
exports.TransitionTimeouts = exports.TransitionStatuses = exports.TransitionPropTypeKeys = exports.PopperPlacements = void 0;
+exports.addDefaultProps = addDefaultProps;
exports.addMultipleEventListeners = addMultipleEventListeners;
exports.canUseDOM = void 0;
exports.conditionallyUpdateScrollbar = conditionallyUpdateScrollbar;
@@ -31,6 +32,9 @@ exports.toNumber = toNumber;
exports.warnOnce = warnOnce;
var _propTypes = _interopRequireDefault(require("prop-types"));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
// https://github.com/twbs/bootstrap/blob/v4.0.0-alpha.4/js/src/modal.js#L436-L443
function getScrollbarWidth() {
let scrollDiv = document.createElement('div');
@@ -304,3 +308,13 @@ function addMultipleEventListeners(_els, handler, _events, useCapture) {
}
const focusableElements = ['a[href]', 'area[href]', 'input:not([disabled]):not([type=hidden])', 'select:not([disabled])', 'textarea:not([disabled])', 'button:not([disabled])', 'object', 'embed', '[tabindex]:not(.modal):not(.offcanvas)', 'audio[controls]', 'video[controls]', '[contenteditable]:not([contenteditable="false"])'];
exports.focusableElements = focusableElements;
+function addDefaultProps(defaultProps, props) {
+ if (!defaultProps || !props) return props;
+ let result = _objectSpread({}, props);
+ Object.keys(defaultProps).forEach(key => {
+ if (result[key] === undefined) {
+ result[key] = defaultProps[key];
+ }
+ });
+ return result;
+}
\ No newline at end of file
diff --git a/node_modules/reactstrap/src/Alert.js b/node_modules/reactstrap/src/Alert.js
index 655fcc0..44c8544 100644
--- a/node_modules/reactstrap/src/Alert.js
+++ b/node_modules/reactstrap/src/Alert.js
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { mapToCssModules, tagPropType } from './utils';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
const propTypes = {
/** Pass children so this component can wrap the child elements */
@@ -46,7 +46,7 @@ function Alert(props) {
toggle,
children,
transition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
unmountOnExit: true,
},
fade = true,
@@ -67,7 +67,7 @@ function Alert(props) {
);
const alertTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...transition,
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0,
diff --git a/node_modules/reactstrap/src/Dropdown.js b/node_modules/reactstrap/src/Dropdown.js
index 17d89a4..daea0a6 100644
--- a/node_modules/reactstrap/src/Dropdown.js
+++ b/node_modules/reactstrap/src/Dropdown.js
@@ -127,7 +127,6 @@ class Dropdown extends React.Component {
this.toggle(e);
}
-
handleKeyDown(e) {
const isTargetMenuItem =
e.target.getAttribute('role') === 'menuitem' ||
diff --git a/node_modules/reactstrap/src/DropdownMenu.js b/node_modules/reactstrap/src/DropdownMenu.js
index 3088f8b..6a3b3d7 100644
--- a/node_modules/reactstrap/src/DropdownMenu.js
+++ b/node_modules/reactstrap/src/DropdownMenu.js
@@ -102,7 +102,11 @@ class DropdownMenu extends React.Component {
strategy={strategy}
>
{({ ref, style, placement, update }) => {
- let combinedStyle = { ...this.props.style, ...persistStyles, ...style };
+ let combinedStyle = {
+ ...this.props.style,
+ ...persistStyles,
+ ...style,
+ };
const handleRef = (tagRef) => {
// Send the ref to `react-popper`
diff --git a/node_modules/reactstrap/src/DropdownToggle.js b/node_modules/reactstrap/src/DropdownToggle.js
index e9546a8..f61ba70 100644
--- a/node_modules/reactstrap/src/DropdownToggle.js
+++ b/node_modules/reactstrap/src/DropdownToggle.js
@@ -118,25 +118,15 @@ class DropdownToggle extends React.Component {
children={children}
/>
);
- }
+ };
// No Reference component if the component is in Navbar
if (this.context.inNavbar) {
- return (
- <>
- {returnFunction({ ref: this.context.onToggleRef })}
- </>
- );
+ return <>{returnFunction({ ref: this.context.onToggleRef })}</>;
}
// Normal rendering if component not in NavBar
- return (
-
- <Reference innerRef={innerRef} >
- {returnFunction}
- </Reference>
- );
-
+ return <Reference innerRef={innerRef}>{returnFunction}</Reference>;
}
}
diff --git a/node_modules/reactstrap/src/Fade.js b/node_modules/reactstrap/src/Fade.js
index 2936d5d..9d22f28 100644
--- a/node_modules/reactstrap/src/Fade.js
+++ b/node_modules/reactstrap/src/Fade.js
@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import { Transition } from 'react-transition-group';
import {
+ addDefaultProps,
mapToCssModules,
omit,
pick,
+ tagPropType,
TransitionPropTypeKeys,
TransitionTimeouts,
- tagPropType,
} from './utils';
const propTypes = {
@@ -29,7 +30,7 @@ const propTypes = {
]),
};
-const defaultProps = {
+export const fadeDefaultProps = {
...Transition.defaultProps,
timeout: TransitionTimeouts.Fade,
appear: true,
@@ -52,10 +53,8 @@ function Fade(props) {
...otherProps
} = props;
- const transitionProps = pick(
- { defaultProps, ...otherProps },
- TransitionPropTypeKeys,
- );
+ const transitionProps = pick(otherProps, TransitionPropTypeKeys);
+
const childProps = omit(otherProps, TransitionPropTypeKeys);
return (
@@ -77,6 +76,10 @@ function Fade(props) {
}
Fade.propTypes = propTypes;
-Fade.defaultProps = defaultProps;
-export default Fade;
+// PropTypes did not account for default props
+function FadeWrapper(props) {
+ return <Fade {...addDefaultProps(fadeDefaultProps, props)} />;
+}
+
+export default FadeWrapper;
diff --git a/node_modules/reactstrap/src/Modal.js b/node_modules/reactstrap/src/Modal.js
index 51c16ce..34dab8d 100644
--- a/node_modules/reactstrap/src/Modal.js
+++ b/node_modules/reactstrap/src/Modal.js
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import Portal from './Portal';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
import {
getOriginalBodyPadding,
conditionallyUpdateScrollbar,
@@ -505,13 +505,13 @@ class Modal extends React.Component {
const hasTransition = this.props.fade;
const modalTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...this.props.modalTransition,
baseClass: hasTransition ? this.props.modalTransition.baseClass : '',
timeout: hasTransition ? this.props.modalTransition.timeout : 0,
};
const backdropTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...this.props.backdropTransition,
baseClass: hasTransition ? this.props.backdropTransition.baseClass : '',
timeout: hasTransition ? this.props.backdropTransition.timeout : 0,
diff --git a/node_modules/reactstrap/src/Offcanvas.js b/node_modules/reactstrap/src/Offcanvas.js
index 49a2b8e..d94c6e0 100644
--- a/node_modules/reactstrap/src/Offcanvas.js
+++ b/node_modules/reactstrap/src/Offcanvas.js
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import Portal from './Portal';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
import {
TransitionTimeouts,
conditionallyUpdateScrollbar,
@@ -393,7 +393,7 @@ class Offcanvas extends React.Component {
const hasTransition = this.props.fade;
const offcanvasTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...this.props.offcanvasTransition,
baseClass: hasTransition
? this.props.offcanvasTransition.baseClass
@@ -401,7 +401,7 @@ class Offcanvas extends React.Component {
timeout: hasTransition ? this.props.offcanvasTransition.timeout : 0,
};
const backdropTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...this.props.backdropTransition,
baseClass: hasTransition ? this.props.backdropTransition.baseClass : '',
timeout: hasTransition ? this.props.backdropTransition.timeout : 0,
diff --git a/node_modules/reactstrap/src/PlaceholderButton.js b/node_modules/reactstrap/src/PlaceholderButton.js
index c46ade7..12c927b 100644
--- a/node_modules/reactstrap/src/PlaceholderButton.js
+++ b/node_modules/reactstrap/src/PlaceholderButton.js
@@ -17,7 +17,7 @@ const propTypes = {
function PlaceholderButton(props) {
let { cssModule, className, tag: Tag = Button, ...attributes } = props;
- let { attributes: modifiedAttributes, colClasses } = getColumnClasses(
+ let { modifiedAttributes, colClasses } = getColumnClasses(
{ color: 'primary', ...attributes },
cssModule,
);
diff --git a/node_modules/reactstrap/src/Popover.js b/node_modules/reactstrap/src/Popover.js
index a48fe5c..e959ebc 100644
--- a/node_modules/reactstrap/src/Popover.js
+++ b/node_modules/reactstrap/src/Popover.js
@@ -1,6 +1,7 @@
import React from 'react';
import classNames from 'classnames';
import TooltipPopoverWrapper, { propTypes } from './TooltipPopoverWrapper';
+import { addDefaultProps } from './utils';
const defaultProps = {
placement: 'right',
@@ -16,7 +17,7 @@ function Popover(props) {
return (
<TooltipPopoverWrapper
- {...props}
+ {...addDefaultProps(defaultProps, props)}
arrowClassName={arrowClasses}
popperClassName={popperClasses}
innerClassName={classes}
@@ -25,6 +26,5 @@ function Popover(props) {
}
Popover.propTypes = propTypes;
-Popover.defaultProps = defaultProps;
export default Popover;
diff --git a/node_modules/reactstrap/src/PopperContent.js b/node_modules/reactstrap/src/PopperContent.js
index 81f3caa..fc610eb 100644
--- a/node_modules/reactstrap/src/PopperContent.js
+++ b/node_modules/reactstrap/src/PopperContent.js
@@ -10,7 +10,7 @@ import {
DOMElement,
tagPropType,
} from './utils';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
function noop() {}
@@ -49,7 +49,7 @@ const defaultProps = {
onClosed: noop,
fade: true,
transition: {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
},
};
@@ -164,7 +164,7 @@ class PopperContent extends React.Component {
const extendedModifiers = [...baseModifiers, ...modifiers];
const popperTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...transition,
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0,
diff --git a/node_modules/reactstrap/src/Toast.js b/node_modules/reactstrap/src/Toast.js
index 7711f1a..365abaf 100644
--- a/node_modules/reactstrap/src/Toast.js
+++ b/node_modules/reactstrap/src/Toast.js
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { mapToCssModules, tagPropType } from './utils';
-import Fade from './Fade';
+import Fade, { fadeDefaultProps } from './Fade';
const propTypes = {
children: PropTypes.node,
@@ -27,7 +27,7 @@ function Toast(props) {
isOpen = true,
children,
transition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
unmountOnExit: true,
},
fade = true,
@@ -38,7 +38,7 @@ function Toast(props) {
const classes = mapToCssModules(classNames(className, 'toast'), cssModule);
const toastTransition = {
- ...Fade.defaultProps,
+ ...fadeDefaultProps,
...transition,
baseClass: fade ? transition.baseClass : '',
timeout: fade ? transition.timeout : 0,
diff --git a/node_modules/reactstrap/src/Tooltip.js b/node_modules/reactstrap/src/Tooltip.js
index 3e21cf6..00d66f1 100644
--- a/node_modules/reactstrap/src/Tooltip.js
+++ b/node_modules/reactstrap/src/Tooltip.js
@@ -1,6 +1,7 @@
import React from 'react';
import classNames from 'classnames';
import TooltipPopoverWrapper, { propTypes } from './TooltipPopoverWrapper';
+import { addDefaultProps } from './utils';
const defaultProps = {
placement: 'top',
@@ -14,9 +15,11 @@ function Tooltip(props) {
const popperClasses = classNames('tooltip', 'show', props.popperClassName);
const classes = classNames('tooltip-inner', props.innerClassName);
+ const _props = addDefaultProps(defaultProps, props);
+
return (
<TooltipPopoverWrapper
- {...props}
+ {..._props}
arrowClassName={arrowClasses}
popperClassName={popperClasses}
innerClassName={classes}
@@ -25,6 +28,5 @@ function Tooltip(props) {
}
Tooltip.propTypes = propTypes;
-Tooltip.defaultProps = defaultProps;
export default Tooltip;
diff --git a/node_modules/reactstrap/src/UncontrolledAccordion.js b/node_modules/reactstrap/src/UncontrolledAccordion.js
index 78e95e9..214491e 100644
--- a/node_modules/reactstrap/src/UncontrolledAccordion.js
+++ b/node_modules/reactstrap/src/UncontrolledAccordion.js
@@ -27,7 +27,7 @@ function UncontrolledAccordion({ defaultOpen, stayOpen, ...props }) {
setOpen([...open, id]);
}
} else if (open === id) {
- setOpen(undefined);
+ setOpen('');
} else {
setOpen(id);
}
diff --git a/node_modules/reactstrap/src/utils.js b/node_modules/reactstrap/src/utils.js
index 72f91c2..a6acf0c 100644
--- a/node_modules/reactstrap/src/utils.js
+++ b/node_modules/reactstrap/src/utils.js
@@ -381,3 +381,17 @@ export const focusableElements = [
'video[controls]',
'[contenteditable]:not([contenteditable="false"])',
];
+
+export function addDefaultProps(defaultProps, props) {
+ if (!defaultProps || !props) return props;
+
+ let result = { ...props };
+
+ Object.keys(defaultProps).forEach((key) => {
+ if (result[key] === undefined) {
+ result[key] = defaultProps[key];
+ }
+ });
+
+ return result;
+}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment