diff options
author | 2019-03-21 16:35:38 +0100 | |
---|---|---|
committer | 2019-03-21 16:36:19 +0100 | |
commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
tree | 703432658a50425e2a295f527c9fdb392211bfd3 /packages/forms/src/input/index.tsx | |
parent | add workspaces count badge in settings navigation (diff) | |
download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip |
fix merge conflicts with latest develop
Diffstat (limited to 'packages/forms/src/input/index.tsx')
-rw-r--r-- | packages/forms/src/input/index.tsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index cc3709b1a..f89c91be5 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx | |||
@@ -34,7 +34,7 @@ interface IState { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | class InputComponent extends Component<IProps, IState> { | 36 | class InputComponent extends Component<IProps, IState> { |
37 | public static defaultProps = { | 37 | static defaultProps = { |
38 | focus: false, | 38 | focus: false, |
39 | onChange: () => {}, | 39 | onChange: () => {}, |
40 | onBlur: () => {}, | 40 | onBlur: () => {}, |
@@ -109,8 +109,10 @@ class InputComponent extends Component<IProps, IState> { | |||
109 | placeholder, | 109 | placeholder, |
110 | spellCheck, | 110 | spellCheck, |
111 | onBlur, | 111 | onBlur, |
112 | onEnterKey, | ||
113 | onFocus, | 112 | onFocus, |
113 | min, | ||
114 | max, | ||
115 | step, | ||
114 | } = this.props; | 116 | } = this.props; |
115 | 117 | ||
116 | const { | 118 | const { |
@@ -157,6 +159,9 @@ class InputComponent extends Component<IProps, IState> { | |||
157 | onBlur={onBlur} | 159 | onBlur={onBlur} |
158 | disabled={disabled} | 160 | disabled={disabled} |
159 | onKeyPress={this.onInputKeyPress.bind(this)} | 161 | onKeyPress={this.onInputKeyPress.bind(this)} |
162 | min={min} | ||
163 | max={max} | ||
164 | step={step} | ||
160 | /> | 165 | /> |
161 | {suffix && ( | 166 | {suffix && ( |
162 | <span className={classes.suffix}> | 167 | <span className={classes.suffix}> |