@goliapkg/sentori-react-native 1.0.0-rc.6 → 1.0.0-rc.8

package/android/src/main/java/com/sentori/SentoriReplayCapture.kt

@@ -1,10 +1,12 @@
 package com.sentori
 
 import android.app.Activity
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
-import android.graphics.drawable.RippleDrawable
+import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.StateListDrawable
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
@@ -93,9 +95,18 @@ object SentoriReplayCapture {
             totalEmptyResultTicks++
             return null
         }
-        val root = activity.window?.decorView
+        // rc.8 — anchor the walk at android.R.id.content, NOT
+        // window.decorView. decorView includes the StatusBarBackground
+        // and NavigationBarBackground sibling views the PhoneWindow
+        // injects (full display width, positioned in absolute window
+        // coords). Insight 2026-05-18 saw those bleed into the
+        // wireframe as horizontal grey bars stretching beyond the
+        // viewport width. Anchoring at the content FrameLayout drops
+        // them while keeping the app's React tree intact.
+        val decor = activity.window?.decorView
+        val root = decor?.findViewById<View>(android.R.id.content)
         if (root == null) {
-            lastDiagPath = "decorView.null"
+            lastDiagPath = if (decor == null) "decorView.null" else "contentView.null"
             totalEmptyResultTicks++
             return null
         }
@@ -217,18 +228,21 @@ object SentoriReplayCapture {
                     kindEmitted = true
                 }
                 view.background != null -> {
-                    node.put("kind", "rect")
-                    // rc.5 — extract the fill colour from the
-                    // background Drawable so wireframes show the host
-                    // app's actual brand palette, not a uniform grey
-                    // grid. iOS' UIView.backgroundColor already drives
-                    // this path; the Android side had been emitting
-                    // null since v0.9.6 and the dashboard fell back to
-                    // a neutral fill for every coloured CTA. Insight
-                    // 2026-05-18 verify event made the gap visible.
-                    val color = extractDrawableColor(view.background)
-                    if (color != null && (color shr 24 and 0xff) != 0) {
-                        node.put("color", colorToHex(color))
+                    // rc.8 — backgrounds backed by a BitmapDrawable
+                    // (a View whose backgroundImage / drawable
+                    // resource is a raster) emit as `image` kind so
+                    // the dashboard renders them as a media region,
+                    // not as a grey rect. Everything else stays
+                    // `rect` and tries to extract a fill colour.
+                    val bg = view.background
+                    if (bg is BitmapDrawable) {
+                        node.put("kind", "image")
+                    } else {
+                        node.put("kind", "rect")
+                        val color = extractDrawableColor(bg)
+                        if (color != null && (color shr 24 and 0xff) != 0) {
+                            node.put("color", colorToHex(color))
+                        }
                     }
                     kindEmitted = true
                 }
@@ -256,31 +270,45 @@ object SentoriReplayCapture {
         return String.format("#%02X%02X%02X%02X", r, g, b, a)
     }
 
-    /** rc.5 — best-effort fill-colour extraction for the View's
-     *  background Drawable. RN's `backgroundColor: '#...'` style
-     *  lands as a ColorDrawable in flat cases and a GradientDrawable
-     *  whenever the View also carries `borderRadius` or
-     *  `borderWidth`; Pressables wrap the painted child in a
-     *  RippleDrawable layer list. We cover all three. Returns
-     *  the packed ARGB int or null when nothing usable is exposed
-     *  (StateListDrawable with no current state, opaque image
-     *  drawables, etc.). */
+    /** rc.5 / rc.7 — best-effort fill-colour extraction for the View's
+     *  background Drawable. We hit:
+     *
+     *    - `ColorDrawable` — flat `<View style={{ backgroundColor }}>`.
+     *    - `GradientDrawable` — RN ≤ 0.73's path for backgroundColor +
+     *      borderRadius / borderWidth.
+     *    - Any `LayerDrawable` subclass — RippleDrawable (Pressable),
+     *      `com.facebook.react.uimanager.drawable.CompositeBackgroundDrawable`
+     *      (RN 0.74+ Fabric path, wraps the real
+     *      `BackgroundDrawable` layer alongside borders / shadows), and
+     *      any other future composite. Iterate layers, recurse.
+     *    - **rc.7 reflective fallback** — for the BackgroundDrawable
+     *      itself (RN 0.74+, Kotlin `internal class` so we can't
+     *      import it from this module) and any other custom Drawable
+     *      that follows the convention of exposing `getBackgroundColor()`
+     *      or `getColor()`. Without this, Insight's app — which uses
+     *      Pressables and rounded Views and so renders nearly every
+     *      coloured surface via CompositeBackgroundDrawable —
+     *      surfaced zero `node.color` fields on rc.5. */
     private fun extractDrawableColor(drawable: Drawable?): Int? {
         return when (drawable) {
             null -> null
             is ColorDrawable -> drawable.color
             is GradientDrawable -> {
-                // API 24+ exposes the ColorStateList for the
-                // `setColor()` value. RN's typical solid-colour
-                // GradientDrawable returns a single default colour
-                // here; gradients with multiple stops still surface
-                // a reasonable representative colour.
                 val csl = drawable.color
                 csl?.defaultColor
             }
-            is RippleDrawable -> {
-                // Iterate the layer list; the inner painted layer
-                // is what carries the brand colour.
+            is StateListDrawable -> {
+                // rc.8 — Pressable / TouchableOpacity wrap their child
+                // in a StateListDrawable (default state + pressed
+                // state). `.current` returns the currently-applied
+                // state's drawable, which during a normal capture
+                // is the unpressed visual — exactly what we want.
+                // AnimatedStateListDrawable extends StateListDrawable
+                // so it inherits this branch.
+                extractDrawableColor(drawable.current)
+            }
+            is BitmapDrawable -> null
+            is LayerDrawable -> {
                 for (i in 0 until drawable.numberOfLayers) {
                     val inner = drawable.getDrawable(i)
                     val c = extractDrawableColor(inner)
@@ -288,7 +316,31 @@ object SentoriReplayCapture {
                 }
                 null
             }
-            else -> null
+            else -> extractByReflection(drawable)
+        }
+    }
+
+    /** rc.7 — read `getBackgroundColor()` / `getColor()` via Java
+     *  reflection. Kotlin synthesizes the former from any `var
+     *  backgroundColor: Int` declaration, so RN's internal
+     *  `BackgroundDrawable` (which holds the actual paint colour
+     *  behind any RN View with backgroundColor) exposes it
+     *  automatically. Any throw / non-Int return falls through to
+     *  null — fully best-effort. */
+    private fun extractByReflection(drawable: Drawable): Int? {
+        val cls = drawable.javaClass
+        for (name in arrayOf("getBackgroundColor", "getColor")) {
+            try {
+                val method = cls.getMethod(name)
+                val result = method.invoke(drawable)
+                if (result is Int) return result
+            } catch (_: NoSuchMethodException) {
+                // try next
+            } catch (_: Throwable) {
+                // some custom drawables throw on reflective access; bail
+                return null
+            }
         }
+        return null
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goliapkg/sentori-react-native",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.8",
   "description": "Sentori SDK for React Native \u2014 JS-layer error capture, native crash handlers (iOS / Android), batched transport, fetch + react-navigation tracing.",
   "license": "MIT",
   "homepage": "https://sentori.golia.jp",