rsuite 5.26.1 → 5.27.0

package/esm/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/esm/Button/Button.js

@@ -2,9 +2,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _taggedTemplateLiteralLoose from "@babel/runtime/helpers/esm/taggedTemplateLiteralLoose";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 
-var _templateObject;
+var _templateObject, _templateObject2, _templateObject3;
 
-import React, { useContext } from 'react';
+import React, { useCallback, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { ButtonGroupContext } from '../ButtonGroup';
 import SafeAnchor from '../SafeAnchor';
@@ -26,8 +26,10 @@ var Button = /*#__PURE__*/React.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 = _objectWithoutPropertiesLoose(props, ["as", "active", "appearance", "block", "className", "children", "classPrefix", "color", "disabled", "loading", "ripple", "size", "type"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "active", "appearance", "block", "className", "children", "classPrefix", "color", "disabled", "loading", "ripple", "size", "startIcon", "endIcon", "type"]);
 
   var buttonGroup = useContext(ButtonGroupContext);
   var size = sizeProp !== null && sizeProp !== void 0 ? sizeProp : buttonGroup === null || buttonGroup === void 0 ? void 0 : buttonGroup.size;
@@ -43,10 +45,17 @@ var Button = /*#__PURE__*/React.forwardRef(function (props, ref) {
     loading: loading,
     block: block
   }));
-  var rippleElement = ripple && !isOneOf(appearance, ['link', 'ghost']) ? /*#__PURE__*/React.createElement(Ripple, null) : null;
-  var spin = /*#__PURE__*/React.createElement("span", {
-    className: prefix(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["spin"])))
-  });
+  var renderButtonContent = useCallback(function () {
+    var spin = /*#__PURE__*/React.createElement("span", {
+      className: prefix(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["spin"])))
+    });
+    var rippleElement = ripple && !isOneOf(appearance, ['link', 'ghost']) ? /*#__PURE__*/React.createElement(Ripple, null) : null;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, loading && spin, startIcon ? /*#__PURE__*/React.createElement("span", {
+      className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["start-icon"])))
+    }, startIcon) : null, children, endIcon ? /*#__PURE__*/React.createElement("span", {
+      className: prefix(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["end-icon"])))
+    }, endIcon) : null, rippleElement);
+  }, [appearance, children, endIcon, loading, prefix, ripple, startIcon]);
 
   if (rest.href) {
     return /*#__PURE__*/React.createElement(SafeAnchor, _extends({}, rest, {
@@ -55,7 +64,7 @@ var Button = /*#__PURE__*/React.forwardRef(function (props, ref) {
       "aria-disabled": disabled,
       disabled: disabled,
       className: classes
-    }), loading && spin, children, rippleElement);
+    }), renderButtonContent());
   }
 
   var Component = as || 'button';
@@ -68,7 +77,7 @@ var Button = /*#__PURE__*/React.forwardRef(function (props, ref) {
     disabled: disabled,
     "aria-disabled": disabled,
     className: classes
-  }), loading && spin, children, rippleElement);
+  }), renderButtonContent());
 });
 Button.displayName = 'Button';
 Button.propTypes = {

package/esm/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/esm/Message/Message.js

@@ -4,10 +4,11 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
-import React, { useState, useCallback } from 'react';
+import React, { useState, useCallback, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { useClassNames, useTimeout, MESSAGE_STATUS_ICONS, STATUS, useIsMounted } from '../utils';
 import CloseButton from '../CloseButton';
+import ToastContext from '../toaster/ToastContext';
 var Message = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _withClassPrefix;
 
@@ -37,9 +38,13 @@ var Message = /*#__PURE__*/React.forwardRef(function (props, ref) {
       merge = _useClassNames.merge,
       prefix = _useClassNames.prefix;
 
-  var isMounted = useIsMounted(); // Timed close message
+  var isMounted = useIsMounted();
 
-  var _useTimeout = useTimeout(onClose, duration, duration > 0),
+  var _useContext = useContext(ToastContext),
+      usedToaster = _useContext.usedToaster; // Timed close message
+
+
+  var _useTimeout = useTimeout(onClose, duration, usedToaster && duration > 0),
       clear = _useTimeout.clear;
 
   var handleClose = useCallback(function (event) {

package/esm/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/esm/Notification/Notification.js

@@ -4,10 +4,11 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 
 var _templateObject, _templateObject2;
 
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { useClassNames, useTimeout, MESSAGE_STATUS_ICONS, useIsMounted } from '../utils';
 import CloseButton from '../CloseButton';
+import ToastContext from '../toaster/ToastContext';
 var Notification = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -32,9 +33,13 @@ var Notification = /*#__PURE__*/React.forwardRef(function (props, ref) {
       merge = _useClassNames.merge,
       prefix = _useClassNames.prefix;
 
-  var isMounted = useIsMounted(); // Timed close message
+  var isMounted = useIsMounted();
 
-  var _useTimeout = useTimeout(onClose, duration, duration > 0),
+  var _useContext = useContext(ToastContext),
+      usedToaster = _useContext.usedToaster; // Timed close message
+
+
+  var _useTimeout = useTimeout(onClose, duration, usedToaster && duration > 0),
       clear = _useTimeout.clear; // Click to trigger to close the message
 
 

package/esm/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/esm/Schema/Schema.js

@@ -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';
 var SchemaTyped = {
   Model: SchemaModel,
   Types: {
@@ -7,7 +7,8 @@ var SchemaTyped = {
     ArrayType: ArrayType,
     DateType: DateType,
     ObjectType: ObjectType,
-    BooleanType: BooleanType
+    BooleanType: BooleanType,
+    MixedType: MixedType
   }
 };
 export default SchemaTyped;

package/esm/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/esm/toaster/ToastContainer.js

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import kebabCase from 'lodash/kebabCase';
 import Transition from '../Animation/Transition';
 import { useClassNames, guid, createChainedFunction, render } from '../utils';
+import ToastContext from './ToastContext';
 export var toastPlacements = ['topCenter', 'bottomCenter', 'topStart', 'topEnd', 'bottomStart', 'bottomEnd'];
 
 var useMessages = function useMessages() {
@@ -19,14 +20,14 @@ var useMessages = function useMessages() {
 
     return key;
   }, [messages]);
-  var push = useCallback(function (message) {
+  var push = useCallback(function (message, options) {
     var key = guid();
     setMessages(function (prevMessages) {
-      return [].concat(prevMessages, [{
+      return [].concat(prevMessages, [_extends({
         key: key,
         visible: true,
         node: message
-      }]);
+      }, options)]);
     });
     return key;
   }, []);
@@ -118,6 +119,7 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
       return /*#__PURE__*/React.cloneElement(item.node, _extends({}, rest, {
         ref: ref,
+        duration: item.duration,
         // Remove the message after the specified time.
         onClose: 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);
@@ -126,13 +128,17 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }));
     });
   });
-  return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(ToastContext.Provider, {
+    value: {
+      usedToaster: true
+    }
+  }, /*#__PURE__*/React.createElement(Component, _extends({}, 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/esm/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/esm/toaster/ToastContext.js

@@ -0,0 +1,6 @@
+import React from 'react';
+var ToastContext = /*#__PURE__*/React.createContext({
+  usedToaster: false
+});
+ToastContext.displayName = 'ToastContext';
+export default ToastContext;

package/esm/toaster/toaster.js

@@ -1,3 +1,4 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import ToastContainer from './ToastContainer';
@@ -58,23 +59,24 @@ 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 = _objectWithoutPropertiesLoose(_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/esm/toaster/useToaster.js

@@ -14,7 +14,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.push(message, options);
+      return customToaster ? customToaster.push(message, options) : toaster.push(message, options);
     },
     remove: function remove(key) {
       toasters ? Array.from(toasters.current).forEach(function (_ref) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.26.1",
+  "version": "5.27.0",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/styles/variables.less

@@ -247,6 +247,9 @@
 // Ghost Button
 @btn-ghost-border-width:    1px;
 
+// Button with icons (not IconButton)
+@btn-icon-gap:              5px;
+
 // Button Loading
 @btn-loading-spin-default-diameter: 18px;
 @btn-loading-spin-xs-diameter:      16px;