@shortkitsdk/react-native 0.2.27 → 0.2.29

package/ios/ShortKitFeedView.swift

@@ -38,14 +38,19 @@ import ShortKitSDK
         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
-
+    /// The `active` prop is authoritative: whenever the view is deciding
+    /// whether to activate/deactivate/suspend its FeedViewController, it
+    /// consults this value directly. The `didSet` only exists to react to
+    /// transitions while the VC already exists. Transitions that arrive
+    /// before the VC is created (a common Fabric ordering: props set on the
+    /// view instance before `didMoveToWindow` runs) are stored in the Bool
+    /// property by Swift automatically — `embedFeedViewControllerIfNeeded`
+    /// reads the current value and acts on it when the VC is finally set up.
     @objc public var active: Bool = true {
         didSet {
-            guard active != oldValue, let feedVC = feedViewController else { return }
-            if !active { isActiveManagedByProp = true }
+            guard active != oldValue, let feedVC = feedViewController else {
+                return
+            }
             if active {
                 feedVC.activate()
             } else {
@@ -62,9 +67,16 @@ import ShortKitSDK
 
     // MARK: - Lifecycle
 
+    public override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+
+    public required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+
     public override func didMoveToWindow() {
         super.didMoveToWindow()
-
         if window != nil {
             embedFeedViewControllerIfNeeded()
         }
@@ -72,8 +84,11 @@ import ShortKitSDK
 
     public override func willMove(toWindow newWindow: UIWindow?) {
         super.willMove(toWindow: newWindow)
-
-        if newWindow == nil && !isActiveManagedByProp {
+        // Suspend only if we're leaving the window AND the prop says this
+        // surface should be active. When the prop is false, the consumer has
+        // already driven the VC into deactivate via active.didSet (or will,
+        // once the VC exists), and we mustn't double-suspend.
+        if newWindow == nil && active {
             suspendFeedViewController()
         }
     }
@@ -96,18 +111,21 @@ 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)
-            if !isActiveManagedByProp {
+            // Authoritative: read the current active prop and act on it.
+            // If prop is false, stay deactivated — do NOT claim the pool.
+            // This is the fix for the prop-arrived-before-VC race: a prop
+            // update dropped by the didSet guard (vcExists=false) lands here
+            // and is honored.
+            if active {
                 feedVC.activate()
             }
             if let feedId = self.feedId {
                 ShortKitBridge.shared?.registerFeed(id: feedId, viewController: feedVC)
             }
-            NSLog("[ShortKit FeedView] re-attach complete — activate() called")
             return
         }
 
@@ -120,33 +138,22 @@ import ShortKitSDK
 
         // Consume preload handle if available
         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 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 or feedItems 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()
+        let feedVC = ShortKitFeedViewController(
+            shortKit: sdk,
+            config: feedConfig,
+            startAtItemId: startAtItemId,
+            lifecycle: .manual
+        )
 
         // Seed a thumbnail from the host app's image cache so the first cell
         // renders with a visible thumbnail from frame zero. Synchronous
@@ -174,8 +181,6 @@ import ShortKitSDK
             }
         }
 
-        NSLog("[ShortKit FeedView] VC created successfully (bridge-managed)")
-
         feedVC.onDismiss = {
             ShortKitBridge.shared?.emitDismiss()
         }
@@ -192,13 +197,12 @@ import ShortKitSDK
         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.
+        // surfaces, the bridge is the sole authority on claim timing. Read
+        // the authoritative `active` prop and act on it. If the prop is
+        // false (including the case where it was set to false before the VC
+        // existed and the didSet guard returned early), 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()
         }
@@ -209,20 +213,15 @@ 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 {
-            NSLog("[ShortKit FeedView] suspendFeedViewController NOOP — no feedVC")
-            return
-        }
+        guard let feedVC = feedViewController else { 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/ShortKitModule.mm

@@ -308,6 +308,17 @@ RCT_EXPORT_METHOD(applyFilter:(NSString *)feedId filterJSON:(NSString *)filterJS
   }
 }
 
+RCT_EXPORT_METHOD(refresh:(NSString *)feedId) {
+  if (_shortKitBridge) {
+    [_shortKitBridge refresh:feedId];
+  } else {
+    if (!_pendingBridgeOps) _pendingBridgeOps = [NSMutableArray new];
+    [_pendingBridgeOps addObject:^{
+      [self->_shortKitBridge refresh:feedId];
+    }];
+  }
+}
+
 RCT_EXPORT_METHOD(preloadFeed:(NSString *)configJSON
                   itemsJSON:(NSString *)itemsJSON
                   resolve:(RCTPromiseResolveBlock)resolve

package/ios/ShortKitPlayerNativeView.swift

@@ -187,13 +187,19 @@ import ShortKitSDK
             overlayMode = .none
         }
 
+        let feedConfig: FeedConfig = {
+            guard let feedConfigStr = obj["feedConfig"] as? String else { return FeedConfig() }
+            return ShortKitBridge.parseFeedConfig(feedConfigStr)
+        }()
+
         return PlayerConfig(
             cornerRadius: cornerRadius,
             clickAction: clickAction,
             autoplay: autoplay,
             loop: loop,
             muteOnStart: muteOnStart,
-            videoOverlay: overlayMode
+            videoOverlay: overlayMode,
+            feedConfig: feedConfig
         )
     }
 

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