Skip to content

Fix iOS player view controller containment #4908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sorinc03 wants to merge 1 commit into
base: support/6.x.x
Choose a base branch
from
+7 −1
Open

Fix iOS player view controller containment #4908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ios/Video/RCTVideo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,8 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
if let playerViewController = _playerViewController {
if _controls {
// prevents crash https://github.com/TheWidlarzGroup/react-native-video/issues/3040
self._playerViewController?.removeFromParent()
playerViewController.willMove(toParent: nil)
playerViewController.removeFromParent()
}

viewController.present(playerViewController, animated: true, completion: { [weak self] in
Expand Down Expand Up @@ -1190,6 +1191,9 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
_playerViewController.view.topAnchor.constraint(equalTo: self.topAnchor),
_playerViewController.view.bottomAnchor.constraint(equalTo: self.bottomAnchor),
])
if let viewController {
_playerViewController.didMove(toParent: viewController)
}
}

_playerObserver.playerViewController = _playerViewController
Expand Down Expand Up @@ -1256,6 +1260,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
}
} else {
DispatchQueue.main.async {
self._playerViewController?.willMove(toParent: nil)
self._playerViewController?.view.removeFromSuperview()
self._playerViewController?.removeFromParent()
self._playerViewController = nil
Expand Down Expand Up @@ -1455,6 +1460,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
self.removePlayerLayer()

if let _playerViewController {
_playerViewController.willMove(toParent: nil)
_playerViewController.view.removeFromSuperview()
_playerViewController.removeFromParent()
_playerViewController.rctDelegate = nil
Expand Down
Loading