-
Notifications
You must be signed in to change notification settings - Fork 24.3k
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.
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
Update NavigatorIOS.ios.js #5101
Conversation
Allow props passed to the route object to overwrite props passed to the navigator.
By analyzing the blame information on this pull request, we identified @sahrens, @eduardinni and @mrspeaker to be potential reviewers. |
Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla - and if you have received this in error or have any questions, please drop us a line at cla@fb.com. Thanks! |
@@ -247,16 +247,46 @@ var NavigatorIOS = React.createClass({ | |||
* Styles for the navigation item containing the component | |||
*/ | |||
wrapperStyle: View.propTypes.style, | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no-trailing-spaces: Trailing spaces not allowed.
Thanks @katrinanova! If you can clean up those trailing space issues this looks good to me. In a follow-up PR it would also be good to have this behaviour explicitly documented - I think a good place for this would be in the comment docblock in NavigatorIOS.ios.js. The docs extract the docblock and make this: https://facebook.github.io/react-native/docs/navigatorios.html#content |
@katrinanova updated the pull request. |
@brentvatne not sure why the travis ci failed :( everything ran fine when I've tested it |
@katrinanova it's failing in an objc test. It's not you. We really need to fix that one of these days. |
@facebook-github-bot shipit |
Thanks for importing. If you are an FB employee go to https://our.intern.facebook.com/intern/opensource/github/pull_request/555455854613327/int_phab to review. |
Whoops. Could you also sign the CLA @katrinanova ? https://code.facebook.com/cla |
86af597
@skevy signed |
@katrinanova thanks! And thanks for the PR! |
Allow props passed to the route object to overwrite props passed to the navigator.