Skip to content
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

fix(ios): don't crash app if view wasn't found #3841

Merged
merged 2 commits into from
May 27, 2024
Merged

fix(ios): don't crash app if view wasn't found #3841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5b22a
fix(ios): don't crash app if view wasn't found
KrzysztofMoch May 26, 2024
525e5b9
lint code
KrzysztofMoch May 26, 2024
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
12 changes: 6 additions & 6 deletions examples/basic/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ PODS:
- React-Mapbuffer (0.74.1):
- glog
- React-debug
- react-native-video (6.0.0):
- react-native-video (6.1.2):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -949,15 +949,15 @@ PODS:
- React-featureflags
- React-graphics
- React-ImageManager
- react-native-video/Video (= 6.0.0)
- react-native-video/Video (= 6.1.2)
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-video/Video (6.0.0):
- react-native-video/Video (6.1.2):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1398,7 +1398,7 @@ SPEC CHECKSUMS:
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
hermes-engine: 16b8530de1b383cdada1476cf52d1b52f0692cbc
RCT-Folly: 045d6ecaa59d826c5736dfba0b2f4083ff8d79df
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: efb313d8126259e9294dc4ee0002f44a6f676aba
RCTRequired: f49ea29cece52aee20db633ae7edc4b271435562
RCTTypeSafety: a11979ff0570d230d74de9f604f7d19692157bc4
Expand All @@ -1422,7 +1422,7 @@ SPEC CHECKSUMS:
React-jsitracing: 3de522f8f794dccd3c54af9160dc992ee65bd494
React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce
React-Mapbuffer: c5844bf3c2206f5475c0fc2340a89b049ea23c97
react-native-video: e0c12a51732b3a6c46baf5f0d26986b34ca286b4
react-native-video: edecf23162492d4f41f96ff167684fc0507ca63a
React-nativeconfig: 21d89c65ca39875fad2c5c465e0e013e514eba21
React-NativeModulesApple: e2e180dae4486b2978fcf3564cc4c8de4b453a68
React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a
Expand Down Expand Up @@ -1452,4 +1452,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: bbe1bd5f521b6b9366288dbaf8af1cec85c0a95a

COCOAPODS: 1.15.2
COCOAPODS: 1.13.0
8 changes: 5 additions & 3 deletions ios/Video/RCTVideoManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ class RCTVideoManager: RCTViewManager {
return
}

guard let view = self.bridge.uiManager.view(forReactTag: reactTag) as? RCTVideo else {
RCTLogError("Invalid view returned from registry, expecting RCTVideo, got: \(String(describing: view))")
let view = self.bridge.uiManager.view(forReactTag: reactTag)

guard let videoView = view as? RCTVideo else {
DebugLog("Invalid view returned from registry, expecting RCTVideo, got: \(String(describing: view))")
callback(nil)
return
}

callback(view)
callback(videoView)
}
}

Expand Down
Loading