@shortkitsdk/react-native 0.2.36 → 0.2.37

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.
          */
@@ -687,6 +732,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 +1317,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 +1334,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/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/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.37</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.36</string>
+    <string>0.2.37</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.37\""
     },
     {
       "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=
+		Rmlks05t/ZAWDJyrlYCLZI2hLt4=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.abi.json</key>
 		<data>
-		mwN55YBG0lFbYyqh8rFLlhydUhg=
+		o4q5PMYrrSkfEuV3X5DKLlP/Ic8=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>
 		<data>
@@ -50,7 +50,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lPV80dTyQRi3R5Al7WxpvZYLMH1fLtDMRPj8kH++RCs=
+			GPD6LqlhW6OfAta/UbVY9JS6SMSbk402F6pveuST4rY=
 			</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.37</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.36</string>
+    <string>0.2.37</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.37\""
     },
     {
       "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.37\""
     },
     {
       "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=
+		Rmlks05t/ZAWDJyrlYCLZI2hLt4=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		mwN55YBG0lFbYyqh8rFLlhydUhg=
+		o4q5PMYrrSkfEuV3X5DKLlP/Ic8=
 		</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=
+		o4q5PMYrrSkfEuV3X5DKLlP/Ic8=
 		</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=
+			GPD6LqlhW6OfAta/UbVY9JS6SMSbk402F6pveuST4rY=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -94,7 +94,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lPV80dTyQRi3R5Al7WxpvZYLMH1fLtDMRPj8kH++RCs=
+			GPD6LqlhW6OfAta/UbVY9JS6SMSbk402F6pveuST4rY=
 			</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.37",
   "description": "ShortKit React Native SDK — short-form video feed",
   "react-native": "src/index",
   "source": "src/index",