rsuite 4.9.2 → 4.9.3

package/es/Nav/Nav.js

@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import { setStatic } from 'recompose';
 import shallowEqual from '../utils/shallowEqual';
 import NavItem from './NavItem';
-import { prefix, getUnhandledProps, defaultProps, ReactChildren } from '../utils';
+import { prefix, getUnhandledProps, defaultProps, ReactChildren, createChainedFunction } from '../utils';
 import { getClassNamePrefix } from '../utils/prefix';
 import { NavbarContext } from '../Navbar/Navbar';
 import { SidenavContext } from '../Sidenav/Sidenav';
@@ -54,20 +54,21 @@ function (_React$Component) {
       var _item$props = item.props,
           eventKey = _item$props.eventKey,
           active = _item$props.active,
-          rest = _objectWithoutPropertiesLoose(_item$props, ["eventKey", "active"]);
+          onSelectItem = _item$props.onSelect,
+          rest = _objectWithoutPropertiesLoose(_item$props, ["eventKey", "active", "onSelect"]);
 
       var displayName = item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.displayName;
       var hasTooltip = sidenav && !expanded;
 
       if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(NavItem)'))) {
         return _extends({}, rest, {
-          onSelect: onSelect,
+          onSelect: createChainedFunction(onSelect, onSelectItem),
           hasTooltip: hasTooltip,
           active: typeof activeKey === 'undefined' ? active : shallowEqual(activeKey, eventKey)
         });
       } else if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(Dropdown)'))) {
         return _extends({}, rest, {
-          onSelect: onSelect,
+          onSelect: createChainedFunction(onSelect, onSelectItem),
           activeKey: activeKey,
           showHeader: hasTooltip,
           componentClass: 'li'

package/es/Uploader/Uploader.js

@@ -48,6 +48,8 @@ function (_React$Component) {
 
       (_this$props$onRemove = (_this$props = _this.props).onRemove) === null || _this$props$onRemove === void 0 ? void 0 : _this$props$onRemove.call(_this$props, file);
       (_this$props$onChange = (_this$props2 = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props2, nextFileList);
+
+      _this.cleanInputValue();
     };
 
     _this.handleUploadTriggerChange = function (event) {

package/lib/Nav/Nav.js

@@ -76,19 +76,20 @@ function (_React$Component) {
       var _item$props = item.props,
           eventKey = _item$props.eventKey,
           active = _item$props.active,
-          rest = (0, _objectWithoutPropertiesLoose2.default)(_item$props, ["eventKey", "active"]);
+          onSelectItem = _item$props.onSelect,
+          rest = (0, _objectWithoutPropertiesLoose2.default)(_item$props, ["eventKey", "active", "onSelect"]);
       var displayName = item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.displayName;
       var hasTooltip = sidenav && !expanded;
 
       if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(NavItem)'))) {
         return (0, _extends2.default)({}, rest, {
-          onSelect: onSelect,
+          onSelect: (0, _utils.createChainedFunction)(onSelect, onSelectItem),
           hasTooltip: hasTooltip,
           active: typeof activeKey === 'undefined' ? active : (0, _shallowEqual.default)(activeKey, eventKey)
         });
       } else if (~(displayName === null || displayName === void 0 ? void 0 : displayName.indexOf('(Dropdown)'))) {
         return (0, _extends2.default)({}, rest, {
-          onSelect: onSelect,
+          onSelect: (0, _utils.createChainedFunction)(onSelect, onSelectItem),
           activeKey: activeKey,
           showHeader: hasTooltip,
           componentClass: 'li'

package/lib/Uploader/Uploader.js

@@ -70,6 +70,8 @@ function (_React$Component) {
 
       (_this$props$onRemove = (_this$props = _this.props).onRemove) === null || _this$props$onRemove === void 0 ? void 0 : _this$props$onRemove.call(_this$props, file);
       (_this$props$onChange = (_this$props2 = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props2, nextFileList);
+
+      _this.cleanInputValue();
     };
 
     _this.handleUploadTriggerChange = function (event) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "4.9.2",
+  "version": "4.9.3",
   "description": "A suite of react components",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
     "react-lifecycles-compat": "^3.0.4",
     "react-virtualized": "^9.21.0",
     "recompose": "^0.30.0",
-    "rsuite-table": "^3.14.3",
+    "rsuite-table": "^3.14.4",
     "schema-typed": "^1.5.1"
   },
   "peerDependencies": {

package/src/Nav/Nav.tsx

@@ -5,7 +5,13 @@ import { setStatic } from 'recompose';
 import shallowEqual from '../utils/shallowEqual';
 
 import NavItem from './NavItem';
-import { prefix, getUnhandledProps, defaultProps, ReactChildren } from '../utils';
+import {
+  prefix,
+  getUnhandledProps,
+  defaultProps,
+  ReactChildren,
+  createChainedFunction
+} from '../utils';
 import { getClassNamePrefix } from '../utils/prefix';
 import { NavbarContext } from '../Navbar/Navbar';
 import { SidenavContext } from '../Sidenav/Sidenav';
@@ -56,21 +62,21 @@ class Nav extends React.Component<NavProps> {
     const hasWaterline = appearance !== 'default';
 
     const items = ReactChildren.mapCloneElement(children, item => {
-      const { eventKey, active, ...rest } = item.props;
+      const { eventKey, active, onSelect: onSelectItem, ...rest } = item.props;
       const displayName = item?.type?.displayName;
       const hasTooltip = sidenav && !expanded;
 
       if (~displayName?.indexOf('(NavItem)')) {
         return {
           ...rest,
-          onSelect,
+          onSelect: createChainedFunction(onSelect, onSelectItem),
           hasTooltip,
           active: typeof activeKey === 'undefined' ? active : shallowEqual(activeKey, eventKey)
         };
       } else if (~displayName?.indexOf('(Dropdown)')) {
         return {
           ...rest,
-          onSelect,
+          onSelect: createChainedFunction(onSelect, onSelectItem),
           activeKey,
           showHeader: hasTooltip,
           componentClass: 'li'

package/src/Nav/test/NavSpec.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import ReactTestUtils from 'react-dom/test-utils';
 import { innerText, getDOMNode } from '@test/testUtils';
 
 import Nav from '../Nav';
@@ -68,4 +69,38 @@ describe('Nav', () => {
     const instance = getDOMNode(<Nav classPrefix="custom-prefix" />);
     assert.ok(instance.className.match(/\bcustom-prefix\b/));
   });
+
+  it('Should call onSelect callback', done => {
+    const doneOp = eventKey => {
+      if (eventKey === 2) {
+        done();
+      }
+    };
+    const instance = getDOMNode(
+      <Nav onSelect={doneOp}>
+        <Nav.Item eventKey={1}>1</Nav.Item>
+        <Nav.Item eventKey={2}>2</Nav.Item>
+      </Nav>
+    );
+
+    ReactTestUtils.Simulate.click(instance.querySelectorAll('.rs-nav-item a')[1]);
+  });
+
+  it('Should call onSelect callback on Nav.Item', done => {
+    const doneOp = eventKey => {
+      if (eventKey === 2) {
+        done();
+      }
+    };
+    const instance = getDOMNode(
+      <Nav>
+        <Nav.Item eventKey={1}>1</Nav.Item>
+        <Nav.Item eventKey={2} onSelect={doneOp}>
+          2
+        </Nav.Item>
+      </Nav>
+    );
+
+    ReactTestUtils.Simulate.click(instance.querySelectorAll('.rs-nav-item a')[1]);
+  });
 });

package/src/Uploader/Uploader.tsx

@@ -132,6 +132,7 @@ class Uploader extends React.Component<UploaderProps, UploaderState> {
 
     this.props.onRemove?.(file);
     this.props.onChange?.(nextFileList);
+    this.cleanInputValue();
   };
 
   handleUploadTriggerChange = (event: React.ChangeEvent<HTMLInputElement>) => {