react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSStable.h

@@ -11,22 +11,26 @@
 
 namespace facebook::react {
 
-class ReactNativeFeatureFlagsOverridesOSSStable
-    : public ReactNativeFeatureFlagsDefaults {
+class ReactNativeFeatureFlagsOverridesOSSStable : public ReactNativeFeatureFlagsDefaults {
  public:
-  bool enableBridgelessArchitecture() override {
+  bool enableBridgelessArchitecture() override
+  {
     return true;
   }
-  bool enableFabricRenderer() override {
+  bool enableFabricRenderer() override
+  {
     return true;
   }
-  bool useTurboModules() override {
+  bool useTurboModules() override
+  {
     return true;
   }
-  bool useNativeViewConfigsInBridgelessMode() override {
+  bool useNativeViewConfigsInBridgelessMode() override
+  {
     return true;
   }
-  bool useShadowNodeStateOnClone() override {
+  bool useShadowNodeStateOnClone() override
+  {
     return true;
   }
 };

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<70d501526baf497e55f9ca9a33b582ef>>
+ * @generated SignedSource<<06c6740fe7d613f235ae791da750bd52>>
  */
 
 /**
@@ -29,12 +29,14 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool cdpInteractionMetricsEnabled() = 0;
   virtual bool cxxNativeAnimatedEnabled() = 0;
   virtual bool cxxNativeAnimatedRemoveJsSync() = 0;
+  virtual bool disableEarlyViewCommandExecution() = 0;
   virtual bool disableFabricCommitInCXXAnimated() = 0;
   virtual bool disableMountItemReorderingAndroid() = 0;
   virtual bool disableOldAndroidAttachmentMetricsWorkarounds() = 0;
   virtual bool disableTextLayoutManagerCacheAndroid() = 0;
   virtual bool enableAccessibilityOrder() = 0;
   virtual bool enableAccumulatedUpdatesInRawPropsAndroid() = 0;
+  virtual bool enableAndroidLinearText() = 0;
   virtual bool enableAndroidTextMeasurementOptimizations() = 0;
   virtual bool enableBridgelessArchitecture() = 0;
   virtual bool enableCppPropsIteratorSetter() = 0;
@@ -49,36 +51,46 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool enableIOSTextBaselineOffsetPerLine() = 0;
   virtual bool enableIOSViewClipToPaddingBox() = 0;
   virtual bool enableImagePrefetchingAndroid() = 0;
+  virtual bool enableImagePrefetchingOnUiThreadAndroid() = 0;
   virtual bool enableImmediateUpdateModeForContentOffsetChanges() = 0;
+  virtual bool enableImperativeFocus() = 0;
   virtual bool enableInteropViewManagerClassLookUpOptimizationIOS() = 0;
+  virtual bool enableIntersectionObserverByDefault() = 0;
+  virtual bool enableKeyEvents() = 0;
   virtual bool enableLayoutAnimationsOnAndroid() = 0;
   virtual bool enableLayoutAnimationsOnIOS() = 0;
   virtual bool enableMainQueueCoordinatorOnIOS() = 0;
   virtual bool enableModuleArgumentNSNullConversionIOS() = 0;
   virtual bool enableNativeCSSParsing() = 0;
   virtual bool enableNetworkEventReporting() = 0;
-  virtual bool enableNewBackgroundAndBorderDrawables() = 0;
   virtual bool enablePreparedTextLayout() = 0;
   virtual bool enablePropsUpdateReconciliationAndroid() = 0;
   virtual bool enableResourceTimingAPI() = 0;
+  virtual bool enableSwiftUIBasedFilters() = 0;
   virtual bool enableViewCulling() = 0;
   virtual bool enableViewRecycling() = 0;
+  virtual bool enableViewRecyclingForImage() = 0;
   virtual bool enableViewRecyclingForScrollView() = 0;
   virtual bool enableViewRecyclingForText() = 0;
   virtual bool enableViewRecyclingForView() = 0;
+  virtual bool enableVirtualViewClippingWithoutScrollViewClipping() = 0;
+  virtual bool enableVirtualViewContainerStateExperimental() = 0;
   virtual bool enableVirtualViewDebugFeatures() = 0;
   virtual bool enableVirtualViewRenderState() = 0;
   virtual bool enableVirtualViewWindowFocusDetection() = 0;
   virtual bool enableWebPerformanceAPIsByDefault() = 0;
   virtual bool fixMappingOfEventPrioritiesBetweenFabricAndReact() = 0;
+  virtual bool fuseboxAssertSingleHostState() = 0;
   virtual bool fuseboxEnabledRelease() = 0;
   virtual bool fuseboxNetworkInspectionEnabled() = 0;
   virtual bool hideOffscreenVirtualViewsOnIOS() = 0;
+  virtual bool overrideBySynchronousMountPropsAtMountingAndroid() = 0;
+  virtual bool perfIssuesEnabled() = 0;
   virtual bool perfMonitorV2Enabled() = 0;
   virtual double preparedTextCacheSize() = 0;
   virtual bool preventShadowTreeCommitExhaustion() = 0;
-  virtual bool releaseImageDataWhenConsumed() = 0;
   virtual bool shouldPressibilityUseW3CPointerEventsForHover() = 0;
+  virtual bool shouldTriggerResponderTransferOnScrollAndroid() = 0;
   virtual bool skipActivityIdentityAssertionOnHostPause() = 0;
   virtual bool sweepActiveTouchOnChildNativeGesturesAndroid() = 0;
   virtual bool traceTurboModulePromiseRejectionsOnAndroid() = 0;
@@ -91,8 +103,11 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool useOptimizedEventBatchingOnAndroid() = 0;
   virtual bool useRawPropsJsiValue() = 0;
   virtual bool useShadowNodeStateOnClone() = 0;
+  virtual bool useSharedAnimatedBackend() = 0;
+  virtual bool useTraitHiddenOnAndroid() = 0;
   virtual bool useTurboModuleInterop() = 0;
   virtual bool useTurboModules() = 0;
+  virtual double viewCullingOutsetRatio() = 0;
   virtual double virtualViewHysteresisRatio() = 0;
   virtual double virtualViewPrerenderRatio() = 0;
 };

package/ReactCommon/react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h

@@ -15,10 +15,7 @@
 
 namespace facebook::react {
 
-std::unordered_map<
-    std::string,
-    std::function<
-        std::shared_ptr<TurboModule>(std::shared_ptr<CallInvoker> jsInvoker)>>&
+std::unordered_map<std::string, std::function<std::shared_ptr<TurboModule>(std::shared_ptr<CallInvoker> jsInvoker)>> &
 globalExportedCxxTurboModuleMap();
 
 /**
@@ -29,7 +26,6 @@ globalExportedCxxTurboModuleMap();
  */
 void registerCxxModuleToGlobalModuleMap(
     std::string name,
-    std::function<std::shared_ptr<TurboModule>(
-        std::shared_ptr<CallInvoker> jsInvoker)> moduleProviderFunc);
+    std::function<std::shared_ptr<TurboModule>(std::shared_ptr<CallInvoker> jsInvoker)> moduleProviderFunc);
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h

@@ -24,22 +24,13 @@ namespace facebook::react {
  */
 class JSI_EXPORT TurboCxxModule : public TurboModule {
  public:
-  TurboCxxModule(
-      std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule,
-      std::shared_ptr<CallInvoker> jsInvoker);
-
-  facebook::jsi::Value create(
-      facebook::jsi::Runtime& runtime,
-      const facebook::jsi::PropNameID& propName) override;
-
-  std::vector<facebook::jsi::PropNameID> getPropertyNames(
-      facebook::jsi::Runtime& runtime) override;
-
-  jsi::Value invokeMethod(
-      jsi::Runtime& runtime,
-      const std::string& methodName,
-      const jsi::Value* args,
-      size_t count);
+  TurboCxxModule(std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule, std::shared_ptr<CallInvoker> jsInvoker);
+
+  facebook::jsi::Value create(facebook::jsi::Runtime &runtime, const facebook::jsi::PropNameID &propName) override;
+
+  std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime &runtime) override;
+
+  jsi::Value invokeMethod(jsi::Runtime &runtime, const std::string &methodName, const jsi::Value *args, size_t count);
 
  private:
   std::vector<facebook::xplat::module::CxxModule::Method> cxxMethods_;

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h

@@ -36,9 +36,7 @@ enum TurboModuleMethodValueKind {
 /**
  * Determines TurboModuleMethodValueKind based on the jsi::Value type.
  */
-TurboModuleMethodValueKind getTurboModuleMethodValueKind(
-    jsi::Runtime& rt,
-    const jsi::Value* value);
+TurboModuleMethodValueKind getTurboModuleMethodValueKind(jsi::Runtime &rt, const jsi::Value *value);
 
 class TurboCxxModule;
 class TurboModuleBinding;
@@ -55,21 +53,20 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
   // JS representation. To customize lookup of properties, override `create`.
   // Note: keep this method declared inline to avoid conflicts
   // between RTTI and non-RTTI compilation units
-  jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& propName)
-      override {
+  jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &propName) override
+  {
     auto prop = create(runtime, propName);
     // If we have a JS wrapper, cache the result of this lookup
     // We don't cache misses, to allow for methodMap_ to dynamically be
     // extended
     if (jsRepresentation_ && !prop.isUndefined()) {
-      jsRepresentation_->lock(runtime).asObject(runtime).setProperty(
-          runtime, propName, prop);
+      jsRepresentation_->lock(runtime).asObject(runtime).setProperty(runtime, propName, prop);
     }
     return prop;
   }
 
-  std::vector<jsi::PropNameID> getPropertyNames(
-      jsi::Runtime& runtime) override {
+  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &runtime) override
+  {
     std::vector<jsi::PropNameID> result;
     result.reserve(methodMap_.size());
     for (auto it = methodMap_.cbegin(); it != methodMap_.cend(); ++it) {
@@ -84,18 +81,14 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
 
   struct MethodMetadata {
     size_t argCount;
-    jsi::Value (*invoker)(
-        jsi::Runtime& rt,
-        TurboModule& turboModule,
-        const jsi::Value* args,
-        size_t count);
+    jsi::Value (*invoker)(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value *args, size_t count);
   };
   std::unordered_map<std::string, MethodMetadata> methodMap_;
-  std::unordered_map<std::string, std::shared_ptr<IAsyncEventEmitter>>
-      eventEmitterMap_;
 
-  using ArgFactory =
-      std::function<void(jsi::Runtime& runtime, std::vector<jsi::Value>& args)>;
+  friend class TurboModuleTestFixtureInternal;
+  std::unordered_map<std::string, std::shared_ptr<IAsyncEventEmitter>> eventEmitterMap_;
+
+  using ArgFactory = std::function<void(jsi::Runtime &runtime, std::vector<jsi::Value> &args)>;
 
   /**
    * Calls RCTDeviceEventEmitter.emit to JavaScript, with given event name and
@@ -109,35 +102,31 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
    *      args.emplace_back(jsi::Value(42));
    *  });
    */
-  void emitDeviceEvent(
-      const std::string& eventName,
-      ArgFactory&& argFactory = nullptr);
+  void emitDeviceEvent(const std::string &eventName, ArgFactory &&argFactory = nullptr);
 
   // Backwards compatibility version
   void emitDeviceEvent(
-      jsi::Runtime& /*runtime*/,
+      jsi::Runtime & /*runtime*/,
 
-      const std::string& eventName,
-      ArgFactory&& argFactory = nullptr) {
+      const std::string &eventName,
+      ArgFactory &&argFactory = nullptr)
+  {
     emitDeviceEvent(eventName, std::move(argFactory));
   }
 
-  virtual jsi::Value create(
-      jsi::Runtime& runtime,
-      const jsi::PropNameID& propName) {
+  virtual jsi::Value create(jsi::Runtime &runtime, const jsi::PropNameID &propName)
+  {
     std::string propNameUtf8 = propName.utf8(runtime);
-    if (auto methodIter = methodMap_.find(propNameUtf8);
-        methodIter != methodMap_.end()) {
-      const MethodMetadata& meta = methodIter->second;
+    if (auto methodIter = methodMap_.find(propNameUtf8); methodIter != methodMap_.end()) {
+      const MethodMetadata &meta = methodIter->second;
       return jsi::Function::createFromHostFunction(
           runtime,
           propName,
           static_cast<unsigned int>(meta.argCount),
           [this, meta](
-              jsi::Runtime& rt,
-              [[maybe_unused]] const jsi::Value& thisVal,
-              const jsi::Value* args,
-              size_t count) { return meta.invoker(rt, *this, args, count); });
+              jsi::Runtime &rt, [[maybe_unused]] const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
+            return meta.invoker(rt, *this, args, count);
+          });
     } else if (auto eventEmitterIter = eventEmitterMap_.find(propNameUtf8);
                eventEmitterIter != eventEmitterMap_.end()) {
       return eventEmitterIter->second->get(runtime, jsInvoker_);
@@ -156,7 +145,6 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
  * An app/platform-specific provider function to get an instance of a module
  * given a name.
  */
-using TurboModuleProviderFunctionType =
-    std::function<std::shared_ptr<TurboModule>(const std::string& name)>;
+using TurboModuleProviderFunctionType = std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp

@@ -128,7 +128,6 @@ void TurboModuleBinding::install(
     return;
   }
 
-  defineReadOnlyGlobal(runtime, "RN$UnifiedNativeModuleProxy", true);
   defineReadOnlyGlobal(
       runtime,
       "nativeModuleProxy",

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h

@@ -28,15 +28,14 @@ class TurboModuleBinding {
    * Thread synchronization must be enforced externally.
    */
   static void install(
-      jsi::Runtime& runtime,
-      TurboModuleProviderFunctionType&& moduleProvider,
-      TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr,
-      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection =
-          nullptr);
+      jsi::Runtime &runtime,
+      TurboModuleProviderFunctionType &&moduleProvider,
+      TurboModuleProviderFunctionType &&legacyModuleProvider = nullptr,
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection = nullptr);
 
   TurboModuleBinding(
-      jsi::Runtime& runtime,
-      TurboModuleProviderFunctionType&& moduleProvider,
+      jsi::Runtime &runtime,
+      TurboModuleProviderFunctionType &&moduleProvider,
       std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection);
 
   virtual ~TurboModuleBinding();
@@ -48,10 +47,9 @@ class TurboModuleBinding {
    * A lookup function exposed to JS to get an instance of a TurboModule
    * for the given name.
    */
-  jsi::Value getModule(jsi::Runtime& runtime, const std::string& moduleName)
-      const;
+  jsi::Value getModule(jsi::Runtime &runtime, const std::string &moduleName) const;
 
-  jsi::Runtime& runtime_;
+  jsi::Runtime &runtime_;
   TurboModuleProviderFunctionType moduleProvider_;
   std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
 };

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h

@@ -11,71 +11,57 @@
 #include <memory>
 
 namespace facebook::react::TurboModulePerfLogger {
-void enableLogging(std::unique_ptr<NativeModulePerfLogger>&& logger);
+void enableLogging(std::unique_ptr<NativeModulePerfLogger> &&logger);
 void disableLogging();
 
-void moduleDataCreateStart(const char* moduleName, int32_t id);
-void moduleDataCreateEnd(const char* moduleName, int32_t id);
+void moduleDataCreateStart(const char *moduleName, int32_t id);
+void moduleDataCreateEnd(const char *moduleName, int32_t id);
 
 /**
  * Create NativeModule platform object
  */
-void moduleCreateStart(const char* moduleName, int32_t id);
-void moduleCreateCacheHit(const char* moduleName, int32_t id);
-void moduleCreateConstructStart(const char* moduleName, int32_t id);
-void moduleCreateConstructEnd(const char* moduleName, int32_t id);
-void moduleCreateSetUpStart(const char* moduleName, int32_t id);
-void moduleCreateSetUpEnd(const char* moduleName, int32_t id);
-void moduleCreateEnd(const char* moduleName, int32_t id);
-void moduleCreateFail(const char* moduleName, int32_t id);
+void moduleCreateStart(const char *moduleName, int32_t id);
+void moduleCreateCacheHit(const char *moduleName, int32_t id);
+void moduleCreateConstructStart(const char *moduleName, int32_t id);
+void moduleCreateConstructEnd(const char *moduleName, int32_t id);
+void moduleCreateSetUpStart(const char *moduleName, int32_t id);
+void moduleCreateSetUpEnd(const char *moduleName, int32_t id);
+void moduleCreateEnd(const char *moduleName, int32_t id);
+void moduleCreateFail(const char *moduleName, int32_t id);
 
 /**
  * JS require beginning
  */
-void moduleJSRequireBeginningStart(const char* moduleName);
-void moduleJSRequireBeginningCacheHit(const char* moduleName);
-void moduleJSRequireBeginningEnd(const char* moduleName);
-void moduleJSRequireBeginningFail(const char* moduleName);
+void moduleJSRequireBeginningStart(const char *moduleName);
+void moduleJSRequireBeginningCacheHit(const char *moduleName);
+void moduleJSRequireBeginningEnd(const char *moduleName);
+void moduleJSRequireBeginningFail(const char *moduleName);
 
 /**
  * JS require ending
  */
-void moduleJSRequireEndingStart(const char* moduleName);
-void moduleJSRequireEndingEnd(const char* moduleName);
-void moduleJSRequireEndingFail(const char* moduleName);
+void moduleJSRequireEndingStart(const char *moduleName);
+void moduleJSRequireEndingEnd(const char *moduleName);
+void moduleJSRequireEndingFail(const char *moduleName);
 
 // Sync method calls
-void syncMethodCallStart(const char* moduleName, const char* methodName);
-void syncMethodCallArgConversionStart(
-    const char* moduleName,
-    const char* methodName);
-void syncMethodCallArgConversionEnd(
-    const char* moduleName,
-    const char* methodName);
-void syncMethodCallExecutionStart(
-    const char* moduleName,
-    const char* methodName);
-void syncMethodCallExecutionEnd(const char* moduleName, const char* methodName);
-void syncMethodCallReturnConversionStart(
-    const char* moduleName,
-    const char* methodName);
-void syncMethodCallReturnConversionEnd(
-    const char* moduleName,
-    const char* methodName);
-void syncMethodCallEnd(const char* moduleName, const char* methodName);
-void syncMethodCallFail(const char* moduleName, const char* methodName);
+void syncMethodCallStart(const char *moduleName, const char *methodName);
+void syncMethodCallArgConversionStart(const char *moduleName, const char *methodName);
+void syncMethodCallArgConversionEnd(const char *moduleName, const char *methodName);
+void syncMethodCallExecutionStart(const char *moduleName, const char *methodName);
+void syncMethodCallExecutionEnd(const char *moduleName, const char *methodName);
+void syncMethodCallReturnConversionStart(const char *moduleName, const char *methodName);
+void syncMethodCallReturnConversionEnd(const char *moduleName, const char *methodName);
+void syncMethodCallEnd(const char *moduleName, const char *methodName);
+void syncMethodCallFail(const char *moduleName, const char *methodName);
 
 // Async method calls
-void asyncMethodCallStart(const char* moduleName, const char* methodName);
-void asyncMethodCallArgConversionStart(
-    const char* moduleName,
-    const char* methodName);
-void asyncMethodCallArgConversionEnd(
-    const char* moduleName,
-    const char* methodName);
-void asyncMethodCallDispatch(const char* moduleName, const char* methodName);
-void asyncMethodCallEnd(const char* moduleName, const char* methodName);
-void asyncMethodCallFail(const char* moduleName, const char* methodName);
+void asyncMethodCallStart(const char *moduleName, const char *methodName);
+void asyncMethodCallArgConversionStart(const char *moduleName, const char *methodName);
+void asyncMethodCallArgConversionEnd(const char *moduleName, const char *methodName);
+void asyncMethodCallDispatch(const char *moduleName, const char *methodName);
+void asyncMethodCallEnd(const char *moduleName, const char *methodName);
+void asyncMethodCallFail(const char *moduleName, const char *methodName);
 
 /**
  * Pre-processing async method call batch
@@ -84,25 +70,10 @@ void asyncMethodCallBatchPreprocessStart();
 void asyncMethodCallBatchPreprocessEnd(int batchSize);
 
 // Async method call execution
-void asyncMethodCallExecutionStart(
-    const char* moduleName,
-    const char* methodName,
-    int32_t id);
-void asyncMethodCallExecutionArgConversionStart(
-    const char* moduleName,
-    const char* methodName,
-    int32_t id);
-void asyncMethodCallExecutionArgConversionEnd(
-    const char* moduleName,
-    const char* methodName,
-    int32_t id);
-void asyncMethodCallExecutionEnd(
-    const char* moduleName,
-    const char* methodName,
-    int32_t id);
-void asyncMethodCallExecutionFail(
-    const char* moduleName,
-    const char* methodName,
-    int32_t id);
+void asyncMethodCallExecutionStart(const char *moduleName, const char *methodName, int32_t id);
+void asyncMethodCallExecutionArgConversionStart(const char *moduleName, const char *methodName, int32_t id);
+void asyncMethodCallExecutionArgConversionEnd(const char *moduleName, const char *methodName, int32_t id);
+void asyncMethodCallExecutionEnd(const char *moduleName, const char *methodName, int32_t id);
+void asyncMethodCallExecutionFail(const char *moduleName, const char *methodName, int32_t id);
 
 } // namespace facebook::react::TurboModulePerfLogger

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h

@@ -16,19 +16,16 @@
 namespace facebook::react {
 
 struct Promise : public LongLivedObject {
-  Promise(jsi::Runtime& rt, jsi::Function resolve, jsi::Function reject);
+  Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject);
 
-  void resolve(const jsi::Value& result);
-  void reject(const std::string& message);
+  void resolve(const jsi::Value &result);
+  void reject(const std::string &message);
 
   jsi::Function resolve_;
   jsi::Function reject_;
 };
 
-using PromiseSetupFunctionType =
-    std::function<void(jsi::Runtime& rt, std::shared_ptr<Promise>)>;
-jsi::Value createPromiseAsJSIValue(
-    jsi::Runtime& rt,
-    PromiseSetupFunctionType&& func);
+using PromiseSetupFunctionType = std::function<void(jsi::Runtime &rt, std::shared_ptr<Promise>)>;
+jsi::Value createPromiseAsJSIValue(jsi::Runtime &rt, PromiseSetupFunctionType &&func);
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleWithJSIBindings.h

@@ -18,12 +18,10 @@ class TurboModuleWithJSIBindings {
  public:
   virtual ~TurboModuleWithJSIBindings() = default;
 
-  static void installJSIBindings(
-      const std::shared_ptr<TurboModule>& cxxModule,
-      jsi::Runtime& runtime);
+  static void installJSIBindings(const std::shared_ptr<TurboModule> &cxxModule, jsi::Runtime &runtime);
 
  private:
-  virtual void installJSIBindingsWithRuntime(jsi::Runtime& runtime) = 0;
+  virtual void installJSIBindingsWithRuntime(jsi::Runtime &runtime) = 0;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h

@@ -28,22 +28,20 @@ class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule {
   };
 
   JavaInteropTurboModule(
-      const JavaTurboModule::InitParams& params,
-      const std::vector<MethodDescriptor>& methodDescriptors);
+      const JavaTurboModule::InitParams &params,
+      const std::vector<MethodDescriptor> &methodDescriptors);
 
-  std::vector<facebook::jsi::PropNameID> getPropertyNames(
-      facebook::jsi::Runtime& runtime) override;
+  std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime &runtime) override;
 
  protected:
-  jsi::Value create(jsi::Runtime& runtime, const jsi::PropNameID& propName)
-      override;
+  jsi::Value create(jsi::Runtime &runtime, const jsi::PropNameID &propName) override;
 
  private:
   std::vector<MethodDescriptor> methodDescriptors_;
   std::vector<jmethodID> methodIDs_;
   jsi::Value constantsCache_;
 
-  const jsi::Value& getConstants(jsi::Runtime& runtime);
+  const jsi::Value &getConstants(jsi::Runtime &runtime);
   bool exportsConstants();
 };
 

package/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp

@@ -395,7 +395,8 @@ JNIArgs convertJSIArgsToJNIArgs(
             "boolean", argIndex, methodName, arg, &rt);
       }
       jarg->l = makeGlobalIfNecessary(
-          jni::JBoolean::valueOf(arg->getBool()).release());
+          jni::JBoolean::valueOf(static_cast<unsigned char>(arg->getBool()))
+              .release());
     } else if (type == "Ljava/lang/String;") {
       if (!arg->isString()) {
         throw JavaTurboModuleArgumentConversionException(

package/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h

@@ -18,14 +18,11 @@
 namespace facebook::react {
 
 struct JTurboModule : jni::JavaClass<JTurboModule> {
-  static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/turbomodule/core/interfaces/TurboModule;";
+  static auto constexpr kJavaDescriptor = "Lcom/facebook/react/turbomodule/core/interfaces/TurboModule;";
 };
 
-struct JTurboModuleWithJSIBindings
-    : jni::JavaClass<JTurboModuleWithJSIBindings> {
-  static auto constexpr kJavaDescriptor =
-      "Lcom/facebook/react/turbomodule/core/interfaces/TurboModuleWithJSIBindings;";
+struct JTurboModuleWithJSIBindings : jni::JavaClass<JTurboModuleWithJSIBindings> {
+  static auto constexpr kJavaDescriptor = "Lcom/facebook/react/turbomodule/core/interfaces/TurboModuleWithJSIBindings;";
 };
 
 class JSI_EXPORT JavaTurboModule : public TurboModule {
@@ -38,22 +35,23 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
     std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker;
   };
 
-  JavaTurboModule(const InitParams& params);
+  JavaTurboModule(const InitParams &params);
   virtual ~JavaTurboModule();
 
   jsi::Value invokeJavaMethod(
-      jsi::Runtime& runtime,
+      jsi::Runtime &runtime,
       TurboModuleMethodValueKind valueKind,
-      const std::string& methodName,
-      const std::string& methodSignature,
-      const jsi::Value* args,
+      const std::string &methodName,
+      const std::string &methodSignature,
+      const jsi::Value *args,
       size_t argCount,
-      jmethodID& cachedMethodID);
+      jmethodID &cachedMethodID);
 
  protected:
   void configureEventEmitterCallback();
 
-  [[deprecated]] void setEventEmitterCallback(jni::alias_ref<jobject>) {
+  [[deprecated]] void setEventEmitterCallback(jni::alias_ref<jobject> /*unused*/)
+  {
     configureEventEmitterCallback();
   }
 

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.mm

@@ -51,7 +51,7 @@ std::vector<const RCTMethodInfo *> getMethodInfos(Class moduleClass)
   std::vector<const RCTMethodInfo *> methodInfos;
 
   Class cls = moduleClass;
-  while (cls && cls != [NSObject class] && cls != [NSProxy class]) {
+  while ((cls != nullptr) && cls != [NSObject class] && cls != [NSProxy class]) {
     unsigned int methodCount;
     Method *methods = class_copyMethodList(object_getClass(cls), &methodCount);
 
@@ -482,7 +482,7 @@ void ObjCInteropTurboModule::setInvocationArg(
         return;
       }
 
-      if (arg) {
+      if (arg != nullptr) {
         [retainedObjectsForInvocation addObject:arg];
       }
       [inv setArgument:&arg atIndex:(index) + 2];
@@ -496,7 +496,7 @@ void ObjCInteropTurboModule::setInvocationArg(
       typeInvocation.target = [RCTConvert class];
 
       void *returnValue = malloc(typeSignature.methodReturnLength);
-      if (!returnValue) {
+      if (returnValue == nullptr) {
         // CWE - 391 : Unchecked error condition
         // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
         // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
@@ -511,15 +511,16 @@ void ObjCInteropTurboModule::setInvocationArg(
       return;
     }
 
-    const char *BLOCK_TYPE = @encode(__typeof__(^{
-    }));
+    const char *BLOCK_TYPE = @encode(
+        __typeof__(^{
+        }));
 
     if (objCArgType == BLOCK_TYPE) {
       /**
        * RCTModuleMethod doesn't actually call into RCTConvert in this case.
        */
       id arg = [objCArg copy];
-      if (arg) {
+      if (arg != nullptr) {
         [retainedObjectsForInvocation addObject:arg];
       }
       [inv setArgument:&arg atIndex:(index) + 2];
@@ -537,7 +538,7 @@ void ObjCInteropTurboModule::setInvocationArg(
 
     RCTResponseSenderBlock arg =
         (RCTResponseSenderBlock)TurboModuleConvertUtils::convertJSIValueToObjCObject(runtime, jsiArg, jsInvoker_, YES);
-    if (arg) {
+    if (arg != nullptr) {
       [retainedObjectsForInvocation addObject:arg];
     }
     [inv setArgument:&arg atIndex:(index) + 2];