Set onFullscreenToggled listener for Android

Author: arelra

dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomPlayer.tsx

@@ -97,28 +97,57 @@ const fullscreenStyles = (id: string) => css`
 `;
 
 /**
- * We set the external_fullscreen configuration property depending on
- * whether the native layer needs to delegate fullscreen styling to
- * the webview.
+ * We set the external_fullscreen configuration property to
+ * control whether the YouTube player enables it's default
+ * fullscreen behaviour.
  *
- * This is true for Android but not for iOS which handles fullscreen
- * natively. The Bridget method setFullscreen returns a value to
- * indicate this requirement. We use it here by passing a value of
- * false for fullscreen when intialising the player to determine
- * the value we need to pass for external_fullscreen.
+ * On Android webviews, the YouTube player does not implement
+ * fullscreen so we need to set external_fullscreen to true and
+ * apply custom styling to mimic fullscreen behaviour.
  *
- * external_fullscreen is allowed listed on our CODE and PROD domains.
+ * The Bridget method setFullscreen returns a boolean value
+ * to indicate if the YouTubeAtom should apply fullscreen
+ * styling itself.
+ *
+ * This will return true for Android but not for iOS which
+ * handles fullscreen natively.
+ *
+ * By invoking setFullscreen(false) when intialising the player
+ * and checking the return value we can determine if the player
+ * requires the external_fullscreen configuration to be set.
+ *
+ * external_fullscreen is allow-listed by YouTube
+ * on only our CODE and PROD domains.
  */
 const setAppsConfiguration = async (
 	basePlayerConfiguration: YouTubePlayerArgs,
 	renderingTarget: RenderingTarget,
-) => {
+	videoId: string,
+	setIsFullscreen: (value: React.SetStateAction<boolean>) => void,
+): Promise<YouTubePlayerArgs> => {
 	if (renderingTarget === 'Apps') {
 		const requiresWebFullscreen =
 			await getVideoClient().setFullscreen(false);
 		const updatedConfiguration = {
 			...basePlayerConfiguration,
-			external_fullscreen: requiresWebFullscreen ? 1 : 0,
+			youtubeOptions: {
+				...basePlayerConfiguration.youtubeOptions,
+				playerVars: {
+					...basePlayerConfiguration.youtubeOptions.playerVars,
+					external_fullscreen: requiresWebFullscreen ? 1 : 0,
+					fs: 1,
+				},
+				events: {
+					...basePlayerConfiguration.youtubeOptions.events,
+					onFullscreenToggled: () => {
+						log('dotcom', {
+							from: 'YoutubeAtomPlayer fullscreen toggled',
+							videoId,
+						});
+						setIsFullscreen((prev) => !prev);
+					},
+				},
+			},
 		};
 		return updatedConfiguration;
 	}
@@ -514,28 +543,22 @@ export const YoutubeAtomPlayer = ({
 						},
 						events: {
 							onStateChange: onStateChangeListener,
-							onFullscreenToggled: () => {
-								if (renderingTarget === 'Apps') {
-									log('dotcom', {
-										from: 'YoutubeAtomPlayer fullscreen',
-										videoId,
-									});
-									setIsFullscreen((prev) => !prev);
-								}
-							},
 						},
 					},
 					onReadyListener,
 					enableIma: enableAds,
 				};
 
-				const basePlayerConfigurationWithApps = setAppsConfiguration(
-					basePlayerConfiguration,
-					renderingTarget,
-				);
+				const basePlayerConfigurationWithAppsPromise =
+					setAppsConfiguration(
+						basePlayerConfiguration,
+						renderingTarget,
+						videoId,
+						setIsFullscreen,
+					);
 
 				void Promise.allSettled([
-					basePlayerConfigurationWithApps,
+					basePlayerConfigurationWithAppsPromise,
 					isSignedIn(),
 				]).then(([playerConfigurationResult, isSignedInResult]) => {
 					const playerConfiguration =

dotcom-rendering/src/components/YoutubeAtom/YoutubePlayer.ts

@@ -131,10 +131,14 @@ class YouTubePlayer {
 								onReady: onReadyListener,
 								onStateChange:
 									youtubeOptions.events?.onStateChange,
-								onFullscreenToggled:
-									youtubeOptions.events?.onFullscreenToggled,
 							},
 						});
+						if (youtubeOptions.events?.onFullscreenToggled) {
+							this.player.addEventListener(
+								'onFullscreenToggled',
+								youtubeOptions.events.onFullscreenToggled,
+							);
+						}
 						resolve({ player: this.player });
 					}
 				} catch (e) {