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

Jump to bottom

Fixes: fishhook.h & RCTValueAnimatedNode.h import path error #19173

Closed
wants to merge 6 commits into from
Closed

Fixes: fishhook.h & RCTValueAnimatedNode.h import path error #19173

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c407205
fixes: fishhook.h import path
jzhangdev May 8, 2018
39e9628
Merge branch 'master' of https://github.com/facebook/react-native
jzhangdev May 8, 2018
ab0fe01
fixs: RCTValueAnimatedNode.h import path error
jzhangdev May 8, 2018
61272da
fixes(Android): while alert method buttons param not array
jzhangdev May 11, 2018
790b18f
Merge branch 'master' of https://github.com/facebook/react-native
jzhangdev May 11, 2018
661a8d8
reserve: reset
jzhangdev May 11, 2018
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
2 changes: 1 addition & 1 deletion Libraries/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class AlertAndroid {
}
// At most three buttons (neutral, negative, positive). Ignore rest.
// The text 'OK' should be probably localized. iOS Alert does that in native.
const validButtons: Buttons = buttons
const validButtons: Buttons = buttons instanceof Array
? buttons.slice(0, 3)
: [{text: 'OK'}];
const buttonPositive = validButtons.pop();
Expand Down