rsuite 5.6.0 → 5.6.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [5.6.1](https://github.com/rsuite/rsuite/compare/v5.6.0...v5.6.1) (2022-02-17)
+
+### Bug Fixes
+
+- **caretAs:** fix DatePicker and DateRangePicker cannot replace caret ([#2360](https://github.com/rsuite/rsuite/issues/2360)) ([1e619b2](https://github.com/rsuite/rsuite/commit/1e619b2ef7abc58a93f6d6d4fc78ffea07761c81))
+- **IconButton:** infer addtional props from as prop ([#2343](https://github.com/rsuite/rsuite/issues/2343)) ([3b6c25c](https://github.com/rsuite/rsuite/commit/3b6c25c103ed33a86baa47b8c757462da7ae8c4c))
+- **Toaster:** code breaks when toaster is in a useEffect ([#2353](https://github.com/rsuite/rsuite/issues/2353)) ([d083fe2](https://github.com/rsuite/rsuite/commit/d083fe27013659cbc45196b7ead9ff5863404fb8)), closes [#2336](https://github.com/rsuite/rsuite/issues/2336)
+- **useTimeout:** fix callback not being called after timeout ([#2349](https://github.com/rsuite/rsuite/issues/2349)) ([e82a12a](https://github.com/rsuite/rsuite/commit/e82a12aa2929cf66e7a3c6d70008c5bedb4ab128))
+
 # [5.6.0](https://github.com/rsuite/rsuite/compare/v5.5.2...v5.6.0) (2022-02-10)
 
 ### Bug Fixes

package/README.md

@@ -130,9 +130,11 @@ If you like React Suite, you can show your support by either
 This project exists thanks to all the people who contribute.
 
 <a href="https://github.com/rsuite/rsuite/graphs/contributors" target="_blank">
-  <img src="https://opencollective.com/rsuite/contributors.svg?width=890" />
+  <img src="https://contrib.rocks/image?repo=rsuite/rsuite" />
 </a>
 
+[![opencollective-now][opencollective-svg]][opencollective-home]
+
 ## License
 
 React Suite is [MIT licensed][license]. Copyright (c) 2016-present, HYPERS.

package/cjs/DatePicker/DatePicker.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
 import { RangeType } from './Toolbar';
 import { DatePickerLocale } from '../locales';
+import { PickerToggleProps } from '../Picker';
 import { FormControlBaseProps, PickerBaseProps, RsRefForwardingComponent } from '../@types/common';
 export type { RangeType } from './Toolbar';
-export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, FormControlBaseProps<Date | null> {
+export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, FormControlBaseProps<Date | null>, Pick<PickerToggleProps, 'caretAs' | 'readOnly' | 'plaintext'> {
     /** Configure shortcut options */
     ranges?: RangeType<Date>[];
     /** Calendar panel default presentation date and time */

package/cjs/DatePicker/DatePicker.js

@@ -68,6 +68,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       showWeekNumbers = props.showWeekNumbers,
       style = props.style,
       toggleAs = props.toggleAs,
+      caretAsProp = props.caretAs,
       disabledDateProp = props.disabledDate,
       renderValue = props.renderValue,
       onChange = props.onChange,
@@ -83,7 +84,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onSelect = props.onSelect,
       onToggleMonthDropdown = props.onToggleMonthDropdown,
       onToggleTimeDropdown = props.onToggleTimeDropdown,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "defaultValue", "disabled", "format", "isoWeek", "limitEndYear", "locale", "menuClassName", "appearance", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "toggleAs", "disabledDate", "renderValue", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "defaultValue", "disabled", "format", "isoWeek", "limitEndYear", "locale", "menuClassName", "appearance", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "toggleAs", "caretAs", "disabledDate", "renderValue", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown"]);
 
   var _useCustom = (0, _utils.useCustom)('DatePicker', overrideLocale),
       locale = _useCustom.locale,
@@ -445,8 +446,8 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     return (_renderValue = renderValue === null || renderValue === void 0 ? void 0 : renderValue(value, formatStr)) !== null && _renderValue !== void 0 ? _renderValue : formatDate(value, formatStr);
   }, [formatStr, formatDate, placeholder, renderValue, value]);
   var caretAs = (0, _react.useMemo)(function () {
-    return _utils.DateUtils.shouldOnlyTime(formatStr) ? _ClockO.default : _Calendar.default;
-  }, [formatStr]);
+    return caretAsProp || (_utils.DateUtils.shouldOnlyTime(formatStr) ? _ClockO.default : _Calendar.default);
+  }, [caretAsProp, formatStr]);
   return /*#__PURE__*/_react.default.createElement(_Picker.PickerToggleTrigger, {
     trigger: "active",
     pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),

package/cjs/DateRangePicker/DateRangePicker.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { FormControlBaseProps, PickerBaseProps } from '../@types/common';
-import { PickerComponent } from '../Picker';
+import { PickerComponent, PickerToggleProps } from '../Picker';
 import { DisabledDateFunction, RangeType, DateRange } from './types';
-export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<DateRange | null> {
+export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<DateRange | null>, Pick<PickerToggleProps, 'caretAs' | 'readOnly' | 'plaintext'> {
     /** Configure shortcut options */
     ranges?: RangeType[];
     /** Format date */

package/cjs/DateRangePicker/DateRangePicker.js

@@ -82,6 +82,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       showMeridian = props.showMeridian,
       style = props.style,
       toggleAs = props.toggleAs,
+      caretAs = props.caretAs,
       valueProp = props.value,
       onChange = props.onChange,
       onClean = props.onClean,
@@ -92,7 +93,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       onOk = props.onOk,
       onOpen = props.onOpen,
       onSelect = props.onSelect,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "showMeridian", "style", "toggleAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "showMeridian", "style", "toggleAs", "caretAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       merge = _useClassNames.merge,
@@ -632,8 +633,8 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     hasValue: hasValue,
     active: isPickerToggleActive,
     placement: placement,
-    caretAs: _Calendar.default,
-    disabled: disabled
+    disabled: disabled,
+    caretAs: caretAs || _Calendar.default
   }), getDisplayString(value))));
 });
 

package/cjs/IconButton/IconButton.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
-import { ButtonProps } from '../Button';
 import { IconProps } from '@rsuite/icons/lib/Icon';
+import { RsRefForwardingComponent } from '../@types/common';
+import Button, { ButtonProps } from '../Button';
 export interface IconButtonProps extends ButtonProps {
     /** Set the icon */
     icon?: React.ReactElement<IconProps>;
@@ -9,5 +10,7 @@ export interface IconButtonProps extends ButtonProps {
     /** The placement of icon */
     placement?: 'left' | 'right';
 }
-declare const IconButton: React.ForwardRefExoticComponent<IconButtonProps & React.RefAttributes<unknown>>;
+declare const IconButton: RsRefForwardingComponent<typeof Button, IconButtonProps & {
+    ref?: React.Ref<HTMLElement>;
+}>;
 export default IconButton;

package/cjs/IconButton/IconButton.js

@@ -13,10 +13,10 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _Button = _interopRequireDefault(require("../Button"));
-
 var _utils = require("../utils");
 
+var _Button = _interopRequireDefault(require("../Button"));
+
 var IconButton = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var icon = props.icon,
       _props$placement = props.placement,

package/cjs/IconButton/test/IconButton.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/IconButton/test/IconButton.test.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _IconButton = _interopRequireDefault(require("../IconButton"));
+
+var Link = function Link(_ref) {
+  var to = _ref.to;
+  return /*#__PURE__*/_react.default.createElement("a", {
+    href: to
+  });
+};
+
+var ref = /*#__PURE__*/_react.default.createRef(); // Infer `as` component props
+
+
+/*#__PURE__*/
+_react.default.createElement(_IconButton.default, {
+  ref: ref,
+  as: Link,
+  to: "/home"
+});

package/cjs/Picker/index.d.ts

@@ -1,4 +1,5 @@
 import { pickTriggerPropKeys, omitTriggerPropKeys, OverlayTriggerInstance, PositionChildProps } from './PickerToggleTrigger';
+import { PickerToggleProps } from './PickerToggle';
 import { PickerInstance, PickerComponent } from './types';
 export { default as DropdownMenu } from './DropdownMenu';
 export { default as DropdownMenuCheckItem } from './DropdownMenuCheckItem';
@@ -10,6 +11,6 @@ export { default as PickerToggleTrigger } from './PickerToggleTrigger';
 export { default as SearchBar } from './SearchBar';
 export { default as SelectedElement } from './SelectedElement';
 export { pickTriggerPropKeys, omitTriggerPropKeys };
-export type { OverlayTriggerInstance, PositionChildProps, PickerInstance, PickerComponent };
+export type { OverlayTriggerInstance, PositionChildProps, PickerInstance, PickerComponent, PickerToggleProps };
 export * from './utils';
 export * from './propTypes';

package/cjs/toaster/toaster.d.ts

@@ -8,7 +8,7 @@ export interface Toaster {
      * @param message
      * @param options
      */
-    push(message: React.ReactNode, options?: ToastContainerProps): string;
+    push(message: React.ReactNode, options?: ToastContainerProps): string | undefined;
     /**
      * Remove a message by key
      * @param key

package/cjs/toaster/toaster.js

@@ -41,6 +41,8 @@ var toaster = function toaster(message) {
 };
 
 toaster.push = function (message, options) {
+  var _container$current;
+
   if (options === void 0) {
     options = {};
   }
@@ -53,18 +55,22 @@ toaster.push = function (message, options) {
     container = createContainer((_options$placement = options.placement) !== null && _options$placement !== void 0 ? _options$placement : '', options);
   }
 
-  return container.current.push(message);
+  return (_container$current = container.current) === null || _container$current === void 0 ? void 0 : _container$current.push(message);
 };
 
 toaster.remove = function (key) {
   containers.forEach(function (c) {
-    return c.current.remove(key);
+    var _c$current;
+
+    return (_c$current = c.current) === null || _c$current === void 0 ? void 0 : _c$current.remove(key);
   });
 };
 
 toaster.clear = function () {
   containers.forEach(function (c) {
-    return c.current.clear();
+    var _c$current2;
+
+    return (_c$current2 = c.current) === null || _c$current2 === void 0 ? void 0 : _c$current2.clear();
   });
 };
 

package/cjs/utils/useTimeout.d.ts

@@ -6,7 +6,7 @@ export interface UseTimeoutFnReturn {
  * A timer hook
  * @param fn Timer callback function
  * @param ms Milliseconds of the timer
- * @param open Whether to open the timer
+ * @param enabled Whether to open the timer
  */
-declare function useTimeout(fn: (() => void) | undefined, ms?: number, open?: boolean): UseTimeoutFnReturn;
+declare function useTimeout(fn: (() => void) | undefined, ms?: number, enabled?: boolean): UseTimeoutFnReturn;
 export default useTimeout;

package/cjs/utils/useTimeout.js

@@ -9,32 +9,41 @@ var _react = require("react");
  * A timer hook
  * @param fn Timer callback function
  * @param ms Milliseconds of the timer
- * @param open Whether to open the timer
+ * @param enabled Whether to open the timer
  */
-function useTimeout(fn, ms, open) {
+function useTimeout(fn, ms, enabled) {
   if (ms === void 0) {
     ms = 0;
   }
 
-  if (open === void 0) {
-    open = true;
+  if (enabled === void 0) {
+    enabled = true;
   }
 
   var timeout = (0, _react.useRef)();
+  var callback = (0, _react.useRef)(fn);
   var clear = (0, _react.useCallback)(function () {
     timeout.current && clearTimeout(timeout.current);
   }, []);
   var set = (0, _react.useCallback)(function () {
-    if (open) {
+    timeout.current && clearTimeout(timeout.current);
+
+    if (enabled) {
       timeout.current = setTimeout(function () {
-        return fn === null || fn === void 0 ? void 0 : fn();
+        var _callback$current;
+
+        (_callback$current = callback.current) === null || _callback$current === void 0 ? void 0 : _callback$current.call(callback);
       }, ms);
     }
-  }, [ms, fn, open]);
+  }, [ms, enabled]); // update ref when function changes
+
+  (0, _react.useEffect)(function () {
+    callback.current = fn;
+  }, [fn]);
   (0, _react.useEffect)(function () {
     set();
     return clear;
-  }, [fn, ms, open, clear, set]);
+  }, [ms, enabled, set, clear]);
   return {
     clear: clear,
     reset: set