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

Move RCTFollyConvert to the correct namespace

Browse Source 
Reviewed By: mhorowitz

Differential Revision: D4551124

fbshipit-source-id: 40a0a8ca818710a7529798b8244d9c133eb5c22d
This commit is contained in:
Pieter De Baets
2017-02-16 06:45:40 -08:00
committed by Facebook Github Bot
parent ae57b25134
commit 5d4ff693b4
8 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
React/CxxModule/RCTCxxMethod.mm
View File

@@ -12,12 +12,14 @@
#import <React/RCTBridge+Private.h>
#import <React/RCTBridge.h>
#import <React/RCTConvert.h>
#import <React/RCTFollyConvert.h>
#import <cxxreact/JsArgumentHelpers.h>
#import <folly/Memory.h>
#import "RCTCxxUtils.h"
using facebook::xplat::module::CxxModule;
using namespace facebook::react;
@implementation RCTCxxMethod
{
@@ -77,14 +79,14 @@ using facebook::xplat::module::CxxModule;
NSNumber *id2 = arguments[arguments.count - 1];
second = ^(std::vector<folly::dynamic> args) {
[bridge enqueueCallback:id2 args:RCTConvertFollyDynamic(folly::dynamic(args.begin(), args.end()))];
[bridge enqueueCallback:id2 args:convertFollyDynamicToId(folly::dynamic(args.begin(), args.end()))];
};
} else {
id1 = arguments[arguments.count - 1];
}
first = ^(std::vector<folly::dynamic> args) {
[bridge enqueueCallback:id1 args:RCTConvertFollyDynamic(folly::dynamic(args.begin(), args.end()))];
[bridge enqueueCallback:id1 args:convertFollyDynamicToId(folly::dynamic(args.begin(), args.end()))];
};
}
@@ -98,7 +100,7 @@ using facebook::xplat::module::CxxModule;
} else {
auto result = _method->syncFunc(std::move(args));
// TODO: we should convert this to JSValue directly
return RCTConvertFollyDynamic(result);
return convertFollyDynamicToId(result);
}
} catch (const facebook::xplat::JsArgumentException &ex) {
RCTLogError(@"Method %@.%s argument error: %s",