@onekeyfe/react-native-perf-stats 3.0.27 → 3.0.29

package/android/src/main/java/com/margelo/nitro/reactnativeperfstats/ReactNativePerfStats.kt

@@ -593,7 +593,11 @@ internal object Overlay : Application.ActivityLifecycleCallbacks {
         val view = overlayView ?: return
         if (attachedToWindowManager) {
             try {
-                val wm = currentActivity?.getSystemService(Context.WINDOW_SERVICE)
+                // Use the view's own context, not currentActivity. onActivityDestroyed
+                // posts detach() to the main handler and then clears currentActivity
+                // synchronously, so by the time this runs currentActivity may already
+                // be null and the overlay would otherwise leak.
+                val wm = view.context.getSystemService(Context.WINDOW_SERVICE)
                     as? WindowManager
                 wm?.removeView(view)
             } catch (e: Exception) {

package/ios/ReactNativePerfStats.swift

@@ -412,19 +412,43 @@ private final class JsFpsHolder {
 
 // MARK: - Overlay
 //
-// Singleton UILabel attached to the current key UIWindow. Updates always
-// dispatch to main. No floating-window permission needed; overlay only
-// shows while the app is in the foreground.
+// Singleton overlay rendered on its own dedicated UIWindow at
+// `.alert + 1` windowLevel. The dedicated window is required because
+// React Native's <Modal> presents view controllers via UIKit's modal
+// presentation, which renders above any subview added to the host
+// app's main UIWindow — a UILabel attached to keyWindow ends up behind
+// the modal regardless of view-hierarchy z-order. A separate UIWindow
+// with a higher `windowLevel` sits above modal-presented view
+// controllers and system alerts, so the overlay stays visible.
+//
+// `OverlayPassthroughWindow` overrides `hitTest` to return nil for
+// touches outside the label, letting them fall through to the
+// underlying app windows — otherwise the overlay window would swallow
+// every tap on the screen.
 //
 // Inherits NSObject so UIPanGestureRecognizer's target/action selector
 // dispatch resolves cleanly via Obj-C runtime.
 
+private final class OverlayPassthroughWindow: UIWindow {
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        let hit = super.hitTest(point, with: event)
+        // Anything that bubbles up to the window itself or its empty
+        // root view means the touch missed our overlay subview — pass it
+        // through to whatever's below this window.
+        if hit === self || hit === self.rootViewController?.view {
+            return nil
+        }
+        return hit
+    }
+}
+
 private final class Overlay: NSObject {
     static let shared = Overlay()
 
     private override init() { super.init() }
 
     private var label: UILabel?
+    private var overlayWindow: UIWindow?
     private var visible = false
 
     // `_lastSample` is written by the Sampler timer thread and read by the
@@ -484,11 +508,27 @@ private final class Overlay: NSObject {
 
     private func attach() {
         if label != nil { return }
-        guard let window = currentKeyWindow() else {
-            OneKeyLog.warn(kTag, "No key UIWindow available; overlay deferred")
+        guard let scene = currentForegroundScene() else {
+            OneKeyLog.warn(kTag, "No foreground UIWindowScene; overlay deferred")
             return
         }
 
+        // Dedicated host VC keeps the window's view hierarchy minimal —
+        // the empty UIView serves only as the parent for the label and
+        // as the hitTest sentinel checked by OverlayPassthroughWindow.
+        let host = UIViewController()
+        host.view.backgroundColor = .clear
+
+        let window = OverlayPassthroughWindow(windowScene: scene)
+        window.frame = scene.coordinateSpace.bounds
+        // .alert is 2000 on iOS; +1 puts the overlay above modal-presented
+        // controllers, system alerts and action sheets. Status bar is
+        // .statusBar (1000), which we stay below intentionally.
+        window.windowLevel = UIWindow.Level.alert + 1
+        window.backgroundColor = .clear
+        window.isHidden = false
+        window.rootViewController = host
+
         let lbl = UILabel(frame: CGRect(x: 30, y: 100, width: 170, height: 92))
         lbl.backgroundColor = UIColor.black.withAlphaComponent(0.7)
         lbl.layer.cornerRadius = 8
@@ -503,8 +543,9 @@ private final class Overlay: NSObject {
         let pan = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
         lbl.addGestureRecognizer(pan)
 
-        window.addSubview(lbl)
+        host.view.addSubview(lbl)
         label = lbl
+        overlayWindow = window
 
         if let s = lastSample {
             lbl.text = renderText(s)
@@ -514,6 +555,13 @@ private final class Overlay: NSObject {
     private func detach() {
         label?.removeFromSuperview()
         label = nil
+        // Hide before nilling so UIKit can release the window cleanly;
+        // assigning nil to rootViewController first avoids a fleeting
+        // warning when the window is torn down with a controller still
+        // attached.
+        overlayWindow?.isHidden = true
+        overlayWindow?.rootViewController = nil
+        overlayWindow = nil
     }
 
     @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
@@ -541,29 +589,19 @@ private final class Overlay: NSObject {
         return "CPU: \(cpuStr)\nRAM: \(memStr)\nUI:  \(uiStr)\nJS:  \(jsStr)"
     }
 
-    private func currentKeyWindow() -> UIWindow? {
-        // iOS 15+ preferred path
-        if #available(iOS 15.0, *) {
-            for scene in UIApplication.shared.connectedScenes {
-                guard
-                    let windowScene = scene as? UIWindowScene,
-                    windowScene.activationState == .foregroundActive
-                else { continue }
-                if let kw = windowScene.keyWindow {
-                    return kw
-                }
-            }
-        }
-        // Fallback: scan all connected scenes
+    /// Locate an active foreground `UIWindowScene` to host the overlay
+    /// window. Prefers `.foregroundActive`; falls back to the first
+    /// connected `UIWindowScene` so we still attach during transient
+    /// states like cold launch when no scene is `.foregroundActive` yet.
+    private func currentForegroundScene() -> UIWindowScene? {
+        var fallback: UIWindowScene?
         for scene in UIApplication.shared.connectedScenes {
-            guard let windowScene = scene as? UIWindowScene else { continue }
-            if let kw = windowScene.windows.first(where: { $0.isKeyWindow }) {
-                return kw
-            }
-            if let any = windowScene.windows.first {
-                return any
+            guard let ws = scene as? UIWindowScene else { continue }
+            if ws.activationState == .foregroundActive {
+                return ws
             }
+            if fallback == nil { fallback = ws }
         }
-        return nil
+        return fallback
     }
 }

package/lib/typescript/src/ReactNativePerfStats.nitro.d.ts

@@ -43,9 +43,13 @@ export interface ReactNativePerfStats extends HybridObject<{
     /**
      * Show the floating overlay (CPU + RAM) drawn natively.
      *
-     * - Android: TextView attached to the current Activity via
-     *   `addContentView` — no floating-window permission required.
-     * - iOS: UILabel added to the key UIWindow.
+     * - Android: TextView attached via `WindowManager.addView` using the
+     *   current Activity's window token (window type
+     *   `TYPE_APPLICATION_ABOVE_SUB_PANEL`) — no floating-window permission
+     *   required, and the overlay tracks Activity lifecycle (re-attach on
+     *   resume, detach on pause/destroy).
+     * - iOS: UILabel hosted on a dedicated passthrough UIWindow above the
+     *   app's key window so it stays above modally-presented controllers.
      * - Draggable on both platforms.
      * - Idempotent. If the sampler is not running, the overlay shows "--"
      *   until `start` is called.

package/lib/typescript/src/ReactNativePerfStats.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativePerfStats.nitro.d.ts","sourceRoot":"","sources":["../../../src/ReactNativePerfStats.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD;;;;;;;;OAQG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAEhC,+EAA+E;IAC/E,IAAI,IAAI,IAAI,CAAC;IAEb;;;;;;;;;OASG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB,gFAAgF;IAChF,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;OAIG;IACH,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAE9B;;;;;;;;OAQG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC"}
+{"version":3,"file":"ReactNativePerfStats.nitro.d.ts","sourceRoot":"","sources":["../../../src/ReactNativePerfStats.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD;;;;;;;;OAQG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAEhC,+EAA+E;IAC/E,IAAI,IAAI,IAAI,CAAC;IAEb;;;;;;;;;;;;;OAaG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB,gFAAgF;IAChF,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;OAIG;IACH,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAE9B;;;;;;;;OAQG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-perf-stats",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "description": "react-native-perf-stats",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/ReactNativePerfStats.nitro.ts

@@ -45,9 +45,13 @@ export interface ReactNativePerfStats
   /**
    * Show the floating overlay (CPU + RAM) drawn natively.
    *
-   * - Android: TextView attached to the current Activity via
-   *   `addContentView` — no floating-window permission required.
-   * - iOS: UILabel added to the key UIWindow.
+   * - Android: TextView attached via `WindowManager.addView` using the
+   *   current Activity's window token (window type
+   *   `TYPE_APPLICATION_ABOVE_SUB_PANEL`) — no floating-window permission
+   *   required, and the overlay tracks Activity lifecycle (re-attach on
+   *   resume, detach on pause/destroy).
+   * - iOS: UILabel hosted on a dedicated passthrough UIWindow above the
+   *   app's key window so it stays above modally-presented controllers.
    * - Draggable on both platforms.
    * - Idempotent. If the sampler is not running, the overlay shows "--"
    *   until `start` is called.