diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/forms/src/input/index.tsx | 6 | ||||
-rw-r--r-- | packages/theme/src/themes/dark/index.ts | 3 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 3 |
3 files changed, 12 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)} |
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index 9b6bf055c..1757f5abd 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts | |||
@@ -60,3 +60,6 @@ export const selectOptionBorder = `1px solid ${color(legacyStyles.darkThemeGrayL | |||
60 | export const selectOptionItemHover = color(legacyStyles.darkThemeGrayLight).darken(0.2).hex(); | 60 | export const selectOptionItemHover = color(legacyStyles.darkThemeGrayLight).darken(0.2).hex(); |
61 | export const selectOptionItemHoverColor = selectColor; | 61 | export const selectOptionItemHoverColor = selectColor; |
62 | export const selectSearchColor = inputBackground; | 62 | export const selectSearchColor = inputBackground; |
63 | |||
64 | // Modal | ||
65 | export const colorModalOverlayBackground = color(legacyStyles.darkThemeGray).alpha(0.8).rgb().string(); | ||
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index d36558ff0..40521995b 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -137,3 +137,6 @@ export const selectDisabledOpacity = inputDisabledOpacity; | |||
137 | // Badge | 137 | // Badge |
138 | export const badgeFontSize = uiFontSize - 2; | 138 | export const badgeFontSize = uiFontSize - 2; |
139 | export const badgeBorderRadius = 50; | 139 | export const badgeBorderRadius = 50; |
140 | |||
141 | // Modal | ||
142 | export const colorModalOverlayBackground = color(legacyStyles.themeGrayLighter).alpha(0.8).rgb().string(); | ||