rsuite 4.10.5 → 4.10.6

package/es/Modal/BaseModal.js

@@ -48,6 +48,7 @@ function (_React$Component2) {
     _this.lastFocus = null;
     _this.onDocumentKeyupListener = null;
     _this.onFocusinListener = null;
+    _this._isMounted = null;
 
     _this.setMountNodeRef = function (ref) {
       var _ref$getMountNode;
@@ -95,15 +96,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 = activeElement(ownerDocument(_assertThisInitialized(_this)));
+      var currentActiveElement = activeElement(ownerDocument(_assertThisInitialized(_this)));
 
       var modal = _this.getDialogElement();
 
-      if (modal && modal !== active && !contains(modal, active)) {
+      if (modal && modal !== currentActiveElement && !contains(modal, currentActiveElement)) {
+        modal.focus();
+      }
+    };
+
+    _this.handlePortalRendered = function () {
+      if (!_this.props.autoFocus) {
+        return;
+      }
+
+      var modal = _this.getDialogElement();
+
+      var currentActiveElement = activeElement(ownerDocument(_assertThisInitialized(_this)));
+
+      if (modal && modal !== currentActiveElement && !contains(modal, currentActiveElement)) {
+        _this.lastFocus = currentActiveElement;
         modal.focus();
       }
     };
@@ -120,6 +136,8 @@ function (_React$Component2) {
   var _proto2 = BaseModal.prototype;
 
   _proto2.componentDidMount = function componentDidMount() {
+    this._isMounted = true;
+
     if (this.props.show) {
       this.onShow();
     }
@@ -163,6 +181,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();
@@ -293,7 +312,8 @@ function (_React$Component2) {
 
     return React.createElement(Portal, {
       ref: this.setMountNodeRef,
-      container: container
+      container: container,
+      onRendered: this.handlePortalRendered
     }, React.createElement("div", {
       ref: this.modalNodeRef,
       role: rest.role,

package/es/Modal/ModalDialog.js

@@ -66,6 +66,7 @@ function (_React$Component) {
     return React.createElement("div", _extends({}, props, {
       title: null,
       role: "dialog",
+      tabIndex: -1,
       ref: mergeRefs(this.bindHtmlRef, dialogRef),
       className: classNames(classPrefix, className),
       style: modalStyle

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/ModalDialog.js

@@ -82,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "4.10.5",
+  "version": "4.10.6",
   "description": "A suite of react components",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
     "prop-types": "^15.7.2",
     "react-lifecycles-compat": "^3.0.4",
     "react-virtualized": "^9.21.0",
-    "rsuite-table": "^3.15.1",
+    "rsuite-table": "^3.16.0",
     "schema-typed": "^1.5.1"
   },
   "peerDependencies": {
@@ -112,7 +112,7 @@
     "css-loader": "^0.28.11",
     "cssnano": "^4.1.10",
     "del": "^3.0.0",
-    "dtslint": "^0.3.0",
+    "dtslint": "^4.2.1",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "eslint": "^6.7.2",

package/src/Modal/BaseModal.tsx

@@ -50,6 +50,7 @@ class BaseModal extends React.Component<BaseModalProps, BaseModalState> {
   lastFocus = null;
   onDocumentKeyupListener = null;
   onFocusinListener = null;
+  _isMounted = null;
 
   constructor(props: BaseModalProps) {
     super(props);
@@ -59,6 +60,7 @@ class BaseModal extends React.Component<BaseModalProps, BaseModalState> {
     this.dialogRef = React.createRef();
   }
   componentDidMount() {
+    this._isMounted = true;
     if (this.props.show) {
       this.onShow();
     }
@@ -95,6 +97,8 @@ class BaseModal extends React.Component<BaseModalProps, BaseModalState> {
   componentWillUnmount() {
     const { show, transition } = this.props;
 
+    this._isMounted = false;
+
     if (show || (transition && !this.state.exited)) {
       this.onHide();
     }
@@ -173,14 +177,28 @@ class BaseModal extends React.Component<BaseModalProps, BaseModalState> {
   enforceFocus = () => {
     const { enforceFocus } = this.props;
 
-    if (!enforceFocus || !this.isTopModal()) {
+    if (!enforceFocus || !this._isMounted || !this.isTopModal()) {
+      return;
+    }
+
+    const currentActiveElement = activeElement(ownerDocument(this));
+    const modal = this.getDialogElement();
+
+    if (modal && modal !== currentActiveElement && !contains(modal, currentActiveElement)) {
+      modal.focus();
+    }
+  };
+
+  handlePortalRendered = () => {
+    if (!this.props.autoFocus) {
       return;
     }
 
-    const active = activeElement(ownerDocument(this));
     const modal = this.getDialogElement();
+    const currentActiveElement = activeElement(ownerDocument(this));
 
-    if (modal && modal !== active && !contains(modal, active)) {
+    if (modal && modal !== currentActiveElement && !contains(modal, currentActiveElement)) {
+      this.lastFocus = currentActiveElement;
       modal.focus();
     }
   };
@@ -268,7 +286,11 @@ class BaseModal extends React.Component<BaseModalProps, BaseModalState> {
     }
 
     return (
-      <Portal ref={this.setMountNodeRef} container={container}>
+      <Portal
+        ref={this.setMountNodeRef}
+        container={container}
+        onRendered={this.handlePortalRendered}
+      >
         <div ref={this.modalNodeRef} role={rest.role} style={style} className={className}>
           {backdrop && this.renderBackdrop()}
           <RefHolder ref={this.dialogRef}>{dialog}</RefHolder>

package/src/Modal/ModalDialog.tsx

@@ -53,6 +53,7 @@ class ModalDialog extends React.Component<ModalDialogProps> {
         {...props}
         title={null}
         role="dialog"
+        tabIndex={-1}
         ref={mergeRefs(this.bindHtmlRef, dialogRef)}
         className={classNames(classPrefix, className)}
         style={modalStyle}

package/src/Modal/test/ModalSpec.js

@@ -124,4 +124,9 @@ describe('Modal', () => {
     const instance = getInstance(<Modal classPrefix="custom-prefix" show />);
     assert.ok(instance.dialogElement.className.match(/\bcustom-prefix\b/));
   });
+
+  it('Should be forced to focus on Modal', () => {
+    const instance = getInstance(<Modal className="custom" show />);
+    assert.equal(instance.dialogElement, document.activeElement);
+  });
 });