mirror of
https://github.com/status-im/react-native.git
synced 2025-01-10 09:35:48 +00:00
e3225f3403
Summary: Fixes a crash due to the selector regex not knowing about the nullability annotations. Adds support for both the core annotations `__nullable` and `__nonnull` plus their shorthand counterparts `nullable` and `nonnull`. Objective-C allows the shorthand versions only at the front of a parameter type declaration like `(nullable NSString *)` but the regex will pick up `(NSString * nullable)` too. This shouldn't cause any adverse effects and I left the code this way to keep the regex readable. Fixes #1795 Closes https://github.com/facebook/react-native/pull/1796 Github Author: James Ide <ide@jameside.com> Test Plan: Wrote a bridge method that uses a nullability annotation and verified that it didn't cause the app to crash: ``` RCT_EXPORT_METHOD(method:(nullable NSNumber *)reactTag) { } ``` Also added a nullable annotation to RCTTest.
86 lines
2.2 KiB
Objective-C
86 lines
2.2 KiB
Objective-C
/**
|
|
* Copyright (c) 2015-present, Facebook, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under the BSD-style license found in the
|
|
* LICENSE file in the root directory of this source tree. An additional grant
|
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
*/
|
|
|
|
#import "RCTTestModule.h"
|
|
|
|
#import "FBSnapshotTestController.h"
|
|
#import "RCTAssert.h"
|
|
#import "RCTEventDispatcher.h"
|
|
#import "RCTLog.h"
|
|
#import "RCTUIManager.h"
|
|
|
|
@implementation RCTTestModule
|
|
{
|
|
NSMutableDictionary *_snapshotCounter;
|
|
}
|
|
|
|
@synthesize bridge = _bridge;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (dispatch_queue_t)methodQueue
|
|
{
|
|
return _bridge.uiManager.methodQueue;
|
|
}
|
|
|
|
- (instancetype)init
|
|
{
|
|
if ((self = [super init])) {
|
|
_snapshotCounter = [NSMutableDictionary new];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(verifySnapshot:(RCTResponseSenderBlock)callback)
|
|
{
|
|
RCTAssert(_controller != nil, @"No snapshot controller configured.");
|
|
|
|
[_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {
|
|
|
|
NSString *testName = NSStringFromSelector(_testSelector);
|
|
_snapshotCounter[testName] = [@([_snapshotCounter[testName] integerValue] + 1) stringValue];
|
|
|
|
NSError *error = nil;
|
|
BOOL success = [_controller compareSnapshotOfView:_view
|
|
selector:_testSelector
|
|
identifier:_snapshotCounter[testName]
|
|
error:&error];
|
|
callback(@[@(success)]);
|
|
}];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(sendAppEvent:(NSString *)name body:(nullable id)body)
|
|
{
|
|
[_bridge.eventDispatcher sendAppEventWithName:name body:body];
|
|
}
|
|
|
|
RCT_REMAP_METHOD(shouldResolve, shouldResolve_resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
{
|
|
resolve(@1);
|
|
}
|
|
|
|
RCT_REMAP_METHOD(shouldReject, shouldReject_resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
{
|
|
reject(nil);
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(markTestCompleted)
|
|
{
|
|
[self markTestPassed:YES];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(markTestPassed:(BOOL)success)
|
|
{
|
|
[_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {
|
|
_status = success ? RCTTestStatusPassed : RCTTestStatusFailed;
|
|
}];
|
|
}
|
|
|
|
@end
|