rsuite 4.10.6 → 4.10.9

package/es/CheckTreePicker/CheckTreePicker.js

@@ -510,9 +510,7 @@ function (_React$Component) {
   };
 
   _proto.updateDataChange = function updateDataChange(prevState) {
-    var _this$state2 = this.state,
-        searchKeyword = _this$state2.searchKeyword,
-        expandItemValues = _this$state2.expandItemValues;
+    var searchKeyword = this.state.searchKeyword;
     var _this$props7 = this.props,
         _this$props7$data = _this$props7.data,
         data = _this$props7$data === void 0 ? [] : _this$props7$data,
@@ -523,8 +521,7 @@ function (_React$Component) {
       this.nodes = {};
       this.flattenNodes(nextData);
       this.unserializeLists({
-        check: this.getValue(),
-        expand: expandItemValues
+        check: this.getValue()
       });
       this.setState({
         data: nextData,
@@ -567,10 +564,10 @@ function (_React$Component) {
   };
 
   _proto.updateUncheckableItemValuesChange = function updateUncheckableItemValuesChange(prevState) {
-    var _this$state3 = this.state,
-        data = _this$state3.data,
-        selectedValues = _this$state3.selectedValues,
-        expandItemValues = _this$state3.expandItemValues;
+    var _this$state2 = this.state,
+        data = _this$state2.data,
+        selectedValues = _this$state2.selectedValues,
+        expandItemValues = _this$state2.expandItemValues;
     var uncheckableItemValues = this.props.uncheckableItemValues;
 
     if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues) && _isArray(uncheckableItemValues)) {
@@ -586,10 +583,10 @@ function (_React$Component) {
   };
 
   _proto.updateCascadeChange = function updateCascadeChange(prevState) {
-    var _this$state4 = this.state,
-        data = _this$state4.data,
-        selectedValues = _this$state4.selectedValues,
-        expandItemValues = _this$state4.expandItemValues;
+    var _this$state3 = this.state,
+        data = _this$state3.data,
+        selectedValues = _this$state3.selectedValues,
+        expandItemValues = _this$state3.expandItemValues;
     var cascade = this.props.cascade; // cascade 改变时，重新初始化
 
     if (cascade !== prevState.cascade && cascade) {
@@ -1062,9 +1059,9 @@ function (_React$Component) {
   _proto.renderNode = function renderNode(node, layer) {
     var _this10 = this;
 
-    var _this$state5 = this.state,
-        activeNode = _this$state5.activeNode,
-        searchKeyword = _this$state5.searchKeyword;
+    var _this$state4 = this.state,
+        activeNode = _this$state4.activeNode,
+        searchKeyword = _this$state4.searchKeyword;
     var _this$props11 = this.props,
         valueKey = _this$props11.valueKey,
         labelKey = _this$props11.labelKey,
@@ -1132,10 +1129,10 @@ function (_React$Component) {
   };
 
   _proto.renderVirtualNode = function renderVirtualNode(node, options) {
-    var _this$state6 = this.state,
-        activeNode = _this$state6.activeNode,
-        expandAll = _this$state6.expandAll,
-        searchKeyword = _this$state6.searchKeyword;
+    var _this$state5 = this.state,
+        activeNode = _this$state5.activeNode,
+        expandAll = _this$state5.expandAll,
+        searchKeyword = _this$state5.searchKeyword;
     var _this$props12 = this.props,
         valueKey = _this$props12.valueKey,
         labelKey = _this$props12.labelKey,
@@ -1185,9 +1182,9 @@ function (_React$Component) {
         _this11 = this,
         _classNames3;
 
-    var _this$state7 = this.state,
-        filterData = _this$state7.filterData,
-        isSomeNodeHasChildren = _this$state7.isSomeNodeHasChildren;
+    var _this$state6 = this.state,
+        filterData = _this$state6.filterData,
+        isSomeNodeHasChildren = _this$state6.isSomeNodeHasChildren;
     var _this$props13 = this.props,
         inline = _this$props13.inline,
         style = _this$props13.style,
@@ -1279,9 +1276,9 @@ function (_React$Component) {
         positionRef = _this$props14.positionRef,
         rest = _objectWithoutPropertiesLoose(_this$props14, ["cascade", "style", "locale", "inline", "disabled", "valueKey", "labelKey", "cleanable", "countable", "placeholder", "toggleComponentClass", "onExited", "onEntered", "onClean", "renderValue", "positionRef"]);
 
-    var _this$state8 = this.state,
-        hasValue = _this$state8.hasValue,
-        selectedValues = _this$state8.selectedValues;
+    var _this$state7 = this.state,
+        hasValue = _this$state7.hasValue,
+        selectedValues = _this$state7.selectedValues;
 
     var hasValidValue = hasValue || selectedValues.length > 0 && _isFunction(renderValue);
 

package/es/InputNumber/InputNumber.js

@@ -164,6 +164,17 @@ function (_React$Component) {
     }
   };
 
+  _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
+    var preValue = prevProps.value;
+    var currentValue = this.props.value;
+
+    if (preValue !== currentValue) {
+      this.setState({
+        value: currentValue
+      });
+    }
+  };
+
   _proto.getValue = function getValue() {
     var value = this.props.value;
     return _isUndefined(value) ? this.state.value : value;

package/lib/CheckTreePicker/CheckTreePicker.js

@@ -544,9 +544,7 @@ function (_React$Component) {
   };
 
   _proto.updateDataChange = function updateDataChange(prevState) {
-    var _this$state2 = this.state,
-        searchKeyword = _this$state2.searchKeyword,
-        expandItemValues = _this$state2.expandItemValues;
+    var searchKeyword = this.state.searchKeyword;
     var _this$props7 = this.props,
         _this$props7$data = _this$props7.data,
         data = _this$props7$data === void 0 ? [] : _this$props7$data,
@@ -557,8 +555,7 @@ function (_React$Component) {
       this.nodes = {};
       this.flattenNodes(nextData);
       this.unserializeLists({
-        check: this.getValue(),
-        expand: expandItemValues
+        check: this.getValue()
       });
       this.setState({
         data: nextData,
@@ -601,10 +598,10 @@ function (_React$Component) {
   };
 
   _proto.updateUncheckableItemValuesChange = function updateUncheckableItemValuesChange(prevState) {
-    var _this$state3 = this.state,
-        data = _this$state3.data,
-        selectedValues = _this$state3.selectedValues,
-        expandItemValues = _this$state3.expandItemValues;
+    var _this$state2 = this.state,
+        data = _this$state2.data,
+        selectedValues = _this$state2.selectedValues,
+        expandItemValues = _this$state2.expandItemValues;
     var uncheckableItemValues = this.props.uncheckableItemValues;
 
     if ((0, _treeUtils.compareArray)(uncheckableItemValues, prevState.uncheckableItemValues) && (0, _isArray2.default)(uncheckableItemValues)) {
@@ -620,10 +617,10 @@ function (_React$Component) {
   };
 
   _proto.updateCascadeChange = function updateCascadeChange(prevState) {
-    var _this$state4 = this.state,
-        data = _this$state4.data,
-        selectedValues = _this$state4.selectedValues,
-        expandItemValues = _this$state4.expandItemValues;
+    var _this$state3 = this.state,
+        data = _this$state3.data,
+        selectedValues = _this$state3.selectedValues,
+        expandItemValues = _this$state3.expandItemValues;
     var cascade = this.props.cascade; // cascade 改变时，重新初始化
 
     if (cascade !== prevState.cascade && cascade) {
@@ -1096,9 +1093,9 @@ function (_React$Component) {
   _proto.renderNode = function renderNode(node, layer) {
     var _this10 = this;
 
-    var _this$state5 = this.state,
-        activeNode = _this$state5.activeNode,
-        searchKeyword = _this$state5.searchKeyword;
+    var _this$state4 = this.state,
+        activeNode = _this$state4.activeNode,
+        searchKeyword = _this$state4.searchKeyword;
     var _this$props11 = this.props,
         valueKey = _this$props11.valueKey,
         labelKey = _this$props11.labelKey,
@@ -1166,10 +1163,10 @@ function (_React$Component) {
   };
 
   _proto.renderVirtualNode = function renderVirtualNode(node, options) {
-    var _this$state6 = this.state,
-        activeNode = _this$state6.activeNode,
-        expandAll = _this$state6.expandAll,
-        searchKeyword = _this$state6.searchKeyword;
+    var _this$state5 = this.state,
+        activeNode = _this$state5.activeNode,
+        expandAll = _this$state5.expandAll,
+        searchKeyword = _this$state5.searchKeyword;
     var _this$props12 = this.props,
         valueKey = _this$props12.valueKey,
         labelKey = _this$props12.labelKey,
@@ -1219,9 +1216,9 @@ function (_React$Component) {
         _this11 = this,
         _classNames3;
 
-    var _this$state7 = this.state,
-        filterData = _this$state7.filterData,
-        isSomeNodeHasChildren = _this$state7.isSomeNodeHasChildren;
+    var _this$state6 = this.state,
+        filterData = _this$state6.filterData,
+        isSomeNodeHasChildren = _this$state6.isSomeNodeHasChildren;
     var _this$props13 = this.props,
         inline = _this$props13.inline,
         style = _this$props13.style,
@@ -1312,9 +1309,9 @@ function (_React$Component) {
         renderValue = _this$props14.renderValue,
         positionRef = _this$props14.positionRef,
         rest = (0, _objectWithoutPropertiesLoose2.default)(_this$props14, ["cascade", "style", "locale", "inline", "disabled", "valueKey", "labelKey", "cleanable", "countable", "placeholder", "toggleComponentClass", "onExited", "onEntered", "onClean", "renderValue", "positionRef"]);
-    var _this$state8 = this.state,
-        hasValue = _this$state8.hasValue,
-        selectedValues = _this$state8.selectedValues;
+    var _this$state7 = this.state,
+        hasValue = _this$state7.hasValue,
+        selectedValues = _this$state7.selectedValues;
     var hasValidValue = hasValue || selectedValues.length > 0 && (0, _isFunction2.default)(renderValue);
     var selectedItems = this.getSelectedItems(selectedValues);
     var selectedElement = placeholder;

package/lib/InputNumber/InputNumber.js

@@ -189,6 +189,17 @@ function (_React$Component) {
     }
   };
 
+  _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
+    var preValue = prevProps.value;
+    var currentValue = this.props.value;
+
+    if (preValue !== currentValue) {
+      this.setState({
+        value: currentValue
+      });
+    }
+  };
+
   _proto.getValue = function getValue() {
     var value = this.props.value;
     return (0, _isUndefined2.default)(value) ? this.state.value : value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "4.10.6",
+  "version": "4.10.9",
   "description": "A suite of react components",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
     "prop-types": "^15.7.2",
     "react-lifecycles-compat": "^3.0.4",
     "react-virtualized": "^9.21.0",
-    "rsuite-table": "^3.16.0",
+    "rsuite-table": "^3.16.1",
     "schema-typed": "^1.5.1"
   },
   "peerDependencies": {

package/src/CheckTreePicker/CheckTreePicker.tsx

@@ -234,7 +234,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
   }
 
   updateDataChange(prevState: CheckTreePickerState) {
-    const { searchKeyword, expandItemValues } = this.state;
+    const { searchKeyword } = this.state;
     const { data = [], childrenKey } = this.props;
 
     if (prevState.data !== data) {
@@ -242,8 +242,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
       this.nodes = {};
       this.flattenNodes(nextData);
       this.unserializeLists({
-        check: this.getValue(),
-        expand: expandItemValues
+        check: this.getValue()
       });
 
       this.setState({

package/src/CheckTreePicker/test/CheckTreePickerSpec.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import Enzyme, { mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
@@ -567,4 +567,45 @@ describe('CheckTreePicker', () => {
       4
     );
   });
+  it('Should expand when has props defaultExpandAll and data change', () => {
+    const Wrapper = React.forwardRef((props, ref) => {
+      const nextData = [
+        {
+          label: 'Fujian',
+          value: 3,
+          children: [
+            {
+              label: 'Fuzhou',
+              value: 36
+            }
+          ]
+        },
+        {
+          label: 'Guangdong',
+          value: 4,
+          children: [
+            {
+              label: 'Guangzhou',
+              value: 45
+            }
+          ]
+        }
+      ];
+      const [willChangeData, setData] = useState(data);
+      const handleClick = () => {
+        setData(nextData);
+      };
+      return (
+        <div ref={ref}>
+          <button onClick={handleClick} className="change-data">
+            change data
+          </button>
+          <CheckTreePicker inline defaultExpandAll data={willChangeData} />
+        </div>
+      );
+    });
+    const instance = getDOMNode(<Wrapper />);
+    ReactTestUtils.Simulate.click(instance.querySelector('.change-data'));
+    expect(instance.querySelectorAll('.rs-check-tree-open').length).to.equal(2);
+  });
 });

package/src/InputNumber/InputNumber.tsx

@@ -115,6 +115,15 @@ class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
       this.inputWheelListener.off();
     }
   }
+  componentDidUpdate(prevProps: InputNumberProps) {
+    const { value: preValue } = prevProps;
+    const { value: currentValue } = this.props;
+    if (preValue !== currentValue) {
+      this.setState({
+        value: currentValue
+      });
+    }
+  }
 
   bindInputRef = ref => {
     this.input = ref;

package/src/InputNumber/test/InputNumberSpec.js

@@ -149,4 +149,29 @@ describe('InputNumber', () => {
     const instance = getDOMNode(<InputNumber classPrefix="custom-prefix" />);
     assert.ok(instance.className.match(/\bcustom-prefix\b/));
   });
+  it('should be change correct value when reset value', () => {
+    let refValue = 0;
+    const Wrapper = React.forwardRef((props, ref) => {
+      const [value, setValue] = React.useState(refValue);
+      const reset = () => {
+        setValue(null);
+      };
+      refValue = value;
+      return (
+        <div ref={ref}>
+          <InputNumber value={value} onChange={setValue} />
+          <button id="reset" onClick={reset}>
+            reset
+          </button>
+        </div>
+      );
+    });
+    const instance = getDOMNode(<Wrapper />);
+    const resetBtn = instance.querySelector('#reset');
+    ReactTestUtils.Simulate.change(instance.querySelector('.rs-input'), { target: { value: 1 } });
+    ReactTestUtils.Simulate.click(resetBtn);
+    ReactTestUtils.Simulate.change(instance.querySelector('.rs-input'), { target: { value: 1 } });
+
+    assert.equal(refValue, 1);
+  });
 });