diff options
author | 2019-02-22 17:15:22 +0100 | |
---|---|---|
committer | 2019-02-22 17:15:22 +0100 | |
commit | bba95118076e1185c05605bdf58fabac3de82f17 (patch) | |
tree | 190f88e47e91763bc5702b5bbc55a04744043358 /packages/forms | |
parent | pin gulp-sass-variables version to 1.1.1 (diff) | |
parent | remove code (diff) | |
download | ferdium-app-bba95118076e1185c05605bdf58fabac3de82f17.tar.gz ferdium-app-bba95118076e1185c05605bdf58fabac3de82f17.tar.zst ferdium-app-bba95118076e1185c05605bdf58fabac3de82f17.zip |
merge-in latest develop
Diffstat (limited to 'packages/forms')
-rw-r--r-- | packages/forms/src/input/index.tsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index 791e0f360..68bb5ac57 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx | |||
@@ -38,6 +38,7 @@ class InputComponent extends Component<IProps, IState> { | |||
38 | focus: false, | 38 | focus: false, |
39 | onChange: () => {}, | 39 | onChange: () => {}, |
40 | onBlur: () => {}, | 40 | onBlur: () => {}, |
41 | onFocus: () => {}, | ||
41 | scorePassword: false, | 42 | scorePassword: false, |
42 | showLabel: true, | 43 | showLabel: true, |
43 | showPasswordToggle: false, | 44 | showPasswordToggle: false, |
@@ -108,7 +109,11 @@ class InputComponent extends Component<IProps, IState> { | |||
108 | placeholder, | 109 | placeholder, |
109 | spellCheck, | 110 | spellCheck, |
110 | onBlur, | 111 | onBlur, |
112 | <<<<<<< HEAD | ||
111 | onEnterKey, | 113 | onEnterKey, |
114 | ======= | ||
115 | onFocus, | ||
116 | >>>>>>> develop | ||
112 | } = this.props; | 117 | } = this.props; |
113 | 118 | ||
114 | const { | 119 | const { |
@@ -151,6 +156,7 @@ class InputComponent extends Component<IProps, IState> { | |||
151 | className={classes.input} | 156 | className={classes.input} |
152 | ref={this.inputRef} | 157 | ref={this.inputRef} |
153 | onChange={this.onChange.bind(this)} | 158 | onChange={this.onChange.bind(this)} |
159 | onFocus={onFocus} | ||
154 | onBlur={onBlur} | 160 | onBlur={onBlur} |
155 | disabled={disabled} | 161 | disabled={disabled} |
156 | onKeyPress={this.onInputKeyPress.bind(this)} | 162 | onKeyPress={this.onInputKeyPress.bind(this)} |