rsuite 5.2.1 → 5.3.0

package/cjs/ButtonGroup/ButtonGroup.js

@@ -15,6 +15,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _utils = require("../utils");
 
+var _ButtonGroupContext = _interopRequireDefault(require("./ButtonGroupContext"));
+
 var ButtonGroup = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -39,11 +41,15 @@ var ButtonGroup = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     vertical: vertical,
     justified: justified
   }));
-  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(_ButtonGroupContext.default.Provider, {
+    value: {
+      size: size
+    }
+  }, /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     role: role,
     ref: ref,
     className: classes
-  }), children);
+  }), children));
 });
 
 ButtonGroup.displayName = 'ButtonGroup';

package/cjs/ButtonGroup/ButtonGroupContext.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { TypeAttributes } from '../@types/common';
+export interface ButtonGroupContextProps {
+    size?: TypeAttributes.Size;
+}
+declare const ButtonGroupContext: React.Context<ButtonGroupContextProps | null>;
+export default ButtonGroupContext;

package/cjs/ButtonGroup/ButtonGroupContext.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var ButtonGroupContext = /*#__PURE__*/_react.default.createContext(null);
+
+var _default = ButtonGroupContext;
+exports.default = _default;

package/cjs/ButtonGroup/index.d.ts

@@ -1,3 +1,5 @@
 import ButtonGroup from './ButtonGroup';
+import ButtonGroupContext from './ButtonGroupContext';
 export type { ButtonGroupProps } from './ButtonGroup';
+export { ButtonGroupContext };
 export default ButtonGroup;

package/cjs/ButtonGroup/index.js

@@ -7,5 +7,8 @@ exports.default = void 0;
 
 var _ButtonGroup = _interopRequireDefault(require("./ButtonGroup"));
 
+var _ButtonGroupContext = _interopRequireDefault(require("./ButtonGroupContext"));
+
+exports.ButtonGroupContext = _ButtonGroupContext.default;
 var _default = _ButtonGroup.default;
 exports.default = _default;

package/cjs/Calendar/Calendar.d.ts

@@ -20,7 +20,7 @@ export interface CalendarProps extends WithAsProps, Omit<HTMLAttributes<HTMLDivE
     /** Hidden seconds */
     disabledSeconds?: (second: number, date: Date) => boolean;
     /** Format str */
-    format?: string;
+    format: string;
     /** Hidden hours */
     hideHours?: (hour: number, date: Date) => boolean;
     /** Hidden minutes */
@@ -28,7 +28,7 @@ export interface CalendarProps extends WithAsProps, Omit<HTMLAttributes<HTMLDivE
     /** Hidden seconds */
     hideSeconds?: (second: number, date: Date) => boolean;
     /** The value that mouse hover on in range selection */
-    hoverRangeValue?: Date[];
+    hoverRangeValue?: [Date, Date];
     /** Is it in the same month as today */
     inSameMonth?: (date: Date) => boolean;
     /** ISO 8601 standard, each calendar week begins on Monday and Sunday on the seventh day */
@@ -36,7 +36,7 @@ export interface CalendarProps extends WithAsProps, Omit<HTMLAttributes<HTMLDivE
     /** Limit showing how many years in the future */
     limitEndYear?: number;
     /** Custom locale */
-    locale?: CalendarLocale;
+    locale: CalendarLocale;
     /** Callback after the date has changed */
     onChangePageDate?: (nextPageDate: Date, event: React.MouseEvent) => void;
     /** Callback after the time has changed */
@@ -48,7 +48,7 @@ export interface CalendarProps extends WithAsProps, Omit<HTMLAttributes<HTMLDivE
     /** Switch to the callback triggered after the next month. */
     onMoveForward?: (nextPageDate: Date) => void;
     /** Callback fired before the date selected */
-    onSelect?: (date: Date, event: React.MouseEvent<HTMLDivElement>) => void;
+    onSelect?: (date: Date, event: React.MouseEvent) => void;
     /** Date displayed on the current page */
     calendarDate: Date;
     /** Custom rendering cell*/

package/cjs/Calendar/Calendar.js

@@ -51,7 +51,8 @@ var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       format = props.format,
       hoverRangeValue = props.hoverRangeValue,
       inSameMonth = props.inSameMonth,
-      isoWeek = props.isoWeek,
+      _props$isoWeek = props.isoWeek,
+      isoWeek = _props$isoWeek === void 0 ? false : _props$isoWeek,
       limitEndYear = props.limitEndYear,
       locale = props.locale,
       onChangePageDate = props.onChangePageDate,
@@ -77,7 +78,9 @@ var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       merge = _useClassNames.merge;
 
   var isDisabledDate = function isDisabledDate(date) {
-    return disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate(date);
+    var _disabledDate;
+
+    return (_disabledDate = disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate(date)) !== null && _disabledDate !== void 0 ? _disabledDate : false;
   };
 
   var isTimeDisabled = function isTimeDisabled(date) {

package/cjs/Calendar/CalendarContext.js

@@ -7,7 +7,7 @@ exports.useCalendarContext = exports.CalendarProvider = exports.default = void 0
 
 var _react = _interopRequireWildcard(require("react"));
 
-var CalendarContext = /*#__PURE__*/_react.default.createContext(null);
+var CalendarContext = /*#__PURE__*/_react.default.createContext({});
 
 var _default = CalendarContext;
 exports.default = _default;

package/cjs/Calendar/TableRow.js

@@ -66,7 +66,7 @@ var TableRow = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         selectedStartDate = _ref[0],
         selectedEndDate = _ref[1];
 
-    var _ref2 = hoverRangeValue || [],
+    var _ref2 = hoverRangeValue !== null && hoverRangeValue !== void 0 ? hoverRangeValue : [],
         hoverStartDate = _ref2[0],
         hoverEndDate = _ref2[1];
 

package/cjs/Calendar/TimeDropdown.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _getPosition2 = _interopRequireDefault(require("dom-lib/getPosition"));
+var _getPosition = _interopRequireDefault(require("dom-lib/getPosition"));
 
 var _scrollTop = _interopRequireDefault(require("dom-lib/scrollTop"));
 
@@ -101,8 +101,8 @@ var scrollTo = function scrollTo(time, row) {
     var node = container === null || container === void 0 ? void 0 : container.querySelector("[data-key=\"" + type + "-" + value + "\"]");
 
     if (node && container) {
-      var _getPosition = (0, _getPosition2.default)(node, container),
-          top = _getPosition.top;
+      var _ref2 = (0, _getPosition.default)(node, container),
+          top = _ref2.top;
 
       (0, _utils.scrollTopAnimation)(container, top, (0, _scrollTop.default)(container) !== 0);
     }
@@ -116,7 +116,8 @@ var TimeDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? 'calendar-time-dropdown' : _props$classPrefix,
       show = props.show,
-      showMeridian = props.showMeridian,
+      _props$showMeridian = props.showMeridian,
+      showMeridian = _props$showMeridian === void 0 ? false : _props$showMeridian,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "show", "showMeridian"]);
 
   var _useCalendarContext = (0, _CalendarContext.useCalendarContext)(),
@@ -188,7 +189,7 @@ var TimeDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
           className: itemClasses,
           tabIndex: -1,
           "data-key": type + "-" + i,
-          onClick: !disabled ? (0, _partial.default)(handleClick, type, i) : null
+          onClick: !disabled ? (0, _partial.default)(handleClick, type, i) : undefined
         }, showMeridian && type === 'hours' && i === 0 ? '12' : i)));
       }
     }

package/cjs/Calendar/types.d.ts

@@ -5,9 +5,9 @@ export interface CalendarInnerContextValue {
     dateRange?: Date[];
     disabledDate?: (date: Date, selectRangeValue?: Date[], type?: string) => boolean;
     format?: string;
-    hoverRangeValue?: Date[];
+    hoverRangeValue?: [Date, Date];
     inSameMonth?: (date: Date) => boolean;
-    isoWeek?: boolean;
+    isoWeek: boolean;
     onChangePageDate?: (nextPageDate: Date, event: React.MouseEvent) => void;
     onChangePageTime?: (nextPageTime: Date, event: React.MouseEvent) => void;
     onMouseMove?: (date: Date) => void;

package/cjs/Calendar/useCalendarDate.d.ts

@@ -1,5 +1,5 @@
-declare const useCalendarDate: (value: Date, defaultDate: Date) => {
+declare const useCalendarDate: (value: Date | undefined, defaultDate: Date | undefined) => {
     calendarDate: Date;
-    setCalendarDate: (date: Date) => void;
+    setCalendarDate: (date: Date | undefined) => void;
 };
 export default useCalendarDate;

package/cjs/Carousel/Carousel.d.ts

@@ -10,9 +10,9 @@ export interface CarouselProps extends WithAsProps {
     /** Button shape */
     shape?: 'dot' | 'bar';
     /** Callback fired when the active item changes */
-    onSelect: (index: number, event: React.ChangeEvent<HTMLInputElement>) => void;
+    onSelect?: (index: number, event: React.ChangeEvent<HTMLInputElement>) => void;
     /** Callback fired when a slide transition starts */
-    onSlideStart?: (index: number, event: React.ChangeEvent<HTMLInputElement>) => void;
+    onSlideStart?: (index: number, event?: React.ChangeEvent<HTMLInputElement>) => void;
     /** Callback fired when a slide transition ends */
     onSlideEnd?: (index: number, event: React.TransitionEvent<HTMLDivElement>) => void;
 }

package/cjs/Carousel/Carousel.js

@@ -75,7 +75,7 @@ var Carousel = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   var handleChange = function handleChange(event) {
     var activeIndex = +event.target.value;
-    handleSlide(activeIndex);
+    handleSlide(activeIndex, event);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(activeIndex, event);
   };
 

package/cjs/Cascader/Cascader.d.ts

@@ -3,7 +3,7 @@ import { PickerLocale } from '../locales';
 import { PickerComponent } from '../Picker';
 import { ItemDataType, FormControlPickerProps } from '../@types/common';
 export declare type ValueType = number | string;
-export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T, PickerLocale, ItemDataType> {
+export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T | null, PickerLocale, ItemDataType> {
     /** Sets the width of the menu */
     menuWidth?: number;
     /** Sets the height of the menu */

package/cjs/Cascader/Cascader.js

@@ -97,10 +97,10 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       flattenData = _useState2[0],
       setFlattenData = _useState2[1];
 
-  var triggerRef = (0, _react.useRef)();
-  var overlayRef = (0, _react.useRef)();
-  var targetRef = (0, _react.useRef)();
-  var searchInputRef = (0, _react.useRef)();
+  var triggerRef = (0, _react.useRef)(null);
+  var overlayRef = (0, _react.useRef)(null);
+  var targetRef = (0, _react.useRef)(null);
+  var searchInputRef = (0, _react.useRef)(null);
 
   var _useControlled = (0, _utils2.useControlled)(valueProp, defaultValue),
       value = _useControlled[0],
@@ -204,12 +204,12 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     setSearchKeyword(value);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(value, event);
 
-    if (items !== null && items !== void 0 && items[0]) {
-      setFocusItemValue(items === null || items === void 0 ? void 0 : items[0]);
+    if (items.length > 0) {
+      setFocusItemValue(items[0][valueKey]);
       setLayer(0);
       setKeys([]);
     }
-  }, [getSearchResult, onSearch, setFocusItemValue, setKeys, setLayer]);
+  }, [getSearchResult, onSearch, setFocusItemValue, setKeys, setLayer, valueKey]);
   var handleEntered = (0, _react.useCallback)(function () {
     onOpen === null || onOpen === void 0 ? void 0 : onOpen();
     setActive(true);
@@ -250,7 +250,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       }
 
       if (!(0, _shallowEqual.default)(value, focusItemValue)) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(focusItemValue, event);
+        onChange === null || onChange === void 0 ? void 0 : onChange(focusItemValue !== null && focusItemValue !== void 0 ? focusItemValue : null, event);
       }
 
       handleClose();
@@ -332,7 +332,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     setValue(nextValue);
     setValueToPaths(nodes);
     enforceUpdate(nextValue);
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, null, event);
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, nodes, event);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
   };
 
@@ -508,7 +508,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     hasValue: hasValue,
     active: active,
     placement: placement,
-    inputValue: value
+    inputValue: value !== null && value !== void 0 ? value : ''
   }), selectedElement || (locale === null || locale === void 0 ? void 0 : locale.placeholder))));
 });
 

package/cjs/Cascader/DropdownMenu.d.ts

@@ -2,16 +2,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ItemDataType, WithAsProps, RsRefForwardingComponent } from '../@types/common';
 import { ValueType } from './Cascader';
-export interface DropdownMenuProps extends WithAsProps {
+export interface DropdownMenuProps extends Omit<WithAsProps, 'classPrefix'> {
+    classPrefix: string;
     disabledItemValues: ValueType[];
-    activeItemValue?: ValueType;
+    activeItemValue?: ValueType | null;
     childrenKey: string;
     cascadeData: ItemDataType[][];
     cascadePaths: ItemDataType[];
     valueKey: string;
     labelKey: string;
-    menuWidth: number;
-    menuHeight: number | string;
+    menuWidth?: number;
+    menuHeight?: number | string;
     renderMenuItem?: (itemLabel: React.ReactNode, item: ItemDataType) => React.ReactNode;
     renderMenu?: (items: ItemDataType[], menu: React.ReactNode, parentNode?: ItemDataType, layer?: number) => React.ReactNode;
     onSelect?: (node: ItemDataType, cascadePaths: ItemDataType[], isLeafNode: boolean, event: React.MouseEvent) => void;

package/cjs/Cascader/utils.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="react" />
 import { CascaderProps } from './Cascader';
 import { ItemDataType } from '../@types/common';
-export declare function getColumnsAndPaths(data: any, value: any, options: any): {
+export declare function getColumnsAndPaths<T extends ItemDataType>(data: T[], value: any, options: any): {
     columns: ItemDataType[][];
-    paths: any[];
+    paths: T[];
 };
 export declare function usePaths(props: CascaderProps): {
-    enforceUpdate: (nextValue: any, isAttachChildren?: boolean) => void;
+    enforceUpdate: (nextValue: any, isAttachChildren?: boolean | undefined) => void;
     columnData: ItemDataType[][];
     valueToPaths: ItemDataType[];
     selectedPaths: ItemDataType[];

package/cjs/CheckPicker/CheckPicker.js

@@ -100,10 +100,10 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onClose = props.onClose,
       onOpen = props.onOpen,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "appearance", "classPrefix", "countable", "data", "disabledItemValues", "valueKey", "labelKey", "searchable", "virtualized", "cleanable", "placement", "menuAutoWidth", "menuMaxHeight", "menuClassName", "menuStyle", "locale", "placeholder", "disabled", "toggleAs", "style", "sticky", "value", "defaultValue", "groupBy", "listProps", "id", "sort", "searchBy", "renderMenuItem", "renderMenuGroup", "renderValue", "renderExtraFooter", "renderMenu", "onGroupTitleClick", "onSearch", "onEnter", "onEntered", "onExited", "onClean", "onChange", "onSelect", "onClose", "onOpen"]);
-  var triggerRef = (0, _react.useRef)();
-  var targetRef = (0, _react.useRef)();
-  var overlayRef = (0, _react.useRef)();
-  var searchInputRef = (0, _react.useRef)();
+  var triggerRef = (0, _react.useRef)(null);
+  var targetRef = (0, _react.useRef)(null);
+  var overlayRef = (0, _react.useRef)(null);
+  var searchInputRef = (0, _react.useRef)(null);
 
   var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
       locale = _useCustom.locale;

package/cjs/CheckTreePicker/CheckTreeNode.d.ts

@@ -4,7 +4,7 @@ import { CheckStateType } from '../utils';
 export interface CheckTreeNodeProps extends WithAsProps {
     rtl?: boolean;
     label?: any;
-    layer?: number;
+    layer: number;
     value?: any;
     focus?: boolean;
     style?: React.CSSProperties;

package/cjs/CheckTreePicker/CheckTreeNode.js

@@ -7,7 +7,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
-var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
@@ -21,11 +21,11 @@ var _Spinner = _interopRequireDefault(require("@rsuite/icons/legacy/Spinner"));
 
 var _DropdownMenuCheckItem = _interopRequireDefault(require("../Picker/DropdownMenuCheckItem"));
 
+var _treeUtils = require("../utils/treeUtils");
+
 var _utils = require("../utils");
 
 var CheckTreeNode = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var _extends2;
-
   var _ref$as = _ref.as,
       Component = _ref$as === void 0 ? 'div' : _ref$as,
       style = _ref.style,
@@ -88,7 +88,7 @@ var CheckTreeNode = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       isChecked = false;
     }
 
-    var nextNodeData = (0, _extends3.default)({}, nodeData, {
+    var nextNodeData = (0, _extends2.default)({}, nodeData, {
       check: isChecked
     });
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextNodeData, event);
@@ -150,11 +150,9 @@ var CheckTreeNode = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     'all-uncheckable': !!allUncheckable,
     'text-muted': disabled,
     focus: focus
-  })); // layer start from 1
-
-  var padding = (layer - 1) * _utils.TREE_NODE_PADDING + _utils.TREE_NODE_ROOT_PADDING;
-  var styles = (0, _extends3.default)({}, style, (_extends2 = {}, _extends2[rtl ? 'paddingRight' : 'paddingLeft'] = padding, _extends2));
-  return visible ? /*#__PURE__*/_react.default.createElement(Component, (0, _extends3.default)({
+  }));
+  var styles = (0, _extends2.default)({}, style, (0, _treeUtils.getTreeNodeIndent)(rtl, layer - 1));
+  return visible ? /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     role: "treeitem",
     "aria-label": label,
     "aria-expanded": expand,

package/cjs/CheckTreePicker/CheckTreePicker.js

@@ -35,14 +35,14 @@ var _CheckTreeNode = _interopRequireDefault(require("./CheckTreeNode"));
 
 var _TreeContext = _interopRequireDefault(require("../Tree/TreeContext"));
 
+var _treeUtils = require("../utils/treeUtils");
+
 var _utils = require("../utils");
 
 var _Picker = require("../Picker");
 
 var _utils2 = require("./utils");
 
-var _treeUtils = require("../utils/treeUtils");
-
 var _TreePicker = require("../TreePicker/TreePicker");
 
 var emptyArray = [];
@@ -62,6 +62,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       searchBy = props.searchBy,
       toggleAs = props.toggleAs,
       searchKeyword = props.searchKeyword,
+      showIndentLine = props.showIndentLine,
       overrideLocale = props.locale,
       _props$cascade = props.cascade,
       cascade = _props$cascade === void 0 ? true : _props$cascade,
@@ -115,17 +116,17 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       renderValue = props.renderValue,
       renderTreeIcon = props.renderTreeIcon,
       renderTreeNode = props.renderTreeNode,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "data", "style", "appearance", "cleanable", "countable", "searchBy", "toggleAs", "searchKeyword", "locale", "cascade", "disabled", "valueKey", "labelKey", "placement", "childrenKey", "placeholder", "value", "defaultValue", "defaultExpandAll", "disabledItemValues", "expandItemValues", "defaultExpandItemValues", "height", "menuStyle", "searchable", "virtualized", "className", "classPrefix", "menuClassName", "menuAutoWidth", "uncheckableItemValues", "id", "listProps", "renderMenu", "getChildren", "renderExtraFooter", "onEntered", "onChange", "onClean", "onClose", "onExited", "onSearch", "onSelect", "onOpen", "onScroll", "onExpand", "renderValue", "renderTreeIcon", "renderTreeNode"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "data", "style", "appearance", "cleanable", "countable", "searchBy", "toggleAs", "searchKeyword", "showIndentLine", "locale", "cascade", "disabled", "valueKey", "labelKey", "placement", "childrenKey", "placeholder", "value", "defaultValue", "defaultExpandAll", "disabledItemValues", "expandItemValues", "defaultExpandItemValues", "height", "menuStyle", "searchable", "virtualized", "className", "classPrefix", "menuClassName", "menuAutoWidth", "uncheckableItemValues", "id", "listProps", "renderMenu", "getChildren", "renderExtraFooter", "onEntered", "onChange", "onClean", "onClose", "onExited", "onSearch", "onSelect", "onOpen", "onScroll", "onExpand", "renderValue", "renderTreeIcon", "renderTreeNode"]);
 
   var _useContext = (0, _react.useContext)(_TreeContext.default),
       inline = _useContext.inline;
 
-  var triggerRef = (0, _react.useRef)();
-  var targetRef = (0, _react.useRef)();
-  var listRef = (0, _react.useRef)();
-  var overlayRef = (0, _react.useRef)();
-  var searchInputRef = (0, _react.useRef)();
-  var treeViewRef = (0, _react.useRef)();
+  var triggerRef = (0, _react.useRef)(null);
+  var targetRef = (0, _react.useRef)(null);
+  var listRef = (0, _react.useRef)(null);
+  var overlayRef = (0, _react.useRef)(null);
+  var searchInputRef = (0, _react.useRef)(null);
+  var treeViewRef = (0, _react.useRef)(null);
 
   var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
       rtl = _useCustom.rtl,
@@ -221,25 +222,21 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
 
 
   var getFormattedNodes = (0, _react.useCallback)(function (render) {
-    var formattedNodes = [];
-
     if (virtualized) {
-      formattedNodes = formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
+      return formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
         cascade: cascade,
         searchKeyword: searchKeywordState
       }).filter(function (item) {
         return item.visible;
       });
-    } else {
-      formattedNodes = (0, _utils2.getFormattedTree)(filteredData, flattenNodes, {
-        childrenKey: childrenKey,
-        cascade: cascade
-      }).map(function (node) {
-        return render === null || render === void 0 ? void 0 : render(node, 1);
-      });
     }
 
-    return formattedNodes;
+    return (0, _utils2.getFormattedTree)(filteredData, flattenNodes, {
+      childrenKey: childrenKey,
+      cascade: cascade
+    }).map(function (node) {
+      return render === null || render === void 0 ? void 0 : render(node, 1);
+    });
   }, [searchKeywordState, expandItemValues, filteredData, flattenNodes, formatVirtualizedTreeData, virtualized, childrenKey, cascade]);
 
   var getTreeNodeProps = function getTreeNodeProps(node, layer) {
@@ -434,10 +431,13 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }
   }, [childrenKey, expandItemValues, getChildren, loadChildren, onExpand, setExpandItemValues, valueKey]);
   (0, _Picker.usePublicMethods)(ref, {
+    rootRef: inline ? treeViewRef : undefined,
     triggerRef: triggerRef,
     overlayRef: overlayRef,
-    targetRef: targetRef
-  }, inline);
+    targetRef: targetRef,
+    listRef: listRef,
+    inline: inline
+  });
   var handleClean = (0, _react.useCallback)(function (event) {
     var target = event.target; // exclude searchBar
 
@@ -486,11 +486,13 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }
   }, [searchKeywordState, checkTreePrefix, expandItemValues, filteredData, focusItemValue, treeNodesRefs, childrenKey, valueKey, disabledItemValues]);
   var handleLeftArrow = (0, _react.useCallback)(function () {
+    if ((0, _isNil2.default)(focusItemValue)) return;
     var focusItem = (0, _treeUtils.getActiveItem)(focusItemValue, flattenNodes, valueKey);
     (0, _treeUtils.leftArrowHandler)({
       focusItem: focusItem,
       expand: expandItemValues.includes(focusItem === null || focusItem === void 0 ? void 0 : focusItem[valueKey]),
       onExpand: handleExpand,
+      childrenKey: childrenKey,
       onFocusItem: function onFocusItem() {
         var _focusItem$parent, _focusItem$parent2;
 
@@ -498,8 +500,9 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         (0, _treeUtils.focusTreeNode)(focusItem === null || focusItem === void 0 ? void 0 : (_focusItem$parent2 = focusItem.parent) === null || _focusItem$parent2 === void 0 ? void 0 : _focusItem$parent2.refKey, treeNodesRefs, "." + checkTreePrefix('node-label'));
       }
     });
-  }, [checkTreePrefix, expandItemValues, flattenNodes, focusItemValue, handleExpand, treeNodesRefs, valueKey]);
+  }, [checkTreePrefix, expandItemValues, flattenNodes, focusItemValue, handleExpand, treeNodesRefs, valueKey, childrenKey]);
   var handleRightArrow = (0, _react.useCallback)(function () {
+    if ((0, _isNil2.default)(focusItemValue)) return;
     var focusItem = (0, _treeUtils.getActiveItem)(focusItemValue, flattenNodes, valueKey);
     (0, _treeUtils.rightArrowHandler)({
       focusItem: focusItem,
@@ -512,6 +515,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     });
   }, [focusItemValue, flattenNodes, valueKey, expandItemValues, childrenKey, handleExpand, handleFocusItem]);
   var selectActiveItem = (0, _react.useCallback)(function (event) {
+    if ((0, _isNil2.default)(focusItemValue)) return;
     var activeItem = (0, _treeUtils.getActiveItem)(focusItemValue, flattenNodes, valueKey);
 
     if (!(0, _utils2.isNodeUncheckable)(activeItem, {
@@ -593,19 +597,22 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         key: node[valueKey]
       }, /*#__PURE__*/_react.default.createElement(_CheckTreeNode.default, (0, _extends2.default)({}, nodeProps, {
         ref: function ref(_ref) {
-          return saveTreeNodeRef(refKey, _ref);
+          return saveTreeNodeRef(_ref, refKey);
         }
       })), /*#__PURE__*/_react.default.createElement("div", {
         className: checkTreePrefix('children')
       }, nodes.map(function (child) {
         return renderNode(child, layer);
+      }), showIndentLine && /*#__PURE__*/_react.default.createElement("span", {
+        className: checkTreePrefix('indent-line'),
+        style: (0, _treeUtils.getTreeNodeIndent)(rtl, layer - 1, true)
       })));
     }
 
     return /*#__PURE__*/_react.default.createElement(_CheckTreeNode.default, (0, _extends2.default)({
       key: node[valueKey],
       ref: function ref(_ref2) {
-        return saveTreeNodeRef(refKey, _ref2);
+        return saveTreeNodeRef(_ref2, refKey);
       }
     }, nodeProps));
   };
@@ -629,7 +636,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         style: style,
         key: key,
         ref: function ref(_ref4) {
-          return saveTreeNodeRef(refKey, _ref4);
+          return saveTreeNodeRef(_ref4, refKey);
         }
       }, nodeProps));
     };
@@ -655,7 +662,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }, style) : {};
     return /*#__PURE__*/_react.default.createElement("div", {
       id: id ? id + "-listbox" : undefined,
-      ref: inline ? (0, _utils.mergeRefs)(treeViewRef, ref) : treeViewRef,
+      ref: treeViewRef,
       role: "tree",
       "aria-multiselectable": true,
       className: classes,

package/cjs/CheckTreePicker/utils.d.ts

@@ -14,6 +14,8 @@ export interface TreeNodeType {
     value?: string | number;
     groupBy?: string;
     children?: TreeNodeType[];
+    hasChildren?: boolean;
+    checkState?: CheckStateType;
 }
 export interface TreeNodesType {
     [key: string]: TreeNodeType;
@@ -38,5 +40,5 @@ export declare function isNodeUncheckable(node: any, props: Partial<CheckTreePic
 export declare function getFormattedTree(data: any[], nodes: TreeNodesType, props: Partial<CheckTreePickerProps>): any[];
 export declare function getDisabledState(nodes: TreeNodesType, node: TreeNodeType, props: Partial<CheckTreePickerProps>): boolean;
 export declare function getCheckTreePickerDefaultValue(value: any[], uncheckableItemValues: any[]): any[];
-export declare function getSelectedItems(nodes: TreeNodesType, value: (string | number)[], valueKey: string): any[];
+export declare function getSelectedItems(nodes: TreeNodesType, value: (string | number)[], valueKey: string): TreeNodeType[];
 export declare function getNodeCheckState({ nodes, node, cascade, childrenKey }: any): CheckStateType;