rsuite 5.16.1 → 5.17.0-beta

package/cjs/toaster/ToastContainer.d.ts

@@ -7,6 +7,7 @@ export interface ToastContainerProps extends WithAsProps {
     placement?: PlacementType;
     /** Set the message to appear in the specified container */
     container?: HTMLElement | (() => HTMLElement);
+    callback?: (ref: React.RefObject<ToastContainerInstance>) => void;
 }
 export interface ToastContainerInstance {
     root: HTMLElement;
@@ -19,7 +20,7 @@ export interface NodeProps extends WithAsProps {
     onClose?: (event?: React.MouseEvent<HTMLDivElement>) => void;
 }
 interface ToastContainerComponent extends RsRefForwardingComponent<'div', ToastContainerProps> {
-    getInstance: (props: ToastContainerProps) => [React.RefObject<ToastContainerInstance>, () => void];
+    getInstance: (props: ToastContainerProps) => Promise<[React.RefObject<ToastContainerInstance>, () => void]>;
 }
 declare const ToastContainer: ToastContainerComponent;
 export default ToastContainer;

package/cjs/toaster/ToastContainer.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactDom = require("react-dom");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _kebabCase = _interopRequireDefault(require("lodash/kebabCase"));
@@ -40,13 +38,15 @@ var useMessages = function useMessages() {
   }, [messages]);
   var push = (0, _react.useCallback)(function (message) {
     var key = (0, _utils.guid)();
-    setMessages([].concat(messages, [{
-      key: key,
-      visible: true,
-      node: message
-    }]));
+    setMessages(function (prevMessages) {
+      return [].concat(prevMessages, [{
+        key: key,
+        visible: true,
+        node: message
+      }]);
+    });
     return key;
-  }, [messages]);
+  }, []);
   var clear = (0, _react.useCallback)(function () {
     // Set all existing messages to be invisible.
     setMessages(messages.map(function (msg) {
@@ -93,7 +93,8 @@ var ToastContainer = /*#__PURE__*/_react.default.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,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "placement"]);
+      callback = props.callback,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "placement", "callback"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -141,7 +142,10 @@ var ToastContainer = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     });
   });
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
-    ref: rootRef,
+    ref: function ref(selfRef) {
+      rootRef.current = selfRef;
+      callback === null || callback === void 0 ? void 0 : callback(selfRef);
+    },
     className: classes
   }), elements);
 });
@@ -152,22 +156,18 @@ ToastContainer.getInstance = function (props) {
 
   var containerRef = /*#__PURE__*/_react.default.createRef();
 
-  var mountElement = document.createElement('div');
-  var containerElement = typeof container === 'function' ? container() : container; //  Parent is document.body or the existing dom element
-
-  var parentElement = containerElement || document.body; // Add the detached element to the parent
-
-  parentElement.appendChild(mountElement);
-
-  function destroy() {
-    (0, _reactDom.unmountComponentAtNode)(mountElement);
-    parentElement.removeChild(mountElement);
-  }
+  var containerElement = (typeof container === 'function' ? container() : container) || document.body;
+  return new Promise(function (resolve) {
+    var renderCallback = function renderCallback() {
+      resolve([containerRef, unmount]);
+    };
 
-  (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(ToastContainer, (0, _extends2.default)({}, rest, {
-    ref: containerRef
-  })), mountElement);
-  return [containerRef, destroy];
+    var _render = (0, _utils.render)( /*#__PURE__*/_react.default.createElement(ToastContainer, (0, _extends2.default)({}, rest, {
+      ref: containerRef,
+      callback: renderCallback
+    })), containerElement),
+        unmount = _render.unmount;
+  });
 };
 
 ToastContainer.displayName = 'ToastContainer';
@@ -175,7 +175,8 @@ ToastContainer.propTypes = {
   className: _propTypes.default.string,
   classPrefix: _propTypes.default.string,
   placement: _propTypes.default.elementType,
-  container: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func])
+  container: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
+  callback: _propTypes.default.func
 };
 var _default = ToastContainer;
 exports.default = _default;

package/cjs/toaster/toaster.d.ts

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

package/cjs/toaster/toaster.js

@@ -5,6 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _ToastContainer = _interopRequireDefault(require("./ToastContainer"));
 
 var defaultContainerId = 'default';
@@ -15,12 +19,8 @@ var containers = new Map();
  * @param options
  */
 
-function createContainer(containerId, props) {
-  var _ToastContainer$getIn = _ToastContainer.default.getInstance(props),
-      container = _ToastContainer$getIn[0];
-
-  containers.set(containerId || defaultContainerId, container);
-  return container;
+function createContainer(_x, _x2) {
+  return _createContainer.apply(this, arguments);
 }
 /**
  * Get the container by ID. Use default ID when ID is not available.
@@ -28,6 +28,33 @@ function createContainer(containerId, props) {
  */
 
 
+function _createContainer() {
+  _createContainer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(containerId, props) {
+    var _yield$ToastContainer, container;
+
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _ToastContainer.default.getInstance(props);
+
+          case 2:
+            _yield$ToastContainer = _context.sent;
+            container = _yield$ToastContainer[0];
+            containers.set(containerId || defaultContainerId, container);
+            return _context.abrupt("return", container);
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _createContainer.apply(this, arguments);
+}
+
 function getContainer(containerId) {
   if (containers.size == 0) {
     return null;
@@ -41,21 +68,24 @@ var toaster = function toaster(message) {
 };
 
 toaster.push = function (message, options) {
-  var _container$current;
+  var _options;
 
   if (options === void 0) {
     options = {};
   }
 
-  var container = getContainer(options.placement);
-
-  if (!container) {
-    var _options$placement;
+  var containerId = (_options = options) === null || _options === void 0 ? void 0 : _options.placement;
+  var container = getContainer(containerId);
 
-    container = createContainer((_options$placement = options.placement) !== null && _options$placement !== void 0 ? _options$placement : '', options);
+  if (container !== null && container !== void 0 && container.current) {
+    return container.current.push(message);
   }
 
-  return (_container$current = container.current) === null || _container$current === void 0 ? void 0 : _container$current.push(message);
+  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);
+  });
 };
 
 toaster.remove = function (key) {

package/cjs/toaster/useToaster.d.ts

@@ -5,7 +5,7 @@ import { ToastContainerProps } from './ToastContainer';
  * @returns toaster { push, remove, clear }
  */
 declare const useToaster: () => {
-    push: (message: React.ReactNode, options?: ToastContainerProps) => string | undefined;
+    push: (message: React.ReactNode, options?: ToastContainerProps) => string | Promise<string | undefined> | undefined;
     remove: (key: string) => void;
     clear: () => void;
 };

package/cjs/utils/attachParent.d.ts

@@ -0,0 +1 @@
+export declare function attachParent<T>(data: T, parent: T): T;

package/cjs/utils/attachParent.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports.__esModule = true;
+exports.attachParent = attachParent;
+
+function attachParent(data, parent) {
+  // mark "parent" unenumable
+  Object.defineProperty(data, 'parent', {
+    value: parent,
+    writable: false,
+    enumerable: false,
+    configurable: true
+  });
+  return data;
+}

package/cjs/utils/index.d.ts

@@ -23,6 +23,7 @@ export { default as composeFunctions } from './composeFunctions';
 export { default as reactToString } from './reactToString';
 export { default as scrollTopAnimation } from './scrollTopAnimation';
 export { default as appendTooltip } from './appendTooltip';
+export { default as render } from './render';
 /** Hooks **/
 export { default as useClassNames } from './useClassNames';
 export { default as useEventListener } from './useEventListener';

package/cjs/utils/index.js

@@ -25,6 +25,7 @@ var _exportNames = {
   reactToString: true,
   scrollTopAnimation: true,
   appendTooltip: true,
+  render: true,
   useClassNames: true,
   useEventListener: true,
   useElementResize: true,
@@ -48,7 +49,7 @@ var _exportNames = {
   DateUtils: true,
   TypeChecker: true
 };
-exports.TypeChecker = exports.DateUtils = exports.globalKey = exports.getClassNamePrefix = exports.defaultClassPrefix = exports.useMount = exports.useIsMounted = exports.useUpdateEffect = exports.useWillUnmount = exports.useUpdatedRef = exports.useEventCallback = exports.stringToObject = exports.getSafeRegExpString = exports.useRootClose = exports.useControlled = exports.useTimeout = exports.createComponent = exports.usePortal = exports.useCustom = exports.useElementResize = exports.useEventListener = exports.useClassNames = exports.appendTooltip = exports.scrollTopAnimation = exports.reactToString = exports.composeFunctions = exports.shallowEqualArray = exports.shallowEqual = exports.mergeRefs = exports.getDOMNode = exports.placementPolyfill = exports.clone = exports.getDataGroupBy = exports.previewFile = exports.ajaxUpload = exports.tplTransform = exports.ReactChildren = exports.isOneOf = exports.createChainedFunction = exports.prefix = exports.guid = void 0;
+exports.TypeChecker = exports.DateUtils = exports.globalKey = exports.getClassNamePrefix = exports.defaultClassPrefix = exports.useMount = exports.useIsMounted = exports.useUpdateEffect = exports.useWillUnmount = exports.useUpdatedRef = exports.useEventCallback = exports.stringToObject = exports.getSafeRegExpString = exports.useRootClose = exports.useControlled = exports.useTimeout = exports.createComponent = exports.usePortal = exports.useCustom = exports.useElementResize = exports.useEventListener = exports.useClassNames = exports.render = exports.appendTooltip = exports.scrollTopAnimation = exports.reactToString = exports.composeFunctions = exports.shallowEqualArray = exports.shallowEqual = exports.mergeRefs = exports.getDOMNode = exports.placementPolyfill = exports.clone = exports.getDataGroupBy = exports.previewFile = exports.ajaxUpload = exports.tplTransform = exports.ReactChildren = exports.isOneOf = exports.createChainedFunction = exports.prefix = exports.guid = void 0;
 
 var _BrowserDetection = require("./BrowserDetection");
 
@@ -173,6 +174,10 @@ var _appendTooltip = _interopRequireDefault(require("./appendTooltip"));
 
 exports.appendTooltip = _appendTooltip.default;
 
+var _render = _interopRequireDefault(require("./render"));
+
+exports.render = _render.default;
+
 var _useClassNames = _interopRequireDefault(require("./useClassNames"));
 
 exports.useClassNames = _useClassNames.default;

package/cjs/utils/render.d.ts

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

package/cjs/utils/render.js

@@ -0,0 +1,49 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var ReactDOM = _interopRequireWildcard(require("react-dom"));
+
+var majorVersion = parseInt(_react.default.version);
+var SuperposedReactDOM = ReactDOM;
+
+function render(element, container) {
+  var mountElement = document.createElement('div');
+  mountElement.className = 'rs-mount-element';
+  var containerElement = container || document.body; // Add the detached element to the root
+
+  containerElement.appendChild(mountElement);
+
+  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 = containerElement.__root || createRoot(mountElement, {
+      identifierPrefix: 'rs-root-'
+    });
+    root.render(element);
+    containerElement.__root = root;
+    return root;
+  }
+
+  SuperposedReactDOM.render(element, mountElement);
+  return {
+    unmount: function unmount() {
+      SuperposedReactDOM.unmountComponentAtNode(mountElement);
+      containerElement.removeChild(mountElement);
+    }
+  };
+}
+
+var _default = render;
+exports.default = _default;

package/cjs/utils/treeUtils.js

@@ -66,6 +66,8 @@ var _reactToString = _interopRequireDefault(require("./reactToString"));
 
 var _constants = require("./constants");
 
+var _attachParent = require("./attachParent");
+
 // gap of tree node
 var TREE_NODE_GAP = 4;
 /**
@@ -113,8 +115,7 @@ function flattenTree(tree, childrenKey, executor) {
 
     data.forEach(function (item, index) {
       var node = typeof executor === 'function' ? executor(item, index) : item;
-      node.parent = parent;
-      flattenData.push((0, _extends3.default)({}, node));
+      flattenData.push((0, _attachParent.attachParent)(node, parent));
 
       if (item[childrenKey]) {
         traverse(item[childrenKey], item);

package/cjs/utils/usePortal.d.ts

@@ -1,10 +1,12 @@
 import React from 'react';
 interface PortalProps {
-    id?: string;
     container?: HTMLElement | (() => HTMLElement | null) | null;
+    waitMount?: boolean;
 }
 declare function usePortal(props?: PortalProps): {
     target: HTMLElement | null;
-    Portal: React.FC<any>;
+    Portal: ((props: any) => JSX.Element) | (({ children }: {
+        children: React.ReactNode;
+    }) => React.ReactPortal | null);
 };
 export default usePortal;

package/cjs/utils/usePortal.js

@@ -1,41 +1,67 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
 exports.default = void 0;
 
-var _react = require("react");
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _reactDom = require("react-dom");
 
 var _canUseDOM = _interopRequireDefault(require("dom-lib/canUseDOM"));
 
+var MountedPortal = /*#__PURE__*/_react.default.memo(function (_ref) {
+  var children = _ref.children,
+      container = _ref.container;
+
+  var _useState = (0, _react.useState)(false),
+      mounted = _useState[0],
+      setMounted = _useState[1];
+
+  (0, _react.useEffect)(function () {
+    return setMounted(true);
+  }, []);
+
+  if (container && mounted) {
+    return /*#__PURE__*/(0, _reactDom.createPortal)(children, container);
+  }
+
+  return null;
+});
+
 function usePortal(props) {
   if (props === void 0) {
     props = {};
   }
 
   var _props = props,
-      id = _props.id,
-      container = _props.container;
+      container = _props.container,
+      _props$waitMount = _props.waitMount,
+      waitMount = _props$waitMount === void 0 ? false : _props$waitMount;
   var rootElemRef = (0, _react.useRef)(_canUseDOM.default ? document.body : null);
   (0, _react.useEffect)(function () {
-    var containerElement = typeof container === 'function' ? container() : container; // Look for existing target dom element to append to
-
-    var existingParent = id && document.querySelector("#" + id); // Parent is either a new root or the existing dom element
+    var containerElement = typeof container === 'function' ? container() : container; // Parent is either a new root or the existing dom element
 
-    var parentElement = containerElement || existingParent || document.body;
+    var parentElement = containerElement || document.body;
     rootElemRef.current = parentElement;
-  }, [rootElemRef, container, id]);
-  var Portal = (0, _react.useCallback)(function (_ref) {
-    var children = _ref.children;
-    if (rootElemRef.current != null) return /*#__PURE__*/(0, _reactDom.createPortal)(children, rootElemRef.current);
-    return null;
-  }, [rootElemRef]);
+  }, [rootElemRef, container]);
+  var Portal = (0, _react.useCallback)(function (_ref2) {
+    var children = _ref2.children;
+    return rootElemRef.current != null ? /*#__PURE__*/(0, _reactDom.createPortal)(children, rootElemRef.current) : null;
+  }, []);
+  var WaitMountPortal = (0, _react.useCallback)(function (props) {
+    return /*#__PURE__*/_react.default.createElement(MountedPortal, (0, _extends2.default)({
+      container: rootElemRef.current
+    }, props));
+  }, []);
   return {
     target: rootElemRef.current,
-    Portal: Portal
+    Portal: waitMount ? WaitMountPortal : Portal
   };
 }
 

package/cjs/utils/useUniqueId.js

@@ -2,20 +2,28 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 exports.__esModule = true;
 exports.default = useUniqueId;
 
-var _react = require("react");
+var React = _interopRequireWildcard(require("react"));
 
 var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
 
+var reactUseId = React['useId' + ''];
 /**
  * Used for generating unique ID for DOM elements
  *
  * @param idProp If id is provided, it will be used instead of generating a new one
  */
+
 function useUniqueId(prefix, idProp) {
-  var idRef = (0, _react.useRef)();
+  var idRef = React.useRef();
+
+  if (reactUseId !== undefined) {
+    return idProp !== null && idProp !== void 0 ? idProp : "" + prefix + reactUseId();
+  }
 
   if (!idRef.current) {
     idRef.current = (0, _uniqueId.default)(prefix);

package/dist/rsuite-rtl.css

@@ -11656,6 +11656,13 @@ textarea.rs-picker-search-input {
   overflow: hidden;
   -webkit-transition: none;
   transition: none;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
   /* stylelint-disable-next-line */
 }
 .rs-theme-high-contrast .rs-picker-menu {
@@ -13857,6 +13864,7 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
 .rs-slider-handle {
   position: absolute;
   top: -50%;
+  outline: none;
 }
 .rs-slider-handle::before {
   content: '';
@@ -15729,15 +15737,6 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   margin-right: -13px;
   border-right: 1px solid rgba(0, 0, 0, 0.1);
 }
-.rs-picker-menu {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
-}
 .rs-picker-menu.rs-tree-menu {
   padding-top: 12px;
 }