rsuite 4.8.9 → 4.9.3

package/es/Footer/Footer.js

@@ -24,7 +24,7 @@ function (_React$Component) {
         props = _objectWithoutPropertiesLoose(_this$props, ["className", "classPrefix"]);
 
     var classes = classNames(classPrefix, className);
-    return React.createElement("div", _extends({}, props, {
+    return React.createElement("footer", _extends({}, props, {
       className: classes
     }));
   };

package/es/InputPicker/InputAutosize.js

@@ -138,7 +138,8 @@ function (_React$Component) {
         className = _this$props3.className,
         placeholder = _this$props3.placeholder,
         inputClassName = _this$props3.inputClassName,
-        inputStyle = _this$props3.inputStyle;
+        inputStyle = _this$props3.inputStyle,
+        tabIndex = _this$props3.tabIndex;
     var inputId = this.getInputId();
     var sizerValue = [defaultValue, value, ''].reduce(function (previousValue, currentValue) {
       if (previousValue !== null && previousValue !== undefined) {
@@ -165,6 +166,7 @@ function (_React$Component) {
     htmlInputProps.className = inputClassName;
     htmlInputProps.id = inputId || inputId;
     htmlInputProps.style = nextInputStyle;
+    htmlInputProps.tabIndex = tabIndex;
     return React.createElement("div", {
       className: className,
       style: wrapperStyle

package/es/InputPicker/InputPicker.js

@@ -353,21 +353,12 @@ function (_React$Component) {
 
       var value = _this.getValue();
 
-      var nextState = {
-        focusItemValue: multi ? _get(value, 0) : value
-      };
-
-      if (multi) {
-        /**
-         在多选的情况下, 当 searchKeyword 过长，在 focus 的时候会导致内容换行。
-         把 searchKeyword 清空是为了，Menu 在展开时候位置正确。
-         */
-        nextState.searchKeyword = '';
-      }
-
       onClose === null || onClose === void 0 ? void 0 : onClose();
 
-      _this.setState(nextState);
+      _this.setState({
+        focusItemValue: multi ? _get(value, 0) : value,
+        searchKeyword: ''
+      });
     };
 
     _this.handleEnter = function () {
@@ -402,6 +393,16 @@ function (_React$Component) {
       _this.handleChange(value, event);
     };
 
+    _this.handleInputFocus = function () {
+      var _this$triggerRef$curr5;
+
+      _this.setState({
+        open: true
+      });
+
+      (_this$triggerRef$curr5 = _this.triggerRef.current) === null || _this$triggerRef$curr5 === void 0 ? void 0 : _this$triggerRef$curr5.show();
+    };
+
     _this.removeLastItem = function (event) {
       var tagName = _get(event, 'target.tagName');
 
@@ -764,10 +765,9 @@ function (_React$Component) {
     var _this$props17 = this.props,
         multi = _this$props17.multi,
         onBlur = _this$props17.onBlur,
-        onFocus = _this$props17.onFocus;
+        onFocus = _this$props17.onFocus,
+        tabIndex = _this$props17.tabIndex;
     var props = {
-      onBlur: onBlur,
-      onFocus: onFocus,
       componentClass: 'input',
       inputRef: this.inputRef
     };
@@ -781,8 +781,11 @@ function (_React$Component) {
     }
 
     return React.createElement(InputSearch, _extends({}, props, {
+      tabIndex: tabIndex,
       onChange: this.handleSearch,
-      value: this.state.open ? this.state.searchKeyword : ''
+      value: this.state.open ? this.state.searchKeyword : '',
+      onBlur: onBlur,
+      onFocus: createChainedFunction(this.handleInputFocus, onFocus)
     }));
   };
 

package/es/Nav/Nav.js

@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import { setStatic } from 'recompose';
 import shallowEqual from '../utils/shallowEqual';
 import NavItem from './NavItem';
-import { prefix, getUnhandledProps, defaultProps, ReactChildren } from '../utils';
+import { prefix, getUnhandledProps, defaultProps, ReactChildren, createChainedFunction } from '../utils';
 import { getClassNamePrefix } from '../utils/prefix';
 import { NavbarContext } from '../Navbar/Navbar';
 import { SidenavContext } from '../Sidenav/Sidenav';
@@ -54,20 +54,21 @@ function (_React$Component) {
       var _item$props = item.props,
           eventKey = _item$props.eventKey,
           active = _item$props.active,
-          rest = _objectWithoutPropertiesLoose(_item$props, ["eventKey", "active"]);
+          onSelectItem = _item$props.onSelect,
+          rest = _objectWithoutPropertiesLoose(_item$props, ["eventKey", "active", "onSelect"]);
 
       var displayName = item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.displayName;
       var hasTooltip = sidenav && !expanded;
 
       if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(NavItem)'))) {
         return _extends({}, rest, {
-          onSelect: onSelect,
+          onSelect: createChainedFunction(onSelect, onSelectItem),
           hasTooltip: hasTooltip,
           active: typeof activeKey === 'undefined' ? active : shallowEqual(activeKey, eventKey)
         });
       } else if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(Dropdown)'))) {
         return _extends({}, rest, {
-          onSelect: onSelect,
+          onSelect: createChainedFunction(onSelect, onSelectItem),
           activeKey: activeKey,
           showHeader: hasTooltip,
           componentClass: 'li'

package/es/Overlay/OverlayTrigger.js

@@ -200,6 +200,8 @@ function (_React$Component) {
   };
 
   _proto.renderOverlay = function renderOverlay() {
+    var _this2 = this;
+
     var _this$props4 = this.props,
         open = _this$props4.open,
         speaker = _this$props4.speaker,
@@ -228,7 +230,11 @@ function (_React$Component) {
     }
 
     if (typeof speaker === 'function') {
-      return React.createElement(Overlay, overlayProps, speaker);
+      return React.createElement(Overlay, overlayProps, function (props, ref) {
+        return speaker(_extends({}, props, {
+          onClose: _this2.hide
+        }), ref);
+      });
     }
 
     return React.createElement(Overlay, overlayProps, React.cloneElement(speaker, speakerProps));

package/es/RangeSlider/RangeSlider.js

@@ -79,7 +79,7 @@ function (_React$Component) {
         end = value;
       }
 
-      _this.setValue([start, end], event);
+      _this.setValue([start, end].sort(), event);
     };
 
     _this.handleDragMove = function (key, event) {

package/es/Uploader/Uploader.d.ts

@@ -67,10 +67,13 @@ export interface UploaderProps extends StandardProps {
   listType?: 'text' | 'picture-text' | 'picture';
 
   /** Allow the queue to be updated. After you select a file, update the checksum function before the upload file queue, and return false to not update */
-  shouldQueueUpdate?: (fileList: FileType[], newFile: FileType[] | FileType) => boolean;
+  shouldQueueUpdate?: (
+    fileList: FileType[],
+    newFile: FileType[] | FileType
+  ) => boolean | Promise<boolean>;
 
   /** Allow uploading of files. Check function before file upload, return false without uploading  */
-  shouldUpload?: (file: FileType) => boolean;
+  shouldUpload?: (file: FileType) => boolean | Promise<boolean>;
 
   /** callback function that the upload queue has changed */
   onChange?: (fileList: FileType[]) => void;

package/es/Uploader/Uploader.js

@@ -48,14 +48,15 @@ function (_React$Component) {
 
       (_this$props$onRemove = (_this$props = _this.props).onRemove) === null || _this$props$onRemove === void 0 ? void 0 : _this$props$onRemove.call(_this$props, file);
       (_this$props$onChange = (_this$props2 = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props2, nextFileList);
+
+      _this.cleanInputValue();
     };
 
     _this.handleUploadTriggerChange = function (event) {
-      var _this$props$onChange2, _this$props4;
-
       var _this$props3 = _this.props,
           autoUpload = _this$props3.autoUpload,
-          shouldQueueUpdate = _this$props3.shouldQueueUpdate;
+          shouldQueueUpdate = _this$props3.shouldQueueUpdate,
+          onChange = _this$props3.onChange;
 
       var fileList = _this.getFileList();
 
@@ -70,20 +71,32 @@ function (_React$Component) {
         });
       });
       var nextFileList = [].concat(fileList, newFileList);
+      var checkState = shouldQueueUpdate === null || shouldQueueUpdate === void 0 ? void 0 : shouldQueueUpdate(nextFileList, newFileList);
+
+      var upload = function upload() {
+        onChange === null || onChange === void 0 ? void 0 : onChange(nextFileList);
+
+        _this.setState({
+          fileList: nextFileList
+        }, function () {
+          autoUpload && _this.handleAjaxUpload();
+        });
+      };
 
-      if ((shouldQueueUpdate === null || shouldQueueUpdate === void 0 ? void 0 : shouldQueueUpdate(nextFileList, newFileList)) === false) {
+      if (checkState instanceof Promise) {
+        checkState.then(function (res) {
+          if (res) {
+            upload();
+          }
+        });
+        return;
+      } else if (checkState === false) {
         _this.cleanInputValue();
 
         return;
       }
 
-      (_this$props$onChange2 = (_this$props4 = _this.props).onChange) === null || _this$props$onChange2 === void 0 ? void 0 : _this$props$onChange2.call(_this$props4, nextFileList);
-
-      _this.setState({
-        fileList: nextFileList
-      }, function () {
-        autoUpload && _this.handleAjaxUpload();
-      });
+      upload();
     };
 
     _this.handleAjaxUploadSuccess = function (file, response, event, xhr) {
@@ -93,9 +106,9 @@ function (_React$Component) {
       });
 
       _this.updateFileList(nextFile, function () {
-        var _this$props$onSuccess, _this$props5;
+        var _this$props$onSuccess, _this$props4;
 
-        (_this$props$onSuccess = (_this$props5 = _this.props).onSuccess) === null || _this$props$onSuccess === void 0 ? void 0 : _this$props$onSuccess.call(_this$props5, response, nextFile, event, xhr);
+        (_this$props$onSuccess = (_this$props4 = _this.props).onSuccess) === null || _this$props$onSuccess === void 0 ? void 0 : _this$props$onSuccess.call(_this$props4, response, nextFile, event, xhr);
       });
     };
 
@@ -105,9 +118,9 @@ function (_React$Component) {
       });
 
       _this.updateFileList(nextFile, function () {
-        var _this$props$onError, _this$props6;
+        var _this$props$onError, _this$props5;
 
-        (_this$props$onError = (_this$props6 = _this.props).onError) === null || _this$props$onError === void 0 ? void 0 : _this$props$onError.call(_this$props6, status, nextFile, event, xhr);
+        (_this$props$onError = (_this$props5 = _this.props).onError) === null || _this$props$onError === void 0 ? void 0 : _this$props$onError.call(_this$props5, status, nextFile, event, xhr);
       });
     };
 
@@ -118,21 +131,21 @@ function (_React$Component) {
       });
 
       _this.updateFileList(nextFile, function () {
-        var _this$props$onProgres, _this$props7;
+        var _this$props$onProgres, _this$props6;
 
-        (_this$props$onProgres = (_this$props7 = _this.props).onProgress) === null || _this$props$onProgres === void 0 ? void 0 : _this$props$onProgres.call(_this$props7, percent, nextFile, event, xhr);
+        (_this$props$onProgres = (_this$props6 = _this.props).onProgress) === null || _this$props$onProgres === void 0 ? void 0 : _this$props$onProgres.call(_this$props6, percent, nextFile, event, xhr);
       });
     };
 
     _this.handleUploadFile = function (file) {
-      var _this$props8 = _this.props,
-          name = _this$props8.name,
-          action = _this$props8.action,
-          headers = _this$props8.headers,
-          withCredentials = _this$props8.withCredentials,
-          timeout = _this$props8.timeout,
-          data = _this$props8.data,
-          onUpload = _this$props8.onUpload;
+      var _this$props7 = _this.props,
+          name = _this$props7.name,
+          action = _this$props7.action,
+          headers = _this$props7.headers,
+          withCredentials = _this$props7.withCredentials,
+          timeout = _this$props7.timeout,
+          data = _this$props7.data,
+          onUpload = _this$props7.onUpload;
       var xhr = ajaxUpload({
         name: name,
         timeout: timeout,
@@ -155,9 +168,9 @@ function (_React$Component) {
     };
 
     _this.handleReupload = function (file) {
-      var _this$props9 = _this.props,
-          onReupload = _this$props9.onReupload,
-          autoUpload = _this$props9.autoUpload;
+      var _this$props8 = _this.props,
+          onReupload = _this$props8.onReupload,
+          autoUpload = _this$props8.autoUpload;
       autoUpload && _this.handleUploadFile(file);
       onReupload === null || onReupload === void 0 ? void 0 : onReupload(file);
     };
@@ -227,7 +240,16 @@ function (_React$Component) {
     var shouldUpload = this.props.shouldUpload;
     var fileList = this.getFileList();
     fileList.forEach(function (file) {
-      if ((shouldUpload === null || shouldUpload === void 0 ? void 0 : shouldUpload(file)) === false) {
+      var checkState = shouldUpload === null || shouldUpload === void 0 ? void 0 : shouldUpload(file);
+
+      if (checkState instanceof Promise) {
+        checkState.then(function (res) {
+          if (res) {
+            _this2.handleUploadFile(file);
+          }
+        });
+        return;
+      } else if (checkState === false) {
         return;
       }
 
@@ -262,13 +284,13 @@ function (_React$Component) {
   _proto.renderFileItems = function renderFileItems() {
     var _this3 = this;
 
-    var _this$props10 = this.props,
-        disabledFileItem = _this$props10.disabledFileItem,
-        listType = _this$props10.listType,
-        onPreview = _this$props10.onPreview,
-        maxPreviewFileSize = _this$props10.maxPreviewFileSize,
-        renderFileInfo = _this$props10.renderFileInfo,
-        removable = _this$props10.removable;
+    var _this$props9 = this.props,
+        disabledFileItem = _this$props9.disabledFileItem,
+        listType = _this$props9.listType,
+        onPreview = _this$props9.onPreview,
+        maxPreviewFileSize = _this$props9.maxPreviewFileSize,
+        renderFileInfo = _this$props9.renderFileInfo,
+        removable = _this$props9.removable;
     var fileList = this.getFileList();
     return React.createElement("div", {
       key: "items",
@@ -290,15 +312,15 @@ function (_React$Component) {
   };
 
   _proto.renderUploadTrigger = function renderUploadTrigger() {
-    var _this$props11 = this.props,
-        name = _this$props11.name,
-        multiple = _this$props11.multiple,
-        disabled = _this$props11.disabled,
-        accept = _this$props11.accept,
-        children = _this$props11.children,
-        toggleComponentClass = _this$props11.toggleComponentClass,
-        draggable = _this$props11.draggable,
-        rest = _objectWithoutPropertiesLoose(_this$props11, ["name", "multiple", "disabled", "accept", "children", "toggleComponentClass", "draggable"]);
+    var _this$props10 = this.props,
+        name = _this$props10.name,
+        multiple = _this$props10.multiple,
+        disabled = _this$props10.disabled,
+        accept = _this$props10.accept,
+        children = _this$props10.children,
+        toggleComponentClass = _this$props10.toggleComponentClass,
+        draggable = _this$props10.draggable,
+        rest = _objectWithoutPropertiesLoose(_this$props10, ["name", "multiple", "disabled", "accept", "children", "toggleComponentClass", "draggable"]);
 
     var unhandled = getUnhandledProps(Uploader, rest);
     return React.createElement(UploadTrigger, _extends({}, unhandled, {
@@ -317,14 +339,14 @@ function (_React$Component) {
   _proto.render = function render() {
     var _classNames;
 
-    var _this$props12 = this.props,
-        classPrefix = _this$props12.classPrefix,
-        className = _this$props12.className,
-        listType = _this$props12.listType,
-        fileListVisible = _this$props12.fileListVisible,
-        locale = _this$props12.locale,
-        style = _this$props12.style,
-        draggable = _this$props12.draggable;
+    var _this$props11 = this.props,
+        classPrefix = _this$props11.classPrefix,
+        className = _this$props11.className,
+        listType = _this$props11.listType,
+        fileListVisible = _this$props11.fileListVisible,
+        locale = _this$props11.locale,
+        style = _this$props11.style,
+        draggable = _this$props11.draggable;
     var classes = classNames(className, classPrefix, this.addPrefix(listType), (_classNames = {}, _classNames[this.addPrefix('draggable')] = draggable, _classNames));
     var renderList = [this.renderUploadTrigger()];
 

package/es/styles/utilities.less

@@ -44,9 +44,11 @@
 .fade {
   opacity: 0;
   transition: opacity 0.15s linear;
+  pointer-events: none;
 
   &.in {
     opacity: 1;
+    pointer-events: unset;
   }
 }
 

package/lib/Footer/Footer.js

@@ -38,7 +38,7 @@ function (_React$Component) {
         classPrefix = _this$props.classPrefix,
         props = (0, _objectWithoutPropertiesLoose2.default)(_this$props, ["className", "classPrefix"]);
     var classes = (0, _classnames.default)(classPrefix, className);
-    return React.createElement("div", (0, _extends2.default)({}, props, {
+    return React.createElement("footer", (0, _extends2.default)({}, props, {
       className: classes
     }));
   };

package/lib/InputPicker/InputAutosize.js

@@ -152,7 +152,8 @@ function (_React$Component) {
         className = _this$props3.className,
         placeholder = _this$props3.placeholder,
         inputClassName = _this$props3.inputClassName,
-        inputStyle = _this$props3.inputStyle;
+        inputStyle = _this$props3.inputStyle,
+        tabIndex = _this$props3.tabIndex;
     var inputId = this.getInputId();
     var sizerValue = [defaultValue, value, ''].reduce(function (previousValue, currentValue) {
       if (previousValue !== null && previousValue !== undefined) {
@@ -178,6 +179,7 @@ function (_React$Component) {
     htmlInputProps.className = inputClassName;
     htmlInputProps.id = inputId || inputId;
     htmlInputProps.style = nextInputStyle;
+    htmlInputProps.tabIndex = tabIndex;
     return React.createElement("div", {
       className: className,
       style: wrapperStyle

package/lib/InputPicker/InputPicker.js

@@ -386,21 +386,12 @@ function (_React$Component) {
 
       var value = _this.getValue();
 
-      var nextState = {
-        focusItemValue: multi ? (0, _get2.default)(value, 0) : value
-      };
-
-      if (multi) {
-        /**
-         在多选的情况下, 当 searchKeyword 过长，在 focus 的时候会导致内容换行。
-         把 searchKeyword 清空是为了，Menu 在展开时候位置正确。
-         */
-        nextState.searchKeyword = '';
-      }
-
       onClose === null || onClose === void 0 ? void 0 : onClose();
 
-      _this.setState(nextState);
+      _this.setState({
+        focusItemValue: multi ? (0, _get2.default)(value, 0) : value,
+        searchKeyword: ''
+      });
     };
 
     _this.handleEnter = function () {
@@ -435,6 +426,16 @@ function (_React$Component) {
       _this.handleChange(value, event);
     };
 
+    _this.handleInputFocus = function () {
+      var _this$triggerRef$curr5;
+
+      _this.setState({
+        open: true
+      });
+
+      (_this$triggerRef$curr5 = _this.triggerRef.current) === null || _this$triggerRef$curr5 === void 0 ? void 0 : _this$triggerRef$curr5.show();
+    };
+
     _this.removeLastItem = function (event) {
       var tagName = (0, _get2.default)(event, 'target.tagName');
 
@@ -795,10 +796,9 @@ function (_React$Component) {
     var _this$props17 = this.props,
         multi = _this$props17.multi,
         onBlur = _this$props17.onBlur,
-        onFocus = _this$props17.onFocus;
+        onFocus = _this$props17.onFocus,
+        tabIndex = _this$props17.tabIndex;
     var props = {
-      onBlur: onBlur,
-      onFocus: onFocus,
       componentClass: 'input',
       inputRef: this.inputRef
     };
@@ -812,8 +812,11 @@ function (_React$Component) {
     }
 
     return React.createElement(_InputSearch.default, (0, _extends2.default)({}, props, {
+      tabIndex: tabIndex,
       onChange: this.handleSearch,
-      value: this.state.open ? this.state.searchKeyword : ''
+      value: this.state.open ? this.state.searchKeyword : '',
+      onBlur: onBlur,
+      onFocus: (0, _utils.createChainedFunction)(this.handleInputFocus, onFocus)
     }));
   };
 

package/lib/Nav/Nav.js

@@ -76,19 +76,20 @@ function (_React$Component) {
       var _item$props = item.props,
           eventKey = _item$props.eventKey,
           active = _item$props.active,
-          rest = (0, _objectWithoutPropertiesLoose2.default)(_item$props, ["eventKey", "active"]);
+          onSelectItem = _item$props.onSelect,
+          rest = (0, _objectWithoutPropertiesLoose2.default)(_item$props, ["eventKey", "active", "onSelect"]);
       var displayName = item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.displayName;
       var hasTooltip = sidenav && !expanded;
 
       if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(NavItem)'))) {
         return (0, _extends2.default)({}, rest, {
-          onSelect: onSelect,
+          onSelect: (0, _utils.createChainedFunction)(onSelect, onSelectItem),
           hasTooltip: hasTooltip,
           active: typeof activeKey === 'undefined' ? active : (0, _shallowEqual.default)(activeKey, eventKey)
         });
       } else if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(Dropdown)'))) {
         return (0, _extends2.default)({}, rest, {
-          onSelect: onSelect,
+          onSelect: (0, _utils.createChainedFunction)(onSelect, onSelectItem),
           activeKey: activeKey,
           showHeader: hasTooltip,
           componentClass: 'li'

package/lib/Overlay/OverlayTrigger.js

@@ -221,6 +221,8 @@ function (_React$Component) {
   };
 
   _proto.renderOverlay = function renderOverlay() {
+    var _this2 = this;
+
     var _this$props4 = this.props,
         open = _this$props4.open,
         speaker = _this$props4.speaker,
@@ -248,7 +250,11 @@ function (_React$Component) {
     }
 
     if (typeof speaker === 'function') {
-      return React.createElement(_Overlay.default, overlayProps, speaker);
+      return React.createElement(_Overlay.default, overlayProps, function (props, ref) {
+        return speaker((0, _extends2.default)({}, props, {
+          onClose: _this2.hide
+        }), ref);
+      });
     }
 
     return React.createElement(_Overlay.default, overlayProps, React.cloneElement(speaker, speakerProps));

package/lib/RangeSlider/RangeSlider.js

@@ -100,7 +100,7 @@ function (_React$Component) {
         end = value;
       }
 
-      _this.setValue([start, end], event);
+      _this.setValue([start, end].sort(), event);
     };
 
     _this.handleDragMove = function (key, event) {

package/lib/Uploader/Uploader.d.ts

@@ -67,10 +67,13 @@ export interface UploaderProps extends StandardProps {
   listType?: 'text' | 'picture-text' | 'picture';
 
   /** Allow the queue to be updated. After you select a file, update the checksum function before the upload file queue, and return false to not update */
-  shouldQueueUpdate?: (fileList: FileType[], newFile: FileType[] | FileType) => boolean;
+  shouldQueueUpdate?: (
+    fileList: FileType[],
+    newFile: FileType[] | FileType
+  ) => boolean | Promise<boolean>;
 
   /** Allow uploading of files. Check function before file upload, return false without uploading  */
-  shouldUpload?: (file: FileType) => boolean;
+  shouldUpload?: (file: FileType) => boolean | Promise<boolean>;
 
   /** callback function that the upload queue has changed */
   onChange?: (fileList: FileType[]) => void;