@shortkitsdk/react-native 0.2.26 → 0.2.28

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

@@ -835,6 +835,14 @@ class ShortKitBridge(
         }
     }
 
+    fun refresh(feedId: String) {
+        val fragment = feedRegistry[feedId]?.get()
+        if (fragment != null) {
+            Handler(Looper.getMainLooper()).post { fragment.refresh() }
+        }
+        // No pending ops — refresh on unregistered feed is a no-op
+    }
+
     // ------------------------------------------------------------------
     // Fetch content
     // ------------------------------------------------------------------

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

@@ -230,6 +230,16 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    override fun refresh(feedId: String) {
+        val b = bridge
+        if (b != null) {
+            b.refresh(feedId)
+        } else {
+            // No buffering — refresh before bridge is ready is a no-op
+        }
+    }
+
     @ReactMethod
     override fun preloadFeed(configJSON: String, itemsJSON: String?, promise: Promise) {
         val b = bridge

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.view.MotionEvent
 import android.widget.FrameLayout
 import com.shortkit.sdk.config.PlayerClickAction
+import com.shortkit.sdk.config.FeedConfig
 import com.shortkit.sdk.config.PlayerConfig
 import com.shortkit.sdk.config.VideoOverlayMode
 import com.shortkit.sdk.model.ContentItem
@@ -106,6 +107,9 @@ class ShortKitPlayerNativeView(context: Context) : FrameLayout(context) {
                 loop = obj.optBoolean("loop", true),
                 muteOnStart = obj.optBoolean("muteOnStart", true),
                 videoOverlay = parseOverlay(obj),
+                feedConfig = obj.optString("feedConfig", "").let { fcStr ->
+                    if (fcStr.isNotEmpty()) ShortKitBridge.parseFeedConfig(fcStr, context) else FeedConfig()
+                },
             )
         } catch (_: Exception) {
             PlayerConfig()

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

@@ -5,28 +5,40 @@ import android.widget.FrameLayout
 import com.shortkit.sdk.config.PlayerClickAction
 import com.shortkit.sdk.config.VideoOverlayMode
 import com.shortkit.sdk.config.WidgetConfig
-import com.shortkit.sdk.model.ContentItem
 import com.shortkit.sdk.widget.ShortKitWidgetView
+import com.shortkit.sdk.config.FeedConfig
 import com.shortkit.sdk.model.FeedFilter
+import com.shortkit.sdk.model.WidgetInput
 import org.json.JSONArray
 import org.json.JSONObject
 
 /**
  * Fabric native view wrapping [ShortKitWidgetView] for use as a
  * horizontal video carousel in React Native.
+ *
+ * Props:
+ *  - `config`: JSON string with WidgetConfig values
+ *  - `items`: JSON string with WidgetInput array (compact playback-ID form)
  */
 class ShortKitWidgetNativeView(context: Context) : FrameLayout(context) {
 
     private var widgetView: ShortKitWidgetView? = null
     private var configJson: String? = null
     private var itemsJson: String? = null
+    private var parsedConfig: WidgetConfig = WidgetConfig()
+    private var parsedItems: List<WidgetInput> = emptyList()
 
     var config: String?
         get() = configJson
         set(value) {
             if (value == configJson) return
             configJson = value
-            rebuildIfNeeded()
+            parsedConfig = parseWidgetConfig(value)
+            // If widget is already built, rebuild to pick up new config.
+            if (widgetView != null) {
+                removeWidget()
+                embedWidgetIfNeeded()
+            }
         }
 
     var items: String?
@@ -34,39 +46,38 @@ class ShortKitWidgetNativeView(context: Context) : FrameLayout(context) {
         set(value) {
             if (value == itemsJson) return
             itemsJson = value
-            applyItems()
+            parsedItems = parseWidgetInputs(value) ?: emptyList()
+            // Post-mount update on an existing widget.
+            widgetView?.configure(parsedItems)
         }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        rebuildIfNeeded()
+        embedWidgetIfNeeded()
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        removeWidget()
     }
 
-    private fun rebuildIfNeeded() {
+    private fun embedWidgetIfNeeded() {
         if (widgetView != null) return
-
         val sdk = ShortKitBridge.shared?.sdk ?: return
-        val widgetConfig = parseWidgetConfig(configJson)
 
+        // Pass items at initialize time so the widget never races the server
+        // fetch — analogous to the feed's `feedItems` prop wiring.
         val view = ShortKitWidgetView(context).apply {
             layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
         }
-        view.initialize(sdk, widgetConfig)
+        view.initialize(sdk, parsedConfig, parsedItems)
         addView(view)
         widgetView = view
-
-        applyItems()
     }
 
-    private fun applyItems() {
-        val json = itemsJson ?: return
-        val view = widgetView ?: return
-        val contentItems = parseContentItems(json) ?: return
-        view.configure(contentItems)
+    private fun removeWidget() {
+        widgetView?.let { removeView(it) }
+        widgetView = null
     }
 
     private fun parseWidgetConfig(json: String?): WidgetConfig {
@@ -91,6 +102,9 @@ class ShortKitWidgetNativeView(context: Context) : FrameLayout(context) {
                 filter = obj.optString("filter", "").let { filterStr ->
                     if (filterStr.isNotEmpty()) ShortKitBridge.parseFeedFilterToModel(filterStr) else null
                 },
+                feedConfig = obj.optString("feedConfig", "").let { fcStr ->
+                    if (fcStr.isNotEmpty()) ShortKitBridge.parseFeedConfig(fcStr, context) else FeedConfig()
+                },
             )
         } catch (_: Exception) {
             WidgetConfig()
@@ -107,29 +121,27 @@ class ShortKitWidgetNativeView(context: Context) : FrameLayout(context) {
         return VideoOverlayMode.None
     }
 
-    private fun parseContentItems(json: String): List<ContentItem>? {
+    /**
+     * Parse a JSON array of `WidgetInput` values (compact playback-ID form).
+     * Mirrors the JS `WidgetInput` type:
+     *   `{ type: 'video'; playbackId: string; fallbackUrl?: string }`.
+     */
+    private fun parseWidgetInputs(json: String?): List<WidgetInput>? {
+        if (json.isNullOrEmpty()) return null
         return try {
             val arr = JSONArray(json)
-            val items = mutableListOf<ContentItem>()
+            val out = mutableListOf<WidgetInput>()
             for (i in 0 until arr.length()) {
                 val obj = arr.getJSONObject(i)
-                items.add(
-                    ContentItem(
-                        id = obj.getString("id"),
-                        title = obj.getString("title"),
-                        description = obj.optString("description", null),
-                        duration = obj.getDouble("duration"),
-                        streamingUrl = obj.getString("streamingUrl"),
-                        thumbnailUrl = obj.getString("thumbnailUrl"),
-                        captionTracks = emptyList(),
-                        customMetadata = null,
-                        author = obj.optString("author", null),
-                        articleUrl = obj.optString("articleUrl", null),
-                        commentCount = if (obj.has("commentCount")) obj.getInt("commentCount") else null,
-                    )
-                )
+                if (obj.optString("type") != "video") continue
+                val playbackId = obj.optString("playbackId", "")
+                if (playbackId.isEmpty()) continue
+                val fallbackUrl = if (obj.has("fallbackUrl") && !obj.isNull("fallbackUrl")) {
+                    obj.getString("fallbackUrl")
+                } else null
+                out.add(WidgetInput.Video(playbackId = playbackId, fallbackUrl = fallbackUrl))
             }
-            items
+            out
         } catch (_: Exception) {
             null
         }

package/ios/ShortKitBridge.swift

@@ -404,6 +404,14 @@ import ShortKitSDK
         }
     }
 
+    @objc public func refresh(_ feedId: String) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            self.feedViewController(for: feedId)?.refresh()
+            // No pending ops buffer — refresh on a not-yet-registered feed is a no-op
+        }
+    }
+
     @objc public func fetchContent(_ limit: Int, filterJSON: String?, completion: @escaping (String) -> Void) {
         let filter = filterJSON.flatMap { Self.parseFeedFilter($0) }
         Task {

package/ios/ShortKitFeedView.swift

@@ -191,10 +191,16 @@ import ShortKitSDK
         addSubview(feedVC.view)
         feedVC.didMove(toParent: parentVC)
 
-        // Fabric sets props BEFORE didMoveToWindow, so active=false may have
-        // fired its didSet while feedViewController was still nil. Apply now.
-        if isActiveManagedByProp && !active, let feedVC = feedViewController {
-            feedVC.deactivate()
+        // 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()
         }
     }
 

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/ios-arm64/ShortKitSDK.framework/Info.plist

@@ -11,9 +11,9 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleVersion</key>
-    <string>0.2.26</string>
+    <string>0.2.28</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.26</string>
+    <string>0.2.28</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>