@shortkitsdk/react-native 0.2.11 → 0.2.14

package/ios/ShortKitBridge.swift

@@ -30,6 +30,9 @@ import ShortKitSDK
     /// Preload handles keyed by UUID, consumed by feed views via preloadId prop.
     public var preloadHandles: [String: FeedPreload] = [:]
 
+    /// Tracks the most recently created preload or registered feed ID for feedReady routing.
+    private var activeFeedId: String = ""
+
     // MARK: - Feed Instance Registry
 
     private struct WeakFeedRef {
@@ -41,6 +44,7 @@ import ShortKitSDK
 
     public func registerFeed(id: String, viewController vc: ShortKitFeedViewController) {
         feedRegistry[id] = WeakFeedRef(vc: vc)
+        activeFeedId = id
 
         // Wire per-feed remaining content count callback
         vc.onRemainingContentCountChange = { [weak self] count in
@@ -50,6 +54,11 @@ import ShortKitSDK
             ])
         }
 
+        // Wire per-feed ready callback
+        vc.onFeedReady = { [weak self] in
+            self?.emitOnMain("onFeedReady", body: ["feedId": id])
+        }
+
         // Replay buffered operations on the next run-loop tick so the VC's
         // view hierarchy is fully set up after didMoveToWindow returns.
         if let ops = pendingOps.removeValue(forKey: id) {
@@ -315,14 +324,35 @@ import ShortKitSDK
         }
     }
 
-    @objc public func preloadFeed(_ configJSON: String, completion: @escaping (String) -> Void) {
+    @objc public func preloadFeed(_ configJSON: String, itemsJSON: String?, completion: @escaping (String) -> Void) {
         let config = Self.parseFeedConfig(configJSON)
-        guard let preload = shortKit?.preloadFeed(filter: config.filter) else {
+        let preload: FeedPreload?
+
+        NSLog("[ShortKit Bridge] preloadFeed called — feedSource: %@, hasItemsJSON: %@",
+              config.feedSource == .custom ? "custom" : "algorithmic",
+              itemsJSON != nil ? "yes (\(itemsJSON!.prefix(100))...)" : "no")
+
+        if config.feedSource == .custom {
+            guard let json = itemsJSON, let items = Self.parseFeedInputs(json) else {
+                NSLog("[ShortKit Bridge] ❌ preloadFeed: feedSource=custom but no valid items — returning empty")
+                completion("")
+                return
+            }
+            NSLog("[ShortKit Bridge] preloadFeed: creating custom preload with %d items", items.count)
+            preload = shortKit?.preloadFeed(items: items)
+        } else {
+            preload = shortKit?.preloadFeed(filter: config.filter)
+        }
+
+        guard let preload else {
+            NSLog("[ShortKit Bridge] ❌ preloadFeed: shortKit?.preloadFeed returned nil")
             completion("")
             return
         }
         let uuid = UUID().uuidString
+        NSLog("[ShortKit Bridge] ✅ preloadFeed: created handle %@", uuid)
         preloadHandles[uuid] = preload
+        activeFeedId = uuid
         completion(uuid)
     }
 
@@ -621,13 +651,19 @@ import ShortKitSDK
         let feedSource: FeedSource = feedSourceStr == "custom" ? .custom : .algorithmic
 
         let carouselOverlay = parseCarouselOverlay(obj["carouselOverlay"] as? String)
+        let videoCarouselOverlay = parseVideoCarouselOverlay(obj["videoCarouselOverlay"] as? String)
 
         let filter = parseFeedFilter(obj["filter"] as? String)
 
+        let scrollAxisStr = obj["scrollAxis"] as? String ?? "vertical"
+        let scrollAxis: ScrollAxis = scrollAxisStr == "horizontal" ? .horizontal : .vertical
+
         return FeedConfig(
             feedHeight: feedHeight,
+            scrollAxis: scrollAxis,
             videoOverlay: videoOverlay,
             carouselOverlay: carouselOverlay,
+            videoCarouselOverlay: videoCarouselOverlay,
             surveyOverlay: .none,
             adOverlay: .none,
             muteOnStart: muteOnStart,
@@ -706,6 +742,39 @@ import ShortKitSDK
         return .none
     }
 
+    /// Parse a double-stringified video carousel overlay JSON into a `VideoCarouselOverlayMode`.
+    ///
+    /// Examples:
+    /// - `"\"none\""` -> `.none`
+    /// - `"{\"type\":\"custom\",\"name\":\"news\"}"` -> `.custom { ReactVideoCarouselOverlayHost() }`
+    private static func parseVideoCarouselOverlay(_ json: String?) -> VideoCarouselOverlayMode {
+        guard let json,
+              let data = json.data(using: .utf8),
+              let parsed = try? JSONSerialization.jsonObject(with: data) else {
+            return .none
+        }
+
+        if let str = parsed as? String, str == "none" {
+            return .none
+        }
+
+        if let obj = parsed as? [String: Any],
+           let type = obj["type"] as? String,
+           type == "custom" {
+            let name = obj["name"] as? String ?? "Default"
+            return .custom { @Sendable in
+                let host = ReactVideoCarouselOverlayHost()
+                host.surfacePresenter = ShortKitBridge.shared?.surfacePresenter
+                host.bridge = ShortKitBridge.shared
+                host.videoCarouselOverlayModuleName = "ShortKitVideoCarouselOverlay_\(name)"
+                host.prepareSurface()
+                return host
+            }
+        }
+
+        return .none
+    }
+
     /// Parse a double-stringified feedHeight JSON.
     /// e.g. `"{\"type\":\"fullscreen\"}"` or `"{\"type\":\"percentage\",\"value\":0.8}"`
     private static func parseFeedHeight(_ json: String?) -> FeedHeight {
@@ -766,6 +835,13 @@ import ShortKitSDK
                     continue
                 }
                 result.append(.imageCarousel(carouselItem))
+            case "videoCarousel":
+                guard let itemData = obj["item"] as? [String: Any],
+                      let itemJSON = try? JSONSerialization.data(withJSONObject: itemData),
+                      let carouselItem = try? JSONDecoder().decode(VideoCarouselItem.self, from: itemJSON) else {
+                    continue
+                }
+                result.append(.videoCarousel(carouselItem))
             default:
                 continue
             }

package/ios/ShortKitFeedView.swift

@@ -66,6 +66,7 @@ import ShortKitSDK
             feedVC.view.frame = bounds
             addSubview(feedVC.view)
             feedVC.didMove(toParent: parentVC)
+            feedVC.activate()
             if let feedId = self.feedId {
                 ShortKitBridge.shared?.registerFeed(id: feedId, viewController: feedVC)
             }
@@ -80,12 +81,30 @@ import ShortKitSDK
         var feedConfig = ShortKitBridge.parseFeedConfig(self.config ?? "{}")
 
         // Consume preload handle if available
-        if let preloadId = self.preloadId,
-           let preload = ShortKitBridge.shared?.consumePreload(id: preloadId) {
-            feedConfig.preload = preload
+        if let preloadId = self.preloadId {
+            NSLog("[ShortKit FeedView] preloadId prop: %@", preloadId)
+            if let preload = ShortKitBridge.shared?.consumePreload(id: preloadId) {
+                feedConfig.preload = preload
+                NSLog("[ShortKit FeedView] ✅ Preload handle consumed for feedId: %@", preloadId)
+            } else {
+                NSLog("[ShortKit FeedView] ❌ No preload handle found for feedId: %@", preloadId)
+                NSLog("[ShortKit FeedView] Available preload handles: %@", ShortKitBridge.shared?.preloadHandles.keys.joined(separator: ", ") ?? "none")
+            }
+        } else {
+            NSLog("[ShortKit FeedView] No preloadId prop set")
         }
 
+        NSLog("[ShortKit FeedView] feedConfig.preload is %@", feedConfig.preload != nil ? "SET" : "NIL")
+        NSLog("[ShortKit FeedView] feedConfig.feedSource: %@", feedConfig.feedSource == .custom ? "custom" : "algorithmic")
+
+        NSLog("[ShortKit FeedView] Creating ShortKitFeedViewController with config.preload=%@, config.feedSource=%@",
+              feedConfig.preload != nil ? "SET" : "NIL",
+              feedConfig.feedSource == .custom ? "custom" : "algorithmic")
+
         let feedVC = ShortKitFeedViewController(shortKit: sdk, config: feedConfig, startAtItemId: startAtItemId)
+        feedVC.setBridgeManaged()
+
+        NSLog("[ShortKit FeedView] VC created successfully (bridge-managed)")
 
         feedVC.onDismiss = {
             ShortKitBridge.shared?.emitDismiss()
@@ -113,6 +132,7 @@ import ShortKitSDK
         }
         guard let feedVC = feedViewController else { return }
 
+        feedVC.deactivate()
         feedVC.willMove(toParent: nil)
         feedVC.view.removeFromSuperview()
         feedVC.removeFromParent()
@@ -126,6 +146,7 @@ import ShortKitSDK
         }
         guard let feedVC = feedViewController else { return }
 
+        feedVC.deactivate()
         feedVC.willMove(toParent: nil)
         feedVC.view.removeFromSuperview()
         feedVC.removeFromParent()

package/ios/ShortKitModule.mm

@@ -71,6 +71,7 @@ RCT_EXPORT_MODULE(ShortKitModule)
     @"onSurveyResponse",
     @"onContentTapped",
     @"onDismiss",
+    @"onFeedReady",
     @"onRefreshRequested",
     @"onDidFetchContentItems",
     @"onOverlayActiveChanged",
@@ -81,6 +82,9 @@ RCT_EXPORT_MODULE(ShortKitModule)
     @"onOverlayActiveCueChanged",
     @"onOverlayFeedScrollPhaseChanged",
     @"onOverlayTimeUpdate",
+    @"onOverlayFullState",
+    @"onCarouselActiveImageChanged",
+    @"onVideoCarouselActiveVideoChanged",
   ];
 }
 
@@ -104,7 +108,6 @@ RCT_EXPORT_MODULE(ShortKitModule)
 
 - (void)emitEvent:(NSString *)name body:(NSDictionary *)body {
 #ifdef RCT_NEW_ARCH_ENABLED
-  // New Architecture: use the codegen EventEmitterCallback directly
   if (_eventEmitterCallback) {
     _eventEmitterCallback(std::string([name UTF8String]), body);
   }
@@ -258,9 +261,10 @@ RCT_EXPORT_METHOD(applyFilter:(NSString *)feedId filterJSON:(NSString *)filterJS
 }
 
 RCT_EXPORT_METHOD(preloadFeed:(NSString *)configJSON
+                  itemsJSON:(NSString *)itemsJSON
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  [_shortKitBridge preloadFeed:configJSON completion:^(NSString *uuid) {
+  [_shortKitBridge preloadFeed:configJSON itemsJSON:itemsJSON completion:^(NSString *uuid) {
     resolve(uuid);
   }];
 }

package/ios/ShortKitSDK.xcframework/Info.plist

@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>ShortKitSDK.framework/ShortKitSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ShortKitSDK.framework</string>
 			<key>SupportedArchitectures</key>
@@ -17,14 +17,12 @@
 			</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</string>
+			<string>ios-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ShortKitSDK.framework</string>
 			<key>SupportedArchitectures</key>
@@ -33,6 +31,8 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>