@shortkitsdk/react-native 0.2.6 → 0.2.12

package/ios/ShortKitBridge.swift

@@ -18,25 +18,87 @@ import ShortKitSDK
     private var cancellables = Set<AnyCancellable>()
     private weak var delegate: ShortKitBridgeDelegateProtocol?
 
+    /// Surface presenter for creating RCTFabricSurface instances in overlay hosts.
+    /// Set from ShortKitModule.mm via setSurfacePresenter: (called by RCTInstance).
+    public var surfacePresenter: AnyObject?
+
+    /// Called from ShortKitModule when RCTInstance provides the surface presenter.
+    @objc public func updateSurfacePresenter(_ presenter: AnyObject?) {
+        self.surfacePresenter = presenter
+    }
+
+    /// 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 {
+        weak var vc: ShortKitFeedViewController?
+    }
+
+    private var feedRegistry: [String: WeakFeedRef] = [:]
+    private var pendingOps: [String: [(ShortKitFeedViewController) -> Void]] = [:]
+
+    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
+            self?.emit("onRemainingContentCountChanged", body: [
+                "feedId": id,
+                "count": count
+            ])
+        }
+
+        // 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) {
+            DispatchQueue.main.async { [weak vc] in
+                guard let vc = vc else { return }
+                for op in ops {
+                    op(vc)
+                }
+            }
+        }
+    }
+
+    public func unregisterFeed(id: String) {
+        feedRegistry.removeValue(forKey: id)
+        // Note: pendingOps are preserved for this ID to survive detach/reattach cycles
+    }
+
+    private func feedViewController(for id: String) -> ShortKitFeedViewController? {
+        return feedRegistry[id]?.vc
+    }
+
     // MARK: - Init
 
     @objc public init(
         apiKey: String,
-        config configJSON: String,
+        hasLoadingView: Bool,
         clientAppName: String?,
         clientAppVersion: String?,
         customDimensions customDimensionsJSON: String?,
-        delegate: ShortKitBridgeDelegateProtocol
+        delegate: ShortKitBridgeDelegateProtocol,
+        surfacePresenter: AnyObject?
     ) {
         self.delegate = delegate
+        self.surfacePresenter = surfacePresenter
         super.init()
 
-        let feedConfig = Self.parseFeedConfig(configJSON)
         let dimensions = Self.parseCustomDimensions(customDimensionsJSON)
 
         let sdk = ShortKit(
             apiKey: apiKey,
-            config: feedConfig,
             clientAppName: clientAppName,
             clientAppVersion: clientAppVersion,
             customDimensions: dimensions
@@ -45,6 +107,14 @@ import ShortKitSDK
 
         ShortKitBridge.shared = self
 
+        if hasLoadingView {
+            sdk.loadingViewProvider = { [weak self] in
+                let host = ReactLoadingHost()
+                host.surfacePresenter = self?.surfacePresenter
+                return host
+            }
+        }
+
         subscribeToPublishers(sdk.player)
         sdk.delegate = self
     }
@@ -53,6 +123,9 @@ import ShortKitSDK
 
     @objc public func teardown() {
         cancellables.removeAll()
+        preloadHandles.removeAll()
+        feedRegistry.removeAll()
+        pendingOps.removeAll()
         shortKit = nil
         if ShortKitBridge.shared === self {
             ShortKitBridge.shared = nil
@@ -143,17 +216,31 @@ import ShortKitSDK
 
     // MARK: - Custom Feed
 
-    @objc public func setFeedItems(_ json: String) {
+    @objc public func setFeedItems(_ feedId: String, items json: String) {
         guard let items = Self.parseFeedInputs(json) else { return }
-        Task { @MainActor in
-            self.shortKit?.setFeedItems(items)
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            if let vc = self.feedViewController(for: feedId) {
+                vc.setFeedItems(items)
+            } else {
+                self.pendingOps[feedId, default: []].append { vc in
+                    vc.setFeedItems(items)
+                }
+            }
         }
     }
 
-    @objc public func appendFeedItems(_ json: String) {
+    @objc public func appendFeedItems(_ feedId: String, items json: String) {
         guard let items = Self.parseFeedInputs(json) else { return }
-        Task { @MainActor in
-            self.shortKit?.appendFeedItems(items)
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            if let vc = self.feedViewController(for: feedId) {
+                vc.appendFeedItems(items)
+            } else {
+                self.pendingOps[feedId, default: []].append { vc in
+                    vc.appendFeedItems(items)
+                }
+            }
         }
     }
 
@@ -209,14 +296,25 @@ import ShortKitSDK
         }
     }
 
-    @objc public func notifyOverlayReady() {
-        NotificationCenter.default.post(name: .shortKitOverlayReady, object: nil)
+    @objc public func applyFilter(_ feedId: String, filterJSON: String?) {
+        let filter = filterJSON.flatMap { Self.parseFeedFilter($0) }
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            if let vc = self.feedViewController(for: feedId) {
+                vc.applyFilter(filter)
+            } else {
+                self.pendingOps[feedId, default: []].append { vc in
+                    vc.applyFilter(filter)
+                }
+            }
+        }
     }
 
-    @objc public func fetchContent(_ limit: Int, completion: @escaping (String) -> Void) {
+    @objc public func fetchContent(_ limit: Int, filterJSON: String?, completion: @escaping (String) -> Void) {
+        let filter = filterJSON.flatMap { Self.parseFeedFilter($0) }
         Task {
             do {
-                let items = try await self.shortKit?.fetchContent(limit: limit) ?? []
+                let items = try await self.shortKit?.fetchContent(limit: limit, filter: filter) ?? []
                 let data = try JSONEncoder().encode(items)
                 let json = String(data: data, encoding: .utf8) ?? "[]"
                 completion(json)
@@ -226,6 +324,43 @@ import ShortKitSDK
         }
     }
 
+    @objc public func preloadFeed(_ configJSON: String, itemsJSON: String?, completion: @escaping (String) -> Void) {
+        let config = Self.parseFeedConfig(configJSON)
+        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)
+    }
+
+    /// Consume a preload handle by ID. Returns and removes the handle.
+    public func consumePreload(id: String) -> FeedPreload? {
+        return preloadHandles.removeValue(forKey: id)
+    }
+
     // MARK: - Combine Subscriptions
 
     private func subscribeToPublishers(_ player: ShortKitPlayer) {
@@ -382,22 +517,16 @@ import ShortKitSDK
             }
             .store(in: &cancellables)
 
-        // Remaining content count
-        player.remainingContentCount
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] count in
-                self?.emit("onRemainingContentCountChanged", body: ["count": count])
-            }
-            .store(in: &cancellables)
+        // Remaining content count — now handled per-feed via onRemainingContentCountChange callback
     }
 
     // MARK: - Event Emission Helpers
 
-    private func emit(_ name: String, body: [String: Any]) {
+    func emit(_ name: String, body: [String: Any]) {
         delegate?.emitEvent(name, body: body)
     }
 
-    private func emitOnMain(_ name: String, body: [String: Any]) {
+    func emitOnMain(_ name: String, body: [String: Any]) {
         if Thread.isMainThread {
             emit(name, body: body)
         } else {
@@ -407,32 +536,6 @@ import ShortKitSDK
         }
     }
 
-    // MARK: - Overlay Lifecycle Events (called by Fabric view in Task 13)
-
-    /// Emit overlay lifecycle events from the Fabric view's overlay container.
-    public func emitOverlayEvent(_ name: String, item: ContentItem) {
-        emitOnMain(name, body: ["item": serializeContentItemToJSON(item)])
-    }
-
-    /// Emit a raw overlay event with an arbitrary body.
-    public func emitOverlayEvent(_ name: String, body: [String: Any]) {
-        emitOnMain(name, body: body)
-    }
-
-    // MARK: - Carousel Overlay Lifecycle Events
-
-    /// Emit carousel overlay lifecycle events with an ImageCarouselItem.
-    public func emitCarouselOverlayEvent(_ name: String, item: ImageCarouselItem) {
-        guard let data = try? JSONEncoder().encode(item),
-              let json = String(data: data, encoding: .utf8) else { return }
-        emitOnMain(name, body: ["item": json])
-    }
-
-    /// Emit a raw carousel overlay event with an arbitrary body.
-    public func emitCarouselOverlayEvent(_ name: String, body: [String: Any]) {
-        emitOnMain(name, body: body)
-    }
-
     // MARK: - Content Item Serialization
 
     /// Serialize a ContentItem to a JSON string for bridge transport.
@@ -487,6 +590,9 @@ import ShortKitSDK
         if let commentCount = item.commentCount {
             dict["commentCount"] = commentCount
         }
+        if let fallbackUrl = item.fallbackUrl {
+            dict["fallbackUrl"] = fallbackUrl
+        }
 
         return dict
     }
@@ -530,7 +636,7 @@ import ShortKitSDK
     /// {"feedHeight":"{\"type\":\"fullscreen\"}","overlay":"\"none\"",
     ///  "carouselMode":"\"none\"","surveyMode":"\"none\"","muteOnStart":true}
     /// ```
-    private static func parseFeedConfig(_ json: String) -> FeedConfig {
+    public static func parseFeedConfig(_ json: String) -> FeedConfig {
         guard let data = json.data(using: .utf8),
               let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
             return FeedConfig()
@@ -538,6 +644,7 @@ import ShortKitSDK
 
         let feedHeight = parseFeedHeight(obj["feedHeight"] as? String)
         let muteOnStart = obj["muteOnStart"] as? Bool ?? true
+        let autoplay = obj["autoplay"] as? Bool ?? true
         let videoOverlay = parseVideoOverlay(obj["overlay"] as? String)
 
         let feedSourceStr = obj["feedSource"] as? String ?? "algorithmic"
@@ -545,14 +652,22 @@ import ShortKitSDK
 
         let carouselOverlay = parseCarouselOverlay(obj["carouselOverlay"] 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,
             surveyOverlay: .none,
             adOverlay: .none,
             muteOnStart: muteOnStart,
-            feedSource: feedSource
+            autoplay: autoplay,
+            feedSource: feedSource,
+            filter: filter
         )
     }
 
@@ -560,7 +675,7 @@ import ShortKitSDK
     ///
     /// Examples:
     /// - `"\"none\""` → `.none`
-    /// - `"{\"type\":\"custom\"}"` → `.custom { ShortKitOverlayBridge() }`
+    /// - `"{\"type\":\"custom\"}"` → `.custom { ReactOverlayHost() }`
     private static func parseVideoOverlay(_ json: String?) -> VideoOverlayMode {
         guard let json,
               let data = json.data(using: .utf8),
@@ -577,10 +692,13 @@ import ShortKitSDK
         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 overlay = ShortKitOverlayBridge()
-                overlay.bridge = ShortKitBridge.shared
-                return overlay
+                let host = ReactOverlayHost()
+                host.surfacePresenter = ShortKitBridge.shared?.surfacePresenter
+                host.overlayModuleName = "ShortKitOverlay_\(name)"
+                host.bridge = ShortKitBridge.shared
+                return host
             }
         }
 
@@ -591,7 +709,7 @@ import ShortKitSDK
     ///
     /// Examples:
     /// - `"\"none\""` → `.none`
-    /// - `"{\"type\":\"custom\"}"` → `.custom { ShortKitCarouselOverlayBridge() }`
+    /// - `"{\"type\":\"custom\",\"name\":\"news\"}"` → `.custom { ReactCarouselOverlayHost() }`
     private static func parseCarouselOverlay(_ json: String?) -> CarouselOverlayMode {
         guard let json,
               let data = json.data(using: .utf8),
@@ -606,10 +724,16 @@ import ShortKitSDK
         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 overlay = ShortKitCarouselOverlayBridge()
-                overlay.bridge = ShortKitBridge.shared
-                return overlay
+                let host = ReactCarouselOverlayHost()
+                host.surfacePresenter = ShortKitBridge.shared?.surfacePresenter
+                host.bridge = ShortKitBridge.shared
+                host.carouselOverlayModuleName = "ShortKitCarouselOverlay_\(name)"
+                // Eagerly create the RN surface so it's mounted and ready before
+                // the cell scrolls into view, matching video overlay behaviour.
+                host.prepareSurface()
+                return host
             }
         }
 
@@ -637,6 +761,23 @@ import ShortKitSDK
         }
     }
 
+    /// Parse a JSON string of FeedFilter from the JS bridge.
+    private static func parseFeedFilter(_ json: String?) -> FeedFilter? {
+        guard let json,
+              let data = json.data(using: .utf8),
+              let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+            return nil
+        }
+
+        return FeedFilter(
+            tags: obj["tags"] as? [String],
+            section: obj["section"] as? String,
+            author: obj["author"] as? String,
+            contentType: obj["contentType"] as? String,
+            metadata: obj["metadata"] as? [String: String]
+        )
+    }
+
     /// Parse a JSON string of FeedInput[] from the JS bridge.
     private static func parseFeedInputs(_ json: String) -> [FeedInput]? {
         guard let data = json.data(using: .utf8),
@@ -650,7 +791,8 @@ import ShortKitSDK
             switch type {
             case "video":
                 guard let playbackId = obj["playbackId"] as? String else { continue }
-                result.append(.video(playbackId: playbackId))
+                let fallbackUrl = obj["fallbackUrl"] as? String
+                result.append(.video(playbackId: playbackId, fallbackUrl: fallbackUrl))
             case "imageCarousel":
                 guard let itemData = obj["item"],
                       let itemJSON = try? JSONSerialization.data(withJSONObject: itemData),
@@ -685,10 +827,25 @@ extension ShortKitBridge: ShortKitDelegate {
             "index": index
         ])
     }
+
+    public func shortKitDidRequestRefresh(_ shortKit: ShortKit) {
+        emitOnMain("onRefreshRequested", body: [:])
+    }
+
+    public func shortKit(_ shortKit: ShortKit, didFetchContentItems items: [ContentItem]) {
+        Task {
+            let data = try? JSONEncoder().encode(items)
+            let json = data.flatMap { String(data: $0, encoding: .utf8) } ?? "[]"
+            self.emitOnMain("onDidFetchContentItems", body: ["items": json])
+        }
+    }
 }
 
-// MARK: - Notification Names
+// MARK: - Dismiss Emission
 
-extension Notification.Name {
-    static let shortKitOverlayReady = Notification.Name("ShortKitOverlayReady")
+extension ShortKitBridge {
+    @objc public func emitDismiss() {
+        emitOnMain("onDismiss", body: [:])
+    }
 }
+