merge-in latest develop

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> {
     focus: false,
     onChange: () => {},
     onBlur: () => {},
+    onFocus: () => {},
     scorePassword: false,
     showLabel: true,
     showPasswordToggle: false,
@@ -108,7 +109,11 @@ class InputComponent extends Component<IProps, IState> {
       placeholder,
       spellCheck,
       onBlur,
+<<<<<<< HEAD
       onEnterKey,
+=======
+      onFocus,
+>>>>>>> develop
     } = this.props;
 
     const {
@@ -151,6 +156,7 @@ class InputComponent extends Component<IProps, IState> {
               className={classes.input}
               ref={this.inputRef}
               onChange={this.onChange.bind(this)}
+              onFocus={onFocus}
               onBlur={onBlur}
               disabled={disabled}
               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
 export const selectOptionItemHover = color(legacyStyles.darkThemeGrayLight).darken(0.2).hex();
 export const selectOptionItemHoverColor = selectColor;
 export const selectSearchColor = inputBackground;
+
+// Modal
+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;
 // Badge
 export const badgeFontSize = uiFontSize - 2;
 export const badgeBorderRadius = 50;
+
+// Modal
+export const colorModalOverlayBackground = color(legacyStyles.themeGrayLighter).alpha(0.8).rgb().string();