@shortkitsdk/react-native 0.2.12 → 0.2.15

package/ios/ShortKitBridge.swift

@@ -17,6 +17,15 @@ import ShortKitSDK
     private var shortKit: ShortKit?
     private var cancellables = Set<AnyCancellable>()
     private weak var delegate: ShortKitBridgeDelegateProtocol?
+    private var lastProgressEmitTime: CFTimeInterval = 0
+
+    // Time update coalescing (250ms, matching overlay timer interval)
+    private var cachedTime: (current: Double, duration: Double, buffered: Double) = (0, 0, 0)
+    private var timeCoalesceTimer: Timer?
+    private var timeDirty = false
+
+    // Scroll phase coalescing — only emit .dragging on first touch
+    private var lastEmittedScrollPhase: String = "settled"
 
     /// Surface presenter for creating RCTFabricSurface instances in overlay hosts.
     /// Set from ShortKitModule.mm via setSurfacePresenter: (called by RCTInstance).
@@ -116,12 +125,15 @@ import ShortKitSDK
         }
 
         subscribeToPublishers(sdk.player)
+        startTimeCoalescing()
         sdk.delegate = self
     }
 
     // MARK: - Teardown
 
     @objc public func teardown() {
+        timeCoalesceTimer?.invalidate()
+        timeCoalesceTimer = nil
         cancellables.removeAll()
         preloadHandles.removeAll()
         feedRegistry.removeAll()
@@ -376,24 +388,27 @@ import ShortKitSDK
             }
             .store(in: &cancellables)
 
-        // Current item
+        // Current item — deferred to next run-loop tick so emission doesn't
+        // contend with Core Animation's commit phase during swipe settle.
         player.currentItem
             .receive(on: DispatchQueue.main)
             .sink { [weak self] item in
                 guard let item else { return }
-                self?.emit("onCurrentItemChanged", body: Self.contentItemDict(item))
+                let body = Self.contentItemDict(item)
+                DispatchQueue.main.async {
+                    self?.emit("onCurrentItemChanged", body: body)
+                }
             }
             .store(in: &cancellables)
 
-        // Time updates
+        // Time updates — coalesced at 250ms (4 events/sec) to avoid flooding
+        // the JS bridge. Matches the overlay timer interval in ReactOverlayHost.
         player.time
             .receive(on: DispatchQueue.main)
             .sink { [weak self] time in
-                self?.emit("onTimeUpdate", body: [
-                    "current": time.current,
-                    "duration": time.duration,
-                    "buffered": time.buffered
-                ])
+                guard let self else { return }
+                self.cachedTime = (time.current, time.duration, time.buffered)
+                self.timeDirty = true
             }
             .store(in: &cancellables)
 
@@ -458,7 +473,8 @@ import ShortKitSDK
             }
             .store(in: &cancellables)
 
-        // Feed transition
+        // Feed transition — deferred to next run-loop tick so emission doesn't
+        // contend with Core Animation's commit phase during swipe settle.
         player.feedTransition
             .receive(on: DispatchQueue.main)
             .sink { [weak self] event in
@@ -473,24 +489,35 @@ import ShortKitSDK
                 if let to = event.to {
                     body["toItem"] = self.serializeContentItemToJSON(to)
                 }
-                self.emit("onFeedTransition", body: body)
+                DispatchQueue.main.async { [weak self] in
+                    self?.emit("onFeedTransition", body: body)
+                }
             }
             .store(in: &cancellables)
 
-        // Feed scroll phase
+        // Feed scroll phase — coalesced: only emit .dragging on first touch
+        // (transition from settled), drop intermediate .dragging events. Always
+        // emit .settled. Deferred to next run-loop tick to avoid contending with
+        // Core Animation's commit phase.
         player.feedScrollPhase
             .receive(on: DispatchQueue.main)
             .sink { [weak self] phase in
+                guard let self else { return }
                 switch phase {
                 case .dragging(let fromId):
-                    self?.emit("onFeedScrollPhase", body: [
-                        "phase": "dragging",
-                        "fromId": fromId
-                    ])
+                    // Only emit on transition from settled → dragging
+                    guard self.lastEmittedScrollPhase != "dragging" else { return }
+                    self.lastEmittedScrollPhase = "dragging"
+                    let body: [String: Any] = ["phase": "dragging", "fromId": fromId]
+                    DispatchQueue.main.async { [weak self] in
+                        self?.emit("onFeedScrollPhase", body: body)
+                    }
                 case .settled:
-                    self?.emit("onFeedScrollPhase", body: [
-                        "phase": "settled"
-                    ])
+                    self.lastEmittedScrollPhase = "settled"
+                    let body: [String: Any] = ["phase": "settled"]
+                    DispatchQueue.main.async { [weak self] in
+                        self?.emit("onFeedScrollPhase", body: body)
+                    }
                 }
             }
             .store(in: &cancellables)
@@ -536,6 +563,21 @@ import ShortKitSDK
         }
     }
 
+    // MARK: - Time Coalescing
+
+    private func startTimeCoalescing() {
+        timeCoalesceTimer?.invalidate()
+        timeCoalesceTimer = Timer.scheduledTimer(withTimeInterval: 0.25, repeats: true) { [weak self] _ in
+            guard let self, self.timeDirty else { return }
+            self.timeDirty = false
+            self.emit("onTimeUpdate", body: [
+                "current": self.cachedTime.current,
+                "duration": self.cachedTime.duration,
+                "buffered": self.cachedTime.buffered
+            ])
+        }
+    }
+
     // MARK: - Content Item Serialization
 
     /// Serialize a ContentItem to a JSON string for bridge transport.
@@ -651,22 +693,27 @@ 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
 
+        let pullToRefreshEnabled = obj["pullToRefreshEnabled"] as? Bool ?? true
+
         return FeedConfig(
             feedHeight: feedHeight,
             scrollAxis: scrollAxis,
             videoOverlay: videoOverlay,
             carouselOverlay: carouselOverlay,
+            videoCarouselOverlay: videoCarouselOverlay,
             surveyOverlay: .none,
             adOverlay: .none,
             muteOnStart: muteOnStart,
             autoplay: autoplay,
             feedSource: feedSource,
+            pullToRefreshEnabled: pullToRefreshEnabled,
             filter: filter
         )
     }
@@ -740,6 +787,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 {
@@ -800,6 +880,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
             }
@@ -828,8 +915,23 @@ extension ShortKitBridge: ShortKitDelegate {
         ])
     }
 
-    public func shortKitDidRequestRefresh(_ shortKit: ShortKit) {
-        emitOnMain("onRefreshRequested", body: [:])
+    public func shortKit(_ shortKit: ShortKit, didChangeRefreshState state: ShortKitRefreshState) {
+        let body: [String: Any]
+        switch state {
+        case .idle:
+            body = ["status": "idle", "progress": 0.0]
+        case .pulling(let progress):
+            // Throttle pulling events to max 1 per 16ms to avoid bridge saturation
+            let now = CACurrentMediaTime()
+            guard now - lastProgressEmitTime >= 0.016 else { return }
+            lastProgressEmitTime = now
+            body = ["status": "pulling", "progress": progress]
+        case .triggered:
+            body = ["status": "triggered", "progress": 0.0]
+        case .refreshing:
+            body = ["status": "refreshing", "progress": 0.0]
+        }
+        emitOnMain("onRefreshStateChanged", body: body)
     }
 
     public func shortKit(_ shortKit: ShortKit, didFetchContentItems items: [ContentItem]) {

package/ios/ShortKitModule.mm

@@ -72,7 +72,7 @@ RCT_EXPORT_MODULE(ShortKitModule)
     @"onContentTapped",
     @"onDismiss",
     @"onFeedReady",
-    @"onRefreshRequested",
+    @"onRefreshStateChanged",
     @"onDidFetchContentItems",
     @"onOverlayActiveChanged",
     @"onOverlayPlayerStateChanged",
@@ -83,6 +83,8 @@ RCT_EXPORT_MODULE(ShortKitModule)
     @"onOverlayFeedScrollPhaseChanged",
     @"onOverlayTimeUpdate",
     @"onOverlayFullState",
+    @"onCarouselActiveImageChanged",
+    @"onVideoCarouselActiveVideoChanged",
   ];
 }
 
@@ -106,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);
   }
@@ -263,9 +264,18 @@ RCT_EXPORT_METHOD(preloadFeed:(NSString *)configJSON
                   itemsJSON:(NSString *)itemsJSON
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  [_shortKitBridge preloadFeed:configJSON itemsJSON:itemsJSON completion:^(NSString *uuid) {
-    resolve(uuid);
-  }];
+  if (_shortKitBridge) {
+    [_shortKitBridge preloadFeed:configJSON itemsJSON:itemsJSON completion:^(NSString *uuid) {
+      resolve(uuid);
+    }];
+  } else {
+    if (!_pendingBridgeOps) _pendingBridgeOps = [NSMutableArray new];
+    [_pendingBridgeOps addObject:^{
+      [self->_shortKitBridge preloadFeed:configJSON itemsJSON:itemsJSON completion:^(NSString *uuid) {
+        resolve(uuid);
+      }];
+    }];
+  }
 }
 
 // MARK: - Storyboard / Seek Thumbnails

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,22 +17,23 @@
 			</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_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>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Headers/ShortKitSDK-Swift.h

@@ -360,6 +360,7 @@ SWIFT_CLASS("_TtC11ShortKitSDK26ShortKitFeedViewController")
 - (void)scrollViewWillBeginDragging:(UIScrollView * _Nonnull)scrollView;
 - (void)scrollViewDidEndDecelerating:(UIScrollView * _Nonnull)scrollView;
 - (void)scrollViewDidEndDragging:(UIScrollView * _Nonnull)scrollView willDecelerate:(BOOL)decelerate;
+- (void)scrollViewDidScrollToTop:(UIScrollView * _Nonnull)scrollView;
 - (void)scrollViewDidScroll:(UIScrollView * _Nonnull)scrollView;
 @end
 

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Info.plist

@@ -11,6 +11,10 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleVersion</key>
-    <string>1</string>
+    <string>0.2.15</string>
+    <key>CFBundleShortVersionString</key>
+    <string>0.2.15</string>
+    <key>MinimumOSVersion</key>
+    <string>16.0</string>
 </dict>
 </plist>