Specialize JSCValueEncoder for id instead of NSArray

Reviewed By: kathryngray Differential Revision: D5355723 fbshipit-source-id: a992514c92143fcac52f8e35824c665a1cb44ea4
facebook · Aug 7, 2017 · 1cd276a · 1cd276a
1 parent 782453d
commit 1cd276a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
@@ -1164,8 +1164,7 @@ - (JSValue *)callFunctionOnModule:(NSString *)module
   RCT_PROFILE_BEGIN_EVENT(0, @"callFunctionOnModule", (@{ @"module": module, @"method": method }));
   __block JSValue *ret = nil;
   NSError *errorObj = tryAndReturnError(^{
-    Value result = self->_reactInstance->callFunctionSync(
-      [module UTF8String], [method UTF8String], arguments);
+    Value result = self->_reactInstance->callFunctionSync([module UTF8String], [method UTF8String], (id)arguments);
     JSContext *context = contextForGlobalContextRef(JSC_JSContextGetGlobalContext(result.context()));
     ret = [JSC_JSValue(result.context()) valueWithJSValueRef:result inContext:context];
   });

diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
@@ -26,16 +26,10 @@ std::vector<std::unique_ptr<NativeModule>> createNativeModules(NSArray<RCTModule
 
 JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef);
 
-/*
- * The ValueEncoder<NSArray *>::toValue is used by JSCExecutor callFunctionSync.
- * Note: Because the NSArray * is really a NSArray * __strong the toValue is
- * accepting NSArray *const __strong instead of NSArray *&&.
- */
-template <>
-struct ValueEncoder<NSArray *> {
-  static Value toValue(JSGlobalContextRef ctx, NSArray *const __strong array)
-  {
-    JSValue *value = [JSC_JSValue(ctx) valueWithObject:array inContext:contextForGlobalContextRef(ctx)];
+template<>
+struct JSCValueEncoder<id> {
+  static Value toJSCValue(JSGlobalContextRef ctx, id obj) {
+    JSValue *value = [JSC_JSValue(ctx) valueWithObject:obj inContext:contextForGlobalContextRef(ctx)];
     return {ctx, [value JSValueRef]};
   }
 };

diff --git a/ReactCommon/cxxreact/JSCExecutor.h b/ReactCommon/cxxreact/JSCExecutor.h
@@ -36,8 +36,19 @@ class RN_EXPORT JSCExecutorFactory : public JSExecutorFactory {
   folly::dynamic m_jscConfig;
 };
 
-template <typename T>
-struct ValueEncoder;
+template<typename T>
+struct JSCValueEncoder {
+  // If you get a build error here, it means the compiler can't see the template instantation of toJSCValue
+  // applicable to your type.
+  static const Value toJSCValue(JSGlobalContextRef ctx, T&& value);
+};
+
+template<>
+struct JSCValueEncoder<folly::dynamic> {
+  static const Value toJSCValue(JSGlobalContextRef ctx, const folly::dynamic &&value) {
+    return Value::fromDynamic(ctx, value);
+  }
+};
 
 class RN_EXPORT JSCExecutor : public JSExecutor {
 public:
@@ -69,7 +80,7 @@ class RN_EXPORT JSCExecutor : public JSExecutor {
   Value callFunctionSync(
       const std::string& module, const std::string& method, T&& args) {
     return callFunctionSyncWithValue(
-      module, method, ValueEncoder<typename std::decay<T>::type>::toValue(
+      module, method, JSCValueEncoder<typename std::decay<T>::type>::toJSCValue(
         m_context, std::forward<T>(args)));
   }