rsuite 5.75.0 → 5.76.1

package/esm/toaster/toaster.js

@@ -1,16 +1,17 @@
 'use client';
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-var _excluded = ["placement"];
+var _excluded = ["placement", "container"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import ToastContainer from "./ToastContainer.js";
-var defaultContainerId = 'default';
+import ToastContainer, { defaultToasterContainer } from "./ToastContainer.js";
+import { toasterKeyOfContainerElement } from "./render.js";
 var containers = new Map();
 
 /**
- * Create a container by Id.
- * @param containerId
- * @param options
+ * Create a container instance.
+ * @param placement
+ * @param props
  */
 function createContainer(_x, _x2) {
   return _createContainer.apply(this, arguments);
@@ -18,10 +19,11 @@ function createContainer(_x, _x2) {
 /**
  * Get the container by ID. Use default ID when ID is not available.
  * @param containerId
+ * @param placement
  */
 function _createContainer() {
-  _createContainer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(containerId, props) {
-    var _yield$ToastContainer, container;
+  _createContainer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(placement, props) {
+    var _yield$ToastContainer, container, containerId;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -30,9 +32,10 @@ function _createContainer() {
         case 2:
           _yield$ToastContainer = _context.sent;
           container = _yield$ToastContainer[0];
-          containers.set(containerId || defaultContainerId, container);
+          containerId = _yield$ToastContainer[1];
+          containers.set(containerId + "_" + placement, container);
           return _context.abrupt("return", container);
-        case 6:
+        case 7:
         case "end":
           return _context.stop();
       }
@@ -40,11 +43,8 @@ function _createContainer() {
   }));
   return _createContainer.apply(this, arguments);
 }
-function getContainer(containerId) {
-  if (containers.size == 0) {
-    return null;
-  }
-  return containers.get(containerId || defaultContainerId);
+function getContainer(containerId, placement) {
+  return containers.get(containerId + "_" + placement);
 }
 var _toaster = function toaster(message) {
   return _toaster.push(message);
@@ -54,13 +54,24 @@ _toaster.push = function (message, options) {
     options = {};
   }
   var _options = options,
-    containerId = _options.placement,
+    _options$placement = _options.placement,
+    placement = _options$placement === void 0 ? 'topCenter' : _options$placement,
+    container = _options.container,
     restOptions = _objectWithoutPropertiesLoose(_options, _excluded);
-  var container = getContainer(containerId);
-  if (container !== null && container !== void 0 && container.current) {
-    return container.current.push(message, restOptions);
+  var containerElement = (typeof container === 'function' ? container() : container) || defaultToasterContainer;
+  var containerElementId = containerElement[toasterKeyOfContainerElement];
+  if (containerElementId) {
+    var existedContainer = getContainer(containerElementId, placement);
+    if (existedContainer) {
+      var _existedContainer$cur;
+      return (_existedContainer$cur = existedContainer.current) === null || _existedContainer$cur === void 0 ? void 0 : _existedContainer$cur.push(message, restOptions);
+    }
   }
-  return createContainer(containerId !== null && containerId !== void 0 ? containerId : '', options).then(function (ref) {
+  var newOptions = _extends({}, options, {
+    container: containerElement,
+    placement: placement
+  });
+  return createContainer(placement, newOptions).then(function (ref) {
     var _ref$current;
     return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.push(message, restOptions);
   });

package/esm/useToaster/useToaster.js

@@ -13,7 +13,8 @@ import { CustomContext } from "../CustomProvider/CustomProvider.js";
  */
 var useToaster = function useToaster() {
   var _useContext = useContext(CustomContext),
-    toasters = _useContext.toasters;
+    toasters = _useContext.toasters,
+    toastContainer = _useContext.toastContainer;
   return useMemo(function () {
     return {
       /**
@@ -25,9 +26,13 @@ var useToaster = function useToaster() {
        * @returns The key of the toast message.
        */
       push: function push(message, options) {
-        var _toasters$current;
-        var customToaster = toasters === null || toasters === 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, options) : toaster.push(message, options);
+        var container = (typeof (options === null || options === void 0 ? void 0 : options.container) === 'function' ? options === null || options === void 0 ? void 0 : options.container() : options === null || options === void 0 ? void 0 : options.container) || toastContainer;
+        if (container === toastContainer) {
+          var _toasters$current;
+          return toasters === null || toasters === void 0 || (_toasters$current = toasters.current) === null || _toasters$current === void 0 || (_toasters$current = _toasters$current.get((options === null || options === void 0 ? void 0 : options.placement) || 'topCenter')) === null || _toasters$current === void 0 ? void 0 : _toasters$current.push(message, options);
+        } else {
+          return toaster.push(message, options);
+        }
       },
       /**
        * Remove a toast message.
@@ -49,6 +54,6 @@ var useToaster = function useToaster() {
         }) : toaster.clear();
       }
     };
-  }, [toasters]);
+  }, [toastContainer, toasters]);
 };
 export default useToaster;

package/package.json

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

package/styles/index.less

@@ -40,6 +40,7 @@
 @import '../Header/styles/index';
 @import '../FormHelpText/styles/index';
 @import '../IconButton/styles/index';
+@import '../Image/styles/index';
 @import '../Input/styles/index';
 @import '../InputGroup/styles/index';
 @import '../InputNumber/styles/index';