rsuite 5.76.0 → 5.76.1

package/esm/CustomProvider/CustomProvider.d.ts

@@ -142,9 +142,7 @@ export declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         shortDateFormat: string;
-        shortTimeFormat: string; /**
-         * The prefix of the component CSS class
-         */
+        shortTimeFormat: string;
         dateLocale: any;
     } | undefined;
     Calendar?: {
@@ -165,9 +163,7 @@ export declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         shortDateFormat: string;
-        shortTimeFormat: string; /**
-         * The prefix of the component CSS class
-         */
+        shortTimeFormat: string;
         dateLocale: any;
     } | undefined;
     DatePicker?: {
@@ -188,9 +184,7 @@ export declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         shortDateFormat: string;
-        shortTimeFormat: string; /**
-         * The prefix of the component CSS class
-         */
+        shortTimeFormat: string;
         dateLocale: any;
     } | undefined;
     DateRangePicker?: {
@@ -212,14 +206,14 @@ export declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         shortDateFormat: string;
-        shortTimeFormat: string; /**
-         * The prefix of the component CSS class
-         */
+        shortTimeFormat: string;
         dateLocale: any;
     } | undefined;
     Combobox?: {
         noResultsText: string;
-        placeholder: string;
+        placeholder: string; /**
+         * The locale object that contains the language and formatting rules for the date.
+         */
         searchPlaceholder: string;
         checkAll: string;
     } | undefined;
@@ -227,7 +221,9 @@ export declare const CustomContext: React.Context<CustomProviderProps<{
         newItem: string;
         createOption: string;
         noResultsText: string;
-        placeholder: string;
+        placeholder: string; /**
+         * The locale object that contains the language and formatting rules for the date.
+         */
         searchPlaceholder: string;
         checkAll: string;
     } | undefined;
@@ -235,7 +231,9 @@ export declare const CustomContext: React.Context<CustomProviderProps<{
         newItem: string;
         createOption: string;
         noResultsText: string;
-        placeholder: string;
+        placeholder: string; /**
+         * The locale object that contains the language and formatting rules for the date.
+         */
         searchPlaceholder: string;
         checkAll: string;
     } | undefined;

package/esm/CustomProvider/CustomProvider.js

@@ -7,7 +7,7 @@ import IconProvider from '@rsuite/icons/IconProvider';
 import { usePortal, useIsomorphicLayoutEffect } from "../internals/hooks/index.js";
 import { getClassNamePrefix, prefix } from "../internals/utils/prefix.js";
 import { addClass, removeClass, canUseDOM } from "../DOMHelper/index.js";
-import ToastContainer, { toastPlacements } from "../toaster/ToastContainer.js";
+import ToastContainer, { toastPlacements, defaultToasterContainer } from "../toaster/ToastContainer.js";
 export var CustomContext = /*#__PURE__*/React.createContext({});
 var themes = ['light', 'dark', 'high-contrast'];
 
@@ -24,14 +24,15 @@ export default function CustomProvider(props) {
     _props$iconClassPrefi = props.iconClassPrefix,
     iconClassPrefix = _props$iconClassPrefi === void 0 ? classPrefix : _props$iconClassPrefi,
     theme = props.theme,
-    container = props.toastContainer,
+    _props$toastContainer = props.toastContainer,
+    toastContainer = _props$toastContainer === void 0 ? defaultToasterContainer : _props$toastContainer,
     disableRipple = props.disableRipple,
     csp = props.csp,
     disableInlineStyles = props.disableInlineStyles,
     rest = _objectWithoutPropertiesLoose(props, _excluded);
   var toasters = useRef(new Map());
   var _usePortal = usePortal({
-      container: container,
+      container: toastContainer,
       waitMount: true
     }),
     Portal = _usePortal.Portal;
@@ -41,9 +42,10 @@ export default function CustomProvider(props) {
       theme: theme,
       toasters: toasters,
       disableRipple: disableRipple,
-      components: components
+      components: components,
+      toastContainer: toastContainer
     }, rest);
-  }, [classPrefix, theme, disableRipple, components, rest]);
+  }, [classPrefix, theme, disableRipple, components, toastContainer, rest]);
   var iconContext = useMemo(function () {
     return {
       classPrefix: iconClassPrefix,

package/esm/internals/utils/index.d.ts

@@ -13,7 +13,6 @@ export { placementPolyfill } from './placementPolyfill';
 export { mergeRefs } from './mergeRefs';
 export { shallowEqual, shallowEqualArray } from './shallowEqual';
 export { composeFunctions } from './composeFunctions';
-export { render } from './render';
 export { safeSetSelection } from './safeSetSelection';
 export { getStringLength } from './getStringLength';
 export { getDataGroupBy } from './getDataGroupBy';

package/esm/internals/utils/index.js

@@ -14,7 +14,6 @@ export { placementPolyfill } from "./placementPolyfill.js";
 export { mergeRefs } from "./mergeRefs.js";
 export { shallowEqual, shallowEqualArray } from "./shallowEqual.js";
 export { composeFunctions } from "./composeFunctions.js";
-export { render } from "./render.js";
 export { safeSetSelection } from "./safeSetSelection.js";
 export { getStringLength } from "./getStringLength.js";
 export { getDataGroupBy } from "./getDataGroupBy.js";

package/esm/toaster/ToastContainer.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { WithAsProps, RsRefForwardingComponent } from '../internals/types';
+export declare const defaultToasterContainer: HTMLElement;
 export type PlacementType = 'topCenter' | 'bottomCenter' | 'topStart' | 'topEnd' | 'bottomStart' | 'bottomEnd';
 export declare const toastPlacements: PlacementType[];
 export interface ToastContainerProps extends WithAsProps {
@@ -21,10 +22,6 @@ export interface ToastContainerProps extends WithAsProps {
      * Reset the hide timer if the mouse moves over the message.
      */
     mouseReset?: boolean;
-    /**
-     * Callback fired when the component mounts
-     */
-    callback?: (ref: React.RefObject<ToastContainerInstance>) => void;
 }
 interface PushOptions {
     duration?: number;
@@ -32,7 +29,6 @@ interface PushOptions {
     container?: HTMLElement | (() => HTMLElement);
 }
 export interface ToastContainerInstance {
-    root: HTMLElement;
     push: (message: React.ReactNode, options?: PushOptions) => string;
     remove: (key: string) => void;
     clear: () => void;
@@ -41,8 +37,12 @@ export interface ToastContainerInstance {
 export interface NodeProps extends WithAsProps {
     onClose?: (event?: React.MouseEvent<HTMLDivElement>) => void;
 }
+export type GetInstancePropsType = Omit<ToastContainerProps, 'container' | 'placement'> & {
+    container: HTMLElement;
+    placement: PlacementType;
+};
 interface ToastContainerComponent extends RsRefForwardingComponent<'div', ToastContainerProps> {
-    getInstance: (props: ToastContainerProps) => Promise<[React.RefObject<ToastContainerInstance>, () => void]>;
+    getInstance: (props: GetInstancePropsType) => Promise<[React.RefObject<ToastContainerInstance>, string]>;
 }
 declare const ToastContainer: ToastContainerComponent;
 export default ToastContainer;

package/esm/toaster/ToastContainer.js

@@ -1,17 +1,20 @@
 'use client';
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-var _excluded = ["as", "className", "classPrefix", "placement", "callback"],
+var _excluded = ["as", "className", "classPrefix", "placement"],
   _excluded2 = ["className"],
   _excluded3 = ["container"];
-import React, { useState, useImperativeHandle, useRef, useCallback } from 'react';
-import { createPortal } from 'react-dom';
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useState, useImperativeHandle, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import kebabCase from 'lodash/kebabCase';
 import Transition from "../Animation/Transition.js";
 import { useClassNames } from "../internals/hooks/index.js";
-import { guid, createChainedFunction, render } from "../internals/utils/index.js";
+import { guid, createChainedFunction } from "../internals/utils/index.js";
 import ToastContext from "./ToastContext.js";
+import { render } from "./render.js";
+export var defaultToasterContainer = document.body;
 export var toastPlacements = ['topCenter', 'bottomCenter', 'topStart', 'topEnd', 'bottomStart', 'bottomEnd'];
 var useMessages = function useMessages() {
   var _useState = useState([]),
@@ -80,7 +83,6 @@ var useMessages = function useMessages() {
   };
 };
 var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var rootRef = useRef();
   var _props$as = props.as,
     Component = _props$as === void 0 ? 'div' : _props$as,
     className = props.className,
@@ -88,7 +90,6 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     classPrefix = _props$classPrefix === void 0 ? 'toast-container' : _props$classPrefix,
     _props$placement = props.placement,
     placement = _props$placement === void 0 ? 'topCenter' : _props$placement,
-    callback = props.callback,
     rest = _objectWithoutPropertiesLoose(props, _excluded);
   var _useClassNames = useClassNames(classPrefix),
     withClassPrefix = _useClassNames.withClassPrefix,
@@ -102,7 +103,6 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     messages = _useMessages.messages;
   useImperativeHandle(ref, function () {
     return {
-      root: rootRef.current,
       push: push,
       clear: clear,
       remove: remove
@@ -111,9 +111,15 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var elements = messages.map(function (item) {
     var mouseReset = item.mouseReset,
       duration = item.duration,
-      node = item.node,
-      container = item.container;
-    var toastWithTransition = /*#__PURE__*/React.createElement(Transition, {
+      node = item.node;
+    return /*#__PURE__*/React.createElement(ToastContext.Provider, {
+      value: {
+        usedToaster: true,
+        mouseReset: mouseReset,
+        duration: duration
+      },
+      key: item.key
+    }, /*#__PURE__*/React.createElement(Transition, {
       in: item.visible,
       exitedClassName: rootPrefix('toast-fade-exited'),
       exitingClassName: rootPrefix('toast-fade-exiting'),
@@ -132,40 +138,44 @@ var ToastContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }),
         className: merge(rootPrefix('toast'), (_node$props2 = node.props) === null || _node$props2 === void 0 ? void 0 : _node$props2.className, transitionClassName)
       }));
-    });
-    return /*#__PURE__*/React.createElement(ToastContext.Provider, {
-      value: {
-        usedToaster: true,
-        mouseReset: mouseReset,
-        duration: duration
-      },
-      key: item.key
-    }, container ? /*#__PURE__*/createPortal(toastWithTransition, typeof container === 'function' ? container() : container) : toastWithTransition);
+    }));
   });
   return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
-    ref: function ref(selfRef) {
-      rootRef.current = selfRef;
-      callback === null || callback === void 0 || callback(selfRef);
-    },
     className: classes
   }), elements);
 });
-ToastContainer.getInstance = function (props) {
-  var container = props.container,
-    rest = _objectWithoutPropertiesLoose(props, _excluded3);
-  var containerRef = /*#__PURE__*/React.createRef();
-  var containerElement = (typeof container === 'function' ? container() : container) || document.body;
-  return new Promise(function (resolve) {
-    var renderCallback = function renderCallback() {
-      resolve([containerRef, unmount]);
-    };
-    var _render = render(/*#__PURE__*/React.createElement(ToastContainer, _extends({}, rest, {
-        ref: containerRef,
-        callback: renderCallback
-      })), containerElement),
-      unmount = _render.unmount;
-  });
-};
+ToastContainer.getInstance = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(props) {
+    var container, rest, getRefResolve, getRefPromise, containerRef, containerId;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          container = props.container, rest = _objectWithoutPropertiesLoose(props, _excluded3);
+          getRefResolve = null;
+          getRefPromise = new Promise(function (res) {
+            getRefResolve = res;
+          });
+          containerRef = /*#__PURE__*/React.createRef(); // promise containerId & containerRef all have value
+          containerId = render(/*#__PURE__*/React.createElement(ToastContainer, _extends({}, rest, {
+            ref: function ref(_ref3) {
+              containerRef.current = _ref3;
+              getRefResolve && getRefResolve();
+            }
+          })), container);
+          _context.next = 7;
+          return getRefPromise;
+        case 7:
+          return _context.abrupt("return", [containerRef, containerId]);
+        case 8:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function (_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 ToastContainer.displayName = 'ToastContainer';
 ToastContainer.propTypes = {
   className: PropTypes.string,

package/esm/toaster/render.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const toasterKeyOfContainerElement = "toasterId";
+export declare function render(element: React.ReactElement<any>, container: HTMLElement): string;

package/esm/toaster/render.js

@@ -0,0 +1,35 @@
+'use client';
+import React from 'react';
+import { guid } from "../internals/utils/index.js";
+import * as ReactDOM from 'react-dom';
+var majorVersion = parseInt(React.version);
+var SuperposedReactDOM = ReactDOM;
+export var toasterKeyOfContainerElement = 'toasterId';
+export function render(element, container) {
+  var mountElement = document.createElement('div');
+  mountElement.className = 'rs-toaster-mount-element';
+  var containerElement = container;
+
+  // Add the detached element to the root
+  containerElement.appendChild(mountElement);
+  var newContainerId = guid();
+  if (!containerElement[toasterKeyOfContainerElement]) {
+    // attach the containerId to the containerElement
+    containerElement[toasterKeyOfContainerElement] = newContainerId;
+  }
+  if (majorVersion >= 18) {
+    /**
+     * ignore react 18 warnings
+     * Warning: You are importing createRoot from "react-dom" which is not supported. You should instead import it from "react-dom/client".
+     */
+    ReactDOM['__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED'].usingClientEntryPoint = true;
+    var createRoot = SuperposedReactDOM.createRoot;
+    var root = createRoot(mountElement, {
+      identifierPrefix: 'rs-root-'
+    });
+    root.render(element);
+  } else {
+    SuperposedReactDOM.render(element, mountElement);
+  }
+  return containerElement[toasterKeyOfContainerElement];
+}

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.76.0",
+  "version": "5.76.1",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",