rsuite 4.10.2 → 4.10.6

package/es/Uploader/Uploader.js

@@ -6,12 +6,11 @@ import _find from "lodash/find";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { compose } from 'recompose';
 import IntlContext from '../IntlProvider/IntlContext';
 import withLocale from '../IntlProvider/withLocale';
 import FileItem from './UploadFileItem';
 import UploadTrigger from './UploadTrigger';
-import { prefix, ajaxUpload, defaultProps, getUnhandledProps } from '../utils';
+import { compose, prefix, ajaxUpload, defaultProps, getUnhandledProps } from '../utils';
 import { getFiles, guid } from './utils';
 
 var Uploader =
@@ -269,7 +268,7 @@ function (_React$Component) {
       fileList: nextFileList
     };
 
-    if (nextFile.progress) {
+    if (nextFile.progress || nextFile.status === 'error') {
       var fileMap = this.state.fileMap;
       fileMap[nextFile.fileKey] = {
         progress: nextFile.progress,

package/es/utils/defaultProps.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import * as React from 'react';
-import { setDisplayName, wrapDisplayName } from 'recompose';
+import { setDisplayName, wrapDisplayName } from './recompose';
 import { getClassNamePrefix } from './prefix';
 import extendReactStatics from './extendReactStatics';
 

package/es/utils/index.js

@@ -1,6 +1,7 @@
 export * from './BrowserDetection';
 export * from './htmlPropsUtils';
 export { default as withStyleProps } from './withStyleProps';
+export * from './recompose';
 export { default as prefix, defaultClassPrefix, getClassNamePrefix, globalKey } from './prefix';
 export { default as createChainedFunction } from './createChainedFunction';
 export { default as defaultProps } from './defaultProps';

package/es/utils/recompose.js

@@ -0,0 +1,42 @@
+export function compose() {
+  for (var _len = arguments.length, funcs = new Array(_len), _key = 0; _key < _len; _key++) {
+    funcs[_key] = arguments[_key];
+  }
+
+  return funcs.reduce(function (a, b) {
+    return function () {
+      return a(b.apply(void 0, arguments));
+    };
+  }, function (arg) {
+    return arg;
+  });
+}
+export function setStatic(key, value) {
+  return function (BaseComponent) {
+    /* eslint-disable no-param-reassign */
+    BaseComponent[key] = value;
+    /* eslint-enable no-param-reassign */
+
+    return BaseComponent;
+  };
+}
+export function setDisplayName(displayName) {
+  return setStatic('displayName', displayName);
+}
+export function getDisplayName(component) {
+  if (typeof component === 'string') {
+    return component;
+  }
+
+  if (!component) {
+    return undefined;
+  }
+
+  return component.displayName || component.name || 'Component';
+}
+export function wrapDisplayName(component, wrapperName) {
+  return wrapperName + "(" + getDisplayName(component) + ")";
+}
+export function setPropTypes(propTypes) {
+  return setStatic('propTypes', propTypes);
+}

package/es/utils/withStyleProps.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { setDisplayName, wrapDisplayName, setPropTypes } from 'recompose';
+import { setDisplayName, wrapDisplayName, setPropTypes } from './recompose';
 import prefix from './prefix';
 import extendReactStatics from './extendReactStatics';
 import { SIZE, STATUS, COLOR } from '../constants';

package/lib/AutoComplete/AutoComplete.js

@@ -23,7 +23,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
+var _utils = require("../utils");
 
 var _shallowEqual = _interopRequireDefault(require("../utils/shallowEqual"));
 
@@ -31,8 +31,6 @@ var _Input = _interopRequireDefault(require("../Input"));
 
 var _AutoCompleteItem = _interopRequireDefault(require("./AutoCompleteItem"));
 
-var _utils = require("../utils");
-
 var _Picker = require("../Picker");
 
 var _constants = require("../constants");
@@ -389,7 +387,7 @@ AutoComplete.defaultProps = {
 var EnhancedAutoComplete = (0, _utils.defaultProps)({
   classPrefix: 'auto-complete'
 })(AutoComplete);
-(0, _recompose.setStatic)('Item', _AutoCompleteItem.default)(AutoComplete);
+(0, _utils.setStatic)('Item', _AutoCompleteItem.default)(AutoComplete);
 var _default = EnhancedAutoComplete;
 exports.default = _default;
 module.exports = exports.default;

package/lib/Avatar/Avatar.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var _constants = require("../constants");
@@ -71,7 +69,7 @@ Avatar.propTypes = {
   alt: _propTypes.default.string
 };
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'avatar'

package/lib/Breadcrumb/Breadcrumb.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _BreadcrumbItem = _interopRequireDefault(require("./BreadcrumbItem"));
 
 var _utils = require("../utils");
@@ -129,7 +127,7 @@ var EnhancedBreadcrumb = (0, _utils.defaultProps)({
   classPrefix: 'breadcrumb',
   componentClass: 'ol'
 })(Breadcrumb);
-(0, _recompose.setStatic)('Item', _BreadcrumbItem.default)(EnhancedBreadcrumb);
+(0, _utils.setStatic)('Item', _BreadcrumbItem.default)(EnhancedBreadcrumb);
 var _default = EnhancedBreadcrumb;
 exports.default = _default;
 module.exports = exports.default;

package/lib/Button/Button.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _SafeAnchor = _interopRequireDefault(require("../SafeAnchor"));
 
 var _Ripple = _interopRequireDefault(require("../Ripple"));
@@ -97,7 +95,7 @@ Button.defaultProps = {
   ripple: true
 };
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true,
   hasColor: true
 }), (0, _utils.defaultProps)({

package/lib/ButtonGroup/ButtonGroup.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var ButtonGroup =
@@ -66,7 +64,7 @@ ButtonGroup.propTypes = {
   children: _propTypes.default.node
 };
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'btn-group'

package/lib/Calendar/TimeDropdown.js

@@ -97,13 +97,13 @@ function (_React$PureComponent) {
     _this.handleClick = function (type, d, event) {
       var _this$props = _this.props,
           onSelect = _this$props.onSelect,
-          date = _this$props.date; // $FlowFixMe
-
+          date = _this$props.date,
+          showMeridian = _this$props.showMeridian;
       var nextDate = date || new Date();
 
       switch (type) {
         case 'hours':
-          nextDate = (0, _set_hours.default)(date, d);
+          nextDate = (0, _set_hours.default)(date, showMeridian && (0, _get_hours.default)(nextDate) >= 12 ? d + 12 : d);
           break;
 
         case 'minutes':

package/lib/Cascader/Cascader.js

@@ -62,9 +62,11 @@ function (_React$Component) {
     var _this;
 
     _this = _React$Component.call(this, props) || this;
+    _this.toggleRef = void 0;
     _this.triggerRef = void 0;
     _this.containerRef = void 0;
     _this.positionRef = void 0;
+    _this.menuWrapperRef = void 0;
     _this.menuContainerRef = void 0;
     _this.isControlled = void 0;
 
@@ -294,6 +296,14 @@ function (_React$Component) {
       }));
     };
 
+    _this.getPositionInstance = function () {
+      return _this.positionRef.current;
+    };
+
+    _this.getToggleInstance = function () {
+      return _this.toggleRef.current;
+    };
+
     var initState = {
       searchKeyword: '',
       selectNode: null,
@@ -312,13 +322,15 @@ function (_React$Component) {
       items: []
     };
     _this.state = (0, _extends3.default)({}, initState, {}, (0, _utils.getDerivedStateForCascade)(props, initState), {
-      flattenData: (0, _treeUtils.flattenTree)(props.data)
+      flattenData: (0, _treeUtils.flattenTree)(props.data, props.childrenKey)
     });
     _this.isControlled = !(0, _isUndefined2.default)(props.value);
     _this.triggerRef = React.createRef();
     _this.containerRef = React.createRef();
-    _this.positionRef = React.createRef(); // for test
+    _this.positionRef = React.createRef();
+    _this.toggleRef = React.createRef(); // for test
 
+    _this.menuWrapperRef = React.createRef();
     _this.menuContainerRef = React.createRef();
     return _this;
   }
@@ -327,7 +339,8 @@ function (_React$Component) {
     var value = nextProps.value,
         data = nextProps.data,
         labelKey = nextProps.labelKey,
-        valueKey = nextProps.valueKey;
+        valueKey = nextProps.valueKey,
+        childrenKey = nextProps.childrenKey;
 
     if (data !== prevState.data) {
       var _prevState$selectNode;
@@ -345,12 +358,12 @@ function (_React$Component) {
           return (0, _stringToObject2.default)(item, labelKey, valueKey);
         })), {
           data: data,
-          flattenData: (0, _treeUtils.flattenTree)(data)
+          flattenData: (0, _treeUtils.flattenTree)(data, childrenKey)
         });
       }
 
       return (0, _extends3.default)({}, (0, _utils.getDerivedStateForCascade)(nextProps, prevState), {
-        flattenData: (0, _treeUtils.flattenTree)(data),
+        flattenData: (0, _treeUtils.flattenTree)(data, childrenKey),
         data: data
       });
     }
@@ -459,8 +472,11 @@ function (_React$Component) {
     var classes = (0, _classnames.default)(this.addPrefix('cascader-menu'), menuClassName, (_classNames2 = {}, _classNames2[this.addPrefix('inline')] = inline, _classNames2));
     var menuProps = (0, _pick2.default)(this.props, Object.keys((0, _omit2.default)(_DropdownMenu.dropdownMenuPropTypes, ['classPrefix'])));
     return React.createElement(_Picker.MenuWrapper, {
+      ref: this.menuWrapperRef,
       className: classes,
-      style: menuStyle
+      style: menuStyle,
+      getToggleInstance: this.getToggleInstance,
+      getPositionInstance: this.getPositionInstance
     }, searchable && React.createElement(_Picker.SearchBar, {
       placeholder: locale.searchPlaceholder,
       onChange: this.handleSearch,
@@ -553,6 +569,7 @@ function (_React$Component) {
       onExited: (0, _utils2.createChainedFunction)(this.handleExit, onExited),
       speaker: this.renderDropdownMenu()
     }, React.createElement(_Picker.PickerToggle, (0, _extends3.default)({}, unhandled, {
+      ref: this.toggleRef,
       componentClass: toggleComponentClass,
       onClean: (0, _utils2.createChainedFunction)(this.handleClean, onClean),
       cleanable: cleanable && !disabled,

package/lib/Drawer/index.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var _Drawer = _interopRequireDefault(require("./Drawer"));
@@ -22,14 +20,14 @@ var _ModalFooter = _interopRequireDefault(require("../Modal/ModalFooter"));
 var EnhancedBody = (0, _utils.defaultProps)({
   classPrefix: 'drawer-body'
 })(_ModalBody.default);
-(0, _recompose.setStatic)('Body', (0, _recompose.setDisplayName)('Body')(EnhancedBody))(_Drawer.default);
-(0, _recompose.setStatic)('Header', (0, _utils.defaultProps)({
+(0, _utils.setStatic)('Body', (0, _utils.setDisplayName)('Body')(EnhancedBody))(_Drawer.default);
+(0, _utils.setStatic)('Header', (0, _utils.defaultProps)({
   classPrefix: 'drawer-header'
 })(_ModalHeader.default))(_Drawer.default);
-(0, _recompose.setStatic)('Title', (0, _utils.defaultProps)({
+(0, _utils.setStatic)('Title', (0, _utils.defaultProps)({
   classPrefix: 'drawer-title'
 })(_ModalTitle.default))(_Drawer.default);
-(0, _recompose.setStatic)('Footer', (0, _utils.defaultProps)({
+(0, _utils.setStatic)('Footer', (0, _utils.defaultProps)({
   classPrefix: 'drawer-footer'
 })(_ModalFooter.default))(_Drawer.default);
 var _default = _Drawer.default;

package/lib/Dropdown/Dropdown.js

@@ -23,8 +23,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _domLib = require("dom-lib");
 
 var _RootCloseWrapper = _interopRequireDefault(require("../Overlay/RootCloseWrapper"));
@@ -305,8 +303,8 @@ var EnhancedDropdown = (0, _utils.defaultProps)({
   componentClass: 'div',
   classPrefix: 'dropdown'
 })(Dropdown);
-(0, _recompose.setStatic)('Item', _DropdownMenuItem.default)(EnhancedDropdown);
-(0, _recompose.setStatic)('Menu', _DropdownMenu.default)(EnhancedDropdown);
+(0, _utils.setStatic)('Item', _DropdownMenuItem.default)(EnhancedDropdown);
+(0, _utils.setStatic)('Menu', _DropdownMenu.default)(EnhancedDropdown);
 var _default = EnhancedDropdown;
 exports.default = _default;
 module.exports = exports.default;

package/lib/FlexboxGrid/FlexboxGrid.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var _FlexboxGridItem = _interopRequireDefault(require("./FlexboxGridItem"));
@@ -66,7 +64,7 @@ FlexboxGrid.defaultProps = {
 var EnhancedFlexboxGrid = (0, _utils.defaultProps)({
   classPrefix: 'flex-box-grid'
 })(FlexboxGrid);
-(0, _recompose.setStatic)('Item', _FlexboxGridItem.default)(EnhancedFlexboxGrid);
+(0, _utils.setStatic)('Item', _FlexboxGridItem.default)(EnhancedFlexboxGrid);
 var _default = EnhancedFlexboxGrid;
 exports.default = _default;
 module.exports = exports.default;

package/lib/FormGroup/FormGroup.js

@@ -21,8 +21,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var FormGroupContext = (0, _utils.createContext)(null);
@@ -70,7 +68,7 @@ FormGroup.propTypes = {
   validationState: _propTypes.default.oneOf(['success', 'warning', 'error'])
 };
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'form-group'

package/lib/Input/Input.js

@@ -23,8 +23,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var _FormContext = require("../Form/FormContext");
@@ -136,7 +134,7 @@ Input.defaultProps = {
   type: 'text'
 };
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'input',

package/lib/InputGroup/InputGroup.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _InputGroupAddon = _interopRequireDefault(require("./InputGroupAddon"));
 
 var _InputGroupButton = _interopRequireDefault(require("./InputGroupButton"));
@@ -106,12 +104,12 @@ InputGroup.propTypes = {
   disabled: _propTypes.default.bool,
   children: _propTypes.default.node
 };
-var EnhancedInputGroup = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var EnhancedInputGroup = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'input-group'
 }))(InputGroup);
-(0, _recompose.setStatic)('Addon', _InputGroupAddon.default)(EnhancedInputGroup);
-(0, _recompose.setStatic)('Button', _InputGroupButton.default)(EnhancedInputGroup);
+(0, _utils.setStatic)('Addon', _InputGroupAddon.default)(EnhancedInputGroup);
+(0, _utils.setStatic)('Button', _InputGroupButton.default)(EnhancedInputGroup);
 var _default = EnhancedInputGroup;
 exports.default = _default;

package/lib/IntlProvider/withLocale.js

@@ -13,7 +13,7 @@ var _get2 = _interopRequireDefault(require("lodash/get"));
 
 var React = _interopRequireWildcard(require("react"));
 
-var _recompose = require("recompose");
+var _utils = require("../utils");
 
 var _format = _interopRequireDefault(require("date-fns/format"));
 
@@ -59,10 +59,10 @@ function withLocale(combineKeys) {
     (0, _extendReactStatics.default)(WithLocale, BaseComponent, ['defaultProps']);
 
     if (process.env.RUN_ENV === 'test') {
-      return (0, _recompose.setDisplayName)((0, _recompose.wrapDisplayName)(BaseComponent, '__test__'))(WithLocale);
+      return (0, _utils.setDisplayName)((0, _utils.wrapDisplayName)(BaseComponent, '__test__'))(WithLocale);
     }
 
-    return (0, _recompose.setDisplayName)((0, _recompose.wrapDisplayName)(BaseComponent, 'withLocale'))(WithLocale);
+    return (0, _utils.setDisplayName)((0, _utils.wrapDisplayName)(BaseComponent, 'withLocale'))(WithLocale);
   };
 }
 

package/lib/List/List.js

@@ -21,8 +21,6 @@ var React = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _recompose = require("recompose");
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _domLib = require("dom-lib");
@@ -539,7 +537,7 @@ List.defaultProps = {
 var EnhancedList = (0, _utils2.defaultProps)({
   classPrefix: 'list'
 })(List);
-(0, _recompose.setStatic)('Item', _ListItem.default)(EnhancedList);
+(0, _utils2.setStatic)('Item', _ListItem.default)(EnhancedList);
 var _default = EnhancedList;
 exports.default = _default;
 module.exports = exports.default;

package/lib/List/ListItem.js

@@ -17,8 +17,6 @@ var React = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _recompose = require("recompose");
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("../utils");
@@ -138,7 +136,7 @@ ListItem.propTypes = {
 var EnhancedListItem = (0, _utils.defaultProps)({
   classPrefix: 'list-item'
 })(ListItem);
-var Component = (0, _recompose.setDisplayName)('ListItem')(EnhancedListItem);
+var Component = (0, _utils.setDisplayName)('ListItem')(EnhancedListItem);
 
 var WithContextListItem = function WithContextListItem(props) {
   return React.createElement(_ListContext.default.Consumer, null, function (context) {

package/lib/Loader/Loader.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var Loader =
@@ -80,7 +78,7 @@ Loader.defaultProps = {
   speed: 'normal'
 };
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'loader'

package/lib/Modal/BaseModal.js

@@ -69,6 +69,7 @@ function (_React$Component2) {
     _this.lastFocus = null;
     _this.onDocumentKeyupListener = null;
     _this.onFocusinListener = null;
+    _this._isMounted = null;
 
     _this.setMountNodeRef = function (ref) {
       var _ref$getMountNode;
@@ -116,15 +117,30 @@ function (_React$Component2) {
     _this.enforceFocus = function () {
       var enforceFocus = _this.props.enforceFocus;
 
-      if (!enforceFocus || !_this.isTopModal()) {
+      if (!enforceFocus || !_this._isMounted || !_this.isTopModal()) {
         return;
       }
 
-      var active = (0, _domLib.activeElement)((0, _domLib.ownerDocument)((0, _assertThisInitialized2.default)(_this)));
+      var currentActiveElement = (0, _domLib.activeElement)((0, _domLib.ownerDocument)((0, _assertThisInitialized2.default)(_this)));
 
       var modal = _this.getDialogElement();
 
-      if (modal && modal !== active && !(0, _domLib.contains)(modal, active)) {
+      if (modal && modal !== currentActiveElement && !(0, _domLib.contains)(modal, currentActiveElement)) {
+        modal.focus();
+      }
+    };
+
+    _this.handlePortalRendered = function () {
+      if (!_this.props.autoFocus) {
+        return;
+      }
+
+      var modal = _this.getDialogElement();
+
+      var currentActiveElement = (0, _domLib.activeElement)((0, _domLib.ownerDocument)((0, _assertThisInitialized2.default)(_this)));
+
+      if (modal && modal !== currentActiveElement && !(0, _domLib.contains)(modal, currentActiveElement)) {
+        _this.lastFocus = currentActiveElement;
         modal.focus();
       }
     };
@@ -141,6 +157,8 @@ function (_React$Component2) {
   var _proto2 = BaseModal.prototype;
 
   _proto2.componentDidMount = function componentDidMount() {
+    this._isMounted = true;
+
     if (this.props.show) {
       this.onShow();
     }
@@ -184,6 +202,7 @@ function (_React$Component2) {
     var _this$props4 = this.props,
         show = _this$props4.show,
         transition = _this$props4.transition;
+    this._isMounted = false;
 
     if (show || transition && !this.state.exited) {
       this.onHide();
@@ -312,7 +331,8 @@ function (_React$Component2) {
 
     return React.createElement(_Portal.default, {
       ref: this.setMountNodeRef,
-      container: container
+      container: container,
+      onRendered: this.handlePortalRendered
     }, React.createElement("div", {
       ref: this.modalNodeRef,
       role: rest.role,

package/lib/Modal/Modal.js

@@ -21,8 +21,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _elementResizeEvent = _interopRequireWildcard(require("element-resize-event"));
 
 var _BaseModal = _interopRequireDefault(require("./BaseModal"));
@@ -296,11 +294,11 @@ Modal.defaultProps = {
 var EnhancedModal = (0, _utils.defaultProps)({
   classPrefix: 'modal'
 })(Modal);
-(0, _recompose.setStatic)('Body', _ModalBody.default)(EnhancedModal);
-(0, _recompose.setStatic)('Header', _ModalHeader.default)(EnhancedModal);
-(0, _recompose.setStatic)('Title', _ModalTitle.default)(EnhancedModal);
-(0, _recompose.setStatic)('Footer', _ModalFooter.default)(EnhancedModal);
-(0, _recompose.setStatic)('Dialog', _ModalDialog.default)(EnhancedModal);
+(0, _utils.setStatic)('Body', _ModalBody.default)(EnhancedModal);
+(0, _utils.setStatic)('Header', _ModalHeader.default)(EnhancedModal);
+(0, _utils.setStatic)('Title', _ModalTitle.default)(EnhancedModal);
+(0, _utils.setStatic)('Footer', _ModalFooter.default)(EnhancedModal);
+(0, _utils.setStatic)('Dialog', _ModalDialog.default)(EnhancedModal);
 var _default = EnhancedModal;
 exports.default = _default;
 module.exports = exports.default;

package/lib/Modal/ModalDialog.js

@@ -19,8 +19,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _recompose = require("recompose");
-
 var _utils = require("../utils");
 
 var _mergeRefs = _interopRequireDefault(require("../utils/mergeRefs"));
@@ -84,6 +82,7 @@ function (_React$Component) {
     return React.createElement("div", (0, _extends2.default)({}, props, {
       title: null,
       role: "dialog",
+      tabIndex: -1,
       ref: (0, _mergeRefs.default)(this.bindHtmlRef, dialogRef),
       className: (0, _classnames.default)(classPrefix, className),
       style: modalStyle
@@ -100,7 +99,7 @@ function (_React$Component) {
 
 ModalDialog.propTypes = modalDialogPropTypes;
 
-var _default = (0, _recompose.compose)((0, _utils.withStyleProps)({
+var _default = (0, _utils.compose)((0, _utils.withStyleProps)({
   hasSize: true
 }), (0, _utils.defaultProps)({
   classPrefix: 'modal'