rsuite 5.16.1 → 5.16.4

package/esm/Picker/PickerToggle.d.ts

@@ -15,7 +15,7 @@ export interface PickerToggleProps extends ToggleButtonProps {
     readOnly?: boolean;
     plaintext?: boolean;
     tabIndex?: number;
-    input?: boolean;
+    editable?: boolean;
     inputPlaceholder?: string;
     inputMask?: (string | RegExp)[];
     onInputChange?: (value: string, event: React.ChangeEvent) => void;

package/esm/Picker/PickerToggle.js

@@ -29,12 +29,12 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       readOnly = props.readOnly,
       plaintext = props.plaintext,
       hasValue = props.hasValue,
+      editable = props.editable,
       cleanableProp = props.cleanable,
       _props$tabIndex = props.tabIndex,
-      tabIndex = _props$tabIndex === void 0 ? 0 : _props$tabIndex,
+      tabIndexProp = _props$tabIndex === void 0 ? editable ? -1 : 0 : _props$tabIndex,
       id = props.id,
       value = props.value,
-      input = props.input,
       inputPlaceholder = props.inputPlaceholder,
       inputValueProp = props.inputValue,
       _props$inputMask = props.inputMask,
@@ -52,9 +52,10 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
       label = props.label,
-      rest = _objectWithoutPropertiesLoose(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "cleanable", "tabIndex", "id", "value", "input", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
+      rest = _objectWithoutPropertiesLoose(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "editable", "cleanable", "tabIndex", "id", "value", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
 
   var inputRef = useRef(null);
+  var comboboxRef = useRef(null);
 
   var _useState = useState(false),
       activeState = _useState[0],
@@ -74,30 +75,46 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setInputValue = _useState2[1];
 
   useEffect(function () {
-    var value = getInputValue();
-    setInputValue(value);
+    if (comboboxRef.current) {
+      var _value = getInputValue();
+
+      setInputValue(_value);
+    }
   }, [getInputValue]);
   var classes = merge(className, withClassPrefix({
     active: activeProp || activeState
   }));
   var handleFocus = useCallback(function (event) {
     setActive(true);
-    onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
 
-    if (input) {
-      var _inputRef$current;
+    if (editable) {
+      // Avoid firing the onFocus event twice when DatePicker and DateRangePicker allow keyboard input.
+      if (event.target === inputRef.current) {
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+      } // Force the input to be focused and editable.
 
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+
+      if (document.activeElement === comboboxRef.current) {
+        var _inputRef$current;
+
+        (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+      }
+    } else {
+      onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
     }
-  }, [input, onFocus]);
+  }, [editable, onFocus]);
   var handleBlur = useCallback(function (event) {
-    if (inputRef.current && document.activeElement !== inputRef.current) {
+    if (inputRef.current && !editable) {
+      setActive(false);
+    } // When activeElement is an input, it remains active.
+
+
+    if (editable && inputRef.current && document.activeElement !== inputRef.current) {
       setActive(false);
-      inputRef.current.blur();
     }
 
     onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
-  }, [onBlur]);
+  }, [editable, onBlur]);
 
   var handleInputBlur = function handleInputBlur(event) {
     setInputValue(getInputValue());
@@ -105,10 +122,13 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
 
   var handleClean = useCallback(function (event) {
+    var _inputRef$current2, _comboboxRef$current;
+
     event.stopPropagation();
-    onClean === null || onClean === void 0 ? void 0 : onClean(event);
-    setActive(false);
-  }, [onClean]);
+    onClean === null || onClean === void 0 ? void 0 : onClean(event); // When the value is cleared, the current component is still in focus.
+
+    editable ? (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus() : (_comboboxRef$current = comboboxRef.current) === null || _comboboxRef$current === void 0 ? void 0 : _comboboxRef$current.focus();
+  }, [editable, onClean]);
   var handleInputChange = useCallback(function (event) {
     var _event$target;
 
@@ -117,10 +137,18 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(value, event);
   }, [onInputChange]);
   var handleInputKeyDown = useCallback(function (event) {
-    if (input && event.key === KEY_VALUES.ENTER) {
+    if (editable && event.key === KEY_VALUES.ENTER) {
       onInputPressEnter === null || onInputPressEnter === void 0 ? void 0 : onInputPressEnter(event);
     }
-  }, [onInputPressEnter, input]);
+  }, [onInputPressEnter, editable]);
+  var renderInput = useCallback(function (ref, props) {
+    return /*#__PURE__*/React.createElement("input", _extends({
+      ref: mergeRefs(inputRef, ref),
+      style: {
+        pointerEvents: editable ? undefined : 'none'
+      }
+    }, props));
+  }, [editable]);
   var ToggleCaret = useToggleCaret(placement);
   var Caret = caretAs !== null && caretAs !== void 0 ? caretAs : ToggleCaret;
 
@@ -133,7 +161,8 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var showCleanButton = cleanableProp && hasValue && !readOnly; // When the component is read-only or disabled, the input is not interactive.
 
-  var inputFocused = readOnly || disabled ? false : input && activeState;
+  var inputFocused = readOnly || disabled ? false : editable && activeState;
+  var tabIndex = disabled ? undefined : tabIndexProp;
   return /*#__PURE__*/React.createElement(Component, _extends({
     role: "combobox",
     "aria-haspopup": "listbox",
@@ -141,9 +170,9 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     "aria-disabled": disabled,
     "aria-owns": id ? id + "-listbox" : undefined
   }, rest, {
-    ref: ref,
+    ref: mergeRefs(comboboxRef, ref),
     disabled: disabled,
-    tabIndex: disabled ? undefined : tabIndex,
+    tabIndex: tabIndex,
     className: classes,
     onFocus: !disabled ? handleFocus : null // The debounce is set to 200 to solve the flicker caused by the switch between input and div.
     ,
@@ -160,16 +189,12 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     readOnly: !inputFocused,
     disabled: disabled,
     "aria-controls": id ? id + "-listbox" : undefined,
-    tabIndex: -1,
+    tabIndex: editable ? 0 : -1,
     className: prefix('textbox', {
       'read-only': !inputFocused
     }),
     placeholder: inputPlaceholder,
-    render: function render(ref, props) {
-      return /*#__PURE__*/React.createElement("input", _extends({
-        ref: mergeRefs(inputRef, ref)
-      }, props));
-    }
+    render: renderInput
   }), children ? /*#__PURE__*/React.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined

package/esm/SelectPicker/SelectPicker.d.ts

@@ -1,8 +1,8 @@
 import React, { Ref } from 'react';
 import { PickerLocale } from '../locales';
 import { PickerInstance, PickerToggleProps } from '../Picker';
+import { ListProps } from '../Picker/VirtualizedList';
 import { FormControlPickerProps, ItemDataType } from '../@types/common';
-import { ListProps } from 'react-virtualized/dist/commonjs/List';
 export interface SelectProps<T> {
     /** Set group condition key in data */
     groupBy?: string;
@@ -14,7 +14,7 @@ export interface SelectProps<T> {
      * List-related properties in `react-virtualized`
      * https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types
      */
-    listProps?: ListProps;
+    listProps?: Partial<ListProps>;
     /** Custom search rules. */
     searchBy?: (keyword: string, label: React.ReactNode, item: ItemDataType) => boolean;
     /** Sort options */
@@ -40,7 +40,13 @@ export interface MultipleSelectProps<T> extends Omit<SelectProps<T>, 'renderValu
     /** Custom render selected items */
     renderValue?: (value: T[], item: ItemDataType<T>[], selectedElement: React.ReactNode) => React.ReactNode;
 }
-export interface SelectPickerProps<T> extends FormControlPickerProps<T, PickerLocale, ItemDataType<T>>, SelectProps<T>, Pick<PickerToggleProps, 'label'> {
+export interface SelectPickerProps<T> extends Omit<FormControlPickerProps<T, PickerLocale, ItemDataType<T>>, 'value' | 'defaultValue' | 'onChange'>, SelectProps<T>, Pick<PickerToggleProps, 'caretAs' | 'label'> {
+    /** Initial value */
+    defaultValue?: T;
+    /** Current value of the component. Creates a controlled component */
+    value?: T | null;
+    /** Called after the value has been changed */
+    onChange?: (value: T | null, event: React.SyntheticEvent) => void;
 }
 export interface SelectPickerComponent {
     <T>(props: SelectPickerProps<T> & {

package/esm/SelectPicker/test/SelectPicker.test.js

@@ -62,4 +62,36 @@ React.createElement(SelectPicker, {
 React.createElement(SelectPicker, {
   label: "User",
   data: []
+});
+
+/*#__PURE__*/
+React.createElement(SelectPicker, {
+  data: [{
+    label: 'Ascending',
+    value: 'asc'
+  }, {
+    label: 'Descending',
+    value: 'desc'
+  }],
+  value: "asc",
+  onChange: function onChange(value) {
+    expectType(value);
+  }
+});
+
+/*#__PURE__*/
+React.createElement(SelectPicker, {
+  caretAs: function caretAs() {
+    return /*#__PURE__*/React.createElement("div", null);
+  },
+  data: []
+}); // Override the default value of listProps.
+
+/*#__PURE__*/
+React.createElement(SelectPicker, {
+  data: [],
+  virtualized: true,
+  listProps: {
+    rowHeight: 70
+  }
 });

package/esm/Tree/Tree.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { StandardProps, ItemDataType, RsRefForwardingComponent } from '../@types/common';
-import { ListProps } from 'react-virtualized/dist/commonjs/List';
+import { ListProps } from '../Picker/VirtualizedList';
 /**
  * Tree Node Drag Type
  */
@@ -50,7 +50,7 @@ export interface TreeBaseProps<ValueType = string | number, ItemDataType = Recor
      * List-related properties in `react-virtualized`
      * https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types
      */
-    listProps?: ListProps;
+    listProps?: Partial<ListProps>;
     /** Expand all nodes By default */
     defaultExpandAll?: boolean;
     /** searchKeyword (Controlled) */

package/esm/Tree/test/Tree.test.d.ts

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

package/esm/Tree/test/Tree.test.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import Tree from '../Tree'; // Override the default value of listProps.
+
+/*#__PURE__*/
+React.createElement(Tree, {
+  data: [],
+  virtualized: true,
+  listProps: {
+    rowHeight: 70
+  }
+});

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