rsuite 5.16.1 → 5.16.2

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/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;
 }