diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 7 | ||||
-rw-r--r-- | src/components/ui/Select.js | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index d16ec35b8..0c869c16d 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -14,6 +14,7 @@ import Input from '../../ui/Input'; | |||
14 | import Toggle from '../../ui/Toggle'; | 14 | import Toggle from '../../ui/Toggle'; |
15 | import Button from '../../ui/Button'; | 15 | import Button from '../../ui/Button'; |
16 | import ImageUpload from '../../ui/ImageUpload'; | 16 | import ImageUpload from '../../ui/ImageUpload'; |
17 | import Select from '../../ui/Select'; | ||
17 | 18 | ||
18 | import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; | 19 | import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; |
19 | 20 | ||
@@ -333,6 +334,12 @@ export default @observer class EditServiceForm extends Component { | |||
333 | </div> | 334 | </div> |
334 | </div> | 335 | </div> |
335 | 336 | ||
337 | <PremiumFeatureContainer> | ||
338 | <div className="settings__settings-group"> | ||
339 | <Select field={form.$('spellcheckerLanguage')} /> | ||
340 | </div> | ||
341 | </PremiumFeatureContainer> | ||
342 | |||
336 | {isProxyFeatureEnabled && ( | 343 | {isProxyFeatureEnabled && ( |
337 | <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}> | 344 | <PremiumFeatureContainer condition={isProxyFeaturePremiumFeature}> |
338 | <div className="settings__settings-group"> | 345 | <div className="settings__settings-group"> |
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js index abcad417e..102737bec 100644 --- a/src/components/ui/Select.js +++ b/src/components/ui/Select.js | |||
@@ -9,12 +9,14 @@ export default @observer class Select extends Component { | |||
9 | field: PropTypes.instanceOf(Field).isRequired, | 9 | field: PropTypes.instanceOf(Field).isRequired, |
10 | className: PropTypes.string, | 10 | className: PropTypes.string, |
11 | showLabel: PropTypes.bool, | 11 | showLabel: PropTypes.bool, |
12 | disabled: PropTypes.bool, | ||
12 | }; | 13 | }; |
13 | 14 | ||
14 | static defaultProps = { | 15 | static defaultProps = { |
15 | className: null, | 16 | className: null, |
16 | focus: false, | 17 | focus: false, |
17 | showLabel: true, | 18 | showLabel: true, |
19 | disabled: false, | ||
18 | }; | 20 | }; |
19 | 21 | ||
20 | render() { | 22 | render() { |
@@ -22,13 +24,17 @@ export default @observer class Select extends Component { | |||
22 | field, | 24 | field, |
23 | className, | 25 | className, |
24 | showLabel, | 26 | showLabel, |
27 | disabled, | ||
25 | } = this.props; | 28 | } = this.props; |
26 | 29 | ||
30 | console.log('disabled', disabled); | ||
31 | |||
27 | return ( | 32 | return ( |
28 | <div | 33 | <div |
29 | className={classnames({ | 34 | className={classnames({ |
30 | 'franz-form__field': true, | 35 | 'franz-form__field': true, |
31 | 'has-error': field.error, | 36 | 'has-error': field.error, |
37 | 'is-disabled': disabled, | ||
32 | [`${className}`]: className, | 38 | [`${className}`]: className, |
33 | })} | 39 | })} |
34 | > | 40 | > |
@@ -45,12 +51,13 @@ export default @observer class Select extends Component { | |||
45 | id={field.id} | 51 | id={field.id} |
46 | defaultValue={field.value} | 52 | defaultValue={field.value} |
47 | className="franz-form__select" | 53 | className="franz-form__select" |
54 | disabled={field.disabled || disabled} | ||
48 | > | 55 | > |
49 | {field.options.map(type => ( | 56 | {field.options.map(type => ( |
50 | <option | 57 | <option |
51 | key={type.value} | 58 | key={type.value} |
52 | value={type.value} | 59 | value={type.value} |
53 | // selected={field.value === } | 60 | disabled={type.disabled} |
54 | > | 61 | > |
55 | {type.label} | 62 | {type.label} |
56 | </option> | 63 | </option> |