@shortkitsdk/react-native 0.2.11 → 0.2.12

package/android/build.gradle.kts

@@ -31,8 +31,20 @@ android {
 
 dependencies {
     implementation("com.facebook.react:react-android")
-    implementation("dev.shortkit:shortkit:0.2.6")
+    // When Reco's settings.gradle has the composite build, Gradle substitutes
+    // this with the live source from android_sdk/shortkit automatically.
+    // implementation("dev.shortkit:shortkit:0.2.11")
+    implementation(files("/Users/michaelseleman/shortkit/android_sdk/shortkit/build/outputs/aar/shortkit-release.aar"))
+    // Transitive deps needed when using local AAR (Maven artifact bundles these automatically)
+    implementation("androidx.media3:media3-exoplayer:1.5.1")
+    implementation("androidx.media3:media3-exoplayer-hls:1.5.1")
+    implementation("androidx.media3:media3-datasource:1.5.1")
+    implementation("androidx.media3:media3-ui:1.5.1")
+    implementation("androidx.recyclerview:recyclerview:1.4.0")
     implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation("androidx.fragment:fragment-ktx:1.8.5")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
 }

package/android/src/main/java/com/shortkit/reactnative/ReactCarouselOverlayHost.kt

@@ -11,6 +11,12 @@ import com.facebook.react.runtime.ReactSurfaceImpl
 import com.shortkit.sdk.model.CarouselImage
 import com.shortkit.sdk.model.ImageCarouselItem
 import com.shortkit.sdk.overlay.CarouselOverlay
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.io.File
@@ -45,6 +51,10 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
 
     private var surface: ReactSurface? = null
     private var pendingProps: Bundle? = null
+    private var isInLayoutPass: Boolean = false
+    private val ioScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+    private var pendingWriteJob: Job? = null
+    private var configureGeneration: Int = 0
 
     // ------------------------------------------------------------------
     // Fabric layout workaround
@@ -52,15 +62,19 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
 
     private val layoutHandler = android.os.Handler(android.os.Looper.getMainLooper())
 
+    private val layoutRunnable = Runnable {
+        measure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+        layout(left, top, right, bottom)
+    }
+
     override fun requestLayout() {
         super.requestLayout()
-        @Suppress("UNNECESSARY_SAFE_CALL")
-        layoutHandler?.post {
-            measure(
-                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-            )
-            layout(left, top, right, bottom)
+        if (!isInLayoutPass) {
+            @Suppress("UNNECESSARY_SAFE_CALL")
+            layoutHandler?.post(layoutRunnable)
         }
     }
 
@@ -109,65 +123,104 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
     // ------------------------------------------------------------------
 
     override fun configure(item: ImageCarouselItem) {
-        // Replace remote URLs with local file:// URLs for any natively-cached images.
-        val modifiedItem = cachedImage?.let { lookup ->
-            val localImages = item.images.map { image ->
-                val bitmap = lookup(image.url)
-                if (bitmap != null) {
-                    val localUrl = writeTempImage(bitmap, image.url)
-                    if (localUrl != null) {
-                        CarouselImage(url = localUrl, alt = image.alt)
-                    } else {
-                        image
-                    }
-                } else {
-                    image
-                }
+        // Increment generation — any in-flight coroutine from a previous
+        // configure() call will see a stale generation and bail out.
+        val gen = ++configureGeneration
+
+        // Cancel any in-flight write job from a previous configure() call.
+        pendingWriteJob?.cancel()
+
+        // Fast path: check for pre-existing temp files synchronously (just
+        // file.exists(), no I/O). This avoids the flicker of remote→local
+        // URL swap for images that were cached in a previous session.
+        val lookup = cachedImage
+        val fastItem = if (lookup != null) {
+            val fastImages = item.images.map { image ->
+                val hash = image.url.hashCode()
+                val fileName = "sk-carousel-${kotlin.math.abs(hash)}.jpg"
+                val file = File(context.cacheDir, fileName)
+                if (file.exists()) CarouselImage(url = "file://${file.absolutePath}", alt = image.alt)
+                else image
             }
             ImageCarouselItem(
                 id = item.id,
-                images = localImages,
+                images = fastImages,
                 caption = item.caption,
                 title = item.title,
                 description = item.description,
                 author = item.author,
                 section = item.section,
-                articleUrl = item.articleUrl
+                articleUrl = item.articleUrl,
             )
-        } ?: item
+        } else item
+
+        val json = Json.encodeToString(fastItem)
+        val bundle = Bundle().apply { putString("item", json) }
+        applySurfaceProps(bundle)
 
-        val json = Json.encodeToString(modifiedItem)
-        val bundle = Bundle().apply {
-            putString("item", json)
+        // Pre-size the surface view NOW — before the overlay is attached to a cell.
+        val parentView = parent as? android.view.View
+        val w = if (width > 0) width
+                else if (parentView != null && parentView.width > 0) parentView.width
+                else context.resources.displayMetrics.widthPixels
+        val h = if (height > 0) height
+                else if (parentView != null && parentView.height > 0) parentView.height
+                else context.resources.displayMetrics.heightPixels
+        measureAndLayoutSurfaceView(w, h)
+
+        // Background: write any newly-cached images to temp files.
+        // Only runs if there are remote URLs remaining (not all were fast-pathed).
+        if (lookup == null) return
+        val hasRemoteUrls = fastItem.images.any { !it.url.startsWith("file://") }
+        if (!hasRemoteUrls) return
+
+        pendingWriteJob = ioScope.launch {
+            val modifiedItem = withContext(Dispatchers.IO) {
+                val localImages = item.images.map { image ->
+                    val bitmap = lookup(image.url)
+                    if (bitmap != null) {
+                        val localUrl = writeTempImage(bitmap, image.url)
+                        if (localUrl != null) CarouselImage(url = localUrl, alt = image.alt)
+                        else image
+                    } else {
+                        image
+                    }
+                }
+                ImageCarouselItem(
+                    id = item.id,
+                    images = localImages,
+                    caption = item.caption,
+                    title = item.title,
+                    description = item.description,
+                    author = item.author,
+                    section = item.section,
+                    articleUrl = item.articleUrl,
+                )
+            }
+
+            // Back on Main — only update if this configure() is still current
+            if (gen != configureGeneration) return@launch
+            val hasLocalImages = modifiedItem.images.any { it.url.startsWith("file://") }
+            if (hasLocalImages) {
+                val localJson = Json.encodeToString(modifiedItem)
+                val localBundle = Bundle().apply { putString("item", localJson) }
+                applySurfaceProps(localBundle)
+            }
         }
+    }
 
+    /** Apply props to the surface, handling all lifecycle states. */
+    private fun applySurfaceProps(bundle: Bundle) {
         val s = surface
         if (s != null && s.isRunning) {
-            // Surface already running (cell reuse) — update props in place
             (s as? ReactSurfaceImpl)?.updateInitProps(bundle)
         } else if (s != null && !s.isRunning) {
-            // Surface pre-created by prepareSurface() but not started yet.
-            // Set props THEN start — the JS component mounts once with correct data.
             (s as? ReactSurfaceImpl)?.updateInitProps(bundle)
             s.start()
         } else {
-            // No surface at all — create with item as initial props
             pendingProps = bundle
             createSurfaceIfNeeded()
         }
-
-        // Pre-size the surface view NOW — before the overlay is attached to a cell.
-        // This eliminates the black flash: when the cell displays the overlay, the
-        // surface view already has correct dimensions and rendered content.
-        // Use parent dimensions if attached, otherwise use display dimensions.
-        val parentView = parent as? android.view.View
-        val w = if (width > 0) width
-                else if (parentView != null && parentView.width > 0) parentView.width
-                else context.resources.displayMetrics.widthPixels
-        val h = if (height > 0) height
-                else if (parentView != null && parentView.height > 0) parentView.height
-                else context.resources.displayMetrics.heightPixels
-        measureAndLayoutSurfaceView(w, h)
     }
 
     /**
@@ -225,18 +278,23 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
     }
 
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        val w = right - left
-        val h = bottom - top
-        if (w > 0 && h > 0) {
-            measureAndLayoutSurfaceView(w, h)
-        } else {
-            val parentView = parent as? android.view.View
-            val pw = parentView?.width ?: 0
-            val ph = parentView?.height ?: 0
-            if (pw > 0 && ph > 0) {
-                measureAndLayoutSurfaceView(pw, ph)
+        isInLayoutPass = true
+        try {
+            super.onLayout(changed, left, top, right, bottom)
+            val w = right - left
+            val h = bottom - top
+            if (w > 0 && h > 0) {
+                measureAndLayoutSurfaceView(w, h)
+            } else {
+                val parentView = parent as? android.view.View
+                val pw = parentView?.width ?: 0
+                val ph = parentView?.height ?: 0
+                if (pw > 0 && ph > 0) {
+                    measureAndLayoutSurfaceView(pw, ph)
+                }
             }
+        } finally {
+            isInLayoutPass = false
         }
     }
 
@@ -312,6 +370,8 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        pendingWriteJob?.cancel()
+        pendingWriteJob = null
         if (surface?.isRunning == true) {
             surface?.stop()
         }

package/android/src/main/java/com/shortkit/reactnative/ReactOverlayHost.kt

@@ -60,19 +60,24 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
 
     private val layoutHandler = Handler(Looper.getMainLooper())
 
+    /** Reusable runnable to avoid lambda allocation on every requestLayout. */
+    private val layoutRunnable = Runnable {
+        measure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+        layout(left, top, right, bottom)
+    }
+
     /**
      * Fabric may suppress layout propagation to native child views inside
      * the SDK's RecyclerView cells. Override to force a manual layout pass.
      */
     override fun requestLayout() {
         super.requestLayout()
-        @Suppress("UNNECESSARY_SAFE_CALL")
-        layoutHandler?.post {
-            measure(
-                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-            )
-            layout(left, top, right, bottom)
+        if (!isInLayoutPass) {
+            @Suppress("UNNECESSARY_SAFE_CALL")
+            layoutHandler?.post(layoutRunnable)
         }
     }
 
@@ -103,6 +108,7 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
     private var timeCoalesceRunnable: Runnable? = null
 
     private var flowScope: CoroutineScope? = null
+    private var isInLayoutPass: Boolean = false
 
     // ------------------------------------------------------------------
     // Init
@@ -147,14 +153,17 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
         resubscribeToPlayer(player)
     }
 
+    /** Whether the surface has been started at least once. */
+    private var surfaceHasStarted: Boolean = false
+
     override fun configure(item: ContentItem) {
+        val isSameItem = item.id == currentItem?.id
         currentItem = item
         isActive = false
         timeDirty = false
         stopTimeCoalescing()
 
         // Reset ALL cached state so recycled cells don't flash stale values.
-        // Mirrors iOS ReactOverlayHost.configure(with:).
         cachedCurrentTime = 0.0
         cachedDuration = 0.0
         cachedBuffered = 0.0
@@ -164,12 +173,25 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
 
         if (surface == null) {
             createSurfaceIfNeeded()
-        } else {
+            surfaceHasStarted = true
+        } else if (!surfaceHasStarted) {
             (surface as? ReactSurfaceImpl)?.updateInitProps(buildInitialPropsBundle())
+            surfaceHasStarted = true
+        } else if (isSameItem) {
+            // Same item = deactivation only. The overlay already has this
+            // item's data from a previous swipe. Just deactivate (isActive
+            // set to false above, timer stopped). No event emission — avoids
+            // broadcasting to all 7 surfaces for no visual change.
+        } else {
+            // Different item — send via event for React tree diff (not
+            // updateInitProps which causes full Fabric remount).
+            val params = Arguments.createMap().apply {
+                putString("surfaceId", surfaceId)
+                putString("item", ShortKitBridge.serializeContentItemToJSON(item))
+            }
+            ShortKitBridge.shared?.emitEvent("onOverlayItemChanged", params)
         }
-
-        // Pre-size the surface view NOW — before the overlay is attached to a cell.
-        // Eliminates the black flash on cell display.
+        // Pre-size the surface view
         val parentView = parent as? android.view.View
         val w = if (width > 0) width
                 else if (parentView != null && parentView.width > 0) parentView.width
@@ -184,9 +206,7 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
         isActive = true
         startTimeCoalescing()
 
-        // Defer the event burst to the next tick. The JS surface needs time to
-        // mount and establish event subscriptions (useEffect runs after render).
-        // Mirrors iOS: DispatchQueue.main.async { self.emitFullState() }
+        // Defer the event burst to the next tick.
         handler.post {
             if (isActive) {
                 emitFullState()
@@ -195,13 +215,16 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
     }
 
     override fun fadeOutForTransition() {
-        val item = currentItem ?: return
-        ShortKitBridge.shared?.emitOverlayEvent("onOverlayFadeOut", item)
+        // No-op. The JS overlay component handles fade via feedScrollPhase
+        // prop (dragging/settled), not these events. iOS ReactOverlayHost
+        // doesn't implement these methods at all. The previous implementation
+        // serialized the full ContentItem to JSON and emitted across the
+        // bridge to a listener that doesn't exist — 2-15ms of pure waste
+        // on every swipe.
     }
 
     override fun restoreFromTransition() {
-        val item = currentItem ?: return
-        ShortKitBridge.shared?.emitOverlayEvent("onOverlayRestore", item)
+        // No-op. See fadeOutForTransition comment.
     }
 
     // ------------------------------------------------------------------
@@ -257,19 +280,24 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
      * calling setMinimumSize/setMaximumSize in ReactOverlayHost.swift.
      */
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        val w = right - left
-        val h = bottom - top
-        if (w > 0 && h > 0) {
-            measureAndLayoutSurfaceView(w, h)
-        } else {
-            // Host still 0x0 — try parent dimensions
-            val parentView = parent as? android.view.View
-            val pw = parentView?.width ?: 0
-            val ph = parentView?.height ?: 0
-            if (pw > 0 && ph > 0) {
-                measureAndLayoutSurfaceView(pw, ph)
+        isInLayoutPass = true
+        try {
+            super.onLayout(changed, left, top, right, bottom)
+            val w = right - left
+            val h = bottom - top
+            if (w > 0 && h > 0) {
+                measureAndLayoutSurfaceView(w, h)
+            } else {
+                // Host still 0x0 — try parent dimensions
+                val parentView = parent as? android.view.View
+                val pw = parentView?.width ?: 0
+                val ph = parentView?.height ?: 0
+                if (pw > 0 && ph > 0) {
+                    measureAndLayoutSurfaceView(pw, ph)
+                }
             }
+        } finally {
+            isInLayoutPass = false
         }
     }
 
@@ -289,7 +317,9 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
     private fun createSurfaceIfNeeded() {
         if (surface != null) return
 
-        val reactHost = (context.applicationContext as? ReactApplication)?.reactHost
+        val appContext = context.applicationContext
+        val reactHost = (appContext as? ReactApplication)?.reactHost
+
         if (reactHost == null) {
             android.util.Log.e(TAG, "[$surfaceId] createSurface FAILED: reactHost is null")
             return
@@ -310,10 +340,10 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
         } else {
             android.util.Log.e(TAG, "[$surfaceId] createSurface: surfaceView is NULL")
         }
+
         newSurface.start()
 
-        // The host may still be 0x0 at this point (RecyclerView hasn't laid
-        // out the cell yet). Use the parent's dimensions if available.
+        // The host may still be 0x0 at this point. Use the parent's dimensions.
         val parentView = parent as? android.view.View
         val w = if (width > 0) width else parentView?.width ?: 0
         val h = if (height > 0) height else parentView?.height ?: 0
@@ -519,41 +549,22 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
     private fun emitFullState() {
         val bridge = ShortKitBridge.shared ?: return
 
-        bridge.emitEvent("onOverlayActiveChanged", Arguments.createMap().apply {
+        val params = Arguments.createMap().apply {
             putString("surfaceId", surfaceId)
             putBoolean("isActive", true)
-        })
-        bridge.emitEvent("onOverlayPlayerStateChanged", Arguments.createMap().apply {
-            putString("surfaceId", surfaceId)
             putString("playerState", cachedPlayerState)
-        })
-        bridge.emitEvent("onOverlayMutedChanged", Arguments.createMap().apply {
-            putString("surfaceId", surfaceId)
             putBoolean("isMuted", cachedIsMuted)
-        })
-        bridge.emitEvent("onOverlayPlaybackRateChanged", Arguments.createMap().apply {
-            putString("surfaceId", surfaceId)
             putDouble("playbackRate", cachedPlaybackRate)
-        })
-        bridge.emitEvent("onOverlayCaptionsEnabledChanged", Arguments.createMap().apply {
-            putString("surfaceId", surfaceId)
             putBoolean("captionsEnabled", cachedCaptionsEnabled)
-        })
-
-        bridge.emitEvent("onOverlayActiveCueChanged", Arguments.createMap().apply {
-            putString("surfaceId", surfaceId)
             val cueJson = cachedActiveCue?.toString()
             if (cueJson != null) {
                 putString("activeCue", cueJson)
             } else {
                 putNull("activeCue")
             }
-        })
-
-        bridge.emitEvent("onOverlayFeedScrollPhaseChanged", Arguments.createMap().apply {
-            putString("surfaceId", surfaceId)
             cachedFeedScrollPhase?.let { putString("feedScrollPhase", it) }
                 ?: putNull("feedScrollPhase")
-        })
+        }
+        bridge.emitEvent("onOverlayFullState", params)
     }
 }