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/select/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/select/index.tsx')
| -rw-r--r-- | packages/forms/src/select/index.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/forms/src/select/index.tsx b/packages/forms/src/select/index.tsx index cfbe91dda..0e5ded176 100644 --- a/packages/forms/src/select/index.tsx +++ b/packages/forms/src/select/index.tsx | |||
| @@ -311,6 +311,7 @@ class SelectComponent extends Component<IProps> { | |||
| 311 | showLabel, | 311 | showLabel, |
| 312 | showSearch, | 312 | showSearch, |
| 313 | onChange, | 313 | onChange, |
| 314 | required, | ||
| 314 | } = this.props; | 315 | } = this.props; |
| 315 | 316 | ||
| 316 | const { | 317 | const { |
| @@ -340,6 +341,7 @@ class SelectComponent extends Component<IProps> { | |||
| 340 | showLabel={showLabel} | 341 | showLabel={showLabel} |
| 341 | htmlFor={id} | 342 | htmlFor={id} |
| 342 | className={classes.label} | 343 | className={classes.label} |
| 344 | isRequired={required} | ||
| 343 | > | 345 | > |
| 344 | <div | 346 | <div |
| 345 | className={classnames({ | 347 | className={classnames({ |