[ts] Correct style type for IconObject #851
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## next #851 +/- ##
=======================================
Coverage 53.12% 53.12%
=======================================
Files 29 29
Lines 512 512
Branches 108 108
=======================================
Hits 272 272
Misses 186 186
Partials 54 54Continue to review full report at Codecov.
|
xavier-villelegier
approved these changes
Jan 27, 2018
Collaborator
xavier-villelegier
left a comment
There was a problem hiding this comment.
Yes @k3ithl1m, looks good ! Next time just base your PR on next and it'll be perfect 👍
Collaborator
|
@k3ithl1m Could you please solve the conflicts by rebasing the |
Closed
iRoachie
requested changes
Jan 27, 2018
Collaborator
iRoachie
left a comment
There was a problem hiding this comment.
Could you not reindent the entire file? I can’t tell where you made edits or not.
Contributor
Author
|
Sorry @iRoachie , I forgot to turn off auto indent, will fix it |
Contributor
Author
|
@xavier-villelegier I'm sorry, but what does rebase means? I went back to next branch and change ViewStyle to TextStyle (this time turning off auto indent.) should i make a PR now? |
iRoachie
approved these changes
Jan 28, 2018
Collaborator
|
Don't worry with the rebase, I fixed the changes :) |
xavier-villelegier
pushed a commit
that referenced
this pull request
Jan 28, 2018
* Update README.md - fixing typos (#835) * Pass activeOpacity to TouchableOpacity inside Tile (#839) * Pass activeOpacity to TouchableOpacity inside Tile * Update Tile tests * Comment `LinearGradient` for now (FIXME) * feat(example): Cleanup remains from example app split * Fix ListItem (#848) Fix error on empty rightTitle prop by adding !! * Separate checkbox single and checkbox with text styling (#850) * (theming) Unify components under one primary color (#849) * feat(theming): Remove not-used colors * feat(theme): Add primary color and use through components Added in button, button group, badge, and header * Update snapshots * Update underColor on buttonGroup to match selectedColor * Snapshots * Add color for Checkbox * fix(Checkbox): Shifting width between checked and unchecked * chore(packages): Update versions to fix warnings in jest * added listItem right icon size so that it takes rightIcon size, or 28 (#852) * uses thumbStyle.transform values in the thumb View (#820) * [ts] Correct style type for IconObject (#851) * Add ButtonComponent props and linear gradient props (#857) * Add ButtonComponent props * Use `linearGradientProps` + add error on mounting * feat(button-group): Adds selectMultiple feature (#858) Closes #713 * Platform specific SearchBar (#837) 🚀 * Add SearchBar wrapper * Split SearchBar iOS and Android into separate files * Add back default SearchBar * Update root import * Add back Input right/left icon * Rename loadingIcon to loadingProps * Specify `platform` PropType * Add a fallback * Move tests to `searchbar` * Remove old Search component * Fix loading props spreading overriding whole style * Remove useless things * Add tests for SearchBar * Generate snapshots * Add more tests * Update tests * Update documentation * Fix typo * Slightly changed the style of SearchBars * Bump version to `1.0.0-beta2` * Update snapshots from Searchbar changes * feat(button): Re-add custom TouchableComponent * feat(Button): Cleanup button code, update ts definitions (#859) * Update SearchBars PropTypes * feat(searchbar-both) Add additional defaultProps Made tests pass * Fix PropTypes warnings * Update snapshots from searchbar android change * feat(ts): Add definitons for searchbar (#860) * Fix attributes spreading in platform specific searchbars * feat(Button) Fix activeOpacity props * fixed PricingCard to use new Button props * test(jest): Update PricingCard snapshots
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
switch current IconObject type that has defined style?: StyleProp;
to style?: StyleProp;
Would this be right? @xavier-villelegier