@shortkitsdk/react-native 0.2.36 → 0.2.38

package/android/build.gradle.kts

@@ -35,10 +35,10 @@ 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")
-    implementation(files("libs/shortkit-release.aar"))
+    // 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")
     implementation("androidx.media3:media3-exoplayer-hls:1.5.1")

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

@@ -343,8 +343,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() {
@@ -464,12 +465,13 @@ class ReactCarouselOverlayHost(context: Context) : FrameLayout(context), Carouse
     // Cleanup
     // ------------------------------------------------------------------
 
-    override fun onDetachedFromWindow() {
+    public override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         pendingWriteJob?.cancel()
         pendingWriteJob = null
-        if (surface?.isRunning == true) {
-            surface?.stop()
-        }
+        // 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.
     }
 }

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
@@ -630,15 +631,28 @@ class ReactVideoCarouselOverlayHost(context: Context) : FrameLayout(context), Vi
     // Cleanup
     // ------------------------------------------------------------------
 
-    override fun onDetachedFromWindow() {
+    public override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        flowScope?.cancel()
-        flowScope = null
-        isActive = false
-        currentCarouselItem = null
-        stopTimeCoalescing()
-        if (surface?.isRunning == true) {
-            surface?.stop()
-        }
+        // iOS-parity: detach is fully non-destructive. The React surface,
+        // currentCarouselItem, flowScope, isActive, AND the time-coalescing
+        // runnable all survive visibility transitions. The cell's recycle
+        // path keeps the overlay attached (mirror of iOS
+        // VideoCarouselCell.prepareForReuse).
+        //
+        // isActive is owned exclusively by the feed's active-cell
+        // propagation (activatePlayback / deactivatePlayback). Touching it
+        // here would create a second writer and break the suspend/resume
+        // case where the active cell never changes — activatePlayback
+        // wouldn't re-fire on resume, leaving isActive stuck false and
+        // gating out every updateActiveVideo emit.
+        //
+        // Player flow subscriptions are idempotently re-established by
+        // attach() -> resubscribeToPlayer (which cancels the prior scope
+        // on entry) when the cell rebinds its player on next visit.
+        //
+        // True teardown happens via release() (called by the cell on
+        // permanent disposal) or implicitly when the host is GC'd along
+        // with the cell.
     }
+
 }

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

@@ -95,6 +95,51 @@ class ShortKitBridge(
             }
         }
 
+        /**
+         * Serialize a [FeedItem] to a ContentItem-shaped JSON string for the
+         * `onFeedTransition` event. For [FeedItem.Content] cells this is the
+         * real ContentItem. For every other cell kind (AdSlotItem,
+         * ImageCarousel, Survey, VideoCarousel) there is no playable
+         * ContentItem, so we synthesize a minimal one whose ONLY meaningful
+         * field is `id`.
+         *
+         * Why: JS hosts use `event.to` as an identity cursor for resume-on-
+         * tab-return (`setFeedItems(startAt:)`). Before this synthesis, non-
+         * content cells came through as `to=null` and the host's stored
+         * resume id stayed pinned to the last regular video — causing the
+         * SDK to re-seed the feed at the wrong index on tab return.
+         *
+         * Scope: this is a bridge-only synthesis. It never flows back into
+         * the Android SDK (pool, cache, FeedDataSource, etc. all still see
+         * the real FeedItem and treat non-content cells honestly). JS-side
+         * consumers should ONLY read `.id` / `.playbackId` from
+         * `onFeedTransition` items — deeper fields are placeholders for
+         * non-content cells.
+         *
+         * Mirrors iOS PR #170 ShortKitBridge.swift:770-790.
+         */
+        fun serializeFeedItemIdentityJSON(feedItem: com.shortkit.sdk.model.FeedItem): String {
+            if (feedItem is com.shortkit.sdk.model.FeedItem.Content) {
+                return serializeContentItemToJSON(feedItem.item)
+            }
+            val synthetic = ContentItem(
+                id = feedItem.id,
+                playbackId = null,
+                title = "",
+                description = null,
+                duration = 0.0,
+                streamingUrl = "",
+                thumbnailUrl = "",
+                captionTracks = emptyList(),
+                customMetadata = null,
+                author = null,
+                articleUrl = null,
+                commentCount = null,
+                fallbackUrl = null,
+            )
+            return serializeContentItemToJSON(synthetic)
+        }
+
         /**
          * Serialize a [ContentItem] to a JSON string for bridge transport.
          */
@@ -539,7 +584,8 @@ class ShortKitBridge(
             customDimensions = dims,
             debugPanelEnabled = debugPanel,
             serverTracingEnabled = serverTracingEnabled,
-            consoleTracingEnabled = consoleTracingEnabled
+            consoleTracingEnabled = consoleTracingEnabled,
+            poolDebugEnabled = consoleTracingEnabled,
         )
         this.shortKit = sdk
         shared = this
@@ -687,6 +733,38 @@ class ShortKitBridge(
         fragment.onVideoCarouselCellTap = { payload ->
             emitVideoCarouselCellTap(payload.id, payload.index, payload.pageIndex)
         }
+        // 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
+        // <ShortKitFeed>, causing cross-feed state pollution). Structural fix:
+        // callback literally cannot fire on the wrong feed. Mirrors iOS
+        // PR #170 ShortKitBridge.swift:117-143.
+        fragment.onFeedTransition = { event ->
+            val params = Arguments.createMap().apply {
+                putString("feedId", id)
+                putString("phase", when (event.phase) {
+                    FeedTransitionPhase.BEGAN -> "began"
+                    FeedTransitionPhase.ENDED -> "ended"
+                })
+                putString("direction", when (event.direction) {
+                    FeedDirection.FORWARD -> "forward"
+                    FeedDirection.BACKWARD -> "backward"
+                    else -> "forward"
+                })
+                // Serialize from the underlying FeedItem (not event.from/to
+                // which are null for non-content cells). See the docstring on
+                // serializeFeedItemIdentityJSON for the why — in short, this
+                // ensures carousels/ads/surveys come through with a populated
+                // id, so JS-side hosts can track feed position for any cell type.
+                event.fromFeedItem?.let {
+                    putString("fromItem", serializeFeedItemIdentityJSON(it))
+                }
+                event.toFeedItem?.let {
+                    putString("toItem", serializeFeedItemIdentityJSON(it))
+                }
+            }
+            emitEventOnMain("onFeedTransition", params)
+        }
 
         // Replay buffered operations after the fragment's view is created.
         // commitNowAllowingStateLoss triggers onCreate but onViewCreated
@@ -1240,10 +1318,16 @@ class ShortKitBridge(
             }
         }
 
-        // Did loop
+        // Did loop — tagged with active surface's feedId. player.didLoop is a
+        // singleton flow on the shared ShortKitPlayer (only one item plays at
+        // a time). The event semantically belongs to whichever feed owns the
+        // active surface; tag with that feedId so JS consumers bound to
+        // specific feeds can filter. Empty string means no active surface
+        // (treat as unknown/global). Mirrors iOS bridge :615-631.
         newScope.launch {
             player.didLoop.collect { event ->
                 val params = Arguments.createMap().apply {
+                    putString("feedId", activeSurfaceFeedId())
                     putString("contentId", event.contentId)
                     putInt("loopCount", event.loopCount)
                 }
@@ -1251,34 +1335,26 @@ class ShortKitBridge(
             }
         }
 
-        // Feed transition
-        newScope.launch {
-            player.feedTransition.collect { event ->
-                val params = Arguments.createMap().apply {
-                    putString("phase", when (event.phase) {
-                        FeedTransitionPhase.BEGAN -> "began"
-                        FeedTransitionPhase.ENDED -> "ended"
-                    })
-                    putString("direction", when (event.direction) {
-                        FeedDirection.FORWARD -> "forward"
-                        FeedDirection.BACKWARD -> "backward"
-                        else -> "forward"
-                    })
-                    if (event.from != null) {
-                        putString("fromItem", serializeContentItemToJSON(event.from!!))
-                    }
-                    if (event.to != null) {
-                        putString("toItem", serializeContentItemToJSON(event.to!!))
-                    }
-                }
-                emitEvent.invoke("onFeedTransition", params)
-            }
-        }
-
-        // Format change
+        // NOTE: the global `player.feedTransition.collect` subscription used
+        // to live here. It's been removed — feed transitions are now emitted
+        // to RN via the per-fragment `fragment.onFeedTransition` closure
+        // wired in `registerFeedFragment` above. This eliminates the cross-
+        // feed routing bug where every mounted <ShortKitFeed> consumer
+        // received every feed's transitions. Mirrors iOS PR #170
+        // ShortKitBridge.swift:633-642.
+        //
+        // `player.sendFeedTransition` is still called by ShortKitFeedFragment
+        // for backward compatibility with native Kotlin SDK consumers that
+        // subscribe to `ShortKitPlayer.feedTransition` directly.
+
+        // Format change — tagged with active surface's feedId. Same reasoning
+        // as onDidLoop: fires from shared player singleton, but semantically
+        // belongs to whichever feed owns the active surface. Mirrors iOS
+        // bridge :671-688.
         newScope.launch {
             player.formatChange.collect { event ->
                 val params = Arguments.createMap().apply {
+                    putString("feedId", activeSurfaceFeedId())
                     putString("contentId", event.contentId)
                     putDouble("fromBitrate", event.fromBitrate.toDouble())
                     putDouble("toBitrate", event.toBitrate.toDouble())

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

@@ -0,0 +1,136 @@
+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 org.junit.Assert.assertEquals
+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)
+    }
+}

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

@@ -0,0 +1,178 @@
+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 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 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)
+    }
+}

package/ios/ReactVideoCarouselOverlayHost.swift

@@ -148,11 +148,12 @@ import ShortKitSDK
             "playerState": "idle",
             "isMuted": cachedIsMuted,
         ]
-        if let firstVideo = item.videos.first,
-           let videoData = try? JSONEncoder().encode(firstVideo),
+        let initialIndex = item.clampedInitialPageIndex
+        if item.videos.indices.contains(initialIndex),
+           let videoData = try? JSONEncoder().encode(item.videos[initialIndex]),
            let videoJSON = String(data: videoData, encoding: .utf8) {
             props["activeVideo"] = videoJSON
-            props["activeVideoIndex"] = 0
+            props["activeVideoIndex"] = initialIndex
         }
         return props
     }
@@ -160,16 +161,17 @@ import ShortKitSDK
     /// Emit onVideoCarouselItemChanged with full initial state for the new item.
     /// Replaces setProperties() on cell reuse, avoiding a full Fabric root remount.
     private func emitItemChanged(item: VideoCarouselItem, json: String) {
+        let initialIndex = item.clampedInitialPageIndex
         var body: [String: Any] = [
             "surfaceId": surfaceId,
             "carouselItem": json,
             "isActive": false,
             "playerState": "idle",
             "isMuted": cachedIsMuted,
-            "activeVideoIndex": 0,
+            "activeVideoIndex": initialIndex,
         ]
-        if let firstVideo = item.videos.first,
-           let videoData = try? JSONEncoder().encode(firstVideo),
+        if item.videos.indices.contains(initialIndex),
+           let videoData = try? JSONEncoder().encode(item.videos[initialIndex]),
            let videoJSON = String(data: videoData, encoding: .utf8) {
             body["activeVideo"] = videoJSON
         } else {

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.36</string>
+    <string>0.2.38</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.36</string>
+    <string>0.2.38</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

@@ -53517,7 +53517,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.36\""
+      "value": "\"0.2.38\""
     },
     {
       "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>
-		WQrFujyFbopBKGGWbEKoC1woXeM=
+		OPbiGQgVvhc9i76qqjEwO15NZ9U=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.abi.json</key>
 		<data>
-		mwN55YBG0lFbYyqh8rFLlhydUhg=
+		bmR7HZYLcS/c/oJglUFjXRw3kcs=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>
 		<data>
@@ -50,7 +50,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lPV80dTyQRi3R5Al7WxpvZYLMH1fLtDMRPj8kH++RCs=
+			k2NIGYptDbpRKu5vmsmuboSr7G2j4qb9eftlewub0LA=
 			</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.36</string>
+    <string>0.2.38</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.36</string>
+    <string>0.2.38</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

@@ -53517,7 +53517,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.36\""
+      "value": "\"0.2.38\""
     },
     {
       "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

@@ -53517,7 +53517,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.36\""
+      "value": "\"0.2.38\""
     },
     {
       "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>
-		WQrFujyFbopBKGGWbEKoC1woXeM=
+		OPbiGQgVvhc9i76qqjEwO15NZ9U=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		mwN55YBG0lFbYyqh8rFLlhydUhg=
+		bmR7HZYLcS/c/oJglUFjXRw3kcs=
 		</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>
-		mwN55YBG0lFbYyqh8rFLlhydUhg=
+		bmR7HZYLcS/c/oJglUFjXRw3kcs=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -66,7 +66,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lPV80dTyQRi3R5Al7WxpvZYLMH1fLtDMRPj8kH++RCs=
+			k2NIGYptDbpRKu5vmsmuboSr7G2j4qb9eftlewub0LA=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -94,7 +94,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lPV80dTyQRi3R5Al7WxpvZYLMH1fLtDMRPj8kH++RCs=
+			k2NIGYptDbpRKu5vmsmuboSr7G2j4qb9eftlewub0LA=
 			</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.36",
+  "version": "0.2.38",
   "description": "ShortKit React Native SDK — short-form video feed",
   "react-native": "src/index",
   "source": "src/index",