1 files changed, 11 insertions, 1 deletions

diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx
index 5178904d3..a2d7c62d5 100644
--- a/packages/forms/src/input/index.tsx
+++ b/packages/forms/src/input/index.tsx
@@ -25,6 +25,7 @@ interface IProps extends React.InputHTMLAttributes<HTMLInputElement>, IFormField
   showPasswordToggle?: boolean;
   data: IData;
   inputClassName?: string;
+  onEnterKey?: Function;
 }
 
 interface IState {
@@ -33,7 +34,7 @@ interface IState {
 }
 
 class InputComponent extends Component<IProps, IState> {
-  public static defaultProps = {
+  static defaultProps = {
     focus: false,
     onChange: () => {},
     onBlur: () => {},
@@ -81,6 +82,13 @@ class InputComponent extends Component<IProps, IState> {
     }
   }
 
+  onInputKeyPress(e: React.KeyboardEvent) {
+    if (e.key === "Enter") {
+      const { onEnterKey } = this.props;
+      onEnterKey && onEnterKey();
+    }
+  }
+
   render() {
     const {
       classes,
@@ -124,6 +132,7 @@ class InputComponent extends Component<IProps, IState> {
           title={label}
           showLabel={showLabel}
           htmlFor={id}
+          className={classes.label}
           isRequired={required}
         >
           <div
@@ -152,6 +161,7 @@ class InputComponent extends Component<IProps, IState> {
               onFocus={onFocus}
               onBlur={onBlur}
               disabled={disabled}
+              onKeyPress={this.onInputKeyPress.bind(this)}
               min={min}
               max={max}
               step={step}