react-native-inapp-inspector 2.5.12 → 2.5.14

package/ios/NetworkInspectorModule.mm

@@ -10,8 +10,13 @@
 #import <CoreImage/CoreImage.h>
 #import <ImageIO/ImageIO.h>
 #import <MobileCoreServices/MobileCoreServices.h>
+#import <Photos/Photos.h>
+#import <PhotosUI/PhotosUI.h>
+#if __has_include(<UniformTypeIdentifiers/UniformTypeIdentifiers.h>)
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
+#endif
 
-static NetworkInspectorModule *sharedInstance = nil;
+static __weak NetworkInspectorModule *sharedInstance = nil;
 static NSUncaughtExceptionHandler *previousUncaughtExceptionHandler = NULL;
 static BOOL g_floatingButtonPressed = NO;
 
@@ -322,38 +327,8 @@ static BOOL g_floatingButtonPressed = NO;
 static InAppInspectorFloatingView *floatingButtonView = nil;
 static BOOL g_floatingButtonDesiredVisible = NO;
 
-static void NativeSignalHandler(int signalNumber) {
-    void* callstack[128];
-    int frames = backtrace(callstack, 128);
-    char **strs = backtrace_symbols(callstack, frames);
-
-    NSMutableArray *backtraceArray = [NSMutableArray arrayWithCapacity:frames];
-    for (int i = 0; i < frames; i++) {
-        if (strs[i]) {
-            [backtraceArray addObject:[NSString stringWithUTF8String:strs[i]]];
-        }
-    }
-    free(strs);
-
-    NSString *stackTrace = [backtraceArray componentsJoinedByString:@"\n"];
-    NSString *signalName = @"UNKNOWN";
-    switch (signalNumber) {
-        case SIGABRT: signalName = @"SIGABRT (Abort)"; break;
-        case SIGSEGV: signalName = @"SIGSEGV (Segmentation Fault)"; break;
-        case SIGBUS:  signalName = @"SIGBUS (Bus Error)"; break;
-        case SIGILL:  signalName = @"SIGILL (Illegal Instruction)"; break;
-        case SIGFPE:  signalName = @"SIGFPE (Floating Point Exception)"; break;
-        case SIGPIPE: signalName = @"SIGPIPE (Broken Pipe)"; break;
-        case SIGTRAP: signalName = @"SIGTRAP (Trace Trap)"; break;
-    }
-
-    NSString *message = [NSString stringWithFormat:@"Native Signal Crash: %@", signalName];
-    if (sharedInstance != nil) {
-        [sharedInstance emitCrashEventWithMessage:message stackTrace:stackTrace];
-    }
-}
-
 static void NativeExceptionHandler(NSException *exception) {
+    if (!exception) return;
     NSArray *callStack = [exception callStackSymbols];
     NSString *stackTrace = [callStack componentsJoinedByString:@"\n"];
     NSString *message = [NSString stringWithFormat:@"%@: %@", [exception name], [exception reason]];
@@ -362,131 +337,35 @@ static void NativeExceptionHandler(NSException *exception) {
         [sharedInstance emitCrashEventWithMessage:message stackTrace:stackTrace];
     }
 
-    // Give the crash event a brief window to emit (up to 3 seconds),
-    // then delegate to the previous handler instead of freezing the UI forever.
-    // The old infinite-runloop approach permanently froze the main thread on any
-    // exception (including Fabric view recycling assertions), causing blank screens.
-    CFRunLoopRef runLoop = CFRunLoopGetCurrent();
-    CFArrayRef allModes = CFRunLoopCopyAllModes(runLoop);
-    NSTimeInterval deadline = [NSDate timeIntervalSinceReferenceDate] + 3.0;
-    while ([NSDate timeIntervalSinceReferenceDate] < deadline) {
-        for (NSString *mode in (__bridge NSArray *)allModes) {
-            CFRunLoopRunInMode((CFStringRef)mode, 0.001, false);
-        }
-    }
-    if (allModes) {
-        CFRelease(allModes);
-    }
+    // Save crash record to local cache directory synchronously for persistent debugging
+    @try {
+        NSString *cacheDir = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
+        NSString *crashDir = [cacheDir stringByAppendingPathComponent:@"inspector_captures"];
+        [[NSFileManager defaultManager] createDirectoryAtPath:crashDir withIntermediateDirectories:YES attributes:nil error:nil];
+        NSString *crashFile = [crashDir stringByAppendingPathComponent:@"last_native_crash.json"];
+        NSDictionary *crashDict = @{
+            @"platform": @"ios",
+            @"message": message ?: @"Unknown iOS Exception",
+            @"name": [exception name] ?: @"NSException",
+            @"reason": [exception reason] ?: @"",
+            @"stack": stackTrace ?: @"",
+            @"timestamp": @([[NSDate date] timeIntervalSince1970] * 1000)
+        };
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:crashDict options:NSJSONWritingPrettyPrinted error:nil];
+        [jsonData writeToFile:crashFile atomically:YES];
+    } @catch (NSException *e) {}
 
-    // Delegate to the previous exception handler (e.g. React Native's own handler)
-    if (previousUncaughtExceptionHandler) {
+    // Delegate to previous exception handler (React Native / Crashlytics / default)
+    if (previousUncaughtExceptionHandler && previousUncaughtExceptionHandler != &NativeExceptionHandler) {
         previousUncaughtExceptionHandler(exception);
     }
 }
 
-// ─── Fabric View Recycle Safeguard ───────────────────────────────────────────
-// Custom NSAssertionHandler that catches the specific Fabric view recycling
-// assertion ('Attempt to recycle a mounted view') and logs it as a warning
-// instead of crashing. This prevents third-party native views (like
-// BVLinearGradient from react-native-linear-gradient) from causing fatal
-// assertion failures when Fabric's view recycler encounters views whose
-// superview is still attached during conditional unmounting.
-
-@interface InAppInspectorAssertionHandler : NSAssertionHandler
-@property (nonatomic, strong) NSAssertionHandler *previousHandler;
-@end
-
-@implementation InAppInspectorAssertionHandler
-
-+ (void)install {
-    NSThread *mainThread = [NSThread mainThread];
-    NSMutableDictionary *threadDict = [mainThread threadDictionary];
-    NSAssertionHandler *current = threadDict[NSAssertionHandlerKey];
-
-    InAppInspectorAssertionHandler *handler = [[InAppInspectorAssertionHandler alloc] init];
-    handler.previousHandler = current;
-    threadDict[NSAssertionHandlerKey] = handler;
-    NSLog(@"[InAppInspector] Fabric view recycle safeguard (assertion handler) installed");
-}
-
-- (void)handleFailureInMethod:(SEL)selector
-                       object:(id)object
-                         file:(NSString *)fileName
-                   lineNumber:(NSInteger)line
-                  description:(NSString *)format, ... {
-    va_list args;
-    va_start(args, format);
-    NSString *desc = [[NSString alloc] initWithFormat:format arguments:args];
-    va_end(args);
-
-    // Intercept the specific Fabric recycle assertion
-    if ([desc containsString:@"Attempt to recycle a mounted view"]) {
-        NSLog(@"[InAppInspector] ⚠️ Suppressed Fabric view recycle assertion: %@ (in %@:%ld)",
-              desc, fileName, (long)line);
-        return; // Suppress — don't crash
-    }
-
-    // Forward all other assertions to the previous handler
-    if (self.previousHandler) {
-        va_start(args, format);
-        [self.previousHandler handleFailureInMethod:selector
-                                             object:object
-                                               file:fileName
-                                         lineNumber:line
-                                        description:@"%@", desc];
-        va_end(args);
-    } else {
-        // No previous handler — raise as exception (default behavior)
-        NSString *reason = [NSString stringWithFormat:
-            @"*** Assertion failure in %@, %@:%ld: %@",
-            NSStringFromSelector(selector), fileName, (long)line, desc];
-        @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                                       reason:reason
-                                     userInfo:nil];
-    }
-}
-
-- (void)handleFailureInFunction:(NSString *)functionName
-                           file:(NSString *)fileName
-                     lineNumber:(NSInteger)line
-                    description:(NSString *)format, ... {
-    va_list args;
-    va_start(args, format);
-    NSString *desc = [[NSString alloc] initWithFormat:format arguments:args];
-    va_end(args);
-
-    // Intercept the specific Fabric recycle assertion
-    if ([desc containsString:@"Attempt to recycle a mounted view"]) {
-        NSLog(@"[InAppInspector] ⚠️ Suppressed Fabric view recycle assertion: %@ (in %@:%ld)",
-              desc, fileName, (long)line);
-        return; // Suppress — don't crash
-    }
-
-    // Forward all other assertions to the previous handler
-    if (self.previousHandler) {
-        va_start(args, format);
-        [self.previousHandler handleFailureInFunction:functionName
-                                                 file:fileName
-                                           lineNumber:line
-                                          description:@"%@", desc];
-        va_end(args);
-    } else {
-        NSString *reason = [NSString stringWithFormat:
-            @"*** Assertion failure in %@, %@:%ld: %@",
-            functionName, fileName, (long)line, desc];
-        @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                                       reason:reason
-                                     userInfo:nil];
-    }
-}
-
-@end
-
 // ─────────────────────────────────────────────────────────────────────────────
 // NATIVE CAMERA ROLL / PHOTO & VIDEO PICKER DELEGATE
 // ─────────────────────────────────────────────────────────────────────────────
 
-@interface InAppInspectorPickerDelegate : NSObject <UIImagePickerControllerDelegate, UINavigationControllerDelegate>
+@interface InAppInspectorPickerDelegate : NSObject <PHPickerViewControllerDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate>
 @property (nonatomic, copy) RCTPromiseResolveBlock resolve;
 @property (nonatomic, copy) RCTPromiseRejectBlock reject;
 @property (nonatomic, copy) NSString *capturesDirectory;
@@ -494,18 +373,18 @@ static void NativeExceptionHandler(NSException *exception) {
 
 @implementation InAppInspectorPickerDelegate
 
-- (void)picker:(id)picker didFinishPicking:(NSArray *)results {
+- (void)picker:(PHPickerViewController *)picker didFinishPicking:(NSArray<PHPickerResult *> *)results API_AVAILABLE(ios(14.0)) {
     [picker dismissViewControllerAnimated:YES completion:nil];
     if (results.count == 0) {
         if (self.resolve) self.resolve([NSNull null]);
         return;
     }
-    
-    id result = results.firstObject;
-    NSItemProvider *provider = [result valueForKey:@"itemProvider"];
+
+    PHPickerResult *result = results.firstObject;
+    NSItemProvider *provider = result.itemProvider;
     long long timestamp = (long long)([[NSDate date] timeIntervalSince1970] * 1000.0);
     NSString *randomStr = [NSString stringWithFormat:@"%04d", arc4random_uniform(10000)];
-    
+
     if ([provider hasItemConformingToTypeIdentifier:@"public.movie"]) {
         [provider loadFileRepresentationForTypeIdentifier:@"public.movie" completionHandler:^(NSURL * _Nullable url, NSError * _Nullable error) {
             if (error || !url) {
@@ -516,13 +395,13 @@ static void NativeExceptionHandler(NSException *exception) {
             if (ext.length == 0) ext = @"mp4";
             NSString *filename = [NSString stringWithFormat:@"rn_iai_%lld_imported_%@.%@", timestamp, randomStr, ext];
             NSString *destPath = [self.capturesDirectory stringByAppendingPathComponent:filename];
-            
+
             [[NSFileManager defaultManager] removeItemAtPath:destPath error:nil];
             [[NSFileManager defaultManager] copyItemAtURL:url toURL:[NSURL fileURLWithPath:destPath] error:nil];
-            
+
             NSDictionary *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:destPath error:nil];
             long long sizeBytes = [attrs fileSize];
-            
+
             NSMutableDictionary *map = [NSMutableDictionary dictionaryWithDictionary:@{
                 @"id": filename,
                 @"type": @"video",
@@ -532,7 +411,7 @@ static void NativeExceptionHandler(NSException *exception) {
                 @"sizeBytes": @(sizeBytes),
                 @"timestamp": @(timestamp)
             }];
-            
+
             @try {
                 AVURLAsset *asset = [[AVURLAsset alloc] initWithURL:[NSURL fileURLWithPath:destPath] options:nil];
                 AVAssetImageGenerator *gen = [[AVAssetImageGenerator alloc] initWithAsset:asset];
@@ -548,7 +427,7 @@ static void NativeExceptionHandler(NSException *exception) {
                     map[@"thumbnailUri"] = [NSURL fileURLWithPath:thumbPath].absoluteString;
                 }
             } @catch (id ex) {}
-            
+
             if (self.resolve) self.resolve(map);
         }];
     } else {
@@ -559,12 +438,12 @@ static void NativeExceptionHandler(NSException *exception) {
                 NSString *type = [ext isEqualToString:@"gif"] ? @"gif" : @"image";
                 NSString *filename = [NSString stringWithFormat:@"rn_iai_%lld_imported_%@.%@", timestamp, randomStr, ext];
                 NSString *destPath = [self.capturesDirectory stringByAppendingPathComponent:filename];
-                
+
                 [[NSFileManager defaultManager] removeItemAtPath:destPath error:nil];
                 [[NSFileManager defaultManager] copyItemAtURL:url toURL:[NSURL fileURLWithPath:destPath] error:nil];
                 NSDictionary *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:destPath error:nil];
                 long long sizeBytes = [attrs fileSize];
-                
+
                 NSDictionary *map = @{
                     @"id": filename,
                     @"type": type,
@@ -583,10 +462,10 @@ static void NativeExceptionHandler(NSException *exception) {
                         NSString *filename = [NSString stringWithFormat:@"rn_iai_%lld_imported_%@.jpg", timestamp, randomStr];
                         NSString *destPath = [self.capturesDirectory stringByAppendingPathComponent:filename];
                         [data writeToFile:destPath atomically:YES];
-                        
+
                         NSDictionary *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:destPath error:nil];
                         long long sizeBytes = [attrs fileSize];
-                        
+
                         NSDictionary *map = @{
                             @"id": filename,
                             @"type": @"image",
@@ -620,6 +499,139 @@ static void NativeExceptionHandler(NSException *exception) {
 
 static InAppInspectorPickerDelegate *g_pickerDelegate = nil;
 
+// ─────────────────────────────────────────────────────────────────────────────
+// SAFE WINDOW & VIEW CONTROLLER HELPERS (iOS 13 - 18+)
+// ─────────────────────────────────────────────────────────────────────────────
+
+static BOOL IsInternalSystemWindow(UIWindow *w) {
+    if (!w) return YES;
+    NSString *className = NSStringFromClass([w class]);
+    if ([className hasPrefix:@"_"] ||
+        [className containsString:@"Keyboard"] ||
+        [className containsString:@"TextEffect"] ||
+        [className containsString:@"StatusBar"] ||
+        [className containsString:@"InputSet"] ||
+        [className containsString:@"TrackingWindow"]) {
+        return YES;
+    }
+    return NO;
+}
+
+static UIWindow *GetAppActiveWindow(void) {
+    if (@available(iOS 13.0, *)) {
+        // Priority 1: Foreground Active Scene with Key Window
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]] && scene.activationState == UISceneActivationStateForegroundActive) {
+                UIWindowScene *ws = (UIWindowScene *)scene;
+                for (UIWindow *w in ws.windows) {
+                    if (w.isKeyWindow && !w.hidden && w.alpha > 0.01 && !IsInternalSystemWindow(w)) {
+                        return w;
+                    }
+                }
+                for (UIWindow *w in ws.windows) {
+                    if (w.windowLevel == UIWindowLevelNormal && !w.hidden && w.alpha > 0.01 && !IsInternalSystemWindow(w)) {
+                        return w;
+                    }
+                }
+            }
+        }
+        // Priority 2: Any Scene with usable window
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]]) {
+                UIWindowScene *ws = (UIWindowScene *)scene;
+                for (UIWindow *w in ws.windows) {
+                    if (!w.hidden && w.alpha > 0.01 && !IsInternalSystemWindow(w) && (w.isKeyWindow || w.windowLevel == UIWindowLevelNormal)) {
+                        return w;
+                    }
+                }
+                if (ws.windows.count > 0 && !IsInternalSystemWindow(ws.windows.firstObject)) {
+                    return ws.windows.firstObject;
+                }
+            }
+        }
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    for (UIWindow *w in [UIApplication sharedApplication].windows) {
+        if (!IsInternalSystemWindow(w) && (w.isKeyWindow || w.windowLevel == UIWindowLevelNormal)) {
+            return w;
+        }
+    }
+    return [UIApplication sharedApplication].windows.firstObject;
+#pragma clang diagnostic pop
+}
+
+static UIViewController *FindTopViewControllerFrom(UIViewController *vc) {
+    if (!vc) return nil;
+    if ([vc isKindOfClass:[UINavigationController class]]) {
+        UIViewController *visible = [(UINavigationController *)vc visibleViewController];
+        return visible ? FindTopViewControllerFrom(visible) : vc;
+    }
+    if ([vc isKindOfClass:[UITabBarController class]]) {
+        UIViewController *selected = [(UITabBarController *)vc selectedViewController];
+        return selected ? FindTopViewControllerFrom(selected) : vc;
+    }
+    if (vc.presentedViewController && !vc.presentedViewController.isBeingDismissed) {
+        return FindTopViewControllerFrom(vc.presentedViewController);
+    }
+    return vc;
+}
+
+static UIViewController *GetTopViewController(void) {
+    UIWindow *win = GetAppActiveWindow();
+    UIViewController *root = win ? win.rootViewController : nil;
+    if (!root) {
+        if ([[UIApplication sharedApplication].delegate respondsToSelector:@selector(window)]) {
+            root = [UIApplication sharedApplication].delegate.window.rootViewController;
+        }
+    }
+    return root ? FindTopViewControllerFrom(root) : nil;
+}
+
+static CGRect GetAppScreenBounds(void) {
+    UIWindow *w = GetAppActiveWindow();
+    if (w && w.bounds.size.width > 0 && w.bounds.size.height > 0) {
+        return w.bounds;
+    }
+    if (@available(iOS 13.0, *)) {
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]]) {
+                UIWindowScene *ws = (UIWindowScene *)scene;
+                if (ws.coordinateSpace.bounds.size.width > 0 && ws.coordinateSpace.bounds.size.height > 0) {
+                    return ws.coordinateSpace.bounds;
+                }
+            }
+        }
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    CGRect b = [UIScreen mainScreen].bounds;
+    if (b.size.width > 0 && b.size.height > 0) return b;
+#pragma clang diagnostic pop
+    return CGRectMake(0, 0, 393, 852);
+}
+
+static CGFloat GetAppScreenScale(void) {
+    UIWindow *w = GetAppActiveWindow();
+    if (w && w.screen) {
+        return w.screen.scale;
+    }
+    if (@available(iOS 13.0, *)) {
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]]) {
+                UIWindowScene *ws = (UIWindowScene *)scene;
+                if (ws.screen) {
+                    return ws.screen.scale;
+                }
+            }
+        }
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    return [UIScreen mainScreen].scale > 0 ? [UIScreen mainScreen].scale : 2.0;
+#pragma clang diagnostic pop
+}
+
 @implementation NetworkInspectorModule {
     bool hasListeners;
     CADisplayLink *displayLink;
@@ -675,6 +687,17 @@ RCT_EXPORT_MODULE(NetworkInspectorModule);
     return self;
 }
 
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    if (self->displayLink) {
+        [self->displayLink invalidate];
+        self->displayLink = nil;
+    }
+    if (sharedInstance == self) {
+        sharedInstance = nil;
+    }
+}
+
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
@@ -696,7 +719,6 @@ RCT_EXPORT_MODULE(NetworkInspectorModule);
 
 - (void)safeSendEvent:(NSString *)eventName body:(id)body {
     if (!hasListeners) return;
-    if (self.bridge == nil) return;
     @try {
         [self sendEventWithName:eventName body:body];
     } @catch (NSException *ex) {
@@ -721,33 +743,13 @@ RCT_EXPORT_MODULE(NetworkInspectorModule);
 }
 
 - (void)installHandlers {
-    previousUncaughtExceptionHandler = NSGetUncaughtExceptionHandler();
-    NSSetUncaughtExceptionHandler(&NativeExceptionHandler);
-
-    struct sigaction sa;
-    sa.sa_handler = NativeSignalHandler;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_NODEFER;
-
-    sigaction(SIGABRT, &sa, NULL);
-    sigaction(SIGSEGV, &sa, NULL);
-    sigaction(SIGBUS,  &sa, NULL);
-    sigaction(SIGILL,  &sa, NULL);
-    sigaction(SIGFPE,  &sa, NULL);
-    sigaction(SIGPIPE, &sa, NULL);
-    sigaction(SIGTRAP, &sa, NULL);
-
-    // Fabric view recycle safeguard: Install a custom NSAssertionHandler on the
-    // main thread that catches the specific 'Attempt to recycle a mounted view'
-    // assertion from RCTComponentViewRegistry, instead of crashing the app.
-    // This is a defense-in-depth approach — the primary fix is on the JS side
-    // (using LinearGradient as absolute background, not as a container parent).
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [InAppInspectorAssertionHandler install];
-        });
-    });
+    @try {
+        if (!previousUncaughtExceptionHandler) {
+            previousUncaughtExceptionHandler = NSGetUncaughtExceptionHandler();
+            NSSetUncaughtExceptionHandler(&NativeExceptionHandler);
+        }
+        signal(SIGPIPE, SIG_IGN);
+    } @catch (NSException *e) {}
 }
 
 - (void)emitCrashEventWithMessage:(NSString *)message stackTrace:(NSString *)stackTrace {
@@ -766,6 +768,41 @@ RCT_EXPORT_METHOD(enableNativeCrashProtection:(RCTPromiseResolveBlock)resolve
     resolve(@(YES));
 }
 
+RCT_EXPORT_METHOD(getLastNativeCrash:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    @try {
+        NSString *cacheDir = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
+        NSString *crashFile = [[cacheDir stringByAppendingPathComponent:@"inspector_captures"] stringByAppendingPathComponent:@"last_native_crash.json"];
+        if ([[NSFileManager defaultManager] fileExistsAtPath:crashFile]) {
+            NSData *data = [NSData dataWithContentsOfFile:crashFile];
+            if (data) {
+                NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+                if (json) {
+                    resolve(json);
+                    return;
+                }
+            }
+        }
+        resolve([NSNull null]);
+    } @catch (NSException *e) {
+        reject(@"GET_CRASH_ERROR", e.reason, nil);
+    }
+}
+
+RCT_EXPORT_METHOD(clearLastNativeCrash:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    @try {
+        NSString *cacheDir = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
+        NSString *crashFile = [[cacheDir stringByAppendingPathComponent:@"inspector_captures"] stringByAppendingPathComponent:@"last_native_crash.json"];
+        if ([[NSFileManager defaultManager] fileExistsAtPath:crashFile]) {
+            [[NSFileManager defaultManager] removeItemAtPath:crashFile error:nil];
+        }
+        resolve(@(YES));
+    } @catch (NSException *e) {
+        reject(@"CLEAR_CRASH_ERROR", e.reason, nil);
+    }
+}
+
 RCT_EXPORT_METHOD(getDeviceMetrics:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
     NSMutableDictionary *metrics = [NSMutableDictionary dictionary];
@@ -837,42 +874,15 @@ RCT_EXPORT_METHOD(getDeviceMetrics:(RCTPromiseResolveBlock)resolve
     resolve(metrics);
 }
 
-static UIWindow *GetAppActiveWindow(void) {
-    if (@available(iOS 13.0, *)) {
-        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
-            if ([scene isKindOfClass:[UIWindowScene class]]) {
-                UIWindowScene *ws = (UIWindowScene *)scene;
-                for (UIWindow *w in ws.windows) {
-                    if (w.isKeyWindow || w.windowLevel == UIWindowLevelNormal) {
-                        return w;
-                    }
-                }
-                if (ws.windows.count > 0) {
-                    return ws.windows.firstObject;
-                }
-            }
-        }
-    }
-    for (UIWindow *w in [UIApplication sharedApplication].windows) {
-        if (w.isKeyWindow || w.windowLevel == UIWindowLevelNormal) {
-            return w;
-        }
-    }
-    return [UIApplication sharedApplication].windows.firstObject;
-}
-
 RCT_EXPORT_METHOD(showFloatingButton:(NSDictionary *)options
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
         g_floatingButtonDesiredVisible = YES;
-        UIWindow *targetWindow = GetAppActiveWindow();
-        CGRect screenBounds = targetWindow ? targetWindow.bounds : [UIScreen mainScreen].bounds;
+        CGRect screenBounds = GetAppScreenBounds();
 
-        CGFloat screenWidth = screenBounds.size.width > 0 ? screenBounds.size.width : [UIScreen mainScreen].bounds.size.width;
-        if (screenWidth <= 0) screenWidth = 393.0;
-        CGFloat screenHeight = screenBounds.size.height > 0 ? screenBounds.size.height : [UIScreen mainScreen].bounds.size.height;
-        if (screenHeight <= 0) screenHeight = 852.0;
+        CGFloat screenWidth = screenBounds.size.width > 0 ? screenBounds.size.width : 393.0;
+        CGFloat screenHeight = screenBounds.size.height > 0 ? screenBounds.size.height : 852.0;
 
         CGFloat size = 64.0;
         if (options && options[@"size"]) {
@@ -1271,32 +1281,7 @@ RCT_EXPORT_METHOD(getNativeCachedPage:(NSString *)pageKey
 }
 
 - (UIWindow *)findActiveKeyWindow {
-    UIWindow *foundWindow = nil;
-    if (@available(iOS 13.0, *)) {
-        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
-            if ([scene isKindOfClass:[UIWindowScene class]]) {
-                UIWindowScene *windowScene = (UIWindowScene *)scene;
-                for (UIWindow *w in windowScene.windows) {
-                    if (w.isKeyWindow) {
-                        return w;
-                    }
-                    if (!foundWindow && !w.hidden && w.alpha > 0.01) {
-                        foundWindow = w;
-                    }
-                }
-            }
-        }
-    }
-    if (!foundWindow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        foundWindow = [UIApplication sharedApplication].keyWindow;
-        if (!foundWindow && [UIApplication sharedApplication].windows.count > 0) {
-            foundWindow = [UIApplication sharedApplication].windows.firstObject;
-        }
-#pragma clang diagnostic pop
-    }
-    return foundWindow;
+    return GetAppActiveWindow();
 }
 
 - (UIImage *)captureScreenHierarchyWithScale:(CGFloat)scale {
@@ -1305,10 +1290,13 @@ RCT_EXPORT_METHOD(getNativeCachedPage:(NSString *)pageKey
         return nil;
     }
 
-    CGRect screenBounds = [UIScreen mainScreen].bounds;
-    CGFloat screenScale = [UIScreen mainScreen].scale;
+    CGRect screenBounds = GetAppScreenBounds();
+    CGFloat screenScale = GetAppScreenScale();
     CGFloat finalScale = screenScale * scale;
     if (finalScale <= 0.0) finalScale = screenScale;
+    if (screenBounds.size.width <= 0 || screenBounds.size.height <= 0) {
+        screenBounds = CGRectMake(0, 0, 393, 852);
+    }
 
     UIGraphicsBeginImageContextWithOptions(screenBounds.size, NO, finalScale);
     CGContextRef context = UIGraphicsGetCurrentContext();
@@ -1338,7 +1326,7 @@ RCT_EXPORT_METHOD(getNativeCachedPage:(NSString *)pageKey
 
     BOOL drewAny = NO;
     for (UIWindow *w in sortedWindows) {
-        if (w.hidden || w.alpha <= 0.01 || w.bounds.size.width <= 0) continue;
+        if (w.hidden || w.alpha <= 0.01 || w.bounds.size.width <= 0 || IsInternalSystemWindow(w)) continue;
         @try {
             BOOL ok = [w drawViewHierarchyInRect:w.bounds afterScreenUpdates:NO];
             if (ok) {
@@ -1422,8 +1410,8 @@ RCT_EXPORT_METHOD(getNativeCachedPage:(NSString *)pageKey
                                   resolve:(RCTPromiseResolveBlock)resolve
                                    reject:(RCTPromiseRejectBlock)reject {
     dispatch_async(dispatch_get_main_queue(), ^{
-        CGRect bounds = [UIScreen mainScreen].bounds;
-        CGFloat screenScale = [UIScreen mainScreen].scale;
+        CGRect bounds = GetAppScreenBounds();
+        CGFloat screenScale = GetAppScreenScale();
         double scaleParam = [options[@"scale"] doubleValue];
         if (scaleParam <= 0.0 || scaleParam > 1.0) {
             scaleParam = 0.5;
@@ -1764,15 +1752,7 @@ RCT_EXPORT_METHOD(playVideo:(NSString *)videoUri
             playerController.showsPlaybackControls = YES;
             playerController.modalPresentationStyle = UIModalPresentationFullScreen;
 
-            UIWindow *keyWindow = [self findActiveKeyWindow];
-            UIViewController *rootVC = keyWindow.rootViewController;
-            if (!rootVC) {
-                rootVC = [UIApplication sharedApplication].delegate.window.rootViewController;
-            }
-            while (rootVC.presentedViewController) {
-                rootVC = rootVC.presentedViewController;
-            }
-
+            UIViewController *rootVC = GetTopViewController();
             if (rootVC) {
                 [rootVC presentViewController:playerController animated:YES completion:^{
                     [player play];
@@ -1825,7 +1805,7 @@ RCT_EXPORT_METHOD(convertToGif:(NSString *)videoUri
             NSString *filePath = [[self getCapturesDirectory] stringByAppendingPathComponent:filename];
             NSURL *gifUrl = [NSURL fileURLWithPath:filePath];
 
-            CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef)gifUrl, kUTTypeGIF, 0, NULL);
+            CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef)gifUrl, (CFStringRef)@"com.compuserve.gif", 0, NULL);
             if (!destination) {
                 reject(@"GIF_ERROR", @"Failed to create GIF image destination", nil);
                 return;
@@ -2085,6 +2065,36 @@ RCT_EXPORT_METHOD(clearAllCapturedMedia:(RCTPromiseResolveBlock)resolve
 // 100% Native Media Editor: Photo Editing (CoreImage + ImageIO)
 // ─────────────────────────────────────────────────────────────────────────────
 
+static UIColor *inspectorColorFromHex(NSString *hexString, UIColor *defaultColor) {
+    if (!hexString || ![hexString isKindOfClass:[NSString class]]) {
+        return defaultColor ?: [UIColor redColor];
+    }
+    NSString *cleanHex = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@""];
+    cleanHex = [cleanHex stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    unsigned int rgbValue = 0;
+    NSScanner *scanner = [NSScanner scannerWithString:cleanHex];
+    [scanner scanHexInt:&rgbValue];
+    
+    if (cleanHex.length == 8) {
+        CGFloat r = ((rgbValue & 0xFF000000) >> 24) / 255.0;
+        CGFloat g = ((rgbValue & 0x00FF0000) >> 16) / 255.0;
+        CGFloat b = ((rgbValue & 0x0000FF00) >> 8) / 255.0;
+        CGFloat a = (rgbValue & 0x000000FF) / 255.0;
+        return [UIColor colorWithRed:r green:g blue:b alpha:a];
+    } else if (cleanHex.length == 6) {
+        CGFloat r = ((rgbValue & 0xFF0000) >> 16) / 255.0;
+        CGFloat g = ((rgbValue & 0x00FF00) >> 8) / 255.0;
+        CGFloat b = (rgbValue & 0x0000FF) / 255.0;
+        return [UIColor colorWithRed:r green:g blue:b alpha:1.0];
+    } else if (cleanHex.length == 3) {
+        CGFloat r = (((rgbValue & 0xF00) >> 8) * 17) / 255.0;
+        CGFloat g = (((rgbValue & 0x0F0) >> 4) * 17) / 255.0;
+        CGFloat b = ((rgbValue & 0x00F) * 17) / 255.0;
+        return [UIColor colorWithRed:r green:g blue:b alpha:1.0];
+    }
+    return defaultColor ?: [UIColor redColor];
+}
+
 RCT_EXPORT_METHOD(editPhoto:(NSDictionary *)options
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
@@ -2245,34 +2255,223 @@ RCT_EXPORT_METHOD(editPhoto:(NSDictionary *)options
                 UIImage *resultImage = [UIImage imageWithCGImage:cgImage];
                 CGImageRelease(cgImage);
 
-                // 7. Apply Redactions & Annotations Overlay if provided
+                // 7. Apply Redactions, Freehand Drawings, Draggable Texts & Annotations Overlay if provided
                 NSArray *redactions = options[@"redactions"];
                 NSArray *annotations = options[@"annotations"];
-                if ((redactions && [redactions isKindOfClass:[NSArray class]] && redactions.count > 0) ||
-                    (annotations && [annotations isKindOfClass:[NSArray class]] && annotations.count > 0)) {
+                NSArray *drawings = options[@"drawings"];
+                NSArray *texts = options[@"texts"];
+
+                BOOL hasOverlay = (redactions && [redactions isKindOfClass:[NSArray class]] && redactions.count > 0) ||
+                                  (annotations && [annotations isKindOfClass:[NSArray class]] && annotations.count > 0) ||
+                                  (drawings && [drawings isKindOfClass:[NSArray class]] && drawings.count > 0) ||
+                                  (texts && [texts isKindOfClass:[NSArray class]] && texts.count > 0);
+
+                if (hasOverlay) {
                     UIGraphicsBeginImageContextWithOptions(resultImage.size, NO, 1.0);
                     [resultImage drawInRect:CGRectMake(0, 0, resultImage.size.width, resultImage.size.height)];
                     CGContextRef ctx = UIGraphicsGetCurrentContext();
 
+                    CGFloat canvasW = resultImage.size.width;
+                    CGFloat canvasH = resultImage.size.height;
+                    CGFloat baseScale = MAX(1.0, canvasW / 380.0);
+
+                    // A. Redactions (Blackout or Blur/Pixelate Box)
                     if (redactions && [redactions isKindOfClass:[NSArray class]]) {
                         for (NSDictionary *box in redactions) {
                             CGFloat x = [box[@"x"] doubleValue];
                             CGFloat y = [box[@"y"] doubleValue];
                             CGFloat w = [box[@"width"] doubleValue];
                             CGFloat h = [box[@"height"] doubleValue];
-                            BOOL isNorm = [box[@"isNormalized"] boolValue];
+                            BOOL isNorm = box[@"isNormalized"] ? [box[@"isNormalized"] boolValue] : YES;
                             if (isNorm) {
-                                x *= resultImage.size.width;
-                                y *= resultImage.size.height;
-                                w *= resultImage.size.width;
-                                h *= resultImage.size.height;
+                                x *= canvasW;
+                                y *= canvasH;
+                                w *= canvasW;
+                                h *= canvasH;
+                            }
+                            NSString *style = box[@"style"] ?: @"blackout";
+                            if ([style isEqualToString:@"blur"] || [style isEqualToString:@"pixelate"]) {
+                                CGContextSetFillColorWithColor(ctx, [UIColor colorWithWhite:0.12 alpha:0.92].CGColor);
+                            } else {
+                                CGContextSetFillColorWithColor(ctx, [UIColor blackColor].CGColor);
                             }
-                            CGContextSetFillColorWithColor(ctx, [UIColor blackColor].CGColor);
                             CGContextFillRect(ctx, CGRectMake(x, y, w, h));
                         }
                     }
 
-                    if (annotations && [annotations isKindOfClass:[NSArray class]]) {
+                    // B. Freehand Drawings & Vector Shapes (Brush, Highlighter, Arrow, Rect, Circle, Step)
+                    if (drawings && [drawings isKindOfClass:[NSArray class]]) {
+                        for (NSDictionary *stroke in drawings) {
+                            NSString *type = stroke[@"type"] ?: @"brush";
+                            NSString *hexColor = stroke[@"color"] ?: @"#EF4444";
+                            UIColor *strokeColor = inspectorColorFromHex(hexColor, [UIColor redColor]);
+                            CGFloat strokeWidth = stroke[@"strokeWidth"] ? [stroke[@"strokeWidth"] doubleValue] * baseScale : 4.0 * baseScale;
+                            BOOL isNorm = stroke[@"isNormalized"] ? [stroke[@"isNormalized"] boolValue] : YES;
+                            NSArray *points = stroke[@"points"];
+
+                            if ([type isEqualToString:@"brush"]) {
+                                if (points && points.count > 1) {
+                                    CGContextSetStrokeColorWithColor(ctx, strokeColor.CGColor);
+                                    CGContextSetLineWidth(ctx, strokeWidth);
+                                    CGContextSetLineCap(ctx, kCGLineCapRound);
+                                    CGContextSetLineJoin(ctx, kCGLineJoinRound);
+                                    CGContextBeginPath(ctx);
+                                    for (NSUInteger pIdx = 0; pIdx < points.count; pIdx++) {
+                                        NSDictionary *pt = points[pIdx];
+                                        CGFloat px = [pt[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                        CGFloat py = [pt[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                        if (pIdx == 0) {
+                                            CGContextMoveToPoint(ctx, px, py);
+                                        } else {
+                                            CGContextAddLineToPoint(ctx, px, py);
+                                        }
+                                    }
+                                    CGContextStrokePath(ctx);
+                                }
+                            } else if ([type isEqualToString:@"highlighter"]) {
+                                if (points && points.count > 1) {
+                                    UIColor *hiColor = [strokeColor colorWithAlphaComponent:0.4];
+                                    CGContextSetStrokeColorWithColor(ctx, hiColor.CGColor);
+                                    CGContextSetLineWidth(ctx, strokeWidth * 2.5);
+                                    CGContextSetLineCap(ctx, kCGLineCapRound);
+                                    CGContextSetLineJoin(ctx, kCGLineJoinRound);
+                                    CGContextBeginPath(ctx);
+                                    for (NSUInteger pIdx = 0; pIdx < points.count; pIdx++) {
+                                        NSDictionary *pt = points[pIdx];
+                                        CGFloat px = [pt[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                        CGFloat py = [pt[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                        if (pIdx == 0) {
+                                            CGContextMoveToPoint(ctx, px, py);
+                                        } else {
+                                            CGContextAddLineToPoint(ctx, px, py);
+                                        }
+                                    }
+                                    CGContextStrokePath(ctx);
+                                }
+                            } else if ([type isEqualToString:@"arrow"]) {
+                                if (points && points.count >= 2) {
+                                    NSDictionary *p0 = points[0];
+                                    NSDictionary *p1 = points[points.count - 1];
+                                    CGFloat x0 = [p0[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                    CGFloat y0 = [p0[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                    CGFloat x1 = [p1[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                    CGFloat y1 = [p1[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+
+                                    CGContextSetStrokeColorWithColor(ctx, strokeColor.CGColor);
+                                    CGContextSetLineWidth(ctx, strokeWidth);
+                                    CGContextSetLineCap(ctx, kCGLineCapRound);
+                                    CGContextBeginPath(ctx);
+                                    CGContextMoveToPoint(ctx, x0, y0);
+                                    CGContextAddLineToPoint(ctx, x1, y1);
+                                    CGContextStrokePath(ctx);
+
+                                    CGFloat dx = x1 - x0;
+                                    CGFloat dy = y1 - y0;
+                                    CGFloat angle = atan2(dy, dx);
+                                    CGFloat headLen = MAX(14.0 * baseScale, MIN(32.0 * baseScale, strokeWidth * 3.5));
+                                    CGFloat headAngle = M_PI / 6.0;
+                                    CGFloat ax1 = x1 - headLen * cos(angle - headAngle);
+                                    CGFloat ay1 = y1 - headLen * sin(angle - headAngle);
+                                    CGFloat ax2 = x1 - headLen * cos(angle + headAngle);
+                                    CGFloat ay2 = y1 - headLen * sin(angle + headAngle);
+
+                                    CGContextSetFillColorWithColor(ctx, strokeColor.CGColor);
+                                    CGContextBeginPath(ctx);
+                                    CGContextMoveToPoint(ctx, x1, y1);
+                                    CGContextAddLineToPoint(ctx, ax1, ay1);
+                                    CGContextAddLineToPoint(ctx, ax2, ay2);
+                                    CGContextClosePath(ctx);
+                                    CGContextFillPath(ctx);
+                                }
+                            } else if ([type isEqualToString:@"rect"]) {
+                                NSDictionary *p0 = (points && points.count > 0) ? points[0] : nil;
+                                NSDictionary *p1 = (points && points.count > 1) ? points[1] : p0;
+                                CGFloat x0 = [p0[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                CGFloat y0 = [p0[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                CGFloat x1 = [p1[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                CGFloat y1 = [p1[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                CGRect rect = CGRectMake(MIN(x0, x1), MIN(y0, y1), ABS(x1 - x0), ABS(y1 - y0));
+                                CGContextSetStrokeColorWithColor(ctx, strokeColor.CGColor);
+                                CGContextSetLineWidth(ctx, strokeWidth);
+                                CGContextStrokeRect(ctx, rect);
+                            } else if ([type isEqualToString:@"circle"] || [type isEqualToString:@"spotlight"]) {
+                                NSDictionary *p0 = (points && points.count > 0) ? points[0] : nil;
+                                NSDictionary *p1 = (points && points.count > 1) ? points[1] : p0;
+                                CGFloat x0 = [p0[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                CGFloat y0 = [p0[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                CGFloat x1 = [p1[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                CGFloat y1 = [p1[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                CGRect rect = CGRectMake(MIN(x0, x1), MIN(y0, y1), ABS(x1 - x0), ABS(y1 - y0));
+                                CGContextSetStrokeColorWithColor(ctx, strokeColor.CGColor);
+                                CGContextSetLineWidth(ctx, strokeWidth);
+                                CGContextStrokeEllipseInRect(ctx, rect);
+                            } else if ([type isEqualToString:@"step"]) {
+                                NSDictionary *p0 = (points && points.count > 0) ? points[0] : nil;
+                                CGFloat cx = [p0[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                                CGFloat cy = [p0[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                                CGFloat radius = 16.0 * baseScale;
+                                CGRect badgeRect = CGRectMake(cx - radius, cy - radius, radius * 2, radius * 2);
+
+                                CGContextSetFillColorWithColor(ctx, strokeColor.CGColor);
+                                CGContextFillEllipseInRect(ctx, badgeRect);
+
+                                CGContextSetStrokeColorWithColor(ctx, [UIColor whiteColor].CGColor);
+                                CGContextSetLineWidth(ctx, 2.0 * baseScale);
+                                CGContextStrokeEllipseInRect(ctx, badgeRect);
+
+                                NSInteger stepNum = stroke[@"stepNumber"] ? [stroke[@"stepNumber"] integerValue] : 1;
+                                NSString *stepStr = [NSString stringWithFormat:@"%ld", (long)stepNum];
+                                UIFont *font = [UIFont boldSystemFontOfSize:14.0 * baseScale];
+                                NSDictionary *attrs = @{
+                                    NSFontAttributeName: font,
+                                    NSForegroundColorAttributeName: [UIColor whiteColor]
+                                };
+                                CGSize strSize = [stepStr sizeWithAttributes:attrs];
+                                CGPoint strOrigin = CGPointMake(cx - strSize.width / 2.0, cy - strSize.height / 2.0);
+                                [stepStr drawAtPoint:strOrigin withAttributes:attrs];
+                            }
+                        }
+                    }
+
+                    // C. Draggable Text Badges / Notes
+                    if (texts && [texts isKindOfClass:[NSArray class]]) {
+                        for (NSDictionary *tItem in texts) {
+                            NSString *textStr = tItem[@"text"] ?: @"";
+                            if (textStr.length == 0) continue;
+                            BOOL isNorm = tItem[@"isNormalized"] ? [tItem[@"isNormalized"] boolValue] : YES;
+                            CGFloat tx = [tItem[@"x"] doubleValue] * (isNorm ? canvasW : 1.0);
+                            CGFloat ty = [tItem[@"y"] doubleValue] * (isNorm ? canvasH : 1.0);
+                            NSString *textColorHex = tItem[@"color"] ?: @"#FFFFFF";
+                            NSString *bgColorHex = tItem[@"bgColor"] ?: @"#EF4444";
+                            UIColor *textColor = inspectorColorFromHex(textColorHex, [UIColor whiteColor]);
+                            UIColor *bgColor = inspectorColorFromHex(bgColorHex, [UIColor redColor]);
+
+                            UIFont *font = [UIFont boldSystemFontOfSize:15.0 * baseScale];
+                            NSDictionary *attrs = @{
+                                NSFontAttributeName: font,
+                                NSForegroundColorAttributeName: textColor
+                            };
+                            CGSize strSize = [textStr sizeWithAttributes:attrs];
+                            CGFloat padH = 12.0 * baseScale;
+                            CGFloat padV = 6.0 * baseScale;
+                            CGRect pillRect = CGRectMake(tx, ty, strSize.width + padH * 2.0, strSize.height + padV * 2.0);
+                            UIBezierPath *roundedPill = [UIBezierPath bezierPathWithRoundedRect:pillRect cornerRadius:pillRect.size.height / 2.0];
+
+                            CGContextSetFillColorWithColor(ctx, bgColor.CGColor);
+                            CGContextAddPath(ctx, roundedPill.CGPath);
+                            CGContextFillPath(ctx);
+
+                            CGContextSetStrokeColorWithColor(ctx, [[UIColor whiteColor] colorWithAlphaComponent:0.4].CGColor);
+                            CGContextSetLineWidth(ctx, 1.5 * baseScale);
+                            CGContextAddPath(ctx, roundedPill.CGPath);
+                            CGContextStrokePath(ctx);
+
+                            [textStr drawAtPoint:CGPointMake(tx + padH, ty + padV) withAttributes:attrs];
+                        }
+                    }
+
+                    // D. Legacy / Standalone Annotations
+                    if (annotations && [annotations isKindOfClass:[NSArray class]] && (!drawings || drawings.count == 0)) {
                         for (NSDictionary *ann in annotations) {
                             CGFloat x = [ann[@"x"] doubleValue];
                             CGFloat y = [ann[@"y"] doubleValue];
@@ -2280,14 +2479,32 @@ RCT_EXPORT_METHOD(editPhoto:(NSDictionary *)options
                             CGFloat h = [ann[@"height"] doubleValue];
                             BOOL isNorm = [ann[@"isNormalized"] boolValue];
                             if (isNorm) {
-                                x *= resultImage.size.width;
-                                y *= resultImage.size.height;
-                                w *= resultImage.size.width;
-                                h *= resultImage.size.height;
+                                x *= canvasW;
+                                y *= canvasH;
+                                w *= canvasW;
+                                h *= canvasH;
                             }
-                            CGContextSetStrokeColorWithColor(ctx, [UIColor redColor].CGColor);
-                            CGContextSetLineWidth(ctx, 4.0);
+                            NSString *annColorHex = ann[@"color"] ?: @"#EF4444";
+                            UIColor *annColor = inspectorColorFromHex(annColorHex, [UIColor redColor]);
+                            CGContextSetStrokeColorWithColor(ctx, annColor.CGColor);
+                            CGContextSetLineWidth(ctx, 4.0 * baseScale);
                             CGContextStrokeRect(ctx, CGRectMake(x, y, w, h));
+
+                            NSString *label = ann[@"label"];
+                            if (label && [label isKindOfClass:[NSString class]] && label.length > 0) {
+                                UIFont *font = [UIFont boldSystemFontOfSize:13.0 * baseScale];
+                                NSDictionary *attrs = @{
+                                    NSFontAttributeName: font,
+                                    NSForegroundColorAttributeName: [UIColor whiteColor]
+                                };
+                                CGSize strSize = [label sizeWithAttributes:attrs];
+                                CGFloat padH = 6.0 * baseScale;
+                                CGFloat padV = 3.0 * baseScale;
+                                CGRect tagRect = CGRectMake(x, MAX(0, y - strSize.height - padV * 2.0), strSize.width + padH * 2.0, strSize.height + padV * 2.0);
+                                CGContextSetFillColorWithColor(ctx, annColor.CGColor);
+                                CGContextFillRect(ctx, tagRect);
+                                [label drawAtPoint:CGPointMake(tagRect.origin.x + padH, tagRect.origin.y + padV) withAttributes:attrs];
+                            }
                         }
                     }
 
@@ -2516,74 +2733,31 @@ RCT_EXPORT_METHOD(pickMedia:(NSDictionary *)options
                   reject:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
         NSString *mediaType = options[@"mediaType"] ?: @"any";
-        
-        UIWindow *keyWin = nil;
-        if (@available(iOS 13.0, *)) {
-            for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
-                if (scene.activationState == UISceneActivationStateForegroundActive && [scene isKindOfClass:[UIWindowScene class]]) {
-                    for (UIWindow *w in ((UIWindowScene *)scene).windows) {
-                        if (w.isKeyWindow) {
-                            keyWin = w;
-                            break;
-                        }
-                    }
-                }
-                if (keyWin) break;
-            }
-        }
-        if (!keyWin) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-            keyWin = [UIApplication sharedApplication].keyWindow ?: [UIApplication sharedApplication].windows.firstObject;
-#pragma clang diagnostic pop
-        }
-        
-        UIViewController *rootVC = keyWin.rootViewController;
-        while (rootVC.presentedViewController) {
-            rootVC = rootVC.presentedViewController;
+        UIViewController *rootVC = GetTopViewController();
+        if (!rootVC) {
+            reject(@"PICK_ERROR", @"Unable to find active view controller for media picker", nil);
+            return;
         }
-        
+
         g_pickerDelegate = [[InAppInspectorPickerDelegate alloc] init];
         g_pickerDelegate.resolve = resolve;
         g_pickerDelegate.reject = reject;
         g_pickerDelegate.capturesDirectory = [self getCapturesDirectory];
-        
-        Class PHPickerVCClass = NSClassFromString(@"PHPickerViewController");
-        Class PHPickerConfigClass = NSClassFromString(@"PHPickerConfiguration");
-        Class PHPickerFilterClass = NSClassFromString(@"PHPickerFilter");
-        
-        if (PHPickerVCClass && PHPickerConfigClass && PHPickerFilterClass) {
-            id config = [[PHPickerConfigClass alloc] init];
-            [config setValue:@1 forKey:@"selectionLimit"];
-            
-            id filter = nil;
-            SEL imgFilterSel = NSSelectorFromString(@"imagesFilter");
-            SEL vidFilterSel = NSSelectorFromString(@"videosFilter");
-            SEL anyFilterSel = NSSelectorFromString(@"anyFilterMatchingSubfilters:");
-            
+
+        if (@available(iOS 14.0, *)) {
+            PHPickerConfiguration *config = [[PHPickerConfiguration alloc] init];
+            config.selectionLimit = 1;
+
             if ([mediaType isEqualToString:@"image"]) {
-                if ([PHPickerFilterClass respondsToSelector:imgFilterSel]) {
-                    filter = ((id (*)(id, SEL))objc_msgSend)(PHPickerFilterClass, imgFilterSel);
-                }
+                config.filter = [PHPickerFilter imagesFilter];
             } else if ([mediaType isEqualToString:@"video"]) {
-                if ([PHPickerFilterClass respondsToSelector:vidFilterSel]) {
-                    filter = ((id (*)(id, SEL))objc_msgSend)(PHPickerFilterClass, vidFilterSel);
-                }
+                config.filter = [PHPickerFilter videosFilter];
             } else {
-                id imgFilter = [PHPickerFilterClass respondsToSelector:imgFilterSel] ? ((id (*)(id, SEL))objc_msgSend)(PHPickerFilterClass, imgFilterSel) : nil;
-                id vidFilter = [PHPickerFilterClass respondsToSelector:vidFilterSel] ? ((id (*)(id, SEL))objc_msgSend)(PHPickerFilterClass, vidFilterSel) : nil;
-                if (imgFilter && vidFilter && [PHPickerFilterClass respondsToSelector:anyFilterSel]) {
-                    filter = ((id (*)(id, SEL, id))objc_msgSend)(PHPickerFilterClass, anyFilterSel, @[imgFilter, vidFilter]);
-                }
-            }
-            if (filter) {
-                [config setValue:filter forKey:@"filter"];
+                config.filter = [PHPickerFilter anyFilterMatchingSubfilters:@[[PHPickerFilter imagesFilter], [PHPickerFilter videosFilter]]];
             }
-            
-            SEL initConfigSel = NSSelectorFromString(@"initWithConfiguration:");
-            id rawPicker = [PHPickerVCClass alloc];
-            UIViewController *picker = ((UIViewController * (*)(id, SEL, id))objc_msgSend)(rawPicker, initConfigSel, config);
-            [picker setValue:g_pickerDelegate forKey:@"delegate"];
+
+            PHPickerViewController *picker = [[PHPickerViewController alloc] initWithConfiguration:config];
+            picker.delegate = g_pickerDelegate;
             [rootVC presentViewController:picker animated:YES completion:nil];
         } else {
             UIImagePickerController *picker = [[UIImagePickerController alloc] init];
@@ -2603,6 +2777,93 @@ RCT_EXPORT_METHOD(pickMedia:(NSDictionary *)options
     });
 }
 
+RCT_EXPORT_METHOD(writeExportFile:(NSString *)filename
+                  content:(NSString *)content
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        @try {
+            if (!filename || filename.length == 0) {
+                reject(@"INVALID_FILENAME", @"Filename is missing", nil);
+                return;
+            }
+            NSString *dir = [self getCapturesDirectory];
+            NSString *cleanFilename = [filename lastPathComponent];
+            NSString *outPath = [dir stringByAppendingPathComponent:cleanFilename];
+            NSData *data = [(content ?: @"") dataUsingEncoding:NSUTF8StringEncoding];
+            BOOL success = [data writeToFile:outPath atomically:YES];
+            if (success) {
+                resolve([NSURL fileURLWithPath:outPath].absoluteString);
+            } else {
+                reject(@"WRITE_FAILED", @"Failed to write export file", nil);
+            }
+        } @catch (NSException *e) {
+            reject(@"WRITE_ERROR", e.reason, nil);
+        }
+    });
+}
+
+RCT_EXPORT_METHOD(shareFile:(NSString *)filePath
+                  mimeType:(NSString *)mimeType
+                  title:(NSString *)title
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        @try {
+            NSString *cleanPath = filePath;
+            if ([cleanPath hasPrefix:@"file://"]) {
+                cleanPath = [cleanPath substringFromIndex:7];
+            }
+            cleanPath = [cleanPath stringByRemovingPercentEncoding];
+            if (![[NSFileManager defaultManager] fileExistsAtPath:cleanPath]) {
+                reject(@"FILE_NOT_FOUND", @"File not found", nil);
+                return;
+            }
+            NSURL *fileUrl = [NSURL fileURLWithPath:cleanPath];
+            UIActivityViewController *activityVC = [[UIActivityViewController alloc] initWithActivityItems:@[fileUrl] applicationActivities:nil];
+            if (title && title.length > 0) {
+                [activityVC setValue:title forKey:@"subject"];
+            }
+            UIViewController *rootVC = GetTopViewController();
+            if (!rootVC) {
+                reject(@"SHARE_ERROR", @"Unable to find active view controller to share file", nil);
+                return;
+            }
+            if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad && rootVC.view) {
+                activityVC.popoverPresentationController.sourceView = rootVC.view;
+                activityVC.popoverPresentationController.sourceRect = CGRectMake(CGRectGetMidX(rootVC.view.bounds), CGRectGetMidY(rootVC.view.bounds), 1, 1);
+                activityVC.popoverPresentationController.permittedArrowDirections = 0;
+            }
+            activityVC.completionWithItemsHandler = ^(UIActivityType activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
+                resolve(@(completed));
+            };
+            [rootVC presentViewController:activityVC animated:YES completion:nil];
+        } @catch (NSException *e) {
+            reject(@"SHARE_ERROR", e.reason, nil);
+        }
+    });
+}
+
+- (void)invalidate {
+    [super invalidate];
+    hasListeners = NO;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self->displayLink != nil) {
+            [self->displayLink invalidate];
+            self->displayLink = nil;
+        }
+        if (self->_softwareRecordingTimerSource) {
+            dispatch_source_cancel(self->_softwareRecordingTimerSource);
+            self->_softwareRecordingTimerSource = nil;
+        }
+        if (floatingButtonView != nil) {
+            [floatingButtonView removeFromSuperview];
+            floatingButtonView = nil;
+        }
+    });
+}
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule: