kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-29 12:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed null argument errors for timers and layout animations

Browse Source
This commit is contained in:
Nick Lockwood
2015-08-01 07:44:05 -01:00
parent 3e79838a31
commit 95d1fd142e
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Examples/UIExplorer/LayoutEventsExample.js
View File

@@ -49,8 +49,7 @@ var LayoutEventExample = React.createClass({
() => { () => {
console.log('layout animation done.'); console.log('layout animation done.');
this.addWrapText(); this.addWrapText();
}, }
(error) => { throw new Error(JSON.stringify(error)); }
); );
this.setState({ this.setState({
viewStyle: { viewStyle: {

4
Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTests.m
View File

@@ -26,11 +26,11 @@
- (void)setUp - (void)setUp
{ {
#if __LP64__ #if __LP64__
RCTAssert(false, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)"); RCTAssert(NO, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
#endif #endif
NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
RCTAssert(version.majorVersion == 8 || version.minorVersion == 3, @"Tests should be run on iOS 8.3, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion); RCTAssert(version.majorVersion == 8 || version.minorVersion >= 3, @"Tests should be run on iOS 8.3+, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
_runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerIntegrationTests/js/IntegrationTestsApp", nil); _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerIntegrationTests/js/IntegrationTestsApp", nil);
} }

9
Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m
View File

@@ -32,11 +32,12 @@
- (void)setUp - (void)setUp
{ {
#ifdef __LP64__ #if __LP64__
RCTAssert(!__LP64__, @"Snapshot tests should be run on 32-bit device simulators (e.g. iPhone 5)"); RCTAssert(NO, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
#endif #endif
NSString *version = [[UIDevice currentDevice] systemVersion];
RCTAssert([version isEqualToString:@"8.3"], @"Snapshot tests should be run on iOS 8.3, found %@", version); NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
RCTAssert(version.majorVersion == 8 || version.minorVersion >= 3, @"Snapshot tests should be run on iOS 8.3+, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
_runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp.ios", nil); _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp.ios", nil);
_runner.recordMode = NO; _runner.recordMode = NO;
} }

3
Examples/UIExplorer/UIExplorerIntegrationTests/js/LayoutEventsTest.js
View File

@@ -51,8 +51,7 @@ var LayoutEventsTest = React.createClass({
() => { () => {
debug('layout animation done.'); debug('layout animation done.');
this.checkLayout(this.addWrapText); this.checkLayout(this.addWrapText);
}, }
(error) => { throw new Error(JSON.stringify(error)); }
); );
this.setState({viewStyle: {margin: 60}}); this.setState({viewStyle: {margin: 60}});
}, },

2
Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m
View File

@@ -170,7 +170,7 @@ RCT_EXPORT_MODULE(TestModule)
} }
RCT_EXPORT_METHOD(testMethod:(NSInteger)integer RCT_EXPORT_METHOD(testMethod:(NSInteger)integer
number:(NSNumber *)number number:(nonnull NSNumber *)number
string:(NSString *)string string:(NSString *)string
dictionary:(NSDictionary *)dict dictionary:(NSDictionary *)dict
callback:(RCTResponseSenderBlock)callback) callback:(RCTResponseSenderBlock)callback)

6
Libraries/Animation/LayoutAnimation.js
View File

@@ -69,9 +69,11 @@ type Config = {
delete?: Anim; delete?: Anim;
} }
function configureNext(config: Config, onAnimationDidEnd?: Function, onError?: Function) { function configureNext(config: Config, onAnimationDidEnd?: Function) {
configChecker({config}, 'config', 'LayoutAnimation.configureNext'); configChecker({config}, 'config', 'LayoutAnimation.configureNext');
RCTUIManager.configureNextLayoutAnimation(config, onAnimationDidEnd, onError); RCTUIManager.configureNextLayoutAnimation(
config, onAnimationDidEnd || function() {}, function() { /* unused */ }
);
} }
function create(duration: number, type, creationProp): Config { function create(duration: number, type, creationProp): Config {

4
Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js
View File

@@ -47,7 +47,7 @@ var JSTimers = {
return func.apply(undefined, args); return func.apply(undefined, args);
}; };
JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setTimeout; JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setTimeout;
RCTTiming.createTimer(newID, duration, Date.now(), /** recurring */ false); RCTTiming.createTimer(newID, duration || 0, Date.now(), /** recurring */ false);
return newID; return newID;
}, },
@@ -63,7 +63,7 @@ var JSTimers = {
return func.apply(undefined, args); return func.apply(undefined, args);
}; };
JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setInterval; JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setInterval;
RCTTiming.createTimer(newID, duration, Date.now(), /** recurring */ true); RCTTiming.createTimer(newID, duration || 0, Date.now(), /** recurring */ true);
return newID; return newID;
}, },