rsuite 5.16.0 → 5.16.3

package/esm/TreePicker/TreePicker.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
 import { PickerLocale } from '../locales';
-import { PickerComponent } from '../Picker';
+import { PickerComponent, PickerToggleProps } from '../Picker';
 import { TreeDragProps, TreeBaseProps } from '../Tree/Tree';
 import { FormControlPickerProps, ItemDataType } from '../@types/common';
 export declare const maxTreeHeight = 320;
-export interface TreePickerProps<T = number | string> extends TreeBaseProps<T, ItemDataType>, TreeDragProps, FormControlPickerProps<T, PickerLocale, ItemDataType> {
+export interface TreePickerProps<T = number | string> extends TreeBaseProps<T, ItemDataType>, TreeDragProps, FormControlPickerProps<T, PickerLocale, ItemDataType>, Pick<PickerToggleProps, 'caretAs'> {
     /** The height of Dropdown */
     height?: number;
     /** Tree node cascade */

package/esm/TreePicker/test/TreePicker.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/TreePicker/test/TreePicker.test.js

@@ -0,0 +1,10 @@
+import React from 'react';
+import TreePicker from '../TreePicker';
+
+/*#__PURE__*/
+React.createElement(TreePicker, {
+  caretAs: function caretAs() {
+    return /*#__PURE__*/React.createElement("div", null);
+  },
+  data: []
+});

package/esm/utils/attachParent.d.ts

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

package/esm/utils/attachParent.js

@@ -0,0 +1,10 @@
+export function attachParent(data, parent) {
+  // mark "parent" unenumable
+  Object.defineProperty(data, 'parent', {
+    value: parent,
+    writable: false,
+    enumerable: false,
+    configurable: true
+  });
+  return data;
+}

package/esm/utils/treeUtils.js

@@ -13,6 +13,7 @@ import { TREE_NODE_DROP_POSITION, shallowEqual } from '../utils';
 import { shouldDisplay } from '../Picker';
 import reactToString from './reactToString';
 import { TREE_NODE_PADDING, TREE_NODE_ROOT_PADDING } from './constants';
+import { attachParent } from './attachParent';
 // gap of tree node
 var TREE_NODE_GAP = 4;
 /**
@@ -59,8 +60,7 @@ export function flattenTree(tree, childrenKey, executor) {
 
     data.forEach(function (item, index) {
       var node = typeof executor === 'function' ? executor(item, index) : item;
-      node.parent = parent;
-      flattenData.push(_extends({}, node));
+      flattenData.push(attachParent(node, parent));
 
       if (item[childrenKey]) {
         traverse(item[childrenKey], item);

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

@@ -1,6 +1,25 @@
-import { useRef, useEffect, useCallback } from 'react';
+import _extends from "@babel/runtime/helpers/esm/extends";
+import React, { useRef, useEffect, useState, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import canUseDOM from 'dom-lib/canUseDOM';
+var MountedPortal = /*#__PURE__*/React.memo(function (_ref) {
+  var children = _ref.children,
+      container = _ref.container;
+
+  var _useState = useState(false),
+      mounted = _useState[0],
+      setMounted = _useState[1];
+
+  useEffect(function () {
+    return setMounted(true);
+  }, []);
+
+  if (container && mounted) {
+    return /*#__PURE__*/createPortal(children, container);
+  }
+
+  return null;
+});
 
 function usePortal(props) {
   if (props === void 0) {
@@ -8,25 +27,28 @@ function usePortal(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 = useRef(canUseDOM ? document.body : null);
   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 = useCallback(function (_ref) {
-    var children = _ref.children;
-    if (rootElemRef.current != null) return /*#__PURE__*/createPortal(children, rootElemRef.current);
-    return null;
-  }, [rootElemRef]);
+  }, [rootElemRef, container]);
+  var Portal = useCallback(function (_ref2) {
+    var children = _ref2.children;
+    return rootElemRef.current != null ? /*#__PURE__*/createPortal(children, rootElemRef.current) : null;
+  }, []);
+  var WaitMountPortal = useCallback(function (props) {
+    return /*#__PURE__*/React.createElement(MountedPortal, _extends({
+      container: rootElemRef.current
+    }, props));
+  }, []);
   return {
     target: rootElemRef.current,
-    Portal: Portal
+    Portal: waitMount ? WaitMountPortal : Portal
   };
 }
 

package/package.json

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