rsuite 5.78.0 → 5.78.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,7 +11,7 @@ export interface UploadTriggerProps extends ButtonProps {
11
11
  accept?: string;
12
12
  classPrefix?: string;
13
13
  className?: string;
14
- children?: React.ReactNode;
14
+ children?: React.ReactElement;
15
15
  locale?: UploaderLocale;
16
16
  onChange?: React.ChangeEventHandler<HTMLInputElement>;
17
17
  onDragEnter?: React.DragEventHandler<HTMLInputElement>;
@@ -8,6 +8,7 @@ import Button from "../Button/index.js";
8
8
  import { useClassNames } from "../internals/hooks/index.js";
9
9
  import { isIE11 } from "../internals/utils/index.js";
10
10
  var UploadTrigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
11
+ var _children$props;
11
12
  var _props$as = props.as,
12
13
  Component = _props$as === void 0 ? Button : _props$as,
13
14
  name = props.name,
@@ -96,18 +97,21 @@ var UploadTrigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
96
97
  clearInput: handleClearInput
97
98
  };
98
99
  });
100
+
101
+ // Prepare button props with event handlers conditionally applied
99
102
  var buttonProps = _extends({}, rest, {
100
103
  disabled: disabled,
101
104
  className: prefix('btn')
105
+ }, !disabled && !readOnly && {
106
+ onClick: handleClick,
107
+ onDragEnter: handleDragEnter,
108
+ onDragLeave: handleDragLeave,
109
+ onDragOver: handleDragOver,
110
+ onDrop: handleDrop
102
111
  });
103
- if (!disabled && !readOnly) {
104
- buttonProps.onClick = handleClick;
105
- buttonProps.onDragEnter = handleDragEnter;
106
- buttonProps.onDragLeave = handleDragLeave;
107
- buttonProps.onDragOver = handleDragOver;
108
- buttonProps.onDrop = handleDrop;
109
- }
110
- var trigger = children ? (/*#__PURE__*/React.cloneElement(React.Children.only(children), buttonProps)) : /*#__PURE__*/React.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload);
112
+ var trigger = children ? (/*#__PURE__*/React.cloneElement(React.Children.only(children), _extends({}, buttonProps, {
113
+ className: merge((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.className, prefix('btn'))
114
+ }))) : /*#__PURE__*/React.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload);
111
115
  return /*#__PURE__*/React.createElement("div", {
112
116
  ref: rootRef,
113
117
  className: classes
@@ -133,7 +137,7 @@ UploadTrigger.propTypes = {
133
137
  onChange: PropTypes.func,
134
138
  classPrefix: PropTypes.string,
135
139
  className: PropTypes.string,
136
- children: PropTypes.node,
140
+ children: PropTypes.element,
137
141
  draggable: PropTypes.bool,
138
142
  onDragEnter: PropTypes.func,
139
143
  onDragLeave: PropTypes.func,
@@ -29,7 +29,7 @@ export interface UploaderProps extends WithAsProps, Omit<UploadTriggerProps, 'on
29
29
  /** Automatically upload files after selecting them */
30
30
  autoUpload?: boolean;
31
31
  /** Primary content */
32
- children?: React.ReactNode;
32
+ children?: React.ReactElement;
33
33
  /** List of uploaded files */
34
34
  defaultFileList?: FileType[];
35
35
  /** List of uploaded files (Controlled) */
@@ -414,7 +414,7 @@ Uploader.propTypes = {
414
414
  action: PropTypes.string.isRequired,
415
415
  accept: PropTypes.string,
416
416
  autoUpload: PropTypes.bool,
417
- children: PropTypes.node,
417
+ children: PropTypes.element,
418
418
  className: PropTypes.string,
419
419
  classPrefix: PropTypes.string,
420
420
  defaultFileList: PropTypes.array,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rsuite",
3
- "version": "5.78.0",
3
+ "version": "5.78.1",
4
4
  "description": "A suite of react components",
5
5
  "main": "cjs/index.js",
6
6
  "module": "esm/index.js",