react-native-firework-sdk 2.7.0 → 2.7.2-beta.1

package/FireworkVideoUI.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>FireworkVideoUI.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>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FireworkVideoUI.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/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/_CodeSignature/CodeResources

@@ -14,7 +14,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		xSys4PQnG8lKSIv1Abhys20ti8o=
+		sp8HZ2jIRptrAIYXFhCi1ECJ82M=
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>

package/ios/FireworkVideoUI/Podfile

@@ -6,7 +6,7 @@ target 'FireworkVideoUI' do
   use_frameworks!
 
   # Pods for FireworkVideoUI
-  pod 'FireworkVideo', '1.13.0'
+  pod 'FireworkVideo', '1.14.0'
 
   target 'FireworkVideoUITests' do
     # Pods for testing

package/ios/FireworkVideoUI/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - FireworkVideo (1.13.0)
+  - FireworkVideo (1.14.0)
 
 DEPENDENCIES:
-  - FireworkVideo (= 1.13.0)
+  - FireworkVideo (= 1.14.0)
 
 SPEC REPOS:
   trunk:
     - FireworkVideo
 
 SPEC CHECKSUMS:
-  FireworkVideo: 97ef1b615991fe967bd3ed6a7380a250fb02f403
+  FireworkVideo: c8af446a350e2486e86c0a789ecfd4a57ce6facc
 
-PODFILE CHECKSUM: c22dec34b8972d810f5d4e1c0347d4da880ffd0f
+PODFILE CHECKSUM: 880bd5c72a5a81b620b803189a6ec208e8481116
 
 COCOAPODS: 1.12.1

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -8,6 +8,20 @@
 import UIKit
 import FireworkVideo
 
+private class RCTRootViewPlaceholder: UIView {
+    weak var reactViewController: UIViewController?
+}
+
+private struct RCTRootViewResult {
+    weak var viewController: UIViewController?
+    weak var view: RCTRootView?
+}
+
+private struct RCTRootViewPlaceholderResult {
+    weak var viewController: UIViewController?
+    weak var view: RCTRootViewPlaceholder?
+}
+
 private struct PlayerExitButtonInfo {
     enum ExitButtonType: Int {
         case close, floating
@@ -162,8 +176,10 @@ class FWNavigatorModule: RCTEventEmitter {
         let containerViewController = FWRNPresentContainerViewController()
         containerViewController.modalPresentationStyle = .fullScreen
 
-        guard let window = UIApplication.shared.delegate?.window as? UIWindow,
-              let rootView = window.rootViewController?.view as? RCTRootView else {
+        guard let rootVC = RCTKeyWindow()?.rootViewController,
+              let rootViewResult = FWNavigatorModule.findRCTRootViewResult(rootVC),
+              let rootViewVC = rootViewResult.viewController,
+              let rootView = rootViewResult.view else {
             resolver(false)
             return
         }
@@ -176,10 +192,17 @@ class FWNavigatorModule: RCTEventEmitter {
             containerViewController.addChild(detachedController)
             detachedController.didMove(toParent: containerViewController)
         }
+
         rootView.removeFromSuperview()
-        window.rootViewController?.view = UIView()
+        let placeholderView = RCTRootViewPlaceholder()
+        rootViewVC.view = placeholderView
         containerViewController.rootView = rootView
         presentedVC.present(containerViewController, animated: true) {
+            if rootView.reactViewController() != containerViewController {
+                // Save previous reactViewController
+                placeholderView.reactViewController = rootView.reactViewController()
+                rootView.setReactViewController(containerViewController)
+            }
             resolver(true)
         }
     }
@@ -191,22 +214,30 @@ class FWNavigatorModule: RCTEventEmitter {
         if let containerVC = RCTPresentedViewController() as? FWRNPresentContainerViewController,
            let rootView = containerVC.rootView,
            containerVC.presentingViewController != nil {
-            guard let window = UIApplication.shared.delegate?.window as? UIWindow,
-                  let rootViewController = window.rootViewController else {
+            guard let rootVC = RCTKeyWindow()?.rootViewController,
+                  let rootViewPlaceholderResult = FWNavigatorModule.findRCTRootViewPlaceholderResult(rootVC),
+                  let rootViewPlaceholderVC = rootViewPlaceholderResult.viewController,
+                  let rootViewPlaceholder = rootViewPlaceholderResult.view else {
                 resolver(false)
                 return
             }
+
             let childViewControllers = rootView.reactViewController()?.children
             containerVC.dismiss(animated: true) {
                 childViewControllers?.forEach { (childViewController) in
                     let detachedController = childViewController
                     detachedController.willMove(toParent: nil)
                     detachedController.removeFromParent()
-                    rootViewController.addChild(detachedController)
-                    detachedController.didMove(toParent: rootViewController)
+                    rootViewPlaceholderVC.addChild(detachedController)
+                    detachedController.didMove(toParent: rootViewPlaceholderVC)
                 }
                 rootView.removeFromSuperview()
-                rootViewController.view = rootView
+                rootViewPlaceholderVC.view = rootView
+
+                if let reactViewController = rootViewPlaceholder.reactViewController {
+                    // Restore previous reactViewController
+                    rootView.setReactViewController(reactViewController)
+                }
                 resolver(true)
             }
         } else {
@@ -272,6 +303,36 @@ extension FWNavigatorModule {
 
         return isIOSSDKViewController(controller.parent)
     }
+
+    private static func findRCTRootViewResult(_ viewController: UIViewController) -> RCTRootViewResult? {
+        if let rootView = viewController.view as? RCTRootView {
+            return RCTRootViewResult(viewController: viewController, view: rootView)
+        }
+
+        for childVC in viewController.children {
+            if let result = findRCTRootViewResult(childVC) {
+                return result
+            }
+        }
+
+        return nil
+    }
+
+    private static func findRCTRootViewPlaceholderResult(
+        _ viewController: UIViewController
+    ) -> RCTRootViewPlaceholderResult? {
+        if let rootViewPlaceholder = viewController.view as? RCTRootViewPlaceholder {
+            return RCTRootViewPlaceholderResult(viewController: viewController, view: rootViewPlaceholder)
+        }
+
+        for childVC in viewController.children {
+            if let result = findRCTRootViewPlaceholderResult(childVC) {
+                return result
+            }
+        }
+
+        return nil
+    }
 }
 
 extension FWNavigatorModule {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firework-sdk",
-  "version": "2.7.0",
+  "version": "2.7.2-beta.1",
   "description": "Firework React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-firework-sdk.podspec

@@ -35,5 +35,5 @@ fi
 
   s.static_framework = true
   s.dependency 'React-Core'
-  s.dependency 'FireworkVideo', '1.13.0'
+  s.dependency 'FireworkVideo', '1.14.0'
 end