rsuite 5.17.1 → 5.18.0-beta.3

package/cjs/Picker/DropdownMenu.js

@@ -31,7 +31,7 @@ var _getHeight = _interopRequireDefault(require("dom-lib/getHeight"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _VirtualizedList = require("./VirtualizedList");
+var _Windowing = require("../Windowing");
 
 var _shallowEqual = _interopRequireDefault(require("../utils/shallowEqual"));
 
@@ -61,6 +61,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       labelKey = _props$labelKey === void 0 ? 'label' : _props$labelKey,
       virtualized = props.virtualized,
       listProps = props.listProps,
+      virtualizedListRef = props.listRef,
       className = props.className,
       style = props.style,
       focusItemValue = props.focusItemValue,
@@ -74,7 +75,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       renderMenuItem = props.renderMenuItem,
       onGroupTitleClick = props.onGroupTitleClick,
       onSelect = props.onSelect,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "listRef", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -84,10 +85,8 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   var classes = merge(className, withClassPrefix('items', {
     grouped: group
   }));
-  var styles = (0, _extends2.default)({}, style, {
-    maxHeight: maxHeight
-  });
   var menuBodyContainerRef = (0, _react.useRef)(null);
+  var listRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)([]),
       foldedGroupKeys = _useState[0],
@@ -109,8 +108,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value, item, event, checked);
   }, [onSelect]);
 
-  var getRowHeight = function getRowHeight(list, _ref) {
-    var index = _ref.index;
+  var getRowHeight = function getRowHeight(list, index) {
     var item = list[index];
 
     if (group && item[_getDataGroupBy.KEY_GROUP] && index !== 0) {
@@ -148,10 +146,13 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }
   }, [focusItemValue, menuBodyContainerRef, prefix]);
 
-  var renderItem = function renderItem(list, _ref2) {
-    var index = _ref2.index,
-        style = _ref2.style;
-    var item = list[index];
+  var renderItem = function renderItem(_ref) {
+    var _ref$index = _ref.index,
+        index = _ref$index === void 0 ? 0 : _ref$index,
+        style = _ref.style,
+        data = _ref.data,
+        itemData = _ref.item;
+    var item = itemData || data[index];
     var value = item[valueKey];
     var label = item[labelKey];
 
@@ -210,40 +211,45 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       return key === ((_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent[_getDataGroupBy.KEY_GROUP_TITLE]);
     }));
   }) : data;
-  var rowCount = filteredItems.length; // Check whether the height of the data exceeds the height of the container.
+  var rowCount = filteredItems.length;
+  (0, _utils.useMount)(function () {
+    var _listRef$current, _listRef$current$scro;
 
-  var useVirtualized = virtualized && rowCount * rowHeight > maxHeight;
+    var itemIndex = (0, _findIndex.default)(filteredItems, function (item) {
+      return item[valueKey] === (activeItemValues === null || activeItemValues === void 0 ? void 0 : activeItemValues[0]);
+    });
+    (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : (_listRef$current$scro = _listRef$current.scrollToItem) === null || _listRef$current$scro === void 0 ? void 0 : _listRef$current$scro.call(_listRef$current, itemIndex);
+  });
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-    role: !useVirtualized ? 'listbox' : undefined
+    role: "listbox"
   }, rest, {
     className: classes,
     ref: (0, _utils.mergeRefs)(menuBodyContainerRef, ref),
-    style: styles
-  }), useVirtualized ? /*#__PURE__*/_react.default.createElement(_VirtualizedList.AutoSizer, {
+    style: (0, _extends2.default)({}, style, {
+      maxHeight: maxHeight
+    })
+  }), virtualized ? /*#__PURE__*/_react.default.createElement(_Windowing.AutoSizer, {
     defaultHeight: maxHeight,
     style: {
       width: 'auto',
       height: 'auto'
     }
-  }, function (_ref3) {
-    var height = _ref3.height,
-        width = _ref3.width;
-    return /*#__PURE__*/_react.default.createElement(_VirtualizedList.List, (0, _extends2.default)({
-      role: "listbox",
-      containerRole: '',
-      "aria-readonly": undefined,
+  }, function (_ref2) {
+    var height = _ref2.height,
+        width = _ref2.width;
+    return /*#__PURE__*/_react.default.createElement(_Windowing.List, (0, _extends2.default)({
+      as: _Windowing.VariableSizeList,
+      ref: (0, _utils.mergeRefs)(listRef, virtualizedListRef),
       width: width,
       height: height || maxHeight,
-      scrollToIndex: (0, _findIndex.default)(data, function (item) {
-        return item[valueKey] === (activeItemValues === null || activeItemValues === void 0 ? void 0 : activeItemValues[0]);
-      }),
-      rowCount: rowCount,
-      rowHeight: getRowHeight.bind(_this, filteredItems),
-      rowRenderer: renderItem.bind(null, filteredItems)
-    }, listProps));
-  }) : filteredItems.map(function (_item, index) {
-    return renderItem(filteredItems, {
-      index: index
+      itemCount: rowCount,
+      itemData: filteredItems,
+      itemSize: getRowHeight.bind(_this, filteredItems)
+    }, listProps), renderItem);
+  }) : filteredItems.map(function (item, index) {
+    return renderItem({
+      index: index,
+      item: item
     });
   }));
 });

package/cjs/Picker/PickerOverlay.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
-import { OverlayTriggerInstance } from '../Picker';
+import { OverlayTriggerHandle } from '../Picker';
 export interface PickerOverlayProps extends WithAsProps {
     placement?: string;
     autoWidth?: boolean;
     children?: React.ReactNode;
-    target?: React.RefObject<OverlayTriggerInstance>;
+    target?: React.RefObject<OverlayTriggerHandle>;
     onKeyDown?: (event: React.KeyboardEvent) => void;
 }
 declare const PickerOverlay: RsRefForwardingComponent<'div', PickerOverlayProps>;

package/cjs/Picker/PickerToggleTrigger.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { OverlayTriggerInstance, OverlayTriggerProps, OverlayTriggerType } from '../Overlay/OverlayTrigger';
+import { OverlayTriggerHandle, OverlayTriggerProps, OverlayTriggerType } from '../Overlay/OverlayTrigger';
 import { PositionChildProps } from '../Overlay/Position';
 import { TypeAttributes, AnimationEventProps } from '../@types/common';
-export type { OverlayTriggerInstance, PositionChildProps };
+export type { OverlayTriggerHandle, PositionChildProps };
 export interface PickerToggleTriggerProps extends Omit<AnimationEventProps, 'onEntering' | 'onExiting'>, Pick<OverlayTriggerProps, 'speaker'> {
     placement?: TypeAttributes.Placement;
     pickerProps: any;

package/cjs/Picker/index.d.ts

@@ -1,6 +1,6 @@
-import { pickTriggerPropKeys, omitTriggerPropKeys, OverlayTriggerInstance, PositionChildProps } from './PickerToggleTrigger';
+import { pickTriggerPropKeys, omitTriggerPropKeys, OverlayTriggerHandle, PositionChildProps } from './PickerToggleTrigger';
 import { PickerToggleProps } from './PickerToggle';
-import { PickerInstance, PickerComponent } from './types';
+import { PickerHandle, PickerComponent } from './types';
 export { default as DropdownMenu } from './DropdownMenu';
 export { default as DropdownMenuCheckItem } from './DropdownMenuCheckItem';
 export { default as DropdownMenuGroup } from './DropdownMenuGroup';
@@ -11,6 +11,6 @@ export { default as PickerToggleTrigger } from './PickerToggleTrigger';
 export { default as SearchBar } from './SearchBar';
 export { default as SelectedElement } from './SelectedElement';
 export { pickTriggerPropKeys, omitTriggerPropKeys };
-export type { OverlayTriggerInstance, PositionChildProps, PickerInstance, PickerComponent, PickerToggleProps };
+export type { OverlayTriggerHandle, PositionChildProps, PickerHandle, PickerComponent, PickerToggleProps };
 export * from './utils';
 export * from './propTypes';

package/cjs/Picker/types.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="react" />
 import { RsRefForwardingComponent } from '../@types/common';
-export interface PickerInstance {
-    root?: Element;
-    overlay?: Element;
-    target?: HTMLElement;
+import type { ListHandle } from '../Windowing';
+export interface PickerHandle {
+    root: HTMLElement | null;
+    list?: ListHandle;
+    overlay?: HTMLElement | null;
+    target?: HTMLElement | null;
     updatePosition?: () => void;
     open?: () => void;
     close?: () => void;
 }
 export declare type PickerComponent<P> = RsRefForwardingComponent<'div', P & {
-    ref?: React.Ref<PickerInstance>;
+    ref?: React.Ref<PickerHandle>;
 }>;

package/cjs/Picker/utils.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
-import { OverlayTriggerInstance } from './PickerToggleTrigger';
+import { OverlayTriggerHandle } from './PickerToggleTrigger';
 import { TypeAttributes, ItemDataType } from '../@types/common';
-import { ListInstance } from './VirtualizedList';
-interface NodeKeys {
+import type { ListHandle } from '../Windowing';
+export interface NodeKeys {
     valueKey: string;
     childrenKey: string;
 }
 export declare function createConcatChildrenFunction<T = any>(node: any, nodeValue?: any, nodeKeys?: NodeKeys): (data: T[], children: T[]) => T[];
 export declare function shouldDisplay(label: React.ReactNode, searchKeyword: string): boolean;
-interface PickerClassNameProps {
+export interface PickerClassNameProps {
     name?: string;
     classPrefix: string;
     className?: string;
@@ -27,7 +27,7 @@ interface PickerClassNameProps {
  * The className of the assembled Toggle is on the Picker.
  */
 export declare function usePickerClassName(props: PickerClassNameProps): [string, string[]];
-interface EventsProps {
+export interface EventsProps {
     down?: React.KeyboardEventHandler;
     up?: React.KeyboardEventHandler;
     enter?: React.KeyboardEventHandler;
@@ -42,7 +42,7 @@ interface EventsProps {
  * @param events Event callback functions
  */
 export declare function onMenuKeyDown(event: React.KeyboardEvent, events: EventsProps): void;
-interface FocusItemValueProps {
+export interface FocusItemValueProps {
     target: HTMLElement | null | (() => HTMLElement | null);
     data?: any[];
     valueKey?: string;
@@ -65,7 +65,7 @@ export declare const useFocusItemValue: <T>(defaultFocusItemValue: T | null | un
     setKeys: React.Dispatch<React.SetStateAction<any[]>>;
     onKeyDown: (event: any) => void;
 };
-interface ToggleKeyDownEventProps {
+export interface ToggleKeyDownEventProps {
     toggle?: boolean;
     triggerRef: React.RefObject<any>;
     targetRef: React.RefObject<any>;
@@ -86,7 +86,7 @@ interface ToggleKeyDownEventProps {
  * @param props
  */
 export declare const useToggleKeyDownEvent: (props: ToggleKeyDownEventProps) => (event: React.KeyboardEvent) => void;
-interface SearchProps {
+export interface SearchProps {
     labelKey: string;
     data: ItemDataType[];
     searchBy?: (keyword: any, label: any, item: any) => boolean;
@@ -104,16 +104,15 @@ export declare function useSearch(props: SearchProps): {
     checkShouldDisplay: (item: ItemDataType, keyword?: string) => boolean;
     handleSearch: (searchKeyword: string, event: React.SyntheticEvent) => void;
 };
-interface PickerDependentParameters {
-    triggerRef?: React.RefObject<OverlayTriggerInstance>;
+export interface PickerDependentParameters {
+    triggerRef?: React.RefObject<OverlayTriggerHandle>;
     rootRef?: React.RefObject<HTMLElement>;
     overlayRef?: React.RefObject<HTMLElement>;
     targetRef?: React.RefObject<HTMLElement>;
-    listRef?: React.RefObject<ListInstance>;
+    listRef?: React.RefObject<ListHandle>;
     inline?: boolean;
 }
 /**
  * A hook of the exposed method of Picker
  */
 export declare function usePublicMethods(ref: any, parmas: PickerDependentParameters): void;
-export {};

package/cjs/Picker/utils.js

@@ -553,6 +553,10 @@ function usePublicMethods(ref, parmas) {
       get overlay() {
         var _overlayRef$current;
 
+        if (!(overlayRef !== null && overlayRef !== void 0 && overlayRef.current)) {
+          throw new Error('The overlay is not found. Please confirm whether the picker is open.');
+        }
+
         return (_overlayRef$current = overlayRef === null || overlayRef === void 0 ? void 0 : overlayRef.current) !== null && _overlayRef$current !== void 0 ? _overlayRef$current : null;
       },
 

package/cjs/SelectPicker/SelectPicker.d.ts

@@ -1,7 +1,7 @@
 import React, { Ref } from 'react';
 import { PickerLocale } from '../locales';
-import { PickerInstance, PickerToggleProps } from '../Picker';
-import { ListProps } from '../Picker/VirtualizedList';
+import { PickerHandle, PickerToggleProps } from '../Picker';
+import { ListProps } from '../Windowing';
 import { FormControlPickerProps, ItemDataType } from '../@types/common';
 export interface SelectProps<T> {
     /** Set group condition key in data */
@@ -11,8 +11,7 @@ export interface SelectProps<T> {
     /** Whether using virtualized list */
     virtualized?: boolean;
     /**
-     * List-related properties in `react-virtualized`
-     * https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types
+     * Virtualized List Props
      */
     listProps?: Partial<ListProps>;
     /** Custom search rules. */
@@ -50,7 +49,7 @@ export interface SelectPickerProps<T> extends Omit<FormControlPickerProps<T, Pic
 }
 export interface SelectPickerComponent {
     <T>(props: SelectPickerProps<T> & {
-        ref?: Ref<PickerInstance>;
+        ref?: Ref<PickerHandle>;
     }): JSX.Element | null;
     displayName?: string;
     propTypes?: React.WeakValidationMap<SelectPickerProps<any>>;

package/cjs/SelectPicker/SelectPicker.js

@@ -94,6 +94,7 @@ var SelectPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   var targetRef = (0, _react.useRef)(null);
   var overlayRef = (0, _react.useRef)(null);
   var searchInputRef = (0, _react.useRef)(null);
+  var listRef = (0, _react.useRef)(null);
 
   var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
       locale = _useCustom.locale;
@@ -213,7 +214,8 @@ var SelectPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   (0, _Picker.usePublicMethods)(ref, {
     triggerRef: triggerRef,
     overlayRef: overlayRef,
-    targetRef: targetRef
+    targetRef: targetRef,
+    listRef: listRef
   }); // Find active `MenuItem` by `value`
 
   var activeItem = data.find(function (item) {
@@ -264,6 +266,7 @@ var SelectPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     var menu = items.length ? /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenu, {
       id: id ? id + "-listbox" : undefined,
       listProps: listProps,
+      listRef: listRef,
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
       labelKey: labelKey,

package/cjs/Tree/Tree.d.ts

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

package/cjs/TreePicker/TreePicker.js

@@ -25,7 +25,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _VirtualizedList = require("../Picker/VirtualizedList");
+var _Windowing = require("../Windowing");
 
 var _TreeNode = _interopRequireDefault(require("./TreeNode"));
 
@@ -42,6 +42,10 @@ var maxTreeHeight = 320;
 exports.maxTreeHeight = maxTreeHeight;
 var emptyArray = [];
 
+var itemSize = function itemSize() {
+  return 36;
+};
+
 var TreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -597,33 +601,30 @@ var TreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }, nodeProps));
   };
 
-  var renderVirtualListNode = function renderVirtualListNode(nodes) {
-    return function (_ref3) {
-      var key = _ref3.key,
-          index = _ref3.index,
-          style = _ref3.style;
-      var node = nodes[index];
-      var layer = node.layer,
-          visible = node.visible;
-      var expand = (0, _treeUtils.getExpandWhenSearching)(searchKeywordState, expandItemValues.includes(node[valueKey]));
-
-      if (!node.visible) {
-        return null;
-      }
+  var renderVirtualListNode = function renderVirtualListNode(_ref3) {
+    var index = _ref3.index,
+        style = _ref3.style,
+        data = _ref3.data;
+    var node = data[index];
+    var layer = node.layer,
+        visible = node.visible;
+    var expand = (0, _treeUtils.getExpandWhenSearching)(searchKeywordState, expandItemValues.includes(node[valueKey]));
 
-      var nodeProps = (0, _extends2.default)({}, getTreeNodeProps((0, _extends2.default)({}, node, {
-        expand: expand
-      }), layer), {
-        style: style,
-        hasChildren: node.hasChildren
-      });
-      return visible && /*#__PURE__*/_react.default.createElement(_TreeNode.default, (0, _extends2.default)({
-        ref: function ref(_ref4) {
-          return saveTreeNodeRef(_ref4, node.refKey);
-        },
-        key: key
-      }, nodeProps));
-    };
+    if (!node.visible) {
+      return null;
+    }
+
+    var nodeProps = (0, _extends2.default)({}, getTreeNodeProps((0, _extends2.default)({}, node, {
+      expand: expand
+    }), layer), {
+      style: style,
+      hasChildren: node.hasChildren
+    });
+    return visible && /*#__PURE__*/_react.default.createElement(_TreeNode.default, (0, _extends2.default)({
+      ref: function ref(_ref4) {
+        return saveTreeNodeRef(_ref4, node.refKey);
+      }
+    }, nodeProps));
   };
 
   var renderTree = function renderTree() {
@@ -643,7 +644,7 @@ var TreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onKeyDown: inline ? handleTreeKeyDown : undefined
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: treePrefix('nodes')
-    }, virtualized ? /*#__PURE__*/_react.default.createElement(_VirtualizedList.AutoSizer, {
+    }, virtualized ? /*#__PURE__*/_react.default.createElement(_Windowing.AutoSizer, {
       defaultHeight: inline ? height : maxTreeHeight,
       style: {
         width: 'auto',
@@ -652,15 +653,14 @@ var TreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }, function (_ref5) {
       var height = _ref5.height,
           width = _ref5.width;
-      return /*#__PURE__*/_react.default.createElement(_VirtualizedList.List, (0, _extends2.default)({
+      return /*#__PURE__*/_react.default.createElement(_Windowing.List, (0, _extends2.default)({
         ref: listRef,
         width: width,
         height: height,
-        rowHeight: 36,
-        rowCount: formattedNodes.length,
-        rowRenderer: renderVirtualListNode(formattedNodes),
-        scrollToAlignment: "center"
-      }, listProps));
+        itemSize: itemSize,
+        itemCount: formattedNodes.length,
+        itemData: formattedNodes
+      }, listProps), renderVirtualListNode);
     }) : formattedNodes));
   };
 

package/cjs/TreePicker/test/TreePicker.test.js

@@ -12,4 +12,18 @@ _react.default.createElement(_TreePicker.default, {
     return /*#__PURE__*/_react.default.createElement("div", null);
   },
   data: []
+});
+
+/*#__PURE__*/
+_react.default.createElement(_TreePicker.default, {
+  data: [],
+  listProps: {
+    itemSize: 30,
+    onItemsRendered: function onItemsRendered() {
+      console.log('onItemsRendered');
+    },
+    onScroll: function onScroll() {
+      console.log('onScroll');
+    }
+  }
 });

package/cjs/Uploader/UploadTrigger.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { UploaderLocale } from '../locales';
-export interface UploadTriggerProps {
+import { ButtonProps } from '../Button';
+export interface UploadTriggerProps extends ButtonProps {
     as?: React.ElementType;
     name?: string;
     multiple?: boolean;

package/cjs/Uploader/UploadTrigger.js

@@ -7,27 +7,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _Ripple = _interopRequireDefault(require("../Ripple"));
-
 var _utils = require("../utils");
 
-var Button = function Button(props) {
-  return /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({}, props, {
-    type: "button"
-  }));
-};
+var _Button = _interopRequireDefault(require("../Button"));
 
 var UploadTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
-      Component = _props$as === void 0 ? Button : _props$as,
+      Component = _props$as === void 0 ? _Button.default : _props$as,
       name = props.name,
       accept = props.accept,
       multiple = props.multiple,
@@ -138,7 +132,7 @@ var UploadTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     buttonProps.onDrop = handleDrop;
   }
 
-  var trigger = children ? /*#__PURE__*/_react.default.cloneElement(_react.default.Children.only(children), buttonProps) : /*#__PURE__*/_react.default.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload, /*#__PURE__*/_react.default.createElement(_Ripple.default, null));
+  var trigger = children ? /*#__PURE__*/_react.default.cloneElement(_react.default.Children.only(children), buttonProps) : /*#__PURE__*/_react.default.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: rootRef,
     className: classes

package/cjs/Uploader/Uploader.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { UploadTriggerProps } from './UploadTrigger';
 import { WithAsProps } from '../@types/common';
 import { UploaderLocale } from '../locales';
 export interface FileType {
@@ -19,7 +20,7 @@ export interface UploaderInstance {
     root: HTMLElement;
     start: (file?: FileType) => void;
 }
-export interface UploaderProps extends WithAsProps {
+export interface UploaderProps extends WithAsProps, Omit<UploadTriggerProps, 'onChange' | 'onError' | 'onProgress'> {
     /** Uploading URL */
     action: string;
     /** File types that can be accepted. See input accept Attribute */

package/cjs/Uploader/test/Uploader.test.d.ts

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