Skip to content

Conversation

@Gregjarvez
Copy link
Contributor

@Gregjarvez Gregjarvez commented Apr 8, 2018

fixes #1083

@iRoachie
Copy link
Collaborator

iRoachie commented Apr 8, 2018

Great PR @Gregjarvez. You just need to do a rebase so you won't have the the searchBar commit on this branch

@codecov
Copy link

codecov bot commented Apr 8, 2018

Codecov Report

Merging #1087 into next will decrease coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             next    #1087      +/-   ##
==========================================
- Coverage   55.73%   55.66%   -0.08%     
==========================================
  Files          33       33              
  Lines         610      609       -1     
  Branches      111      110       -1     
==========================================
- Hits          340      339       -1     
  Misses        216      216              
  Partials       54       54
Impacted Files Coverage Δ
src/buttons/ButtonGroup.js 61.53% <ø> (-2.75%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c8e0bf...f124d5d. Read the comment docs.

@Gregjarvez
Copy link
Contributor Author

@iRoachie sure will do that. rebase next or master onto my current working branch ?

@iRoachie
Copy link
Collaborator

iRoachie commented Apr 8, 2018

You'll need to rebase from next.

git remote add upstream https://github.com/react-native-training/react-native-elements.git
git fetch --all
git rebase upstream next

Lastly
git push -f origin touchable-specific

@Gregjarvez
Copy link
Contributor Author

Gregjarvez commented Apr 8, 2018

@iRoachie this is awesome. initially when this happened i had to checkout another branch and cherry pick that commit only :)..
i had to do git rebase upstream/next to get it working by the way

Thanks !!

@iRoachie
Copy link
Collaborator

iRoachie commented Apr 8, 2018

Ha it works pretty sweet. The only downside is that sometimes you get some merge conflicts that you have to go through like if your branch is wayy out of sync. Glad I could help.


const Component = component || TouchableHighlight;
const Component =
component || Platform.OS === 'ios'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Lets move this logic to the defaultProps section at the bottom

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure !!!

Copy link
Collaborator

@iRoachie iRoachie left a comment

Choose a reason for hiding this comment

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

Purrrfect

@iRoachie iRoachie merged commit 6d92e00 into react-native-elements:next Apr 8, 2018
@Gregjarvez Gregjarvez deleted the touchable-specific branch April 8, 2018 20:19
Monte9 pushed a commit that referenced this pull request May 6, 2018
* Remove any occurence of `isRequired` #960

* fix(Title) Move disabled style (#1070)

* fix(Title) Move disabled style

* reorder styles

* fix(types): ButtonGroup - Add selectedButtonStyle

Replace selectedBackgroundColor with selectedButtonStyle

* Run prettier on some stray files

* Fix typo in listitem.md (#1078)

* Fix typo in listitem.md

'checkbox' corrected to 'checkBox'

* fix checkBox typo in versioned docs listitem.md

* Allowed Badge to accept any component as the Container component (#1061)

* Button group use platform touchable  (#1087)

* buttongroup platform specific touchable

* move component prop logic defaultprops

* Add WeChat color to SocialIcon (#1092)

* (ListItem) Fix checkmark platform sizing (#1090)

* Fix Overlay children typing

* docs(Avatar): Add size props

small, medium, large, xlarge

* docs(ListItem): Change avatar to leftAvatar

Add props descriptions to beta4 docs. Fixes #1069

* fix(Avatar): Re-add missing `imageProps` prop

* Dismiss overlay by touching backdrop (#1094)

* Dismiss Overlay by clicking outside of Overlay Modal

* updated overlay docs

* rename overlayBackgroundpress to onBackdropPress

* updated overlay snapshot

* fix overlay prop type

* Add `onBackdropPress` to Overlay

* Fix Icon style when using TouchableNativeFeedback (#1104)

* add encasing view and update test

* add encasing view and update test

* Refactor Avatar Size props (#1098)

* rewrite avatar size prop

* updated docs

* updated typescript definitions

* updated docs, ts and size prop logic

* fallback for icon dimension

* @default docs

* Add raised prop back to Button component (#1108)

* Bump docusarus version

* docs(website): Fix small bug in listitem docs header

* docs(website): Set default version shown as 0.19.0

* docs(website): Replace main icon with svg

* Add backdropPress example to docs (#1116)

* Use v0.19.0 as default version (#1101)

* Revert website default version (#1103)

* Use v0.19.0 as default version

* Revert "Use v0.19.0 as default version"

This reverts commit 1caeefd.

* Revert "Use v0.19.0 as default version"

This reverts commit 1caeefd.

* Add descriptions for ListItem props in v1.0.0-beta4 docs (#1118)

* Remove weird duplicate in beta4 docs [ci skip]

* button opacity layer border on button press (#1107)

* Opacity layer borderRadius on Button press

* borderRadius to containerStyle.borderRadius

* containerStyle.borderRadius  -> buttonStyle.borderRadadius😄

* docs(Card) Button icon needs to be a component (#1132)

* Button icon needs to be a component

* Use icon element instead of object for Card docs

* ci(travis) Pin version of node

Node 10 currently breaks builds cause of missing whitelist console in react native jest setup. jestjs/jest#2567 (comment) Pinning node version until react-native/jest bumps

* Cleanup definitons [ci-skip]

* Bounce Form elements (#1146)

* Refactor and make uniform all SearchBars (#1135)

* Remove useless flex

* Refactor default SearchBar

* Add renderIcon helper

* Use helper for default SearchBar

* Use renderIcon in Input

* Add back input icons containers

* Improve renderIcon helper

* Remove useless import

* Use renderIcon for iOS searchbar

* Use renderIcon for Android searchbar

* Update SearchBar and Input docs

* Update this.clear call

* Remove useless onCancel on default searchbar

* Remove useless hasFocus on default props

* Update tests

* Fix tests with new props

* Use renderNode + refactor nodeType

* Fix typo + link to Input props

* Use `false` instead of `null` [ci-skip]

* docs(Input) Typo it should be labelStyle not labelString

* docs(ListItem) onPress component should be TouchableOpacity (#1152)

* Typo?

It seems that a touchableopacity is added - not a touchablehighlight.

shouldn't a touchablehighlight be used here?
* https://medium.com/differential/better-cross-platform-react-native-components-cb8aadeba472
* https://stackoverflow.com/questions/39123357/when-to-use-touchablenativefeedback-touchablehighlight-or-touchableopacity

thanks!

* typo

* Fix depth collision with Button and Overlay (#1113)

* Update Overlay snapshots

* Add Cancel Button Props Object for iOS (#1159)

* docs(website): Set default version shown as 0.19.0 (#1156)

* ci(travis) Pin version of node (#1158)

Node 10 currently breaks builds cause of missing whitelist console in react native jest setup. jestjs/jest#2567 (comment) Pinning node version until react-native/jest bumps

* enhancment(searchBar): add 'cancelButtonColor' to search bar component

This give a user the abilty to change the color of the text for iOS cancel button

* enhancement(searchBar) add 'cancelButtonProps' prop

Users can now pass the normal React Native Button props to the cancel button.

* Add iOS only to docs

* Fix typo in input docs #1041

* Add FormValidationMessage in imports #1144

* (Button) Doc improvement: remove duplicate item (#1167)

for 0.19.0 `Button`
the `loading` item in props list is duplicate

* Create helpers export

* Cleanup SearchBar typings and docs (#1169)

* (types) Cleanup searchbar definitions

* docs(SearchBar): Add inputContainerStyle

Closes #1123

* types (SearchBar) SearchBarAndroid should extend from SearchBarPlatform

* Fix yarn merge conflict [ci-skip]

* Apply renderNode for Button (#1170)

* Update docs

* Use renderNode helper

* Update button icon type

* Update types

* docs(website): Add Troubleshooting section (#1171)

* docs(website): Add Troubleshooting section

* Add more complex steps for font issues

* Bump version to v1.0.0-beta5

* Create new website version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants