Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EIP1559] Horizontal Selector #2815

Merged
merged 7 commits into from
Jun 17, 2021
Merged

[EIP1559] Horizontal Selector #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b103455
Add initial HorizontalSelector
wachunei Jun 16, 2021
bf71c96
Remove line
wachunei Jun 16, 2021
b066969
Fix optionHalf width
wachunei Jun 16, 2021
c35c485
Add hasTopLabels
wachunei Jun 16, 2021
66fd3da
Add propTypes descriptions
wachunei Jun 16, 2021
12122d4
Add function style and missing keys
wachunei Jun 17, 2021
de09dd4
Remove extra option
wachunei Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
271 changes: 271 additions & 0 deletions app/components/Base/HorizontalSelector/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
import React, { Fragment, useCallback, useMemo } from 'react';
import PropTypes from 'prop-types';
import { View, StyleSheet, TouchableOpacity } from 'react-native';
import Text from '../Text';
import { colors } from '../../../styles/common';

const INNER_CIRCLE_SCALE = 0.445;
const OPTION_WIDTH = 110;
const styles = StyleSheet.create({
selector: {
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-around',
alignItems: 'center'
},
labels: {
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-around',
alignItems: 'flex-start'
},
option: {
width: OPTION_WIDTH,
display: 'flex',
alignItems: 'center',
flex: 0,
flexDirection: 'column'
},
circle: size => ({
width: size,
height: size,
flexShrink: 0,
flexGrow: 0,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
borderWidth: 2,
borderRadius: 9999,
borderColor: colors.grey200
}),
circleSelected: {
borderColor: colors.blue
},
circleError: {
borderColor: colors.red
},
circleDisabled: {
opacity: 0.4
},
innerCircle: size => ({
width: size * INNER_CIRCLE_SCALE,
height: size * INNER_CIRCLE_SCALE,
flexShrink: 0,
flexGrow: 0,
backgroundColor: colors.blue,
borderRadius: 999
}),
innerCircleError: {
backgroundColor: colors.red
},
verticalLine: {
marginTop: 2,
marginBottom: -1,
width: 0,
height: 4,
borderLeftWidth: 1,
borderColor: colors.grey200
},
topVerticalLine: {
marginTop: 0,
marginBottom: 2,
width: 0,
height: 4,
borderLeftWidth: 1,
borderColor: colors.blue
},
line: {
alignItems: 'center',
flexDirection: 'row',
justifyContent: 'space-around',
width: '100%',
marginBottom: 2
},
lineHolder: {
flexDirection: 'row',
alignItems: 'center',
borderWidth: 0
},
lineFill: {
flex: 1
},
lineVisible: {
borderTopWidth: 1,
borderColor: colors.grey200
},
circleHitSlop: {
top: 0,
bottom: 20,
left: 0,
right: 0
}
});

function Circle({ size = 22, selected, disabled, error }) {
return (
<View
style={[
styles.circle(size),
selected && styles.circleSelected,
selected && error && styles.circleError,
disabled && styles.circleDisabled
]}
>
{selected && (
<View
style={[
styles.innerCircle(size),
selected && error && styles.innerCircleError,
{ width: size * INNER_CIRCLE_SCALE, height: size * INNER_CIRCLE_SCALE }
]}
/>
)}
</View>
);
}
Circle.propTypes = {
size: PropTypes.number,
selected: PropTypes.bool,
disabled: PropTypes.bool,
error: PropTypes.bool
};

function Option({ onPress, name, ...props }) {
const handlePress = useCallback(() => onPress(name), [name, onPress]);
return <TouchableOpacity onPress={handlePress} style={styles.option} {...props} />;
}

Option.propTypes = {
onPress: PropTypes.func,
name: PropTypes.string
};

function HorizontalSelector({ options = [], selected, circleSize, onPress, disabled, ...props }) {
const hasTopLabels = useMemo(() => options.some(option => option.topLabel), [options]);
return (
<View {...props}>
{hasTopLabels && (
<View style={styles.selector}>
{options.map(option =>
option.topLabel ? (
<View key={option.name} style={styles.option}>
{typeof option.topLabel === 'string' ? (
<Text noMargin bold link small centered>
{option.topLabel}
</Text>
) : typeof option.topLabel === 'function' ? (
option.topLabel(option.name === selected, option.disabled ?? disabled)
) : (
option.topLabel
)}
<View style={styles.topVerticalLine} />
</View>
) : (
<View key={option.name} style={styles.option} />
)
)}
</View>
)}
<View style={styles.selector}>
{options.map(option => (
<Option
key={option.name}
onPress={onPress}
selected={option.name === selected}
hitSlop={styles.circleHitSlop}
{...option}
disabled={disabled ?? option.disabled}
>
<Circle
selected={option.name === selected}
size={circleSize}
disabled={option.disabled || disabled}
error={option.error}
/>
<View style={styles.verticalLine} />
</Option>
))}
</View>
<View style={styles.line}>
{options.map((option, index, array) => (
<Fragment key={option.name}>
<View style={[styles.lineFill, index !== 0 && styles.lineVisible]} />
<View style={[styles.lineHolder, styles.lineFill]}>
<View style={[styles.lineFill, index !== 0 && styles.lineVisible]} />
<View style={[styles.lineFill, index !== array.length - 1 && styles.lineVisible]} />
</View>
<View style={[styles.lineFill, index !== array.length - 1 && styles.lineVisible]} />
</Fragment>
))}
</View>
<View style={styles.labels}>
{options.map(option => (
<Option
key={option.name}
onPress={onPress}
selected={option.name === selected}
{...option}
disabled={disabled ?? option.disabled}
>
{typeof option.label === 'string' ? (
<Text centered>{option.label}</Text>
) : typeof option.label === 'function' ? (
option.label(option.name === selected, option.disabled ?? disabled)
) : (
option.label
)}
</Option>
))}
</View>
</View>
);
}

HorizontalSelector.propTypes = {
/**
* Array of options
*/
options: PropTypes.arrayOf(
PropTypes.shape({
/**
* Label of the option. It can be a string, component or a render
* function, which will be called with arguments (selected, disabled).
*/
label: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
/**
* Top label of the option. It can be a string, component or a render function.
*/
topLabel: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
/**
* Option name string, this is used as argument when calling the onPress function.
*/
name: PropTypes.string,
/**
* Boolean value to determine whether if option is disabled or not.
*/
disabled: PropTypes.bool,
/**
* Boolean value to determine if the option should represent an error
*/
error: PropTypes.bool
})
),
/**
* Boolean value to determine whether the options are disabked or not.
*/
disabled: PropTypes.bool,
/**
* Function that is called when pressing an option. The function is called with option.name argument.
*/
onPress: PropTypes.func,
/**
* Size of the option circle
*/
circleSize: PropTypes.number,
/**
* Current option name selected
*/
selected: PropTypes.string
};

export default HorizontalSelector;
41 changes: 41 additions & 0 deletions app/components/UI/EditGasFee1559/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable react/display-name */
import React, { useCallback, useState } from 'react';
import { View, StyleSheet, TouchableOpacity } from 'react-native';
import Text from '../../Base/Text';
Expand All @@ -7,6 +8,7 @@ import { colors } from '../../../styles/common';
import InfoModal from '../Swaps/components/InfoModal';
import Icon from 'react-native-vector-icons/Ionicons';
import { strings } from '../../../../locales/i18n';
import HorizontalSelector from '../../Base/HorizontalSelector';

const styles = StyleSheet.create({
root: {
Expand Down Expand Up @@ -50,6 +52,7 @@ const EditGasFee1559 = () => {
const [showRangeInfoModal, setShowRangeInfoModal] = useState(false);
const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
const [maxPriorityFeeError, setMaxPriorityFeeError] = useState(null);
const [selectedOption, setSelectedOption] = useState(null);

const toggleRangeInfoModal = useCallback(() => {
setShowRangeInfoModal(showRangeInfoModal => !showRangeInfoModal);
Expand All @@ -73,6 +76,44 @@ const EditGasFee1559 = () => {
</View>
<View>
<Text>SELECTOR</Text>
{/* TODO: hook with controller, add strings i18n */}
<HorizontalSelector
selected={selectedOption}
onPress={setSelectedOption}
options={[
{
name: 'lower',
disabled: true,
label: <Text bold>Lower</Text>
},
{
name: 'medium',
label: (selected, disabled) => (
<Text bold primary={selected && !disabled}>
Medium
</Text>
)
},

{
name: 'high',
error: true,
label: (selected, disabled) => (
<Text bold primary={selected && !disabled}>
Higher
</Text>
),
topLabel: (
<TouchableOpacity onPress={toggleRangeInfoModal}>
<Text noMargin link bold small centered>
Recommended{' '}
<MaterialCommunityIcon name="information" size={14} style={styles.labelInfo} />
</Text>
</TouchableOpacity>
)
}
]}
/>
</View>
<View style={styles.advancedOptionsContainer}>
<TouchableOpacity onPress={toggleAdvancedOptions} style={styles.advancedOptionsButton}>
Expand Down