@depup/react-native 0.85.0-depup.1 → 0.86.2-depup.0

package/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/Libraries/Animated/AnimatedImplementation.js

@@ -118,8 +118,8 @@ const maybeVectorAnim = function (
         configY[key] = y;
       }
     }
-    const aX = anim((value: AnimatedValueXY).x, configX);
-    const aY = anim((value: AnimatedValueXY).y, configY);
+    const aX = anim((value as AnimatedValueXY).x, configX);
+    const aY = anim((value as AnimatedValueXY).y, configY);
     // We use `stopTogether: false` here because otherwise tracking will break
     // because the second animation will get stopped before it can update.
     return parallelImpl([aX, aY], {stopTogether: false});
@@ -142,10 +142,10 @@ const maybeVectorAnim = function (
         configA[key] = a;
       }
     }
-    const aR = anim((value: AnimatedColor).r, configR);
-    const aG = anim((value: AnimatedColor).g, configG);
-    const aB = anim((value: AnimatedColor).b, configB);
-    const aA = anim((value: AnimatedColor).a, configA);
+    const aR = anim((value as AnimatedColor).r, configR);
+    const aG = anim((value as AnimatedColor).g, configG);
+    const aB = anim((value as AnimatedColor).b, configB);
+    const aA = anim((value as AnimatedColor).a, configA);
     // We use `stopTogether: false` here because otherwise tracking will break
     // because the second animation will get stopped before it can update.
     return parallelImpl([aR, aG, aB, aA], {stopTogether: false});

package/Libraries/Animated/NativeAnimatedAllowlist.js

@@ -59,6 +59,27 @@ const SUPPORTED_STYLES: {[string]: true} = {
   scaleY: true,
   translateX: true,
   translateY: true,
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  ...(ReactNativeFeatureFlags.useSharedAnimatedBackend()
+    ? {
+        /* dimension */
+        height: true,
+        maxHeight: true,
+        maxWidth: true,
+        minHeight: true,
+        minWidth: true,
+        width: true,
+        /* position */
+        bottom: true,
+        end: true,
+        left: true,
+        right: true,
+        start: true,
+        top: true,
+        /* flex */
+        flex: true,
+      }
+    : {}),
 };
 
 const SUPPORTED_TRANSFORMS: {[string]: true} = {

package/Libraries/Animated/components/AnimatedImage.js

@@ -14,10 +14,10 @@ import Image from '../../Image/Image';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default (createAnimatedComponent<
+export default createAnimatedComponent<
   $FlowFixMe,
   React.ElementRef<typeof Image>,
->((Image: $FlowFixMe)): AnimatedComponentType<
+>(Image as $FlowFixMe) as AnimatedComponentType<
   React.ElementConfig<typeof Image>,
   React.ElementRef<typeof Image>,
->);
+>;

package/Libraries/Animated/components/AnimatedScrollView.js

@@ -31,7 +31,7 @@ import {cloneElement, useMemo} from 'react';
 type AnimatedScrollViewInstance = React.ElementRef<typeof ScrollView>;
 
 /**
- * @see https://github.com/facebook/react-native/commit/b8c8562
+ * @see https://github.com/react/react-native/commit/b8c8562
  */
 const AnimatedScrollView: AnimatedComponentType<
   ScrollViewProps,

package/Libraries/Animated/components/AnimatedText.js

@@ -14,10 +14,10 @@ import Text, {type TextProps} from '../../Text/Text';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default (createAnimatedComponent<
+export default createAnimatedComponent<
   $FlowFixMe,
   React.ElementRef<typeof Text>,
->((Text: $FlowFixMe)): AnimatedComponentType<
+>(Text as $FlowFixMe) as AnimatedComponentType<
   TextProps,
   React.ElementRef<typeof Text>,
->);
+>;

package/Libraries/Animated/createAnimatedComponent.js

@@ -65,12 +65,12 @@ type PassThroughProps = Readonly<{
   passthroughAnimatedPropExplicitValues?: ViewProps | null,
 }>;
 
-type LooseOmit<O: interface {}, K: keyof $FlowFixMe> = Pick<
+type LooseOmit<O extends interface {}, K extends keyof $FlowFixMe> = Pick<
   O,
   Exclude<keyof O, K>,
 >;
 
-export type AnimatedProps<Props: {...}> = LooseOmit<
+export type AnimatedProps<Props extends {...}> = LooseOmit<
   {
     [K in keyof Props]: K extends NonAnimatedProps
       ? Props[K]
@@ -80,7 +80,7 @@ export type AnimatedProps<Props: {...}> = LooseOmit<
 > &
   PassThroughProps;
 
-export type AnimatedBaseProps<Props: {...}> = LooseOmit<
+export type AnimatedBaseProps<Props extends {...}> = LooseOmit<
   {
     [K in keyof Props]: K extends NonAnimatedProps
       ? Props[K]
@@ -90,12 +90,12 @@ export type AnimatedBaseProps<Props: {...}> = LooseOmit<
 >;
 
 export type AnimatedComponentType<
-  Props: {...},
+  Props extends {...},
   +Instance = unknown,
 > = component(ref?: React.RefSetter<Instance>, ...AnimatedProps<Props>);
 
 export default function createAnimatedComponent<
-  TInstance: React.ComponentType<any>,
+  TInstance extends React.ComponentType<any>,
 >(
   Component: TInstance,
 ): AnimatedComponentType<
@@ -106,8 +106,8 @@ export default function createAnimatedComponent<
 }
 
 export function unstable_createAnimatedComponentWithAllowlist<
-  TProps: {...},
-  TInstance: React.ComponentType<TProps>,
+  TProps extends {...},
+  TInstance extends React.ComponentType<TProps>,
 >(
   Component: TInstance,
   allowlist: ?AnimatedPropsAllowlist,

package/Libraries/Animated/nodes/AnimatedAddition.js

@@ -43,7 +43,7 @@ export default class AnimatedAddition extends AnimatedWithChildren {
     return this._a.__getValue() + this._b.__getValue();
   }
 
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT extends number | string>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Animated/nodes/AnimatedColor.js

@@ -61,12 +61,12 @@ function processColor(
 
   if (isRgbaValue(color)) {
     // $FlowFixMe[incompatible-type] - Type is verified above
-    return (color: RgbaValue);
+    return color as RgbaValue;
   }
 
   let normalizedColor: ?ProcessedColorValue = normalizeColor(
     // $FlowFixMe[incompatible-type] - Type is verified above
-    (color: ColorValue),
+    color as ColorValue,
   );
   if (normalizedColor === undefined || normalizedColor === null) {
     return null;
@@ -118,14 +118,14 @@ export function getRgbaValueAndNativeColor(
 }> {
   const processedColor: RgbaValue | NativeColorValue =
     // $FlowFixMe[incompatible-type] - Type is verified above
-    processColor((value: ColorValue | RgbaValue)) ?? defaultColor;
+    processColor(value as ColorValue | RgbaValue) ?? defaultColor;
   if (isRgbaValue(processedColor)) {
     // $FlowFixMe[incompatible-type] - Type is verified above
-    return {rgbaValue: (processedColor: RgbaValue)};
+    return {rgbaValue: processedColor as RgbaValue};
   } else {
     return {
       // $FlowFixMe[incompatible-type] - Type is verified above
-      nativeColor: (processedColor: NativeColorValue),
+      nativeColor: processedColor as NativeColorValue,
       rgbaValue: defaultColor,
     };
   }
@@ -147,7 +147,7 @@ export default class AnimatedColor extends AnimatedWithChildren {
       valueIn ?? defaultColor;
     if (isRgbaAnimatedValue(value)) {
       // $FlowFixMe[incompatible-type] - Type is verified above
-      const rgbaAnimatedValue: RgbaAnimatedValue = (value: RgbaAnimatedValue);
+      const rgbaAnimatedValue: RgbaAnimatedValue = value as RgbaAnimatedValue;
       this.r = rgbaAnimatedValue.r;
       this.g = rgbaAnimatedValue.g;
       this.b = rgbaAnimatedValue.b;
@@ -155,7 +155,7 @@ export default class AnimatedColor extends AnimatedWithChildren {
     } else {
       const {rgbaValue: initColor, nativeColor} = getRgbaValueAndNativeColor(
         // $FlowFixMe[incompatible-type] - Type is verified above
-        (value: ColorValue | RgbaValue),
+        value as ColorValue | RgbaValue,
       );
       if (nativeColor) {
         this.nativeColor = nativeColor;

package/Libraries/Animated/nodes/AnimatedDiffClamp.js

@@ -44,7 +44,7 @@ export default class AnimatedDiffClamp extends AnimatedWithChildren {
     super.__makeNative(platformConfig);
   }
 
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT extends number | string>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Animated/nodes/AnimatedDivision.js

@@ -59,7 +59,7 @@ export default class AnimatedDivision extends AnimatedWithChildren {
     return a / b;
   }
 
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT extends number | string>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Animated/nodes/AnimatedInterpolation.js

@@ -33,7 +33,7 @@ export type InterpolationConfigSupportedOutputType =
   | NativeColorValue;
 
 export type InterpolationConfigType<
-  OutputT: InterpolationConfigSupportedOutputType,
+  OutputT extends InterpolationConfigSupportedOutputType,
 > = Readonly<{
   ...AnimatedNodeConfig,
   inputRange: ReadonlyArray<number>,
@@ -51,7 +51,7 @@ export type InterpolationConfigType<
 function createNumericInterpolation(
   config: InterpolationConfigType<number>,
 ): (input: number) => number {
-  const outputRange: ReadonlyArray<number> = (config.outputRange: any);
+  const outputRange: ReadonlyArray<number> = config.outputRange as any;
   const inputRange = config.inputRange;
 
   const easing = config.easing || Easing.linear;
@@ -73,11 +73,11 @@ function createNumericInterpolation(
   return input => {
     invariant(
       typeof input === 'number',
-      'Cannot interpolation an input which is not a number',
+      'Cannot interpolate an input which is not a number',
     );
 
     const range = findRange(input, inputRange);
-    return (interpolate(
+    return interpolate(
       input,
       inputRange[range],
       inputRange[range + 1],
@@ -86,7 +86,7 @@ function createNumericInterpolation(
       easing,
       extrapolateLeft,
       extrapolateRight,
-    ): any);
+    ) as any;
   };
 }
 
@@ -205,7 +205,7 @@ function mapStringToNumericComponents(
     const components: Array<string | number> = [];
     let lastMatchEnd = 0;
     let match: RegExp$matchResult;
-    while ((match = (numericComponentRegex.exec(input): any)) != null) {
+    while ((match = numericComponentRegex.exec(input) as any) != null) {
       if (match.index > lastMatchEnd) {
         components.push(input.substring(lastMatchEnd, match.index));
       }
@@ -307,10 +307,9 @@ function findRange(input: number, inputRange: ReadonlyArray<number>) {
   return i - 1;
 }
 
-function checkValidRanges<OutputT: InterpolationConfigSupportedOutputType>(
-  inputRange: ReadonlyArray<number>,
-  outputRange: ReadonlyArray<OutputT>,
-) {
+function checkValidRanges<
+  OutputT extends InterpolationConfigSupportedOutputType,
+>(inputRange: ReadonlyArray<number>, outputRange: ReadonlyArray<OutputT>) {
   checkInfiniteRange('outputRange', outputRange);
   checkInfiniteRange('inputRange', inputRange);
   checkValidInputRange(inputRange);
@@ -334,10 +333,9 @@ function checkValidInputRange(arr: ReadonlyArray<number>) {
   }
 }
 
-function checkInfiniteRange<OutputT: InterpolationConfigSupportedOutputType>(
-  name: string,
-  arr: ReadonlyArray<OutputT>,
-) {
+function checkInfiniteRange<
+  OutputT extends InterpolationConfigSupportedOutputType,
+>(name: string, arr: ReadonlyArray<OutputT>) {
   invariant(arr.length >= 2, name + ' must have at least 2 elements');
   invariant(
     arr.length !== 2 || arr[0] !== -Infinity || arr[1] !== Infinity,
@@ -347,12 +345,12 @@ function checkInfiniteRange<OutputT: InterpolationConfigSupportedOutputType>(
      * etc. If you really mean this implicit string conversion, you can do
      * something like String(myThing) */
     // $FlowFixMe[unsafe-addition]
-    name + 'cannot be ]-infinity;+infinity[ ' + arr,
+    name + ' cannot be ]-infinity;+infinity[ ' + arr,
   );
 }
 
 export default class AnimatedInterpolation<
-  OutputT: InterpolationConfigSupportedOutputType,
+  OutputT extends InterpolationConfigSupportedOutputType,
 > extends AnimatedWithChildren {
   _parent: AnimatedNode;
   _config: InterpolationConfigType<OutputT>;
@@ -376,13 +374,13 @@ export default class AnimatedInterpolation<
     if (!this._interpolation) {
       const config = this._config;
       if (config.outputRange && typeof config.outputRange[0] === 'string') {
-        this._interpolation = (createStringInterpolation((config: any)): any);
+        this._interpolation = createStringInterpolation(config as any) as any;
       } else if (typeof config.outputRange[0] === 'object') {
-        this._interpolation = (createPlatformColorInterpolation(
-          (config: any),
-        ): any);
+        this._interpolation = createPlatformColorInterpolation(
+          config as any,
+        ) as any;
       } else {
-        this._interpolation = (createNumericInterpolation((config: any)): any);
+        this._interpolation = createNumericInterpolation(config as any) as any;
       }
     }
     return this._interpolation;
@@ -402,7 +400,7 @@ export default class AnimatedInterpolation<
     return this._getInterpolation()(parentValue);
   }
 
-  interpolate<NewOutputT: number | string>(
+  interpolate<NewOutputT extends number | string>(
     config: InterpolationConfigType<NewOutputT>,
   ): AnimatedInterpolation<NewOutputT> {
     return new AnimatedInterpolation(this, config);
@@ -428,7 +426,7 @@ export default class AnimatedInterpolation<
     let outputType = null;
     if (typeof outputRange[0] === 'string') {
       // $FlowFixMe[incompatible-type]
-      outputRange = ((outputRange: ReadonlyArray<string>).map(value => {
+      outputRange = (outputRange as ReadonlyArray<string>).map(value => {
         const processedColor = processColor(value);
         if (typeof processedColor === 'number') {
           outputType = 'color';
@@ -436,7 +434,7 @@ export default class AnimatedInterpolation<
         } else {
           return NativeAnimatedHelper.transformDataType(value);
         }
-      }): any);
+      }) as any;
     } else if (typeof outputRange[0] === 'object') {
       outputType = 'platform_color';
     }

package/Libraries/Animated/nodes/AnimatedModulo.js

@@ -39,7 +39,7 @@ export default class AnimatedModulo extends AnimatedWithChildren {
     );
   }
 
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT extends number | string>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Animated/nodes/AnimatedMultiplication.js

@@ -43,7 +43,7 @@ export default class AnimatedMultiplication extends AnimatedWithChildren {
     return this._a.__getValue() * this._b.__getValue();
   }
 
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT extends number | string>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Animated/nodes/AnimatedStyle.js

@@ -22,7 +22,7 @@ import AnimatedWithChildren from './AnimatedWithChildren';
 export type AnimatedStyleAllowlist = Readonly<{[string]: true}>;
 
 type FlatStyle = {[string]: unknown};
-type FlatStyleForWeb<TStyle: FlatStyle> = [unknown, TStyle];
+type FlatStyleForWeb<TStyle extends FlatStyle> = [unknown, TStyle];
 
 function createAnimatedStyle(
   flatStyle: FlatStyle,
@@ -154,7 +154,7 @@ export default class AnimatedStyle extends AnimatedWithChildren {
   /**
    * See the constructor, where this is shadowed on web platforms.
    */
-  __getValueForStyle<TStyle: FlatStyle>(
+  __getValueForStyle<TStyle extends FlatStyle>(
     style: TStyle,
   ): FlatStyleForWeb<TStyle> | TStyle {
     return style;

package/Libraries/Animated/nodes/AnimatedSubtraction.js

@@ -43,7 +43,7 @@ export default class AnimatedSubtraction extends AnimatedWithChildren {
     return this._a.__getValue() - this._b.__getValue();
   }
 
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT extends number | string>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Animated/nodes/AnimatedTracking.js

@@ -79,7 +79,7 @@ export default class AnimatedTracking extends AnimatedNode {
     this._value.animate(
       new this._animationClass({
         ...this._animationConfig,
-        toValue: (this._animationConfig.toValue: any).__getValue(),
+        toValue: (this._animationConfig.toValue as any).__getValue(),
       }),
       this._callback,
     );

package/Libraries/Animated/nodes/AnimatedValue.js

@@ -58,7 +58,7 @@ export function flushValue(rootNode: AnimatedNode): void {
   function findAnimatedStyles(node: AnimatedNode) {
     // $FlowFixMe[prop-missing]
     if (typeof node.update === 'function') {
-      leaves.add((node: any));
+      leaves.add(node as any);
     } else {
       node.__getChildren().forEach(findAnimatedStyles);
     }
@@ -301,7 +301,7 @@ export default class AnimatedValue extends AnimatedWithChildren {
    * Interpolates the value before updating the property, e.g. mapping 0-1 to
    * 0-10.
    */
-  interpolate<OutputT: InterpolationConfigSupportedOutputType>(
+  interpolate<OutputT extends InterpolationConfigSupportedOutputType>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm

@@ -45,6 +45,10 @@
 {
 #if USE_THIRD_PARTY_JSC != 1
   return jsrt_create_hermes_factory();
+#else
+  [NSException raise:@"JSRuntimeFactory"
+              format:@"createJSRuntimeFactory must be overridden when using third-party JSC"];
+  return nil;
 #endif
 }
 

package/Libraries/AppDelegate/RCTRootViewFactory.h

@@ -148,7 +148,7 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
 @property (nonatomic, nullable) RCTExtraLazyModuleClassesForBridge extraLazyModuleClassesForBridge;
 
 /**
- * The bridge will call this block when a module been called from JS
+ * The bridge will call this block when a module has been called from JS
  * cannot be found among registered modules.
  * It should return YES if the module with name 'moduleName' was registered
  * in the implementation, and the system must attempt to look for it again among registered.
@@ -173,11 +173,11 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
 
 #pragma mark - RCTRootViewFactory
 /**
- * The RCTRootViewFactory is an utility class that encapsulates the logic of creating a new RCTRootView based on the
+ * The RCTRootViewFactory is a utility class that encapsulates the logic of creating a new RCTRootView based on the
  * current state of the environment. It allows you to initialize your app root view for old architecture, new
- * architecture and bridgless mode.
+ * architecture and bridgeless mode.
  *
- * This class is used to initalize rootView in RCTAppDelegate, but you can also use it separately.
+ * This class is used to initialize rootView in RCTAppDelegate, but you can also use it separately.
  *
  * Create a new instance of this class (make sure to retain it) and call the
  * `viewWithModuleName:initialProperties:launchOptions` method to create new RCTRootView.
@@ -194,7 +194,7 @@ typedef void (^RCTLoadSourceForBridgeBlock)(RCTBridge *bridge, RCTSourceLoadBloc
 - (instancetype)initWithConfiguration:(RCTRootViewFactoryConfiguration *)configuration;
 
 - (instancetype)initWithTurboModuleDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
-                               hostDelegate:(id<RCTHostDelegate>)hostdelegate
+                               hostDelegate:(id<RCTHostDelegate>)hostDelegate
                               configuration:(RCTRootViewFactoryConfiguration *)configuration;
 
 /**

package/Libraries/AppDelegate/RCTRootViewFactory.mm

@@ -103,12 +103,12 @@
 }
 
 - (instancetype)initWithTurboModuleDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
-                               hostDelegate:(id<RCTHostDelegate>)hostdelegate
+                               hostDelegate:(id<RCTHostDelegate>)hostDelegate
                               configuration:(RCTRootViewFactoryConfiguration *)configuration
 {
   if (self = [super init]) {
     _configuration = configuration;
-    _hostDelegate = hostdelegate;
+    _hostDelegate = hostDelegate;
     _contextContainer = std::make_shared<const facebook::react::ContextContainer>();
     _turboModuleManagerDelegate = turboModuleManagerDelegate;
   }

package/Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/Libraries/AppState/AppState.js

@@ -110,7 +110,7 @@ class AppStateImpl {
    *
    * See https://reactnative.dev/docs/appstate#addeventlistener
    */
-  addEventListener<K: AppStateEvent>(
+  addEventListener<K extends AppStateEvent>(
     type: K,
     handler: (...AppStateEventDefinitions[K]) => void,
   ): EventSubscription {

package/Libraries/BatchedBridge/NativeModules.js

@@ -114,7 +114,7 @@ function genMethod(moduleID: number, methodID: number, type: MethodType) {
           errorData =>
             reject(
               updateErrorWithErrorData(
-                (errorData: $FlowFixMe),
+                errorData as $FlowFixMe,
                 enqueueingFrameError,
               ),
             ),

package/Libraries/Blob/RCTBlobCollector.h

@@ -16,7 +16,7 @@ class JSI_EXPORT RCTBlobCollector : public jsi::HostObject {
   RCTBlobCollector(RCTBlobManager *blobManager, const std::string &blobId);
   ~RCTBlobCollector();
 
-  static void install(RCTBlobManager *blobManager);
+  static void install(jsi::Runtime &runtime, RCTBlobManager *blobManager);
 
  private:
   const std::string blobId_;

package/Libraries/Blob/RCTBlobCollector.mm

@@ -8,7 +8,6 @@
 #import "RCTBlobCollector.h"
 
 #import <React/RCTBlobManager.h>
-#import <React/RCTBridge+Private.h>
 
 namespace facebook::react {
 
@@ -26,32 +25,21 @@ RCTBlobCollector::~RCTBlobCollector()
   });
 }
 
-void RCTBlobCollector::install(RCTBlobManager *blobManager)
+void RCTBlobCollector::install(jsi::Runtime &runtime, RCTBlobManager *blobManager)
 {
-  __weak RCTCxxBridge *cxxBridge = (RCTCxxBridge *)blobManager.bridge;
-  [cxxBridge
-      dispatchBlock:^{
-        if ((cxxBridge == nullptr) || cxxBridge.runtime == nullptr) {
-          return;
-        }
-        jsi::Runtime &runtime = *(jsi::Runtime *)cxxBridge.runtime;
-        runtime.global().setProperty(
-            runtime,
-            "__blobCollectorProvider",
-            jsi::Function::createFromHostFunction(
-                runtime,
-                jsi::PropNameID::forAscii(runtime, "__blobCollectorProvider"),
-                1,
-                [blobManager](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
-                  auto blobId = args[0].asString(rt).utf8(rt);
-                  auto blobCollector = std::make_shared<RCTBlobCollector>(blobManager, blobId);
-                  auto blobCollectorJsObject = jsi::Object::createFromHostObject(rt, blobCollector);
-                  blobCollectorJsObject.setExternalMemoryPressure(
-                      rt, [blobManager lengthOfBlobWithId:[NSString stringWithUTF8String:blobId.c_str()]]);
-                  return blobCollectorJsObject;
-                }));
-      }
-              queue:RCTJSThread];
+  auto provider = jsi::Function::createFromHostFunction(
+      runtime,
+      jsi::PropNameID::forAscii(runtime, "__blobCollectorProvider"),
+      1,
+      [blobManager](jsi::Runtime &rt, const jsi::Value & /*thisVal*/, const jsi::Value *args, size_t /*count*/) {
+        auto blobId = args[0].asString(rt).utf8(rt);
+        auto blobCollector = std::make_shared<RCTBlobCollector>(blobManager, blobId);
+        auto blobCollectorJsObject = jsi::Object::createFromHostObject(rt, blobCollector);
+        blobCollectorJsObject.setExternalMemoryPressure(
+            rt, [blobManager lengthOfBlobWithId:[NSString stringWithUTF8String:blobId.c_str()]]);
+        return blobCollectorJsObject;
+      });
+  runtime.global().setProperty(runtime, "__blobCollectorProvider", std::move(provider));
 }
 
 } // namespace facebook::react