@shortkitsdk/react-native 0.2.25 → 0.2.27

package/ios/ShortKitBridge.swift

@@ -70,6 +70,37 @@ import ShortKitSDK
             self?.emitOnMain("onFeedReady", body: ["feedId": id])
         }
 
+        // Wire per-feed refresh state callback (scoped by feedId)
+        vc.onRefreshStateChanged = { [weak self] state in
+            NSLog("[ShortKit Bridge] onRefreshStateChangedPerFeed feedId=%@ status=%@", id, "\(state)")
+            var body: [String: Any] = ["feedId": id]
+            switch state {
+            case .idle:
+                body["status"] = "idle"
+                body["progress"] = 0.0
+            case .pulling(let progress):
+                body["status"] = "pulling"
+                body["progress"] = progress
+            case .triggered:
+                body["status"] = "triggered"
+                body["progress"] = 0.0
+            case .refreshing:
+                body["status"] = "refreshing"
+                body["progress"] = 0.0
+            }
+            self?.emitOnMain("onRefreshStateChangedPerFeed", body: body)
+        }
+
+        // Wire per-feed video-carousel cell tap event
+        vc.onVideoCarouselCellTap = { [weak self] payload in
+            self?.emitOnMain("onVideoCarouselCellTap", body: [
+                "feedId": id,
+                "id": payload.id,
+                "index": payload.index,
+                "pageIndex": payload.pageIndex,
+            ])
+        }
+
         // 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) {
@@ -272,20 +303,27 @@ import ShortKitSDK
 
     // MARK: - Custom Feed
 
-    @objc public func setFeedItems(_ feedId: String, items json: String) {
+    @objc public func setFeedItems(_ feedId: String, items json: String, startAtId: String?) {
         guard let items = Self.parseFeedInputs(json) else { return }
         DispatchQueue.main.async { [weak self] in
             guard let self else { return }
             if let vc = self.feedViewController(for: feedId) {
-                vc.setFeedItems(items)
+                vc.setFeedItems(items, startAtId: startAtId)
             } else {
                 self.pendingOps[feedId, default: []].append { vc in
-                    vc.setFeedItems(items)
+                    vc.setFeedItems(items, startAtId: startAtId)
                 }
             }
         }
     }
 
+    @objc public func scrollFeedToItem(_ feedId: String, id: String, animated: Bool) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            self.feedViewController(for: feedId)?.scrollToItem(id: id, animated: animated)
+        }
+    }
+
     @objc public func appendFeedItems(_ feedId: String, items json: String) {
         guard let items = Self.parseFeedInputs(json) else { return }
         DispatchQueue.main.async { [weak self] in
@@ -910,7 +948,7 @@ import ShortKitSDK
     }
 
     /// Parse a JSON string of FeedInput[] from the JS bridge.
-    private static func parseFeedInputs(_ json: String) -> [FeedInput]? {
+    static func parseFeedInputs(_ json: String) -> [FeedInput]? {
         guard let data = json.data(using: .utf8),
               let arr = try? JSONSerialization.jsonObject(with: data) as? [[String: Any]] else {
             return nil

package/ios/ShortKitFeedView.swift

@@ -29,6 +29,31 @@ import ShortKitSDK
         didSet { /* used at embed time only */ }
     }
 
+    /// JSON-serialized FeedInput[] for initial custom-feed items at mount time.
+    /// Parsed and wrapped in FeedPreload(immediateItems:) at embed time so the
+    /// SDK takes the sync render path — no async preload wait, no ref-attach
+    /// race, first cell dequeued on the first run-loop tick.
+    /// When preloadId is also set, preloadId takes precedence.
+    @objc public var feedItemsJSON: String? {
+        didSet { /* used at embed time only */ }
+    }
+
+    /// When the consumer explicitly manages this prop, it becomes the
+    /// authoritative suspension signal — overriding willMove(toWindow:).
+    private var isActiveManagedByProp = false
+
+    @objc public var active: Bool = true {
+        didSet {
+            guard active != oldValue, let feedVC = feedViewController else { return }
+            if !active { isActiveManagedByProp = true }
+            if active {
+                feedVC.activate()
+            } else {
+                feedVC.deactivate()
+            }
+        }
+    }
+
     @objc var feedId: String?
 
     // MARK: - Child VC
@@ -48,7 +73,7 @@ import ShortKitSDK
     public override func willMove(toWindow newWindow: UIWindow?) {
         super.willMove(toWindow: newWindow)
 
-        if newWindow == nil {
+        if newWindow == nil && !isActiveManagedByProp {
             suspendFeedViewController()
         }
     }
@@ -71,14 +96,18 @@ import ShortKitSDK
 
         // Re-attach an existing suspended VC (e.g. after native stack pop)
         if let feedVC = feedViewController {
+            NSLog("[ShortKit FeedView] re-attaching suspended VC feedId=%@", feedId ?? "nil")
             parentVC.addChild(feedVC)
             feedVC.view.frame = bounds
             addSubview(feedVC.view)
             feedVC.didMove(toParent: parentVC)
-            feedVC.activate()
+            if !isActiveManagedByProp {
+                feedVC.activate()
+            }
             if let feedId = self.feedId {
                 ShortKitBridge.shared?.registerFeed(id: feedId, viewController: feedVC)
             }
+            NSLog("[ShortKit FeedView] re-attach complete — activate() called")
             return
         }
 
@@ -99,8 +128,14 @@ import ShortKitSDK
                 NSLog("[ShortKit FeedView] ❌ No preload handle found for feedId: %@", preloadId)
                 NSLog("[ShortKit FeedView] Available preload handles: %@", ShortKitBridge.shared?.preloadHandles.keys.joined(separator: ", ") ?? "none")
             }
+        } else if let json = self.feedItemsJSON,
+                  let items = ShortKitBridge.parseFeedInputs(json) {
+            // feedItems prop: wrap in an immediate preload (no async prefetch
+            // work — items are available synchronously at viewDidLoad).
+            feedConfig.preload = FeedPreload(immediateItems: items)
+            NSLog("[ShortKit FeedView] feedItems prop: created immediate preload with %d items", items.count)
         } else {
-            NSLog("[ShortKit FeedView] No preloadId prop set")
+            NSLog("[ShortKit FeedView] No preloadId or feedItems prop set")
         }
 
         NSLog("[ShortKit FeedView] feedConfig.preload is %@", feedConfig.preload != nil ? "SET" : "NIL")
@@ -155,6 +190,18 @@ import ShortKitSDK
         feedVC.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         addSubview(feedVC.view)
         feedVC.didMove(toParent: parentVC)
+
+        // With FVC.viewDidAppear no longer self-claiming for bridge-managed
+        // surfaces, the bridge is the sole authority on claim timing. Mirror
+        // the reattach path: explicitly activate iff the RN `active` prop
+        // is true. If the prop is false (e.g. user is on a different tab
+        // while this FVC was created to handle a delayed API response), the
+        // FVC stays idle — no claim, no pool mutation, no hijack. A later
+        // prop change to active=true triggers `feedVC.activate()` via the
+        // prop's didSet.
+        if active {
+            feedVC.activate()
+        }
     }
 
     /// Detach the feedVC from the parent VC hierarchy without destroying it.
@@ -162,15 +209,20 @@ import ShortKitSDK
     /// (e.g. pushing a new screen on top). The feedVC and its state are preserved
     /// so they can be re-attached when the view returns to the window.
     private func suspendFeedViewController() {
+        NSLog("[ShortKit FeedView] suspendFeedViewController ENTRY feedId=%@", feedId ?? "nil")
         if let feedId = self.feedId {
             ShortKitBridge.shared?.unregisterFeed(id: feedId)
         }
-        guard let feedVC = feedViewController else { return }
+        guard let feedVC = feedViewController else {
+            NSLog("[ShortKit FeedView] suspendFeedViewController NOOP — no feedVC")
+            return
+        }
 
         feedVC.deactivate()
         feedVC.willMove(toParent: nil)
         feedVC.view.removeFromSuperview()
         feedVC.removeFromParent()
+        NSLog("[ShortKit FeedView] suspendFeedViewController EXIT — VC retained for re-attach")
         // Keep feedViewController reference — re-attached in embedFeedViewControllerIfNeeded
     }
 

package/ios/ShortKitFeedViewManager.mm

@@ -27,5 +27,7 @@ RCT_EXPORT_VIEW_PROPERTY(startAtItemId, NSString)
 RCT_EXPORT_VIEW_PROPERTY(preloadId, NSString)
 RCT_EXPORT_VIEW_PROPERTY(feedId, NSString)
 RCT_EXPORT_VIEW_PROPERTY(seedThumbnailUrl, NSString)
+RCT_EXPORT_VIEW_PROPERTY(feedItemsJSON, NSString)
+RCT_EXPORT_VIEW_PROPERTY(active, BOOL)
 
 @end

package/ios/ShortKitModule.mm

@@ -71,7 +71,9 @@ RCT_EXPORT_MODULE(ShortKitModule)
     @"onContentTapped",
     @"onDismiss",
     @"onFeedReady",
+    @"onVideoCarouselCellTap",
     @"onRefreshStateChanged",
+    @"onRefreshStateChangedPerFeed",
     @"onDidFetchContentItems",
     @"onOverlayActiveChanged",
     @"onOverlayPlayerStateChanged",
@@ -256,17 +258,25 @@ RCT_EXPORT_METHOD(setMaxBitrate:(double)bitrate) {
 
 // MARK: - Custom Feed
 
-RCT_EXPORT_METHOD(setFeedItems:(NSString *)feedId items:(NSString *)items) {
+RCT_EXPORT_METHOD(setFeedItems:(NSString *)feedId
+                  items:(NSString *)json
+                  startAtId:(NSString *)startAtId) {
   if (_shortKitBridge) {
-    [_shortKitBridge setFeedItems:feedId items:items];
+    [_shortKitBridge setFeedItems:feedId items:json startAtId:startAtId];
   } else {
     if (!_pendingBridgeOps) _pendingBridgeOps = [NSMutableArray new];
     [_pendingBridgeOps addObject:^{
-      [self->_shortKitBridge setFeedItems:feedId items:items];
+      [self->_shortKitBridge setFeedItems:feedId items:json startAtId:startAtId];
     }];
   }
 }
 
+RCT_EXPORT_METHOD(scrollFeedToItem:(NSString *)feedId
+                  id:(NSString *)itemId
+                  animated:(BOOL)animated) {
+  [_shortKitBridge scrollFeedToItem:feedId id:itemId animated:animated];
+}
+
 RCT_EXPORT_METHOD(appendFeedItems:(NSString *)feedId items:(NSString *)items) {
   if (_shortKitBridge) {
     [_shortKitBridge appendFeedItems:feedId items:items];

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.25</string>
+    <string>0.2.27</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.25</string>
+    <string>0.2.27</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>