rsuite 5.26.1 → 5.27.0

package/Button/styles/index.less

@@ -8,7 +8,8 @@
 
 // Default Button
 .rs-btn {
-  display: inline-block;
+  display: inline-flex;
+  align-items: center;
   margin-bottom: 0; // For input.btn
   font-weight: @btn-font-weight;
   text-align: center;
@@ -52,6 +53,16 @@
   .with-ripple();
 }
 
+.rs-btn-start-icon {
+  line-height: 0; // Eliminate whitespace
+  margin-right: @btn-icon-gap;
+}
+
+.rs-btn-end-icon {
+  line-height: 0; // Eliminate whitespace
+  margin-left: @btn-icon-gap;
+}
+
 // Appearance variants
 // --------------------------------------------------
 

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [5.27.0](https://github.com/rsuite/rsuite/compare/v5.26.1...v5.27.0) (2023-02-17)
+
+### Bug Fixes
+
+- **Message,Notification:** duration property migrated to `toaster.push` option ([#3065](https://github.com/rsuite/rsuite/issues/3065)) ([f18cc32](https://github.com/rsuite/rsuite/commit/f18cc32e4822fa3596b350efe0dc31f286b3918b))
+- **Schema:** add missing Types.MixedType ([#3058](https://github.com/rsuite/rsuite/issues/3058)) ([b6c9654](https://github.com/rsuite/rsuite/commit/b6c965449f5eb1d13b72b02cfd16f454bc942c90))
+
+### Features
+
+- **Button:** add startIcon and endIcon props ([#3067](https://github.com/rsuite/rsuite/issues/3067)) ([d3e967e](https://github.com/rsuite/rsuite/commit/d3e967e3be84ab6f76eb5a2415989a4f592c6674))
+
 ## [5.26.1](https://github.com/rsuite/rsuite/compare/v5.26.0...v5.26.1) (2023-02-09)
 
 ### Bug Fixes

package/cjs/Button/Button.d.ts

@@ -21,6 +21,10 @@ export interface ButtonProps extends WithAsProps, React.HTMLAttributes<HTMLEleme
     disabled?: boolean;
     /** Ripple after button click */
     ripple?: boolean;
+    /** The icon element placed _before_ the button text */
+    startIcon?: React.ReactNode;
+    /** The icon element placed _after_ the button text */
+    endIcon?: React.ReactNode;
     /** Defines HTML button type attribute */
     type?: 'button' | 'reset' | 'submit';
 }

package/cjs/Button/Button.js

@@ -25,7 +25,7 @@ var _Ripple = _interopRequireDefault(require("../Ripple"));
 
 var _utils = require("../utils");
 
-var _templateObject;
+var _templateObject, _templateObject2, _templateObject3;
 
 var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var as = props.as,
@@ -43,8 +43,10 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _props$ripple = props.ripple,
       ripple = _props$ripple === void 0 ? true : _props$ripple,
       sizeProp = props.size,
+      startIcon = props.startIcon,
+      endIcon = props.endIcon,
       typeProp = props.type,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "active", "appearance", "block", "className", "children", "classPrefix", "color", "disabled", "loading", "ripple", "size", "type"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "active", "appearance", "block", "className", "children", "classPrefix", "color", "disabled", "loading", "ripple", "size", "startIcon", "endIcon", "type"]);
   var buttonGroup = (0, _react.useContext)(_ButtonGroup.ButtonGroupContext);
   var size = sizeProp !== null && sizeProp !== void 0 ? sizeProp : buttonGroup === null || buttonGroup === void 0 ? void 0 : buttonGroup.size;
 
@@ -59,11 +61,18 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     loading: loading,
     block: block
   }));
-  var rippleElement = ripple && !(0, _utils.isOneOf)(appearance, ['link', 'ghost']) ? /*#__PURE__*/_react.default.createElement(_Ripple.default, null) : null;
-
-  var spin = /*#__PURE__*/_react.default.createElement("span", {
-    className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["spin"])))
-  });
+  var renderButtonContent = (0, _react.useCallback)(function () {
+    var spin = /*#__PURE__*/_react.default.createElement("span", {
+      className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["spin"])))
+    });
+
+    var rippleElement = ripple && !(0, _utils.isOneOf)(appearance, ['link', 'ghost']) ? /*#__PURE__*/_react.default.createElement(_Ripple.default, null) : null;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, loading && spin, startIcon ? /*#__PURE__*/_react.default.createElement("span", {
+      className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["start-icon"])))
+    }, startIcon) : null, children, endIcon ? /*#__PURE__*/_react.default.createElement("span", {
+      className: prefix(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["end-icon"])))
+    }, endIcon) : null, rippleElement);
+  }, [appearance, children, endIcon, loading, prefix, ripple, startIcon]);
 
   if (rest.href) {
     return /*#__PURE__*/_react.default.createElement(_SafeAnchor.default, (0, _extends2.default)({}, rest, {
@@ -72,7 +81,7 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       "aria-disabled": disabled,
       disabled: disabled,
       className: classes
-    }), loading && spin, children, rippleElement);
+    }), renderButtonContent());
   }
 
   var Component = as || 'button';
@@ -85,7 +94,7 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     disabled: disabled,
     "aria-disabled": disabled,
     className: classes
-  }), loading && spin, children, rippleElement);
+  }), renderButtonContent());
 });
 
 Button.displayName = 'Button';

package/cjs/Message/Message.d.ts

@@ -9,6 +9,10 @@ export interface MessageProps extends WithAsProps {
      * Delay automatic removal of messages.
      * When set to 0, the message is not automatically removed.
      * (Unit: milliseconds)
+     *
+     * @default 2000
+     * @deprecated Use `toaster.push(<Message />, { duration: 2000 })` instead.
+     *
      */
     duration?: number;
     /** The title of the message  */

package/cjs/Message/Message.js

@@ -21,6 +21,8 @@ var _utils = require("../utils");
 
 var _CloseButton = _interopRequireDefault(require("../CloseButton"));
 
+var _ToastContext = _interopRequireDefault(require("../toaster/ToastContext"));
+
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 var Message = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -52,9 +54,13 @@ var Message = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       merge = _useClassNames.merge,
       prefix = _useClassNames.prefix;
 
-  var isMounted = (0, _utils.useIsMounted)(); // Timed close message
+  var isMounted = (0, _utils.useIsMounted)();
+
+  var _useContext = (0, _react.useContext)(_ToastContext.default),
+      usedToaster = _useContext.usedToaster; // Timed close message
+
 
-  var _useTimeout = (0, _utils.useTimeout)(onClose, duration, duration > 0),
+  var _useTimeout = (0, _utils.useTimeout)(onClose, duration, usedToaster && duration > 0),
       clear = _useTimeout.clear;
 
   var handleClose = (0, _react.useCallback)(function (event) {

package/cjs/Notification/Notification.d.ts

@@ -8,6 +8,9 @@ export interface NotificationProps extends WithAsProps {
      * Delay automatic removal of messages.
      * When set to 0, the message is not automatically removed.
      * (Unit: milliseconds)
+     *
+     * @default 4500
+     * @deprecated Use `toaster.push(<Notification />, { duration: 4500 })` instead.
      */
     duration?: number;
     /**

package/cjs/Notification/Notification.js

@@ -21,6 +21,8 @@ var _utils = require("../utils");
 
 var _CloseButton = _interopRequireDefault(require("../CloseButton"));
 
+var _ToastContext = _interopRequireDefault(require("../toaster/ToastContext"));
+
 var _templateObject, _templateObject2;
 
 var Notification = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -47,9 +49,13 @@ var Notification = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       merge = _useClassNames.merge,
       prefix = _useClassNames.prefix;
 
-  var isMounted = (0, _utils.useIsMounted)(); // Timed close message
+  var isMounted = (0, _utils.useIsMounted)();
+
+  var _useContext = (0, _react.useContext)(_ToastContext.default),
+      usedToaster = _useContext.usedToaster; // Timed close message
+
 
-  var _useTimeout = (0, _utils.useTimeout)(onClose, duration, duration > 0),
+  var _useTimeout = (0, _utils.useTimeout)(onClose, duration, usedToaster && duration > 0),
       clear = _useTimeout.clear; // Click to trigger to close the message
 
 

package/cjs/Schema/Schema.d.ts

@@ -1,4 +1,4 @@
-import { SchemaModel, StringType, NumberType, ArrayType, DateType, ObjectType, BooleanType } from 'schema-typed';
+import { SchemaModel, StringType, NumberType, ArrayType, DateType, ObjectType, BooleanType, MixedType } from 'schema-typed';
 declare const SchemaTyped: {
     Model: typeof SchemaModel;
     Types: {
@@ -8,6 +8,7 @@ declare const SchemaTyped: {
         DateType: typeof DateType;
         ObjectType: typeof ObjectType;
         BooleanType: typeof BooleanType;
+        MixedType: typeof MixedType;
     };
 };
 export default SchemaTyped;

package/cjs/Schema/Schema.js

@@ -13,7 +13,8 @@ var SchemaTyped = {
     ArrayType: _schemaTyped.ArrayType,
     DateType: _schemaTyped.DateType,
     ObjectType: _schemaTyped.ObjectType,
-    BooleanType: _schemaTyped.BooleanType
+    BooleanType: _schemaTyped.BooleanType,
+    MixedType: _schemaTyped.MixedType
   }
 };
 var _default = SchemaTyped;

package/cjs/toaster/ToastContainer.d.ts

@@ -7,11 +7,16 @@ export interface ToastContainerProps extends WithAsProps {
     placement?: PlacementType;
     /** Set the message to appear in the specified container */
     container?: HTMLElement | (() => HTMLElement);
+    /** The number of milliseconds to wait before automatically closing a message. */
+    duration?: number;
     callback?: (ref: React.RefObject<ToastContainerInstance>) => void;
 }
+interface PushOptions {
+    duration?: number;
+}
 export interface ToastContainerInstance {
     root: HTMLElement;
-    push: (message: React.ReactNode) => string;
+    push: (message: React.ReactNode, options?: PushOptions) => string;
     remove: (key: string) => void;
     clear: () => void;
     destroy: () => void;

package/cjs/toaster/ToastContainer.js

@@ -21,6 +21,8 @@ var _Transition = _interopRequireDefault(require("../Animation/Transition"));
 
 var _utils = require("../utils");
 
+var _ToastContext = _interopRequireDefault(require("./ToastContext"));
+
 var toastPlacements = ['topCenter', 'bottomCenter', 'topStart', 'topEnd', 'bottomStart', 'bottomEnd'];
 exports.toastPlacements = toastPlacements;
 
@@ -36,14 +38,14 @@ var useMessages = function useMessages() {
 
     return key;
   }, [messages]);
-  var push = (0, _react.useCallback)(function (message) {
+  var push = (0, _react.useCallback)(function (message, options) {
     var key = (0, _utils.guid)();
     setMessages(function (prevMessages) {
-      return [].concat(prevMessages, [{
+      return [].concat(prevMessages, [(0, _extends2.default)({
         key: key,
         visible: true,
         node: message
-      }]);
+      }, options)]);
     });
     return key;
   }, []);
@@ -133,6 +135,7 @@ var ToastContainer = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           rest = (0, _objectWithoutPropertiesLoose2.default)(transitionProps, ["className"]);
       return /*#__PURE__*/_react.default.cloneElement(item.node, (0, _extends2.default)({}, rest, {
         ref: ref,
+        duration: item.duration,
         // Remove the message after the specified time.
         onClose: (0, _utils.createChainedFunction)((_item$node = item.node) === null || _item$node === void 0 ? void 0 : (_item$node$props = _item$node.props) === null || _item$node$props === void 0 ? void 0 : _item$node$props.onClose, function () {
           return remove(item.key);
@@ -141,13 +144,17 @@ var ToastContainer = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       }));
     });
   });
-  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(_ToastContext.default.Provider, {
+    value: {
+      usedToaster: true
+    }
+  }, /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     ref: function ref(selfRef) {
       rootRef.current = selfRef;
       callback === null || callback === void 0 ? void 0 : callback(selfRef);
     },
     className: classes
-  }), elements);
+  }), elements));
 });
 
 ToastContainer.getInstance = function (props) {

package/cjs/toaster/ToastContext.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export interface ToastContextProps {
+    usedToaster?: boolean;
+}
+declare const ToastContext: React.Context<ToastContextProps>;
+export default ToastContext;

package/cjs/toaster/ToastContext.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var ToastContext = /*#__PURE__*/_react.default.createContext({
+  usedToaster: false
+});
+
+ToastContext.displayName = 'ToastContext';
+var _default = ToastContext;
+exports.default = _default;

package/cjs/toaster/toaster.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _ToastContainer = _interopRequireDefault(require("./ToastContainer"));
@@ -68,23 +70,23 @@ var toaster = function toaster(message) {
 };
 
 toaster.push = function (message, options) {
-  var _options;
-
   if (options === void 0) {
     options = {};
   }
 
-  var containerId = (_options = options) === null || _options === void 0 ? void 0 : _options.placement;
+  var _options = options,
+      containerId = _options.placement,
+      restOptions = (0, _objectWithoutPropertiesLoose2.default)(_options, ["placement"]);
   var container = getContainer(containerId);
 
   if (container !== null && container !== void 0 && container.current) {
-    return container.current.push(message);
+    return container.current.push(message, restOptions);
   }
 
   return createContainer(containerId !== null && containerId !== void 0 ? containerId : '', options).then(function (ref) {
     var _ref$current;
 
-    return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.push(message);
+    return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.push(message, restOptions);
   });
 };
 

package/cjs/toaster/useToaster.js

@@ -22,7 +22,7 @@ var useToaster = function useToaster() {
       var _toasters$current;
 
       var customToaster = toasters === null || toasters === void 0 ? void 0 : (_toasters$current = toasters.current) === null || _toasters$current === void 0 ? void 0 : _toasters$current.get((options === null || options === void 0 ? void 0 : options.placement) || 'topCenter');
-      return customToaster ? customToaster.push(message) : _toaster.default.push(message, options);
+      return customToaster ? customToaster.push(message, options) : _toaster.default.push(message, options);
     },
     remove: function remove(key) {
       toasters ? Array.from(toasters.current).forEach(function (_ref) {

package/dist/rsuite-rtl.css

@@ -1849,7 +1849,12 @@ tbody.rs-anim-collapse.rs-anim-in {
   margin: 0 4px;
 }
 .rs-btn {
-  display: inline-block;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin-bottom: 0;
   font-weight: normal;
   text-align: center;
@@ -1954,6 +1959,14 @@ tbody.rs-anim-collapse.rs-anim-in {
     /* stylelint-enable */
   }
 }
+.rs-btn-start-icon {
+  line-height: 0;
+  margin-left: 5px;
+}
+.rs-btn-end-icon {
+  line-height: 0;
+  margin-right: 5px;
+}
 .rs-btn-primary {
   color: #fff;
   color: var(--rs-btn-primary-text);
@@ -10398,7 +10411,12 @@ textarea.rs-picker-search-input {
   padding: 1px 7px;
 }
 .rs-pagination-btn {
-  display: inline-block;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin-bottom: 0;
   font-weight: normal;
   text-align: center;
@@ -10853,7 +10871,12 @@ textarea.rs-picker-search-input {
           box-shadow: var(--rs-state-focus-shadow);
 }
 .rs-picker-toggle {
-  display: inline-block;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin-bottom: 0;
   font-weight: normal;
   text-align: center;
@@ -12775,7 +12798,12 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   display: none;
 }
 .rs-radio-group-picker .rs-radio-checker > label {
-  display: inline-block;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin-bottom: 0;
   font-weight: normal;
   text-align: center;
@@ -15957,7 +15985,12 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   clear: both;
 }
 .rs-uploader-picture .rs-uploader-trigger-btn {
-  display: inline-block;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin-bottom: 0;
   font-weight: normal;
   text-align: center;