diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 16:40:11 +0200 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 16:40:11 +0200 |
| commit | fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4 (patch) | |
| tree | 2051271328c390be6c78b0a214c948e0c0c5f865 /packages/forms/src/input/index.tsx | |
| parent | add context menu for workspace drawer items (diff) | |
| parent | test package order (diff) | |
| download | ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.gz ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.zst ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.zip | |
merge conflicts with latest develop
Diffstat (limited to 'packages/forms/src/input/index.tsx')
| -rw-r--r-- | packages/forms/src/input/index.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index e410f8fef..a2d7c62d5 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx | |||
| @@ -113,6 +113,7 @@ class InputComponent extends Component<IProps, IState> { | |||
| 113 | min, | 113 | min, |
| 114 | max, | 114 | max, |
| 115 | step, | 115 | step, |
| 116 | required, | ||
| 116 | } = this.props; | 117 | } = this.props; |
| 117 | 118 | ||
| 118 | const { | 119 | const { |
| @@ -132,6 +133,7 @@ class InputComponent extends Component<IProps, IState> { | |||
| 132 | showLabel={showLabel} | 133 | showLabel={showLabel} |
| 133 | htmlFor={id} | 134 | htmlFor={id} |
| 134 | className={classes.label} | 135 | className={classes.label} |
| 136 | isRequired={required} | ||
| 135 | > | 137 | > |
| 136 | <div | 138 | <div |
| 137 | className={classnames({ | 139 | className={classnames({ |