diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-02-23 13:36:12 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-02-23 13:36:12 +0100 |
| commit | 52309e4d193f784081cd7842ba679b0f65ff7e2f (patch) | |
| tree | 51310a26f3b28b503268707ab69c561a2a167ded /gui/src/renderer/components/SelectLanguage.tsx | |
| parent | 20ca77845e5d205fdb2cc72d30d80bdff2f54b7c (diff) | |
| parent | dcbdb46fa54091e6d8c4ccd02fe1be0b25de3987 (diff) | |
| download | mullvadvpn-52309e4d193f784081cd7842ba679b0f65ff7e2f.tar.xz mullvadvpn-52309e4d193f784081cd7842ba679b0f65ff7e2f.zip | |
Merge branch 'improve-escape-shortcut'
Diffstat (limited to 'gui/src/renderer/components/SelectLanguage.tsx')
| -rw-r--r-- | gui/src/renderer/components/SelectLanguage.tsx | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/gui/src/renderer/components/SelectLanguage.tsx b/gui/src/renderer/components/SelectLanguage.tsx index d6ef71ef61..a65a02153b 100644 --- a/gui/src/renderer/components/SelectLanguage.tsx +++ b/gui/src/renderer/components/SelectLanguage.tsx @@ -6,7 +6,6 @@ import { AriaInputGroup } from './AriaGroup'; import { CustomScrollbarsRef } from './CustomScrollbars'; import { Container, Layout } from './Layout'; import { - BackBarItem, NavigationBar, NavigationContainer, NavigationItems, @@ -15,6 +14,7 @@ import { } from './NavigationBar'; import Selector, { ISelectorItem } from './cell/Selector'; import SettingsHeader, { HeaderTitle } from './SettingsHeader'; +import { BackAction } from './KeyboardNavigation'; interface IProps { preferredLocale: string; @@ -59,40 +59,41 @@ export default class SelectLanguage extends React.Component<IProps, IState> { public render() { return ( - <Layout> - <StyledContainer> - <NavigationContainer> - <NavigationBar> - <NavigationItems> - <BackBarItem action={this.props.onClose} /> - <TitleBarItem> - { - // TRANSLATORS: Title label in navigation bar - messages.pgettext('select-language-nav', 'Select language') - } - </TitleBarItem> - </NavigationItems> - </NavigationBar> + <BackAction action={this.props.onClose}> + <Layout> + <StyledContainer> + <NavigationContainer> + <NavigationBar> + <NavigationItems> + <TitleBarItem> + { + // TRANSLATORS: Title label in navigation bar + messages.pgettext('select-language-nav', 'Select language') + } + </TitleBarItem> + </NavigationItems> + </NavigationBar> - <StyledNavigationScrollbars ref={this.scrollView}> - <SettingsHeader> - <HeaderTitle> - {messages.pgettext('select-language-nav', 'Select language')} - </HeaderTitle> - </SettingsHeader> - <AriaInputGroup> - <StyledSelector - title="" - values={this.state.source} - value={this.props.preferredLocale} - onSelect={this.props.setPreferredLocale} - selectedCellRef={this.selectedCellRef} - /> - </AriaInputGroup> - </StyledNavigationScrollbars> - </NavigationContainer> - </StyledContainer> - </Layout> + <StyledNavigationScrollbars ref={this.scrollView}> + <SettingsHeader> + <HeaderTitle> + {messages.pgettext('select-language-nav', 'Select language')} + </HeaderTitle> + </SettingsHeader> + <AriaInputGroup> + <StyledSelector + title="" + values={this.state.source} + value={this.props.preferredLocale} + onSelect={this.props.setPreferredLocale} + selectedCellRef={this.selectedCellRef} + /> + </AriaInputGroup> + </StyledNavigationScrollbars> + </NavigationContainer> + </StyledContainer> + </Layout> + </BackAction> ); } |