summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-09-23 14:40:13 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-09-25 10:50:58 +0200
commit524206cc02726151727f8caac61290207d570973 (patch)
treec05d3ba59612a5fbb8268f3e341073870d7e81a9 /gui/src
parent5553de70c47321cd19ee1969421ba4ec499732d9 (diff)
downloadmullvadvpn-524206cc02726151727f8caac61290207d570973.tar.xz
mullvadvpn-524206cc02726151727f8caac61290207d570973.zip
Only wrap Selector in CellSection when the title is provided
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/components/Selector.tsx39
1 files changed, 20 insertions, 19 deletions
diff --git a/gui/src/renderer/components/Selector.tsx b/gui/src/renderer/components/Selector.tsx
index c34d6a4b45..1bbc00ba9a 100644
--- a/gui/src/renderer/components/Selector.tsx
+++ b/gui/src/renderer/components/Selector.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import { Component, Styles, Types } from 'reactxp';
+import { Component, Styles, Types, View } from 'reactxp';
import { colors } from '../../config.json';
import * as Cell from './Cell';
@@ -28,25 +28,26 @@ const styles = {
export default class Selector<T> extends Component<ISelectorProps<T>> {
public render() {
- return (
- <Cell.Section style={[styles.section, this.props.style]}>
- {this.props.title && <Cell.SectionTitle>{this.props.title}</Cell.SectionTitle>}
- {this.props.values.map((item, i) => {
- const selected = item.value === this.props.value;
+ const items = this.props.values.map((item, i) => {
+ const selected = item.value === this.props.value;
- return (
- <SelectorCell
- key={i}
- value={item.value}
- selected={selected}
- ref={selected ? this.props.selectedCellRef : undefined}
- onSelect={this.props.onSelect}>
- {item.label}
- </SelectorCell>
- );
- })}
- </Cell.Section>
- );
+ return (
+ <SelectorCell
+ key={i}
+ value={item.value}
+ selected={selected}
+ ref={selected ? this.props.selectedCellRef : undefined}
+ onSelect={this.props.onSelect}>
+ {item.label}
+ </SelectorCell>
+ );
+ });
+
+ if (this.props.title) {
+ return <Cell.Section style={[styles.section, this.props.style]}>{items}</Cell.Section>;
+ } else {
+ return <View style={[styles.section, this.props.style]}>{items}</View>;
+ }
}
}