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.

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

[Android,Ios]supporting button text resize #16351

Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge branch 'master' into gichang-yang-support-button-text-resize
  • Loading branch information
jason9693 authored Nov 14, 2017
commit b8edc40e2c79cda323e0e40e011fa41bd866c776
6 changes: 6 additions & 0 deletions Libraries/Components/Button.js
Original file line number Diff line number Diff line change
@@ -59,6 +59,7 @@ class Button extends React.Component<{
disabled?: ?boolean,
testID?: ?string,
fontSize?: ?string,
hasTVPreferredFocus?: ?boolean,
}> {
static propTypes = {
/**
@@ -89,6 +90,11 @@ class Button extends React.Component<{
* Used to change button's fontSize
*/
fontSize: PropTypes.number,
* *(Apple TV only)* TV preferred focus (see documentation for the View component).
*
* @platform ios
*/
hasTVPreferredFocus: PropTypes.bool,
};

render() {
You are viewing a condensed version of this merge commit. You can view the full changes here.