fix(NumberPicker): avoid input - when min >=0, close alibaba-fusion#2335

Bingzhao · Apr 6, 2021 · a8f0e89 · a8f0e89
1 parent bb58f37
commit a8f0e89
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/number-picker/number-picker.jsx b/src/number-picker/number-picker.jsx
@@ -221,6 +221,12 @@ class NumberPicker extends React.Component {
 
                 // ignore when input start form '-'
                 if (value === '-' || this.state.value === '-') {
+                    if (this.props.min >= 0) {
+                        // trigger onCorrect when input - on min >= 0
+                        // trigger onChange when the result of correction is not state.value
+                        this.setInputValue(value, e);
+                        return;
+                    }
                     this.setState({
                         value,
                         reRender: false,
@@ -238,7 +244,7 @@ class NumberPicker extends React.Component {
                     return;
                 }
                 // ignore when value < min (because number is inputted one by one)
-                if (!isNaN(value) && Number(value) < this.props.min) {
+                if (!isNaN(value) && Number(value) > 0 && Number(value) < this.props.min) {
                     this.setState({
                         value,
                         reRender: false,
@@ -300,6 +306,8 @@ class NumberPicker extends React.Component {
             if (val > props.max) {
                 val = props.max;
             }
+        } else if (val === '-' && props.min >= 0) {
+            val = props.min;
         } else {
             val = this.state.value;
         }

diff --git a/test/number-picker/index-spec.js b/test/number-picker/index-spec.js
@@ -433,6 +433,38 @@ describe('number-picker', () => {
             done();
         });
 
+        it('should avoid input - when min >= 0', done => {
+            let onChange = value => {
+                    assert(value === 0);
+                },
+                wrapper = mount(
+                    <NumberPicker
+                        min={0}
+                        onChange={onChange}
+                    />
+                );
+            wrapper
+            .find('input')
+            .simulate('change', { target: { value: '-' } });
+            wrapper
+            .find('input')
+            .simulate('change', { target: { value: '-2' } });
+            wrapper = mount(
+                <NumberPicker
+                    defaultValue={-2}
+                    min={0}
+                    onChange={onChange}
+                />
+            );
+            wrapper
+            .find('input')
+            .simulate('change', { target: { value: '-' } });
+            wrapper
+            .find('input')
+            .simulate('change', { target: { value: '-21' } });
+            done();
+
+        })
         it('should be equal min while next value < min by click +', done => {
             let onChange = value => {
                     assert(value === 30);