@shortkitsdk/react-native 0.2.45 → 0.2.47

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

@@ -69,6 +69,10 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
         layout(left, top, right, bottom)
     }
 
+    /** Tracks the deferred measureAndLayoutSurfaceView post from configure() so it can be
+     *  cancelled in onDetachedFromWindow before the stale dimensions are applied. */
+    private var configureLayoutRunnable: Runnable? = null
+
     /**
      * Fabric may suppress layout propagation to native child views inside
      * the SDK's RecyclerView cells. Override to force a manual layout pass.
@@ -238,7 +242,13 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
             }
             ShortKitBridge.shared?.emitEvent("onOverlayItemChanged", params)
         }
-        // Pre-size the surface view
+        // Pre-size the surface view. Deferred to avoid calling sv.measure() synchronously
+        // during RecyclerView.onBindViewHolder — which can trigger Fabric to dispatch pending
+        // mount items (e.g. react-native-screens activityState updates) that commit fragment
+        // transactions re-entrantly, detaching the RecyclerView mid-layout and crashing with
+        // "Tmp detached view should be removed from RecyclerView before it can be recycled".
+        // Safe to defer: createSurfaceIfNeeded() already pre-sizes new surfaces, and onLayout
+        // re-pushes correct dimensions during the same layout pass for recycled ones.
         val parentView = parent as? android.view.View
         val w = if (width > 0) width
                 else if (parentView != null && parentView.width > 0) parentView.width
@@ -246,7 +256,10 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
         val h = if (height > 0) height
                 else if (parentView != null && parentView.height > 0) parentView.height
                 else context.resources.displayMetrics.heightPixels
-        measureAndLayoutSurfaceView(w, h)
+        configureLayoutRunnable?.let { layoutHandler.removeCallbacks(it) }
+        val r = Runnable { measureAndLayoutSurfaceView(w, h) }
+        configureLayoutRunnable = r
+        layoutHandler.post(r)
     }
 
     override fun activatePlayback() {
@@ -300,6 +313,8 @@ class ReactOverlayHost(context: Context) : FrameLayout(context), FeedOverlay {
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        configureLayoutRunnable?.let { layoutHandler.removeCallbacks(it) }
+        configureLayoutRunnable = null
         layoutHandler.removeCallbacks(layoutRunnable)
         // Cancel flow subscriptions to avoid emitting events for off-screen cells.
         // Do NOT stop the surface — keep JS alive so subscriptions persist across

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

@@ -428,10 +428,8 @@ class ShortKitBridge(
                         "video" -> {
                             val playbackId = obj.optString("playbackId", null) ?: continue
                             val fallbackUrl = obj.optString("fallbackUrl", null)
-                            val itemId = obj.optString("id", null)
-                            val nativePlaybackId =
-                                if (!itemId.isNullOrBlank() && !fallbackUrl.isNullOrBlank()) itemId else playbackId
-                            result.add(FeedInput.Video(nativePlaybackId, fallbackUrl))
+                            val contentId = obj.optString("id", null).takeIf { !it.isNullOrBlank() }
+                            result.add(FeedInput.Video(playbackId, fallbackUrl, contentId))
                         }
                         "imageCarousel" -> {
                             val itemObj = obj.optJSONObject("item") ?: continue

package/ios/ShortKitBridge.swift

@@ -1111,7 +1111,8 @@ import ShortKitSDK
                 guard let playbackId = obj["playbackId"] as? String else { continue }
                 let origin = (obj["origin"] as? String).flatMap { ContentOrigin(rawValue: $0) } ?? .other
                 let fallbackUrl = obj["fallbackUrl"] as? String
-                result.append(.video(playbackId: playbackId, origin: origin, fallbackUrl: fallbackUrl))
+                let contentId = obj["id"] as? String
+                result.append(.video(playbackId: playbackId, origin: origin, fallbackUrl: fallbackUrl, contentId: contentId))
             case "imageCarousel":
                 guard let itemData = obj["item"],
                       let itemJSON = try? JSONSerialization.data(withJSONObject: itemData),
@@ -1210,6 +1211,78 @@ extension ShortKitBridge {
     }
 }
 
+// MARK: - Push Navigation
+
+extension ShortKitBridge {
+    /// Push a host-registered RN component onto the feed modal's
+    /// UINavigationController with a native parallax animation. Finds the
+    /// topmost presented UINavigationController via the UIKit presentation
+    /// chain — works for both mask and standard feed expansions. Silently
+    /// no-ops if no nav controller is currently presented (e.g. called when
+    /// no feed modal is on screen).
+    @objc public func pushFeedScreen(_ componentName: String, propsJSON: String) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self,
+                  let navController = Self.topmostNavigationController(),
+                  let presenter = self.surfacePresenter else { return }
+
+            let props: [String: Any]
+            if let data = propsJSON.data(using: .utf8),
+               let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
+                props = obj
+            } else {
+                props = [:]
+            }
+
+            let pushVC = ShortKitPushHostViewController(
+                moduleName: componentName,
+                initialProps: props,
+                surfacePresenter: presenter
+            )
+            navController.pushViewController(pushVC, animated: true)
+        }
+    }
+
+    /// Pop the topmost pushed screen from its navigation stack.
+    ///
+    /// Drills to the topmost *view controller* (not the nav controller itself)
+    /// and calls popViewController on its navigationController. This is more
+    /// robust than calling popViewController on the topmost nav controller
+    /// directly: if a system sheet or other modal is presented on top of the
+    /// pushed screen, that sheet's nav controller (nil) is used instead of
+    /// the push host's nav controller, making the pop a safe no-op rather
+    /// than popping from the wrong stack.
+    @objc public func popFeedScreen() {
+        DispatchQueue.main.async {
+            Self.topmostViewController()?.navigationController?.popViewController(animated: true)
+        }
+    }
+
+    /// Walk the UIViewController presentation chain to find the topmost
+    /// UINavigationController. Used by pushFeedScreen. Called on the main queue.
+    private static func topmostNavigationController() -> UINavigationController? {
+        guard let vc = topmostViewController() else { return nil }
+        if let nav = vc as? UINavigationController { return nav }
+        return vc.navigationController
+    }
+
+    /// Walk the UIViewController presentation chain to its end, then drill
+    /// into a UINavigationController's topViewController if present.
+    private static func topmostViewController() -> UIViewController? {
+        guard let windowScene = UIApplication.shared.connectedScenes
+            .first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
+              let window = windowScene.windows.first(where: { $0.isKeyWindow }) else {
+            return nil
+        }
+        var vc: UIViewController? = window.rootViewController
+        while let presented = vc?.presentedViewController {
+            vc = presented
+        }
+        if let nav = vc as? UINavigationController { return nav.topViewController }
+        return vc
+    }
+}
+
 // MARK: - ShortKitDownloadDelegate
 
 extension ShortKitBridge: ShortKitDownloadDelegate {

package/ios/ShortKitModule.mm

@@ -387,6 +387,16 @@ RCT_EXPORT_METHOD(cancelDownload) {
   [_shortKitBridge cancelDownload];
 }
 
+// MARK: - Push Navigation
+
+RCT_EXPORT_METHOD(pushFeedScreen:(NSString *)componentName propsJSON:(NSString *)propsJSON) {
+  [_shortKitBridge pushFeedScreen:componentName propsJSON:propsJSON];
+}
+
+RCT_EXPORT_METHOD(popFeedScreen) {
+  [_shortKitBridge popFeedScreen];
+}
+
 // MARK: - New Architecture (TurboModule)
 
 #ifdef RCT_NEW_ARCH_ENABLED

package/ios/ShortKitPushHostViewController.swift

@@ -0,0 +1,59 @@
+import UIKit
+
+/// Full-screen UIViewController that hosts an RCTFabricSurface rendering a
+/// host-registered RN component. Pushed onto the feed modal's
+/// UINavigationController by `ShortKitBridge.pushFeedScreen(componentName:propsJSON:)`
+/// to give a native parallax-push animation from within the expanded feed.
+final class ShortKitPushHostViewController: UIViewController {
+
+    private let moduleName: String
+    private let initialProps: [String: Any]
+    private let surfacePresenter: AnyObject
+    private var surface: SKFabricSurfaceWrapper?
+    private var lastLayoutSize: CGSize = .zero
+
+    init(moduleName: String, initialProps: [String: Any], surfacePresenter: AnyObject) {
+        self.moduleName = moduleName
+        self.initialProps = initialProps
+        self.surfacePresenter = surfacePresenter
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) { fatalError() }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .black
+
+        guard let surf = SKFabricSurfaceWrapper(
+            presenter: surfacePresenter,
+            moduleName: moduleName,
+            initialProperties: initialProps
+        ) else { return }
+        surf.start()
+
+        let surfaceView = surf.view
+        surfaceView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(surfaceView)
+        NSLayoutConstraint.activate([
+            surfaceView.topAnchor.constraint(equalTo: view.topAnchor),
+            surfaceView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            surfaceView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            surfaceView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+        self.surface = surf
+    }
+
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        let size = view.bounds.size
+        guard size.width > 0, size.height > 0, size != lastLayoutSize else { return }
+        lastLayoutSize = size
+        surface?.setMinimumSize(size)
+    }
+
+    deinit {
+        surface?.stop()
+    }
+}

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.45</string>
+    <string>0.2.47</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.45</string>
+    <string>0.2.47</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>