rsuite 5.19.1 → 5.20.0

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [5.20.0](https://github.com/rsuite/rsuite/compare/v5.19.1...v5.20.0) (2022-10-21)
+
+### Bug Fixes
+
+- **DatePicker:** reset calendar selection after closing picker menu ([#2807](https://github.com/rsuite/rsuite/issues/2807)) ([1ef91a8](https://github.com/rsuite/rsuite/commit/1ef91a846fc6d99c7479e96994aa50da2af9ef9e))
+- **Form.Control:** when shouldResetWithUnmount should remove value and error ([#2802](https://github.com/rsuite/rsuite/issues/2802)) ([f8d108a](https://github.com/rsuite/rsuite/commit/f8d108aed3e94811491be63e3373008d12e83b60))
+
+### Features
+
+- **SelectPicker,CheckPicker:** add `loading` prop ([#2808](https://github.com/rsuite/rsuite/issues/2808)) ([3a5e5d5](https://github.com/rsuite/rsuite/commit/3a5e5d5d4b891373c8a05ec4d642103f75920f10))
+
 ## [5.19.1](https://github.com/rsuite/rsuite/compare/v5.19.0...v5.19.1) (2022-10-13)
 
 ### Bug Fixes

package/Picker/styles/index.less

@@ -18,6 +18,10 @@
     max-width: 100%;
   }
 
+  &-toggle {
+    min-width: 75px;
+  }
+
   &-toggle.rs-btn {
     .rs-ripple-pond {
       display: none !important;

package/cjs/DatePicker/DatePicker.js

@@ -35,6 +35,8 @@ var _utils = require("../utils");
 
 var _Picker = require("../Picker");
 
+var _OverlayTrigger = require("../Overlay/OverlayTrigger");
+
 var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -419,6 +421,13 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),
     ref: triggerRef,
     placement: placement,
+    onClose: function onClose(cause) {
+      // Unless overlay is closing on user clicking "OK" button,
+      // reset the selected date on calendar panel
+      if (cause !== _OverlayTrigger.OverlayCloseCause.ImperativeHandle) {
+        resetCalendarDate();
+      }
+    },
     onEntered: (0, _utils.createChainedFunction)(handleEntered, onEntered),
     onExited: (0, _utils.createChainedFunction)(handleExited, onExited),
     speaker: renderDropdownMenu

package/cjs/Form/Form.js

@@ -15,8 +15,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
-
 var _omit = _interopRequireDefault(require("lodash/omit"));
 
 var _schemaTyped = require("schema-typed");
@@ -37,6 +35,8 @@ var _useFormClassNames = require("./useFormClassNames");
 
 var _useSchemaModel2 = _interopRequireDefault(require("./useSchemaModel"));
 
+var _utils = require("../utils");
+
 var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$checkTrigger = props.checkTrigger,
       checkTrigger = _props$checkTrigger === void 0 ? 'change' : _props$checkTrigger,
@@ -79,20 +79,18 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     disabled: disabled
   });
 
-  var _useState = (0, _react.useState)(formDefaultValue),
-      _formValue = _useState[0],
-      setFormValue = _useState[1];
+  var _useControlled = (0, _utils.useControlled)(formValue, formDefaultValue),
+      realFormValue = _useControlled[0],
+      setFormValue = _useControlled[1];
 
-  var _useState2 = (0, _react.useState)(formError || {}),
-      _formError = _useState2[0],
-      setFormError = _useState2[1];
+  var _useControlled2 = (0, _utils.useControlled)(formError, {}),
+      realFormError = _useControlled2[0],
+      setFormError = _useControlled2[1];
 
-  var getFormValue = (0, _react.useCallback)(function () {
-    return (0, _isUndefined.default)(formValue) ? _formValue : formValue;
-  }, [_formValue, formValue]);
-  var getFormError = (0, _react.useCallback)(function () {
-    return (0, _isUndefined.default)(formError) ? _formError : formError;
-  }, [formError, _formError]);
+  var realFormValueRef = (0, _react.useRef)(realFormValue);
+  realFormValueRef.current = realFormValue;
+  var realFormErrorRef = (0, _react.useRef)(realFormError);
+  realFormErrorRef.current = realFormError;
   /**
    * Validate the form data and return a boolean.
    * The error message after verification is returned in the callback.
@@ -100,7 +98,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    */
 
   var check = (0, _react.useCallback)(function (callback) {
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var formError = {};
     var errorCount = 0;
     var model = getCombinedModel();
@@ -122,7 +120,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return true;
-  }, [getFormValue, getCombinedModel, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, setFormError, onCheck, onError]);
   /**
    * Check the data field
    * @param fieldName
@@ -132,10 +130,10 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var checkForField = (0, _react.useCallback)(function (fieldName, callback) {
     var _extends2;
 
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var model = getCombinedModel();
     var checkResult = model.checkForField(fieldName, formValue);
-    var formError = (0, _extends6.default)({}, getFormError(), (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
+    var formError = (0, _extends6.default)({}, realFormError, (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
     setFormError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
     callback === null || callback === void 0 ? void 0 : callback(checkResult);
@@ -145,13 +143,13 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return !checkResult.hasError;
-  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, realFormError, setFormError, onCheck, onError]);
   /**
    * Check form data asynchronously and return a Promise
    */
 
   var checkAsync = (0, _react.useCallback)(function () {
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var promises = [];
     var keys = [];
     var model = getCombinedModel();
@@ -182,19 +180,19 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         formError: formError
       };
     });
-  }, [getFormValue, getCombinedModel, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, onCheck, setFormError, onError]);
   /**
    * Asynchronously check form fields and return Promise
    * @param fieldName
    */
 
   var checkForFieldAsync = (0, _react.useCallback)(function (fieldName) {
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var model = getCombinedModel();
     return model.checkForFieldAsync(fieldName, formValue).then(function (checkResult) {
       var _extends3;
 
-      var formError = (0, _extends6.default)({}, getFormError(), (_extends3 = {}, _extends3[fieldName] = checkResult.errorMessage, _extends3));
+      var formError = (0, _extends6.default)({}, realFormError, (_extends3 = {}, _extends3[fieldName] = checkResult.errorMessage, _extends3));
       onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
       setFormError(formError);
 
@@ -204,20 +202,20 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
       return checkResult;
     });
-  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, realFormError, onCheck, setFormError, onError]);
   var cleanErrors = (0, _react.useCallback)(function () {
     setFormError({});
-  }, []);
+  }, [setFormError]);
   var cleanErrorForField = (0, _react.useCallback)(function (fieldName) {
-    setFormError((0, _omit.default)(_formError, [fieldName]));
-  }, [_formError]);
+    setFormError((0, _omit.default)(realFormError, [fieldName]));
+  }, [realFormError, setFormError]);
   var resetErrors = (0, _react.useCallback)(function (formError) {
     if (formError === void 0) {
       formError = {};
     }
 
     setFormError(formError);
-  }, []);
+  }, [setFormError]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       root: rootRef.current,
@@ -231,15 +229,23 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     };
   });
   var removeFieldError = (0, _react.useCallback)(function (name) {
-    var formError = (0, _omit.default)(getFormError(), [name]);
+    /**
+     * when this function is called when the children component is unmount, it's an old render frame
+     * so use Ref to get future error
+     */
+    var formError = (0, _omit.default)(realFormErrorRef.current, [name]);
     setFormError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [getFormError, onCheck]);
+  }, [onCheck, setFormError]);
   var removeFieldValue = (0, _react.useCallback)(function (name) {
-    var formValue = (0, _omit.default)(getFormValue(), [name]);
+    /**
+     * when this function is called when the children component is unmount, it's an old render frame
+     * so use Ref to get future value
+     */
+    var formValue = (0, _omit.default)(realFormValueRef.current, [name]);
     setFormValue(formValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(formValue);
-  }, [getFormValue, onChange]);
+  }, [onChange, setFormValue]);
   var handleSubmit = (0, _react.useCallback)(function (event) {
     if (disabled || readOnly || plaintext) {
       return;
@@ -253,22 +259,22 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var handleFieldError = (0, _react.useCallback)(function (name, errorMessage) {
     var _extends4;
 
-    var formError = (0, _extends6.default)({}, getFormError(), (_extends4 = {}, _extends4[name] = errorMessage, _extends4));
+    var formError = (0, _extends6.default)({}, realFormError, (_extends4 = {}, _extends4[name] = errorMessage, _extends4));
     setFormError(formError);
     onError === null || onError === void 0 ? void 0 : onError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [onError, onCheck, getFormError]);
+  }, [realFormError, setFormError, onError, onCheck]);
   var handleFieldSuccess = (0, _react.useCallback)(function (name) {
     removeFieldError(name);
   }, [removeFieldError]);
   var handleFieldChange = (0, _react.useCallback)(function (name, value, event) {
     var _extends5;
 
-    var formValue = getFormValue();
+    var formValue = realFormValue;
     var nextFormValue = (0, _extends6.default)({}, formValue, (_extends5 = {}, _extends5[name] = value, _extends5));
     setFormValue(nextFormValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextFormValue, event);
-  }, [onChange, getFormValue]);
+  }, [realFormValue, setFormValue, onChange]);
   var rootRef = (0, _react.useRef)(null);
   var formContextValue = (0, _react.useMemo)(function () {
     return {
@@ -279,7 +285,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       readOnly: readOnly,
       plaintext: plaintext,
       disabled: disabled,
-      formError: getFormError(),
+      formError: realFormError,
       removeFieldValue: removeFieldValue,
       removeFieldError: removeFieldError,
       pushFieldRule: pushFieldRule,
@@ -288,7 +294,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onFieldError: handleFieldError,
       onFieldSuccess: handleFieldSuccess
     };
-  }, [getCombinedModel, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
+  }, [getCombinedModel, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, realFormError, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
   return /*#__PURE__*/_react.default.createElement("form", (0, _extends6.default)({}, rest, {
     ref: rootRef,
     onSubmit: handleSubmit,

package/cjs/Overlay/OverlayTrigger.d.ts

@@ -59,10 +59,19 @@ export interface OverlayTriggerProps extends StandardProps, AnimationEventProps
     /** Callback fired when open component */
     onOpen?: () => void;
     /** Callback fired when close component */
-    onClose?: () => void;
+    onClose?: (cause?: OverlayCloseCause) => void;
     /** Whether speaker to follow the cursor */
     followCursor?: boolean;
 }
+/**
+ * The reason that triggers closing of an overlay
+ * - Clicking outside of the overlay
+ * - Direct invocation of triggerRef.current.close()
+ */
+export declare enum OverlayCloseCause {
+    ClickOutside = 0,
+    ImperativeHandle = 1
+}
 export interface OverlayTriggerInstance {
     root: HTMLElement | undefined;
     updatePosition: () => void;

package/cjs/Overlay/OverlayTrigger.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.default = exports.OverlayCloseCause = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -49,6 +49,12 @@ function mergeEvents(events, props) {
   return nextEvents;
 }
 
+/**
+ * The reason that triggers closing of an overlay
+ * - Clicking outside of the overlay
+ * - Direct invocation of triggerRef.current.close()
+ */
+var OverlayCloseCause;
 /**
  * Useful for mouseover and mouseout.
  * In order to resolve the node entering the mouseover element, a mouseout event and a mouseover event will be triggered.
@@ -56,6 +62,14 @@ function mergeEvents(events, props) {
  * @param handler
  * @param event
  */
+
+exports.OverlayCloseCause = OverlayCloseCause;
+
+(function (OverlayCloseCause) {
+  OverlayCloseCause[OverlayCloseCause["ClickOutside"] = 0] = "ClickOutside";
+  OverlayCloseCause[OverlayCloseCause["ImperativeHandle"] = 1] = "ImperativeHandle";
+})(OverlayCloseCause || (exports.OverlayCloseCause = OverlayCloseCause = {}));
+
 function onMouseEventHandler(handler, event, delay) {
   var target = event.currentTarget;
   var related = event.relatedTarget || (0, _get.default)(event, ['nativeEvent', 'toElement']);
@@ -153,17 +167,19 @@ var OverlayTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 
     setOpen(true);
   }, [delayOpen, setOpen]);
-  var handleClose = (0, _react.useCallback)(function (delay) {
+  var handleClose = (0, _react.useCallback)(function (delay, callback) {
     var ms = (0, _isUndefined2.default)(delay) ? delayClose : delay;
 
     if (ms && typeof ms === 'number') {
       return delayCloseTimer.current = setTimeout(function () {
         delayCloseTimer.current = null;
         setOpen(false);
+        callback === null || callback === void 0 ? void 0 : callback();
       }, ms);
     }
 
     setOpen(false);
+    callback === null || callback === void 0 ? void 0 : callback();
   }, [delayClose, setOpen]);
   var handleExited = (0, _react.useCallback)(function () {
     setCursorPosition(null);
@@ -181,7 +197,11 @@ var OverlayTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       },
 
       open: handleOpen,
-      close: handleClose,
+      close: function close(delay) {
+        return handleClose(delay, function () {
+          return onClose === null || onClose === void 0 ? void 0 : onClose(OverlayCloseCause.ImperativeHandle);
+        });
+      },
       updatePosition: function updatePosition() {
         var _overlayRef$current2, _overlayRef$current2$;
 
@@ -342,7 +362,9 @@ var OverlayTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     var overlayProps = (0, _extends2.default)({}, rest, {
       rootClose: rootClose,
       triggerTarget: triggerRef,
-      onClose: trigger !== 'none' ? (0, _utils.createChainedFunction)(handleClose, onClose) : undefined,
+      onClose: trigger !== 'none' ? (0, _utils.createChainedFunction)(handleClose, function () {
+        return onClose === null || onClose === void 0 ? void 0 : onClose(OverlayCloseCause.ClickOutside);
+      }) : undefined,
       onExited: (0, _utils.createChainedFunction)(followCursor ? handleExited : undefined, onExited),
       placement: placement,
       container: container,

package/cjs/Picker/PickerToggle.d.ts

@@ -15,6 +15,7 @@ export interface PickerToggleProps extends ToggleButtonProps {
     readOnly?: boolean;
     plaintext?: boolean;
     tabIndex?: number;
+    loading?: boolean;
     editable?: boolean;
     inputPlaceholder?: string;
     inputMask?: (string | RegExp)[];

package/cjs/Picker/PickerToggle.js

@@ -33,6 +33,10 @@ var _TextMask = _interopRequireDefault(require("../MaskedInput/TextMask"));
 
 var _deprecatePropType = _interopRequireDefault(require("../utils/deprecatePropType"));
 
+var _Loader = _interopRequireDefault(require("../Loader"));
+
+var _Stack = _interopRequireDefault(require("../Stack"));
+
 var _templateObject, _templateObject2;
 
 var defaultInputMask = [];
@@ -52,6 +56,8 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       plaintext = props.plaintext,
       hasValue = props.hasValue,
       editable = props.editable,
+      _props$loading = props.loading,
+      loading = _props$loading === void 0 ? false : _props$loading,
       cleanableProp = props.cleanable,
       _props$tabIndex = props.tabIndex,
       tabIndexProp = _props$tabIndex === void 0 ? editable ? -1 : 0 : _props$tabIndex,
@@ -74,7 +80,7 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
       label = props.label,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "editable", "cleanable", "tabIndex", "id", "value", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "editable", "loading", "cleanable", "tabIndex", "id", "value", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
   var inputRef = (0, _react.useRef)(null);
   var comboboxRef = (0, _react.useRef)(null);
 
@@ -106,7 +112,9 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     active: activeProp || activeState
   }));
   var handleFocus = (0, _react.useCallback)(function (event) {
-    setActive(true);
+    if (!loading) {
+      setActive(true);
+    }
 
     if (editable) {
       // Avoid firing the onFocus event twice when DatePicker and DateRangePicker allow keyboard input.
@@ -123,7 +131,7 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     } else {
       onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
     }
-  }, [editable, onFocus]);
+  }, [editable, loading, onFocus]);
   var handleBlur = (0, _react.useCallback)(function (event) {
     if (inputRef.current && !editable) {
       setActive(false);
@@ -198,7 +206,17 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onFocus: !disabled ? handleFocus : null // The debounce is set to 200 to solve the flicker caused by the switch between input and div.
     ,
     onBlur: !disabled ? (0, _debounce.default)(handleBlur, 200) : null
-  }), /*#__PURE__*/_react.default.createElement(_TextMask.default, {
+  }), /*#__PURE__*/_react.default.createElement(_Stack.default, null, label && /*#__PURE__*/_react.default.createElement(_Stack.default.Item, null, /*#__PURE__*/_react.default.createElement("span", {
+    className: prefix('label')
+  }, label)), /*#__PURE__*/_react.default.createElement(_Stack.default.Item, {
+    grow: 1
+  }, loading ? /*#__PURE__*/_react.default.createElement(_Loader.default, {
+    style: {
+      display: 'block',
+      padding: '1px 0'
+    },
+    "data-testid": "spinner"
+  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_TextMask.default, {
     mask: inputMask,
     value: Array.isArray(inputValue) ? inputValue.toString() : inputValue,
     onBlur: handleInputBlur,
@@ -219,9 +237,7 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }), children ? /*#__PURE__*/_react.default.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined
-  }, label && /*#__PURE__*/_react.default.createElement("span", {
-    className: prefix('label')
-  }, label), children) : null, showCleanButton && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
+  }, children) : null)), showCleanButton && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
     className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["clean"]))),
     tabIndex: -1,
     locale: {
@@ -230,7 +246,7 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onClick: handleClean
   }), caret && /*#__PURE__*/_react.default.createElement(Caret, {
     className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["caret"])))
-  }));
+  })));
 });
 
 PickerToggle.displayName = 'PickerToggle';

package/cjs/Picker/PickerToggleTrigger.d.ts

@@ -3,7 +3,7 @@ import { OverlayTriggerInstance, OverlayTriggerProps, OverlayTriggerType } from
 import { PositionChildProps } from '../Overlay/Position';
 import { TypeAttributes, AnimationEventProps } from '../@types/common';
 export type { OverlayTriggerInstance, PositionChildProps };
-export interface PickerToggleTriggerProps extends Omit<AnimationEventProps, 'onEntering' | 'onExiting'>, Pick<OverlayTriggerProps, 'speaker'> {
+export interface PickerToggleTriggerProps extends Omit<AnimationEventProps, 'onEntering' | 'onExiting'>, Pick<OverlayTriggerProps, 'speaker' | 'onClose'> {
     placement?: TypeAttributes.Placement;
     pickerProps: any;
     open?: boolean;

package/cjs/Picker/PickerToggleTrigger.js

@@ -21,7 +21,7 @@ var _CustomProvider = require("../CustomProvider");
 
 var omitTriggerPropKeys = ['onEntered', 'onExited', 'onEnter', 'onEntering', 'onExit', 'onExiting', 'open', 'defaultOpen', 'onHide', 'container', 'containerPadding', 'preventOverflow'];
 exports.omitTriggerPropKeys = omitTriggerPropKeys;
-var pickTriggerPropKeys = [].concat(omitTriggerPropKeys, ['disabled', 'plaintext', 'readOnly']);
+var pickTriggerPropKeys = [].concat(omitTriggerPropKeys, ['disabled', 'plaintext', 'readOnly', 'loading']);
 exports.pickTriggerPropKeys = pickTriggerPropKeys;
 
 var PickerToggleTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -31,8 +31,10 @@ var PickerToggleTrigger = /*#__PURE__*/_react.default.forwardRef(function (props
       _props$trigger = props.trigger,
       trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["pickerProps", "speaker", "placement", "trigger"]);
+  var pickerTriggerProps = (0, _pick.default)(pickerProps, pickTriggerPropKeys);
   return /*#__PURE__*/_react.default.createElement(_CustomProvider.CustomConsumer, null, function (context) {
-    return /*#__PURE__*/_react.default.createElement(_OverlayTrigger.default, (0, _extends2.default)({}, rest, (0, _pick.default)(pickerProps, pickTriggerPropKeys), {
+    return /*#__PURE__*/_react.default.createElement(_OverlayTrigger.default, (0, _extends2.default)({}, rest, pickerTriggerProps, {
+      disabled: pickerTriggerProps.disabled || pickerTriggerProps.loading,
       ref: ref,
       trigger: trigger,
       placement: (0, _utils.placementPolyfill)(placement, context === null || context === void 0 ? void 0 : context.rtl),

package/cjs/SelectPicker/SelectPicker.d.ts

@@ -6,6 +6,8 @@ import { FormControlPickerProps, ItemDataType } from '../@types/common';
 export interface SelectProps<T> {
     /** Set group condition key in data */
     groupBy?: string;
+    /** Whether to display an loading indicator on toggle button */
+    loading?: boolean;
     /** Whether dispaly search input box */
     searchable?: boolean;
     /** Whether using virtualized list */

package/dist/rsuite-rtl.css

@@ -10721,6 +10721,9 @@ textarea.rs-picker-search-input {
   vertical-align: middle;
   max-width: 100%;
 }
+.rs-picker-toggle {
+  min-width: 75px;
+}
 .rs-picker-toggle.rs-btn .rs-ripple-pond {
   display: none !important;
 }