diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-05-15 15:44:42 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-05-15 15:44:42 +0200 |
| commit | 82f2a5f6bba7767b9bd1b3803272ac785dec62b6 (patch) | |
| tree | 16ebcd2c67f4d5af1a798b2632694ace856f3387 /gui/src/renderer/components/SelectLanguage.tsx | |
| parent | 98c62cd60e88926b73168042a9bb46a95bcff92e (diff) | |
| parent | 11bfac6e9dc3284057299611933a4f6fc92473e1 (diff) | |
| download | mullvadvpn-82f2a5f6bba7767b9bd1b3803272ac785dec62b6.tar.xz mullvadvpn-82f2a5f6bba7767b9bd1b3803272ac785dec62b6.zip | |
Merge branch 'convert-cell-to-styled-component'
Diffstat (limited to 'gui/src/renderer/components/SelectLanguage.tsx')
| -rw-r--r-- | gui/src/renderer/components/SelectLanguage.tsx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gui/src/renderer/components/SelectLanguage.tsx b/gui/src/renderer/components/SelectLanguage.tsx index 254272cc46..1a294a05ba 100644 --- a/gui/src/renderer/components/SelectLanguage.tsx +++ b/gui/src/renderer/components/SelectLanguage.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import ReactDOM from 'react-dom'; import { Component, Styles, View } from 'reactxp'; +import styled from 'styled-components'; import { colors } from '../../config.json'; import { messages } from '../../shared/gettext'; import CustomScrollbars from './CustomScrollbars'; @@ -35,15 +36,16 @@ const styles = { container: Styles.createViewStyle({ flex: 1, }), - selector: Styles.createViewStyle({ - marginBottom: 0, - }), // plain CSS style scrollview: { flex: 1, }, }; +const StyledSelector = (styled(Selector)({ + marginBottom: 0, +}) as unknown) as new <T>() => Selector<T>; + export default class SelectLanguage extends Component<IProps, IState> { private scrollView = React.createRef<CustomScrollbars>(); private selectedCellRef = React.createRef<SelectorCell<string>>(); @@ -92,8 +94,7 @@ export default class SelectLanguage extends Component<IProps, IState> { {messages.pgettext('select-language-nav', 'Select language')} </HeaderTitle> </SettingsHeader> - <Selector - style={styles.selector} + <StyledSelector title="" values={this.state.source} value={this.props.preferredLocale} |
