Remove RCTImageLoader diff

Saadnajmi · Aug 21, 2024 · 1096580 · 1096580
1 parent 0b0c12f
commit 1096580
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/packages/react-native/Libraries/Image/RCTImageLoader.h b/packages/react-native/Libraries/Image/RCTImageLoader.h
@@ -24,7 +24,6 @@
 - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate
                          loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(RCTModuleRegistry *))getLoaders
                         decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(RCTModuleRegistry *))getDecoders;
-- (NSInteger)activeTasks; // [macOS]
 @end
 
 /**

diff --git a/packages/react-native/Libraries/Image/RCTImageLoader.mm b/packages/react-native/Libraries/Image/RCTImageLoader.mm
@@ -489,12 +489,6 @@ - (void)dequeueTasks
   });
 }
 
-// [macOS
-- (NSInteger)activeTasks {
-  return _activeTasks;
-}
-// macOS]
-
 /**
  * This returns either an image, or raw image data, depending on the loading
  * path taken. This is useful if you want to skip decoding, e.g. when preloading

diff --git a/packages/rn-tester/RCTTest/RCTTestRunner.m b/packages/rn-tester/RCTTest/RCTTestRunner.m
@@ -11,11 +11,11 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConstants.h>
 #import <React/RCTDevSettings.h>
-#import <React/RCTImageLoader.h> // [macOS]
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTUtils.h>
+#import <React/RCTUIKit.h> // [macOS]
 
 #import "FBSnapshotTestController.h"
 #import "RCTTestModule.h"
@@ -192,7 +192,9 @@ - (void)runTest:(SEL)test
 #if !TARGET_OS_OSX // [macOS]
     UIViewController *vc = RCTSharedApplication().delegate.window.rootViewController;
     vc.view = [UIView new];
-#endif // [macOS]
+#else // [macOS
+    NSViewController *vc = RCTSharedApplication().mainWindow.contentViewController;
+#endif // macOS]
 
     RCTTestModule *testModule = [bridge moduleForClass:[RCTTestModule class]];
     RCTAssert(_testController != nil, @"_testController should not be nil");
@@ -210,20 +212,15 @@ - (void)runTest:(SEL)test
       rootTag = rootView.reactTag;
       testModule.view = rootView;
 
-#if !TARGET_OS_OSX // [macOS]
       [vc.view addSubview:rootView]; // Add as subview so it doesn't get resized
-#endif // [macOS]
 
       if (configurationBlock) {
         configurationBlock(rootView);
       }
 
-      RCTImageLoader *imageLoader = [bridge moduleForClass:[RCTImageLoader class]]; // [macOS]
 
       NSDate *date = [NSDate dateWithTimeIntervalSinceNow:kTestTimeoutSeconds];
-      while (date.timeIntervalSinceNow > 0 &&
-             (testModule.status == RCTTestStatusPending || [imageLoader activeTasks] > 0) &&
-             errors == nil) { // [macOS]
+      while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && errors == nil) {
         [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
         [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
       }
@@ -244,10 +241,14 @@ - (void)runTest:(SEL)test
           }
         });
 
-#if RCT_DEV && !TARGET_OS_OSX // [macOS]
-    NSArray<UIView *> *nonLayoutSubviews = [vc.view.subviews
+#if RCT_DEV //&& !TARGET_OS_OSX // [macOS]
+    NSArray<RCTPlatformView *> *nonLayoutSubviews = [vc.view.subviews // [macOS]
         filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id subview, NSDictionary *bindings) {
+#if !TARGET_OS_OSX // [macOS]
           return ![NSStringFromClass([subview class]) isEqualToString:@"_UILayoutGuide"];
+#else // [macOS
+      return ![NSStringFromClass([subview class]) isEqualToString:@"_NSLayoutGuide"];
+#endif // macOS]
         }]];
 
     RCTAssert(nonLayoutSubviews.count == 0, @"There shouldn't be any other views: %@", nonLayoutSubviews);