Skip to content

Feat/ColorPicker - preview text style prop #804

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

Merged
merged 5 commits into from
Jun 8, 2020
Merged

Feat/ColorPicker - preview text style prop #804

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e8d67e
Added preview text style prop
ArnonZ Jun 3, 2020
dd6b9db
Merge branch 'master' into feat/cp_textstyle
ArnonZ Jun 3, 2020
10f7585
Added style override to preview's input
ArnonZ Jun 7, 2020
a208767
Merge branch 'master' into feat/cp_textstyle
ArnonZ Jun 7, 2020
98d7452
previewInputStyle
ArnonZ Jun 7, 2020
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
31 changes: 18 additions & 13 deletions src/components/colorPicker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ export default class ColorPicker extends PureBaseComponent {
* Props to pass the Dialog component
*/
dialogProps: PropTypes.object,
/**
* Additional styling for the color preview text.
*/
previewInputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
/**
* Accessibility labels as an object of strings, ex. {addButton: 'add custom color using hex code', dismissButton: 'dismiss', doneButton: 'done', input: 'custom hex color code'}
*/
Expand Down Expand Up @@ -109,7 +113,7 @@ export default class ColorPicker extends PureBaseComponent {
const text = this.getColorValue(nextProps.initialColor || this.props.initialColor);
const color = Colors.getHSL(nextProps.initialColor);
const {valid} = this.getValidColorString(text);

this.setState({color, text, valid});
}
}
Expand Down Expand Up @@ -185,7 +189,7 @@ export default class ColorPicker extends PureBaseComponent {

getValidColorString(text) {
const hex = this.getHexColor(text);

if (Colors.isValidHex(hex)) {
return {hex, valid: true};
}
Expand All @@ -212,7 +216,7 @@ export default class ColorPicker extends PureBaseComponent {
const color = Colors.getHSL(this.props.initialColor);
const text = this.getColorValue(this.props.initialColor);
const {valid} = this.getValidColorString(text);

this.setState({
show: false,
color,
Expand Down Expand Up @@ -275,8 +279,8 @@ export default class ColorPicker extends PureBaseComponent {
const colorValue = color.a === 0 ? Colors.black : Colors.getHexString(color);

return (
<ColorSliderGroup
initialColor={colorValue}
<ColorSliderGroup
initialColor={colorValue}
containerStyle={[this.styles.sliderGroup, {height: keyboardHeight}]}
sliderContainerStyle={this.styles.slider}
showLabels
Expand All @@ -288,7 +292,7 @@ export default class ColorPicker extends PureBaseComponent {
}

renderPreview() {
const {accessibilityLabels} = this.getThemeProps();
const {accessibilityLabels, previewInputStyle} = this.getThemeProps();
const {color, text} = this.state;
const hex = this.getHexString(color);
const textColor = this.getTextColor(hex);
Expand All @@ -299,11 +303,11 @@ export default class ColorPicker extends PureBaseComponent {
<View style={[this.styles.preview, {backgroundColor: hex}]}>
<TouchableOpacity center onPress={this.setFocus} activeOpacity={1} accessible={false}>
<View style={this.styles.inputContainer}>
<Text
text60
white
marginL-13
marginR-5={Constants.isIOS}
<Text
text60
white
marginL-13
marginR-5={Constants.isIOS}
style={{
color: textColor,
transform: [{scaleX: I18nManager.isRTL ? -1 : 1}]
Expand All @@ -321,7 +325,8 @@ export default class ColorPicker extends PureBaseComponent {
style={[
this.styles.input,
{color: textColor, width: (value.length + 1) * 16.5 * fontScale},
Constants.isAndroid && {padding: 0}
Constants.isAndroid && {padding: 0},
previewInputStyle
]}
selectionColor={textColor}
underlineColorAndroid="transparent"
Expand Down Expand Up @@ -410,7 +415,7 @@ function createStyles(props) {
const iconSize = SWATCH_SIZE;
const plusButtonContainerWidth = iconSize + 20 + 12;
const plusButtonContainerHeight = 92 - 2 * SWATCH_MARGIN;

const styles = StyleSheet.create({
palette: {
paddingLeft: plusButtonContainerWidth
Expand Down