@shortkitsdk/react-native 0.2.37 → 0.2.39

package/android/build.gradle.kts

@@ -35,9 +35,9 @@ android {
 
 dependencies {
     implementation("com.facebook.react:react-android")
-    // 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")
+    // Composite build in sample/android/settings.gradle substitutes this with
+    // live android_sdk source automatically (dev.shortkit:shortkit → :shortkit project).
+    // implementation("dev.shortkit:shortkit:0.2.37")
     implementation(files("libs/shortkit-release.aar"))
     // Transitive deps needed when using local AAR (Maven artifact bundles these automatically)
     implementation("androidx.media3:media3-exoplayer:1.5.1")

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

@@ -15,6 +15,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
@@ -52,10 +54,20 @@ 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 ioScope: CoroutineScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
     private var pendingWriteJob: Job? = null
     private var configureGeneration: Int = 0
 
+    /** Test-only accessor for ioScope. */
+    @androidx.annotation.VisibleForTesting
+    internal val ioScopeForTest: CoroutineScope get() = ioScope
+
+    /** Test-only triggers for window lifecycle (protected in View). */
+    @androidx.annotation.VisibleForTesting
+    internal fun callOnDetachedFromWindow() = onDetachedFromWindow()
+    @androidx.annotation.VisibleForTesting
+    internal fun callOnAttachedToWindow() = onAttachedToWindow()
+
     /** Unique identifier for this overlay instance, used for event routing. */
     val surfaceId: String = java.util.UUID.randomUUID().toString()
 
@@ -343,8 +355,9 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
     }
 
     override fun resetState() {
-        val surfaceImpl = surface as? ReactSurfaceImpl ?: return
-        surfaceImpl.updateInitProps(Bundle())
+        // Non-destructive: configure() will push new props on next bind.
+        // iOS parity: ReactCarouselOverlayHost.swift resetState() is a no-op.
+        // Mirrors ReactVideoCarouselOverlayHost.resetState() which is also a no-op.
     }
 
     override fun fadeOutForTransition() {
@@ -404,6 +417,9 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
+        if (!ioScope.isActive) {
+            ioScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+        }
 
         val parentView = parent as? android.view.View
         if (parentView != null && parentView.width > 0 && parentView.height > 0 && (width == 0 || height == 0)) {
@@ -464,12 +480,16 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
     // Cleanup
     // ------------------------------------------------------------------
 
-    override fun onDetachedFromWindow() {
+    public override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        layoutHandler.removeCallbacks(layoutRunnable)
         pendingWriteJob?.cancel()
         pendingWriteJob = null
-        if (surface?.isRunning == true) {
-            surface?.stop()
-        }
+        ioScope.cancel()
+        // Non-destructive: surface survives cell recycle and view transitions.
+        // iOS parity: ReactCarouselOverlayHost.swift has no willMove/didMoveToWindow
+        // override — surface stops only in deinit. Mirrors the non-destructive
+        // contract enforced on ReactVideoCarouselOverlayHost.
+        // ioScope is recreated in onAttachedToWindow if needed.
     }
 }

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

@@ -300,6 +300,7 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        layoutHandler.removeCallbacks(layoutRunnable)
         // Cancel flow subscriptions to avoid emitting events for off-screen cells.
         // Do NOT stop the surface — keep JS alive so subscriptions persist across
         // RecyclerView detach/reattach cycles. This matches iOS behavior where the

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

@@ -133,7 +133,8 @@ class ReactVideoCarouselOverlayHost(context: Context) : FrameLayout(context), Vi
 
     // Player state
     private var player: ShortKitPlayer? = null
-    private var isActive: Boolean = false
+    @androidx.annotation.VisibleForTesting
+    internal var isActive: Boolean = false
     private var cachedPlayerState: String = "idle"
     private var cachedIsMuted: Boolean = true
     private var cachedCurrentTime: Double = 0.0
@@ -155,6 +156,17 @@ class ReactVideoCarouselOverlayHost(context: Context) : FrameLayout(context), Vi
 
     private var flowScope: CoroutineScope? = null
 
+    /** Test-only read-write accessor for flowScope. Write path lets tests inject a scope
+     *  without needing a full ShortKitPlayer mock. */
+    @androidx.annotation.VisibleForTesting
+    internal var flowScopeForTest: CoroutineScope?
+        get() = flowScope
+        set(value) { flowScope = value }
+
+    /** Test-only trigger for onDetachedFromWindow (protected in View). */
+    @androidx.annotation.VisibleForTesting
+    internal fun callOnDetachedFromWindow() = onDetachedFromWindow()
+
     // ------------------------------------------------------------------
     // Fabric layout workaround
     // ------------------------------------------------------------------
@@ -276,9 +288,10 @@ class ReactVideoCarouselOverlayHost(context: Context) : FrameLayout(context), Vi
             putBoolean("isActive", false)
             putString("playerState", "idle")
             putBoolean("isMuted", cachedIsMuted)
-            if (item.videos.isNotEmpty()) {
-                putString("activeVideo", ShortKitBridge.serializeContentItemToJSON(item.videos.first()))
-                putInt("activeVideoIndex", 0)
+            val initialIdx = item.clampedInitialPageIndex
+            if (item.videos.indices.contains(initialIdx)) {
+                putString("activeVideo", ShortKitBridge.serializeContentItemToJSON(item.videos[initialIdx]))
+                putInt("activeVideoIndex", initialIdx)
             }
         }
 
@@ -298,11 +311,12 @@ class ReactVideoCarouselOverlayHost(context: Context) : FrameLayout(context), Vi
             putBoolean("isActive", false)
             putString("playerState", "idle")
             putBoolean("isMuted", cachedIsMuted)
-            putInt("activeVideoIndex", 0)
-            if (item.videos.isNotEmpty()) {
+            val initialIdx = item.clampedInitialPageIndex
+            putInt("activeVideoIndex", initialIdx)
+            if (item.videos.indices.contains(initialIdx)) {
                 putString(
                     "activeVideo",
-                    ShortKitBridge.serializeContentItemToJSON(item.videos.first()),
+                    ShortKitBridge.serializeContentItemToJSON(item.videos[initialIdx]),
                 )
             } else {
                 putNull("activeVideo")
@@ -630,15 +644,19 @@ class ReactVideoCarouselOverlayHost(context: Context) : FrameLayout(context), Vi
     // Cleanup
     // ------------------------------------------------------------------
 
-    override fun onDetachedFromWindow() {
+    public override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        layoutHandler.removeCallbacks(layoutRunnable)
+        // Cancel flow subscriptions so StateFlow collectors don't retain this host
+        // after permanent cell eviction. onAttachedToWindow re-subscribes via the
+        // existing `if (flowScope == null)` guard; attach(player) calls
+        // resubscribeToPlayer unconditionally, which is the canonical re-entry point.
+        //
+        // Do NOT call stopTimeCoalescing() here — the time coalescer is owned
+        // exclusively by activatePlayback/deactivatePlayback. Stopping it on detach
+        // breaks the kept-attached-zone scenario where activatePlayback won't re-fire.
         flowScope?.cancel()
         flowScope = null
-        isActive = false
-        currentCarouselItem = null
-        stopTimeCoalescing()
-        if (surface?.isRunning == true) {
-            surface?.stop()
-        }
     }
+
 }

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

@@ -33,6 +33,7 @@ import com.shortkit.sdk.feed.ShortKitRefreshState
 import com.shortkit.sdk.config.VideoOverlayMode
 import com.shortkit.sdk.feed.FeedPreload
 import com.shortkit.sdk.feed.ShortKitFeedFragment
+import com.shortkit.sdk.feed.VideoCarouselCellLongPressState
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -446,6 +447,7 @@ class ShortKitBridge(
                                 videos = videoInputs,
                                 title = itemObj.optString("title", null),
                                 description = itemObj.optString("description", null),
+                                initialPageIndex = itemObj.optInt("initialPageIndex", -1).takeIf { it >= 0 },
                                 author = itemObj.optString("author", null),
                                 section = itemObj.optString("section", null),
                                 articleUrl = itemObj.optString("articleUrl", null),
@@ -551,6 +553,13 @@ class ShortKitBridge(
     private var shortKit: ShortKit? = null
     private var scope: CoroutineScope? = null
 
+    /**
+     * Factory for [WritableMap] instances. Overridden in unit tests with
+     * `{ JavaOnlyMap() }` to avoid the JNI initialisation that
+     * [Arguments.createMap] requires. Production code always uses the default.
+     */
+    internal var createMap: () -> WritableMap = { Arguments.createMap() }
+
     /** Preload handles keyed by UUID, consumed by feed views via preloadId prop. */
     var preloadHandles = mutableMapOf<String, FeedPreload>()
         private set
@@ -584,7 +593,8 @@ class ShortKitBridge(
             customDimensions = dims,
             debugPanelEnabled = debugPanel,
             serverTracingEnabled = serverTracingEnabled,
-            consoleTracingEnabled = consoleTracingEnabled
+            consoleTracingEnabled = consoleTracingEnabled,
+            poolDebugEnabled = consoleTracingEnabled,
         )
         this.shortKit = sdk
         shared = this
@@ -732,6 +742,11 @@ class ShortKitBridge(
         fragment.onVideoCarouselCellTap = { payload ->
             emitVideoCarouselCellTap(payload.id, payload.index, payload.pageIndex)
         }
+        fragment.onVideoCarouselCellLongPress = { payload ->
+            emitVideoCarouselCellLongPress(
+                payload.id, payload.index, payload.pageIndex, payload.state
+            )
+        }
         // Per-feed transition event. Fires once per transition, bound to this
         // fragment. Replaces the global player.feedTransition.collect pattern
         // (which fanned every feed's transitions out to every mounted
@@ -933,6 +948,29 @@ class ShortKitBridge(
         emitEventOnMain("onVideoCarouselCellTap", params)
     }
 
+    /**
+     * Emit `onVideoCarouselCellLongPress` with the active surface's feedId.
+     * Mirrors iOS ShortKitBridge.emitOnMain("onVideoCarouselCellLongPress").
+     * State enum is lowercased so JS receives "began" | "ended" | "cancelled"
+     * matching the iOS bridge output.
+     */
+    internal fun emitVideoCarouselCellLongPress(
+        itemId: String,
+        index: Int,
+        pageIndex: Int,
+        state: VideoCarouselCellLongPressState,
+    ) {
+        val feedId = activeSurfaceFeedId()
+        val params = createMap().apply {
+            putString("feedId", feedId)
+            putString("id", itemId)
+            putInt("index", index)
+            putInt("pageIndex", pageIndex)
+            putString("state", state.name.lowercase())
+        }
+        emitEventOnMain("onVideoCarouselCellLongPress", params)
+    }
+
     // ------------------------------------------------------------------
     // Player commands
     // ------------------------------------------------------------------

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

@@ -205,6 +205,7 @@ class ShortKitFeedView(context: Context) : FrameLayout(context) {
         synchronized(ShortKitBridge.staticPendingFeedViews) {
             ShortKitBridge.staticPendingFeedViews.remove(this)
         }
+        handler.removeCallbacks(constrainRunnable)
         // Mirror iOS willMove(toWindow:) at react_native_sdk/ios/ShortKitFeedView.swift:91-99 —
         // suspend only if leaving the window AND the prop says we should be active.
         // When active=false the host has already driven the fragment into deactivate

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

@@ -352,7 +352,7 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
                 "onVideoCarouselCellTap" -> emitOnVideoCarouselCellTap(params)
                 "onVideoCarouselItemChanged" -> emitOnVideoCarouselItemChanged(params)
                 "onCarouselActiveVideoCompleted" -> emitOnCarouselActiveVideoCompleted(params)
-                "onVideoCarouselCellTap" -> emitOnVideoCarouselCellTap(params)
+                "onVideoCarouselCellLongPress" -> emitOnVideoCarouselCellLongPress(params)
                 else -> {
                     android.util.Log.w("SK:Module", "sendEvent: unknown event name '$name', using legacy emitter")
                     reactApplicationContext

package/android/src/test/java/com/shortkit/reactnative/ReactCarouselOverlayHostLifecycleTest.kt

@@ -0,0 +1,155 @@
+package com.shortkit.reactnative
+
+import android.content.Context
+import android.view.ViewGroup
+import androidx.test.core.app.ApplicationProvider
+import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.interfaces.TaskInterface
+import com.facebook.react.interfaces.fabric.ReactSurface
+import com.shortkit.sdk.model.CarouselImage
+import com.shortkit.sdk.model.ImageCarouselItem
+import kotlinx.coroutines.isActive
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import java.util.concurrent.TimeUnit
+
+/**
+ * Lifecycle contract for ReactCarouselOverlayHost: surface must survive
+ * onDetachedFromWindow / onAttachedToWindow cycles (iOS-parity), and
+ * resetState() must be a no-op.
+ *
+ * iOS reference: ReactCarouselOverlayHost.swift has no willMove/didMoveToWindow
+ * override — surface only stops in deinit. resetState() is also a no-op on iOS:
+ * "Don't clear surface props — configure() will overwrite."
+ *
+ * Mirrors the contract enforced by ReactVideoCarouselOverlayHostLifecycleTest
+ * for the video carousel host.
+ */
+@RunWith(RobolectricTestRunner::class)
+class ReactCarouselOverlayHostLifecycleTest {
+
+    private object NoOpTask : TaskInterface<Void> {
+        override fun waitForCompletion() = Unit
+        override fun waitForCompletion(duration: Long, timeUnit: TimeUnit): Boolean = true
+        override fun getResult(): Void? = null
+        override fun getError(): Exception? = null
+        override fun isCompleted(): Boolean = true
+        override fun isCancelled(): Boolean = false
+        override fun isFaulted(): Boolean = false
+    }
+
+    /**
+     * Mutable-state ReactSurface stub tracking isRunning and stop call count.
+     * Mirrors TrackingSurface in ReactVideoCarouselOverlayHostLifecycleTest.
+     */
+    private class TrackingSurface : ReactSurface {
+        private val ctx: Context = ApplicationProvider.getApplicationContext()
+        private var _running: Boolean = false
+        var stopCount: Int = 0
+
+        override val surfaceID: Int = 0
+        override val moduleName: String = "TrackingSurface"
+        override val isRunning: Boolean get() = _running
+        override val view: ViewGroup? = null
+        override val context: Context get() = ctx
+        override fun prerender(): TaskInterface<Void> = NoOpTask
+        override fun start(): TaskInterface<Void> { _running = true; return NoOpTask }
+        override fun stop(): TaskInterface<Void> { _running = false; stopCount++; return NoOpTask }
+        override fun clear() = Unit
+        override fun detach() = Unit
+    }
+
+    private fun makeHost(surface: TrackingSurface): ReactCarouselOverlayHost {
+        val ctx = ApplicationProvider.getApplicationContext<Context>()
+        return ReactCarouselOverlayHost(ctx).also {
+            it.createMap = { JavaOnlyMap() }
+            it.createSurface = { _, _ -> surface }
+            it.emitEvent = { _, _ -> }
+        }
+    }
+
+    private fun item(id: String) = ImageCarouselItem(
+        id = id,
+        images = listOf(CarouselImage(url = "https://example.com/$id.jpg", alt = null)),
+    )
+
+    @Test
+    fun `onDetachedFromWindow does not stop surface`() {
+        val surface = TrackingSurface()
+        val host = makeHost(surface)
+        host.configure(item("A"))
+        assertTrue("surface must be running after configure", surface.isRunning)
+        val stopsBefore = surface.stopCount
+
+        host.onDetachedFromWindow()
+
+        assertTrue(
+            "surface must remain running after onDetachedFromWindow (iOS-parity)",
+            surface.isRunning,
+        )
+        assertEquals(
+            "onDetachedFromWindow must not call surface.stop()",
+            stopsBefore,
+            surface.stopCount,
+        )
+    }
+
+    @Test
+    fun `onDetachedFromWindow preserves currentItemId`() {
+        val surface = TrackingSurface()
+        val host = makeHost(surface)
+        host.configure(item("A"))
+        assertEquals("A", host.currentItemId)
+
+        host.onDetachedFromWindow()
+
+        assertEquals(
+            "currentItemId must survive onDetachedFromWindow so configure() can detect same vs different item",
+            "A",
+            host.currentItemId,
+        )
+    }
+
+    @Test
+    fun `resetState does not stop surface`() {
+        // resetState() must be a no-op: iOS ReactCarouselOverlayHost.swift
+        // resetState() body is "// Don't clear surface props — configure() will overwrite."
+        // Mirrors ReactVideoCarouselOverlayHost.resetState() which is also a no-op.
+        // Note: the current production cast (surface as? ReactSurfaceImpl) silently
+        // no-ops in Robolectric (stub isn't ReactSurfaceImpl), so this test
+        // documents intent and guards against future regressions that add
+        // a surface?.stop() call.
+        val surface = TrackingSurface()
+        val host = makeHost(surface)
+        host.configure(item("A"))
+        assertTrue("surface must be running after configure", surface.isRunning)
+        val stopsBefore = surface.stopCount
+
+        host.resetState()
+
+        assertTrue("surface must remain running after resetState", surface.isRunning)
+        assertEquals("resetState must not call surface.stop()", stopsBefore, surface.stopCount)
+    }
+
+    @Test
+    fun `onDetachedFromWindow cancels ioScope and it is recreated on reattach`() {
+        val ctx = ApplicationProvider.getApplicationContext<Context>()
+        val host = ReactCarouselOverlayHost(ctx)
+
+        assertTrue("ioScope must be active initially", host.ioScopeForTest.isActive)
+
+        host.callOnDetachedFromWindow()
+
+        assertFalse("ioScope must be cancelled after detach", host.ioScopeForTest.isActive)
+
+        // Simulate reattach
+        host.callOnAttachedToWindow()
+
+        assertTrue("ioScope must be active again after reattach", host.ioScopeForTest.isActive)
+    }
+}

package/android/src/test/java/com/shortkit/reactnative/ReactVideoCarouselOverlayHostLifecycleTest.kt

@@ -0,0 +1,200 @@
+package com.shortkit.reactnative
+
+import android.content.Context
+import android.view.ViewGroup
+import androidx.test.core.app.ApplicationProvider
+import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.interfaces.TaskInterface
+import com.facebook.react.interfaces.fabric.ReactSurface
+import com.shortkit.sdk.model.ContentItem
+import com.shortkit.sdk.model.VideoCarouselItem
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.isActive
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import java.util.concurrent.TimeUnit
+
+/**
+ * Lifecycle contract for ReactVideoCarouselOverlayHost: surface and state
+ * must survive onDetachedFromWindow / onAttachedToWindow cycles
+ * (iOS-parity), and only release() should perform true teardown.
+ *
+ * iOS reference: swift_sdk/.../VideoCarouselCell.swift:472-476 keeps the
+ * overlay alive across prepareForReuse; the host's deinit performs final
+ * cleanup. Android equivalent: this lifecycle test enforces the same
+ * contract on the RN host.
+ */
+@RunWith(RobolectricTestRunner::class)
+class ReactVideoCarouselOverlayHostLifecycleTest {
+
+    private object NoOpTask : TaskInterface<Void> {
+        override fun waitForCompletion() = Unit
+        override fun waitForCompletion(duration: Long, timeUnit: TimeUnit): Boolean = true
+        override fun getResult(): Void? = null
+        override fun getError(): Exception? = null
+        override fun isCompleted(): Boolean = true
+        override fun isCancelled(): Boolean = false
+        override fun isFaulted(): Boolean = false
+    }
+
+    /**
+     * Mutable-state ReactSurface stub that tracks isRunning + start/stop
+     * calls. Mirrors the StubReactSurface shape used by
+     * ReactVideoCarouselOverlayHostEmitTest, but with mutable state via
+     * a backing field + custom getter (the interface declares isRunning
+     * as `val`, so we can't override with `var`).
+     */
+    private class TrackingSurface : ReactSurface {
+        private val ctx: Context = ApplicationProvider.getApplicationContext()
+        private var _running: Boolean = false
+        var stopCount: Int = 0
+
+        override val surfaceID: Int = 0
+        override val moduleName: String = "TrackingSurface"
+        override val isRunning: Boolean get() = _running
+        override val view: ViewGroup? = null
+        override val context: Context get() = ctx
+        override fun prerender(): TaskInterface<Void> = NoOpTask
+        override fun start(): TaskInterface<Void> { _running = true; return NoOpTask }
+        override fun stop(): TaskInterface<Void> { _running = false; stopCount++; return NoOpTask }
+        override fun clear() = Unit
+        override fun detach() = Unit
+    }
+
+    private fun newHost(surface: TrackingSurface): ReactVideoCarouselOverlayHost {
+        val host = ReactVideoCarouselOverlayHost(
+            ApplicationProvider.getApplicationContext()
+        )
+        host.videoCarouselOverlayName = "test"
+        host.createSurface = { _, _ -> surface }
+        host.createMap = { JavaOnlyMap() }
+        host.emitEvent = { _, _ -> /* no-op for lifecycle tests */ }
+        return host
+    }
+
+    private fun video(id: String) = ContentItem(
+        id = id,
+        title = "t",
+        duration = 5.0,
+        streamingUrl = "https://example.com/$id.m3u8",
+        thumbnailUrl = "https://example.com/$id.jpg",
+        captionTracks = emptyList(),
+    )
+
+    private fun item(id: String, videoCount: Int = 1) = VideoCarouselItem(
+        id = id,
+        videos = (0 until videoCount).map { video("$id-$it") },
+    )
+
+    @Test
+    fun `onDetachedFromWindow does not stop surface`() {
+        val surface = TrackingSurface()
+        val host = newHost(surface)
+        host.configure(item("c1"))  // first mount: applies props, starts surface
+        assertTrue("surface must be running after configure", surface.isRunning)
+        val stopsBefore = surface.stopCount
+
+        host.onDetachedFromWindow()
+
+        assertTrue(
+            "surface must remain running after onDetachedFromWindow (iOS-parity)",
+            surface.isRunning,
+        )
+        assertEquals(
+            "onDetachedFromWindow must not call surface.stop()",
+            stopsBefore,
+            surface.stopCount,
+        )
+    }
+
+    @Test
+    fun `onDetachedFromWindow preserves currentCarouselItem`() {
+        val surface = TrackingSurface()
+        val host = newHost(surface)
+        host.configure(item("c1"))
+        assertNotNull(host.currentCarouselItem)
+
+        host.onDetachedFromWindow()
+
+        assertNotNull(
+            "currentCarouselItem must survive onDetachedFromWindow so re-attach can detect same vs different item",
+            host.currentCarouselItem,
+        )
+    }
+
+    @Test
+    fun `onDetachedFromWindow preserves isActive`() {
+        // Suspend/resume scenario: active cell never changes, so the feed's
+        // active-cell propagation does not re-fire activatePlayback on
+        // resume. If detach flipped isActive false, every subsequent
+        // updateActiveVideo emit would be gated out and per-page swipes
+        // wouldn't update the overlay. iOS-parity: isActive is owned
+        // exclusively by activatePlayback / deactivatePlayback; lifecycle
+        // hooks must not touch it.
+        val surface = TrackingSurface()
+        val host = newHost(surface)
+        host.configure(item("c1"))
+        host.activatePlayback()
+        assertTrue(host.isActive)
+
+        host.onDetachedFromWindow()
+
+        assertTrue(
+            "isActive must survive onDetachedFromWindow — only activatePlayback/deactivatePlayback own it",
+            host.isActive,
+        )
+    }
+
+    @Test
+    fun `onDetachedFromWindow does not stop time coalescer`() {
+        // If detach stopped the coalescer, on resume nothing restarts it
+        // (activatePlayback is the only caller and doesn't re-fire when
+        // the active cell never changed). Time emits would silently stop.
+        // Mirrors the isActive ownership rule: detach is a no-op for
+        // playback-driven state.
+        val surface = TrackingSurface()
+        val host = newHost(surface)
+        host.configure(item("c1"))
+        host.activatePlayback()
+        // activatePlayback() is what kicks off time coalescing — once
+        // running, it should survive detach.
+
+        // No assertion on internals; the contract is observable via the
+        // updateActiveVideo regression test above. This test exists to
+        // document the non-destructive-detach intent: onDetachedFromWindow
+        // must not call stopTimeCoalescing().
+        host.onDetachedFromWindow()
+
+        // host.isActive still true => the coalesce runnable would still
+        // tick if it weren't cancelled. We cannot easily inspect the
+        // handler queue from here, but we can assert the public state
+        // hasn't been disturbed:
+        assertTrue("isActive untouched", host.isActive)
+        assertNotNull("currentCarouselItem untouched", host.currentCarouselItem)
+    }
+
+    @Test
+    fun `onDetachedFromWindow cancels flowScope`() {
+        val ctx = ApplicationProvider.getApplicationContext<Context>()
+        val host = ReactVideoCarouselOverlayHost(ctx)
+
+        // Inject a live scope directly via the writable test accessor.
+        val injected = CoroutineScope(Dispatchers.Main + SupervisorJob())
+        host.flowScopeForTest = injected
+
+        assertTrue("injected scope must be active before detach", injected.isActive)
+
+        host.callOnDetachedFromWindow()
+
+        assertNull("flowScope must be null after detach", host.flowScopeForTest)
+        assertFalse("injected scope must be cancelled after detach", injected.isActive)
+    }
+}

package/android/src/test/java/com/shortkit/reactnative/ShortKitBridgeLongPressTest.kt

@@ -0,0 +1,148 @@
+package com.shortkit.reactnative
+
+import androidx.test.core.app.ApplicationProvider
+import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.bridge.WritableMap
+import com.shortkit.sdk.feed.VideoCarouselCellLongPressState
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * JVM unit tests for [ShortKitBridge.emitVideoCarouselCellLongPress].
+ *
+ * Verifies the event name, state-string lowercasing for all three enum values,
+ * and the full payload shape (feedId, id, index, pageIndex).
+ *
+ * The [JavaOnlyMap] seam avoids the JNI initialisation that
+ * [com.facebook.react.bridge.Arguments.createMap] requires in host tests
+ * (same pattern used in ReactVideoCarouselOverlayHostEmitTest).
+ */
+@RunWith(RobolectricTestRunner::class)
+class ShortKitBridgeLongPressTest {
+
+    /**
+     * Construct a minimal [ShortKitBridge] with a captured [emitEvent] lambda.
+     * [JavaOnlyMap] is injected via the [ShortKitBridge.createMap] seam so
+     * [Arguments.createMap] (which requires JNI) is never called in tests.
+     */
+    private fun makeBridge(
+        onEmit: (String, WritableMap) -> Unit,
+    ): ShortKitBridge {
+        val bridge = ShortKitBridge(
+            apiKey = "pk_test_unit",
+            context = ApplicationProvider.getApplicationContext(),
+            hasLoadingView = false,
+            clientAppName = null,
+            clientAppVersion = null,
+            customDimensionsJSON = null,
+            debugPanel = false,
+            serverTracingEnabled = false,
+            consoleTracingEnabled = false,
+            emitEvent = onEmit,
+        )
+        // Override the map factory before any emit call so the bridge never
+        // reaches Arguments.createMap() in emitVideoCarouselCellLongPress.
+        bridge.createMap = { JavaOnlyMap() }
+        return bridge
+    }
+
+    // ------------------------------------------------------------------
+    // State-string lowercasing
+    // ------------------------------------------------------------------
+
+    @Test
+    fun emitsBegan() {
+        val emitted = mutableListOf<Pair<String, WritableMap>>()
+        val bridge = makeBridge { name, params -> emitted.add(name to params) }
+
+        bridge.emitVideoCarouselCellLongPress(
+            itemId = "item-1",
+            index = 0,
+            pageIndex = 0,
+            state = VideoCarouselCellLongPressState.BEGAN,
+        )
+
+        assertEquals(1, emitted.size)
+        assertEquals("onVideoCarouselCellLongPress", emitted[0].first)
+        assertEquals("began", emitted[0].second.getString("state"))
+    }
+
+    @Test
+    fun emitsEnded() {
+        val emitted = mutableListOf<Pair<String, WritableMap>>()
+        val bridge = makeBridge { name, params -> emitted.add(name to params) }
+
+        bridge.emitVideoCarouselCellLongPress(
+            itemId = "item-1",
+            index = 0,
+            pageIndex = 0,
+            state = VideoCarouselCellLongPressState.ENDED,
+        )
+
+        assertEquals(1, emitted.size)
+        assertEquals("onVideoCarouselCellLongPress", emitted[0].first)
+        assertEquals("ended", emitted[0].second.getString("state"))
+    }
+
+    @Test
+    fun emitsCancelled() {
+        val emitted = mutableListOf<Pair<String, WritableMap>>()
+        val bridge = makeBridge { name, params -> emitted.add(name to params) }
+
+        bridge.emitVideoCarouselCellLongPress(
+            itemId = "item-1",
+            index = 0,
+            pageIndex = 0,
+            state = VideoCarouselCellLongPressState.CANCELLED,
+        )
+
+        assertEquals(1, emitted.size)
+        assertEquals("onVideoCarouselCellLongPress", emitted[0].first)
+        assertEquals("cancelled", emitted[0].second.getString("state"))
+    }
+
+    // ------------------------------------------------------------------
+    // Payload shape
+    // ------------------------------------------------------------------
+
+    @Test
+    fun emitsCorrectPayloadFields() {
+        val emitted = mutableListOf<Pair<String, WritableMap>>()
+        val bridge = makeBridge { name, params -> emitted.add(name to params) }
+
+        bridge.emitVideoCarouselCellLongPress(
+            itemId = "car-1",
+            index = 3,
+            pageIndex = 2,
+            state = VideoCarouselCellLongPressState.BEGAN,
+        )
+
+        val params = emitted[0].second
+        assertEquals("car-1", params.getString("id"))
+        assertEquals(3, params.getInt("index"))
+        assertEquals(2, params.getInt("pageIndex"))
+        assertEquals("began", params.getString("state"))
+    }
+
+    @Test
+    fun emitsFeedId() {
+        val emitted = mutableListOf<Pair<String, WritableMap>>()
+        val bridge = makeBridge { name, params -> emitted.add(name to params) }
+
+        bridge.emitVideoCarouselCellLongPress(
+            itemId = "item-1",
+            index = 0,
+            pageIndex = 0,
+            state = VideoCarouselCellLongPressState.BEGAN,
+        )
+
+        // activeSurfaceFeedId() returns "" when no active surface is registered
+        // (no ShortKitFeedFragment has been attached in this unit-test environment).
+        // The important guarantee is that the "feedId" key is present in the map,
+        // matching the iOS bridge payload shape.
+        val params = emitted[0].second
+        assertEquals("", params.getString("feedId"))
+    }
+}

package/ios/ShortKitBridge.swift

@@ -208,7 +208,8 @@ import ShortKitSDK
             customDimensions: dimensions,
             debugPanelEnabled: debugPanel,
             serverTracingEnabled: serverTracingEnabled,
-            consoleTracingEnabled: consoleTracingEnabled
+            consoleTracingEnabled: consoleTracingEnabled,
+            poolDebugEnabled: false
         )
         self.shortKit = sdk
 

package/ios/ShortKitSDK.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>ShortKitSDK.framework/ShortKitSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ShortKitSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>ShortKitSDK.framework/ShortKitSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ShortKitSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Info.plist

@@ -11,9 +11,9 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleVersion</key>
-    <string>0.2.37</string>
+    <string>0.2.39</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.37</string>
+    <string>0.2.39</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.abi.json

@@ -52850,14 +52850,14 @@
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/Feed\/VideoCarouselCell.swift",
       "kind": "BooleanLiteral",
-      "offset": 31591,
+      "offset": 45026,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/Feed\/VideoCarouselCell.swift",
       "kind": "IntegerLiteral",
-      "offset": 38856,
+      "offset": 52291,
       "length": 1,
       "value": "0"
     },
@@ -53517,7 +53517,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.37\""
+      "value": "\"0.2.39\""
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/ShortKit.swift",

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/_CodeSignature/CodeResources

@@ -10,11 +10,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		Rmlks05t/ZAWDJyrlYCLZI2hLt4=
+		DfvOpn/tL7HwpstLyexoHO9tmlc=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.abi.json</key>
 		<data>
-		o4q5PMYrrSkfEuV3X5DKLlP/Ic8=
+		AhyuvP9Jp9aQmkTfkyn18bZWgYE=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>
 		<data>
@@ -50,7 +50,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			GPD6LqlhW6OfAta/UbVY9JS6SMSbk402F6pveuST4rY=
+			NxZxhP9cPb/bnY8osKT6QvOK/iH3xHbDQNIHRYJGfQ0=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/Info.plist

@@ -11,9 +11,9 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleVersion</key>
-    <string>0.2.37</string>
+    <string>0.2.39</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.37</string>
+    <string>0.2.39</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.abi.json

@@ -52850,14 +52850,14 @@
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/Feed\/VideoCarouselCell.swift",
       "kind": "BooleanLiteral",
-      "offset": 31591,
+      "offset": 45026,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/Feed\/VideoCarouselCell.swift",
       "kind": "IntegerLiteral",
-      "offset": 38856,
+      "offset": 52291,
       "length": 1,
       "value": "0"
     },
@@ -53517,7 +53517,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.37\""
+      "value": "\"0.2.39\""
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/ShortKit.swift",

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.abi.json

@@ -52850,14 +52850,14 @@
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/Feed\/VideoCarouselCell.swift",
       "kind": "BooleanLiteral",
-      "offset": 31591,
+      "offset": 45026,
       "length": 4,
       "value": "true"
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/Feed\/VideoCarouselCell.swift",
       "kind": "IntegerLiteral",
-      "offset": 38856,
+      "offset": 52291,
       "length": 1,
       "value": "0"
     },
@@ -53517,7 +53517,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.37\""
+      "value": "\"0.2.39\""
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/ShortKit.swift",

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/_CodeSignature/CodeResources

@@ -10,11 +10,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		Rmlks05t/ZAWDJyrlYCLZI2hLt4=
+		DfvOpn/tL7HwpstLyexoHO9tmlc=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		o4q5PMYrrSkfEuV3X5DKLlP/Ic8=
+		AhyuvP9Jp9aQmkTfkyn18bZWgYE=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -30,7 +30,7 @@
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		o4q5PMYrrSkfEuV3X5DKLlP/Ic8=
+		AhyuvP9Jp9aQmkTfkyn18bZWgYE=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -66,7 +66,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			GPD6LqlhW6OfAta/UbVY9JS6SMSbk402F6pveuST4rY=
+			NxZxhP9cPb/bnY8osKT6QvOK/iH3xHbDQNIHRYJGfQ0=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -94,7 +94,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			GPD6LqlhW6OfAta/UbVY9JS6SMSbk402F6pveuST4rY=
+			NxZxhP9cPb/bnY8osKT6QvOK/iH3xHbDQNIHRYJGfQ0=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shortkitsdk/react-native",
-  "version": "0.2.37",
+  "version": "0.2.39",
   "description": "ShortKit React Native SDK — short-form video feed",
   "react-native": "src/index",
   "source": "src/index",