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 event listener conflicts #412

Merged
merged 6 commits into from
Mar 21, 2024
Merged

Fix event listener conflicts #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2bbbdb
fix(event conflicts): fix event conflicts for iOS and tvOS
rolandkakonyi Mar 18, 2024
3273b6d
fix(event conflicts): fix event listeners mapping for iOS and tvOS
123mpozzi Mar 19, 2024
7885863
Rename prefixes to start with `on`
123mpozzi Mar 19, 2024
b1561a0
Fix events conflict on Android
123mpozzi Mar 19, 2024
c10b031
[skip ci] Add changelog entry
123mpozzi Mar 19, 2024
8fe5a24
Update CHANGELOG entry to be less specific
123mpozzi Mar 21, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- `CueEnterEvent` and `CueExitEvent` to signal when a subtitle entry transitions into an active or inactive status respectively

### Fixed

- Fix potential event name conflicts with other 3rd party libraries

## [0.18.0] (2024-03-06)

### Changed
Expand Down
122 changes: 61 additions & 61 deletions android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,67 +68,67 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
* be accessed from React.
*/
private val bubblingEventsMapping: Map<String, String> = mapOf(
"event" to "onEvent",
"playerError" to "onPlayerError",
"playerWarning" to "onPlayerWarning",
"destroy" to "onDestroy",
"muted" to "onMuted",
"unmuted" to "onUnmuted",
"ready" to "onReady",
"paused" to "onPaused",
"play" to "onPlay",
"playing" to "onPlaying",
"playbackFinished" to "onPlaybackFinished",
"seek" to "onSeek",
"seeked" to "onSeeked",
"timeShift" to "onTimeShift",
"timeShifted" to "onTimeShifted",
"stallStarted" to "onStallStarted",
"stallEnded" to "onStallEnded",
"timeChanged" to "onTimeChanged",
"sourceLoad" to "onSourceLoad",
"sourceLoaded" to "onSourceLoaded",
"sourceUnloaded" to "onSourceUnloaded",
"sourceError" to "onSourceError",
"sourceWarning" to "onSourceWarning",
"audioAdded" to "onAudioAdded",
"audioChanged" to "onAudioChanged",
"audioRemoved" to "onAudioRemoved",
"subtitleAdded" to "onSubtitleAdded",
"subtitleChanged" to "onSubtitleChanged",
"subtitleRemoved" to "onSubtitleRemoved",
"downloadFinished" to "onDownloadFinished",
"videoDownloadQualityChanged" to "onVideoDownloadQualityChanged",
"pictureInPictureAvailabilityChanged" to "onPictureInPictureAvailabilityChanged",
"pictureInPictureEnter" to "onPictureInPictureEnter",
"pictureInPictureExit" to "onPictureInPictureExit",
"adBreakFinished" to "onAdBreakFinished",
"adBreakStarted" to "onAdBreakStarted",
"adClicked" to "onAdClicked",
"adError" to "onAdError",
"adFinished" to "onAdFinished",
"adManifestLoad" to "onAdManifestLoad",
"adManifestLoaded" to "onAdManifestLoaded",
"adQuartile" to "onAdQuartile",
"adScheduled" to "onAdScheduled",
"adSkipped" to "onAdSkipped",
"adStarted" to "onAdStarted",
"videoPlaybackQualityChanged" to "onVideoPlaybackQualityChanged",
"fullscreenEnabled" to "onFullscreenEnabled",
"fullscreenDisabled" to "onFullscreenDisabled",
"fullscreenEnter" to "onFullscreenEnter",
"fullscreenExit" to "onFullscreenExit",
"castStart" to "onCastStart",
"castPlaybackFinished" to "onCastPlaybackFinished",
"castPaused" to "onCastPaused",
"castPlaying" to "onCastPlaying",
"castStarted" to "onCastStarted",
"castAvailable" to "onCastAvailable",
"castStopped" to "onCastStopped",
"castWaitingForDevice" to "onCastWaitingForDevice",
"castTimeUpdated" to "onCastTimeUpdated",
"cueEnter" to "onCueEnter",
"cueExit" to "onCueExit",
"event" to "onBmpEvent",
"playerError" to "onBmpPlayerError",
"playerWarning" to "onBmpPlayerWarning",
"destroy" to "onBmpDestroy",
"muted" to "onBmpMuted",
"unmuted" to "onBmpUnmuted",
"ready" to "onBmpReady",
"paused" to "onBmpPaused",
"play" to "onBmpPlay",
"playing" to "onBmpPlaying",
"playbackFinished" to "onBmpPlaybackFinished",
"seek" to "onBmpSeek",
"seeked" to "onBmpSeeked",
"timeShift" to "onBmpTimeShift",
"timeShifted" to "onBmpTimeShifted",
"stallStarted" to "onBmpStallStarted",
"stallEnded" to "onBmpStallEnded",
"timeChanged" to "onBmpTimeChanged",
"sourceLoad" to "onBmpSourceLoad",
"sourceLoaded" to "onBmpSourceLoaded",
"sourceUnloaded" to "onBmpSourceUnloaded",
"sourceError" to "onBmpSourceError",
"sourceWarning" to "onBmpSourceWarning",
"audioAdded" to "onBmpAudioAdded",
"audioChanged" to "onBmpAudioChanged",
"audioRemoved" to "onBmpAudioRemoved",
"subtitleAdded" to "onBmpSubtitleAdded",
"subtitleChanged" to "onBmpSubtitleChanged",
"subtitleRemoved" to "onBmpSubtitleRemoved",
"downloadFinished" to "onBmpDownloadFinished",
"videoDownloadQualityChanged" to "onBmpVideoDownloadQualityChanged",
"pictureInPictureAvailabilityChanged" to "onBmpPictureInPictureAvailabilityChanged",
"pictureInPictureEnter" to "onBmpPictureInPictureEnter",
"pictureInPictureExit" to "onBmpPictureInPictureExit",
"adBreakFinished" to "onBmpAdBreakFinished",
"adBreakStarted" to "onBmpAdBreakStarted",
"adClicked" to "onBmpAdClicked",
"adError" to "onBmpAdError",
"adFinished" to "onBmpAdFinished",
"adManifestLoad" to "onBmpAdManifestLoad",
"adManifestLoaded" to "onBmpAdManifestLoaded",
"adQuartile" to "onBmpAdQuartile",
"adScheduled" to "onBmpAdScheduled",
"adSkipped" to "onBmpAdSkipped",
"adStarted" to "onBmpAdStarted",
"videoPlaybackQualityChanged" to "onBmpVideoPlaybackQualityChanged",
"fullscreenEnabled" to "onBmpFullscreenEnabled",
"fullscreenDisabled" to "onBmpFullscreenDisabled",
"fullscreenEnter" to "onBmpFullscreenEnter",
"fullscreenExit" to "onBmpFullscreenExit",
"castStart" to "onBmpCastStart",
"castPlaybackFinished" to "onBmpCastPlaybackFinished",
"castPaused" to "onBmpCastPaused",
"castPlaying" to "onBmpCastPlaying",
"castStarted" to "onBmpCastStarted",
"castAvailable" to "onBmpCastAvailable",
"castStopped" to "onBmpCastStopped",
"castWaitingForDevice" to "onBmpCastWaitingForDevice",
"castTimeUpdated" to "onBmpCastTimeUpdated",
"cueEnter" to "onBmpCueEnter",
"cueExit" to "onBmpCueExit",
)

/**
Expand Down
Loading
Loading