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

Fix iOS Picker Item Colors #11260

Closed
wants to merge 7 commits into from
Closed

Fix iOS Picker Item Colors #11260

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1ceca4
added color prop to push method for Picker.Item
JakeDawkins Dec 1, 2016
dc9da3c
added processColor to color prop
JakeDawkins Dec 2, 2016
3607a76
added check for textColor passed and set if so
JakeDawkins Dec 2, 2016
7f80e5d
removed unnecessary console log
JakeDawkins Dec 2, 2016
4d43979
code style fix
JakeDawkins Dec 2, 2016
d573bf7
updated conditional to use ternary operator
JakeDawkins Dec 3, 2016
3b3b985
shortened conditinal further
JakeDawkins Dec 3, 2016
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
8 changes: 7 additions & 1 deletion Libraries/Components/Picker/PickerIOS.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var StyleSheet = require('StyleSheet');
var StyleSheetPropType = require('StyleSheetPropType');
var TextStylePropTypes = require('TextStylePropTypes');
var View = require('View');
var processColor = require('processColor');

var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
var requireNativeComponent = require('requireNativeComponent');
Expand Down Expand Up @@ -48,7 +49,11 @@ var PickerIOS = React.createClass({
if (child.props.value === props.selectedValue) {
selectedIndex = index;
}
items.push({value: child.props.value, label: child.props.label});
items.push({
value: child.props.value,
label: child.props.label,
textColor: processColor(child.props.color),
});
});
return {selectedIndex, items};
},
Expand Down Expand Up @@ -95,6 +100,7 @@ PickerIOS.Item = class extends React.Component {
static propTypes = {
value: React.PropTypes.any, // string or integer basically
label: React.PropTypes.string,
color: React.PropTypes.string,
};

render() {
Expand Down
8 changes: 7 additions & 1 deletion React/Views/RCTPicker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,13 @@ - (UIView *)pickerView:(UIPickerView *)pickerView
}

label.font = _font;
label.textColor = _color;

if ([_items[row] objectForKey:@"textColor"] == nil) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can simplify this a bit with by using the ?: operator.

label.textColor = [RCTConvert UIColor:_items[row][@"textColor"]] ?: _color;

label.textColor = _color;
} else {
label.textColor = [RCTConvert UIColor:_items[row][@"textColor"]];
}

label.textAlignment = _textAlign;
label.text = [self pickerView:pickerView titleForRow:row forComponent:component];
return label;
Expand Down