Fix InputNumber

Fix Select

Author: e1emeb0t

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "element-react",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Element UI for React",
   "private": false,
   "main": "dist/npm/es5/index.js",
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/eleme/element-react",
   "devDependencies": {
-    "@types/react": "^15.0.39",
+    "@types/react": "^15.6.0",
     "babel-cli": "^6.24.1",
     "babel-eslint": "^7.2.3",
     "babel-jest": "^20.0.3",
@@ -44,7 +44,7 @@
     "codemirror": "^5.28.0",
     "core-js": "^2.4.1",
     "css-loader": "^0.28.4",
-    "element-theme-default": "^1.4.0",
+    "element-theme-default": "^1.4.1",
     "enzyme": "^2.9.1",
     "eslint": "^3.19.0",
     "eslint-config-airbnb": "^15.0.1",
@@ -54,8 +54,8 @@
     "eslint-plugin-react": "^7.0.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
-    "flow-bin": "^0.51.0",
-    "html-webpack-plugin": "^2.29.0",
+    "flow-bin": "^0.51.1",
+    "html-webpack-plugin": "^2.30.1",
     "jest": "^20.0.4",
     "marked": "^0.3.6",
     "mock-raf": "^1.0.0",
@@ -67,11 +67,11 @@
     "react-test-renderer": "^15.5.4",
     "regenerator-runtime": "^0.10.5",
     "sass-loader": "^6.0.5",
-    "sinon": "^2.3.8",
+    "sinon": "^2.4.1",
     "style-loader": "^0.18.2",
     "typescript": "^2.4.2",
     "url-loader": "^0.5.8",
-    "webpack": "^3.4.0",
+    "webpack": "^3.4.1",
     "webpack-dev-server": "^2.6.1"
   },
   "dependencies": {

package.json

@@ -25,7 +25,7 @@ export default class InputNumber extends Component {
 
   componentWillReceiveProps(props: Object) {
     if (props.value != this.props.value) {
-      this.setState({ value: Number(props.value) });
+      this.setState({ value: props.value });
     }
   }
 
@@ -56,7 +56,7 @@ export default class InputNumber extends Component {
         value = Number(this.props.min);
       }
     } else {
-      value = '';
+      value = undefined;
     }
 
     this.setState({ value }, this.onChange);
@@ -83,11 +83,11 @@ export default class InputNumber extends Component {
   }
 
   get minDisabled(): boolean {
-    return  (this.state.value - Number(this.props.step) < this.props.min);
+    return  !this.isValid || (this.state.value - Number(this.props.step) < this.props.min);
   }
 
   get maxDisabled(): boolean {
-    return  (this.state.value + Number(this.props.step) > this.props.max);
+    return  !this.isValid || (this.state.value + Number(this.props.step) > this.props.max);
   }
 
   increase(): void {
@@ -99,6 +99,7 @@ export default class InputNumber extends Component {
     } else {
       if (value + Number(step) > max || disabled) return;
       if (value + Number(step) < min ) value = min - Number(step);
+
       value = accAdd(step, value);
     }
 

src/input-number/InputNumber.jsx

@@ -202,7 +202,7 @@ class Select extends Component {
        })[0];
 
        if (selected) {
-         this.state.selectedLabel = selected.props.label;
+         this.state.selectedLabel = selected.props.label || selected.props.value;
        }
     }
   }

src/select/Select.jsx

@@ -185,8 +185,8 @@ export default class Slider extends Component {
 
   onInputValueChanged(e: number): void {
     this.setState({
-      inputValue: e,
-      firstValue: e
+      inputValue: e || 0,
+      firstValue: e || 0
     }, () => {
       this.setValues();
     });