Merge branch 'release/5.0.1-beta.1' into develop

3 files changed, 10 insertions, 2 deletions

diff --git a/packages/forms/package.json b/packages/forms/package.json
index e78929777..2cd6f4d43 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meetfranz/forms",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "React form components for Franz",
   "main": "lib/index.js",
   "scripts": {
@@ -35,5 +35,5 @@
     "react-dom": "16.7.0",
     "react-jss": "^8.6.1"
   },
-  "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b"
+  "gitHead": "0aad40e6afcdf5e5598137f974f7fd25abb37290"
 }
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx
index 478738cad..ab1c33315 100644
--- a/packages/forms/src/input/index.tsx
+++ b/packages/forms/src/input/index.tsx
@@ -102,6 +102,9 @@ class InputComponent extends Component<IProps, IState> {
       spellCheck,
       onBlur,
       onFocus,
+      min,
+      max,
+      step,
     } = this.props;
 
     const {
@@ -147,6 +150,9 @@ class InputComponent extends Component<IProps, IState> {
               onFocus={onFocus}
               onBlur={onBlur}
               disabled={disabled}
+              min={min}
+              max={max}
+              step={step}
             />
             {suffix && (
               <span className={classes.suffix}>
diff --git a/packages/forms/src/label/index.tsx b/packages/forms/src/label/index.tsx
index 36fcfbedf..590270a06 100644
--- a/packages/forms/src/label/index.tsx
+++ b/packages/forms/src/label/index.tsx
@@ -26,6 +26,8 @@ class LabelComponent extends Component<ILabel> {
       htmlFor,
     } = this.props;
 
+    if (!showLabel) return children;
+
     return (
       <label
         className={classnames({