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

[RNMobile] VideoPress Android WebView #30521

Merged
merged 15 commits into from
May 11, 2023
Merged

[RNMobile] VideoPress Android WebView #30521

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
88e2fad
Update player status when WebView loads
jhnstn May 2, 2023
a60efbc
add changelog
jhnstn May 2, 2023
5480046
Update changelog
jhnstn May 4, 2023
6bf0717
Merge branch 'trunk' into rnmobile/update/loading-screen-android
jhnstn May 4, 2023
aa70933
Update native player overlay
jhnstn May 6, 2023
64fc514
Merge branch 'trunk' into rnmobile/update/loading-screen-android
jhnstn May 8, 2023
4521510
Update changelog
jhnstn May 8, 2023
4092ee4
Merge branch 'rnmobile/update/loading-screen-android' into videopress…
jhnstn May 8, 2023
5132913
Merge branch 'trunk' into videopress/rnmobile/android-webview
jhnstn May 9, 2023
ee64831
Add changelog
jhnstn May 9, 2023
8132d5d
Move styles to external file
jhnstn May 9, 2023
77ad820
Use attribute title
jhnstn May 9, 2023
8b3f071
Fix nitpicks
jhnstn May 10, 2023
a891a7e
Merge branch 'trunk' into videopress/rnmobile/android-webview
jhnstn May 10, 2023
5c41993
Fix double import
jhnstn May 10, 2023
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 projects/packages/videopress/changelog/videopress-rnmobile-android-webview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Use native embed WebView for the VideoPress editor preview on Android
26 changes: 22 additions & 4 deletions ...ackages/videopress/src/client/block-editor/blocks/video/components/player/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import { store as coreStore } from '@wordpress/core-data';
import { useDispatch } from '@wordpress/data';
import { useState, useEffect, useRef, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import { requestEmbedFullscreenPreview } from '@wordpress/react-native-bridge';
/**
* External dependencies
*/
import { View, Text, Platform } from 'react-native';
import { View, Text, Platform, Pressable } from 'react-native';
/**
* Internal dependencies
*/
Expand All @@ -22,7 +23,7 @@ import style from './style.scss';

const VIDEO_PREVIEW_ATTEMPTS_LIMIT = 10;
const DEFAULT_PLAYER_ASPECT_RATIO = 16 / 9; // This is the observed default aspect ratio from VideoPress embeds.

const IS_ANDROID = Platform.OS === 'android';
fluiddot marked this conversation as resolved.
Show resolved Hide resolved
/**
* VideoPlayer react component
*
Expand All @@ -43,6 +44,7 @@ export default function Player( { isSelected, attributes } ) {
seekbarColor,
seekbarLoadingColor,
seekbarPlayedColor,
title,
} = attributes;

const iconStyle = style[ 'videopress-player__loading-icon' ];
Expand Down Expand Up @@ -130,7 +132,7 @@ export default function Player( { isSelected, attributes } ) {
// Android does not receive a 'videopress_ready' event,
// so we need to set the player as ready when the WebView loads.
const onLoadEnd = useCallback( () => {
Platform.OS === 'android' && setIsPlayerReady( true );
IS_ANDROID && setIsPlayerReady( true );
}, [] );

const loadingOverlay = (
Expand All @@ -144,14 +146,30 @@ export default function Player( { isSelected, attributes } ) {
</View>
);

let overlay = ! isSelected && <View style={ style[ 'videopress-player__overlay' ] } />;

// On Android render an overlay to send the embed markup to a native WebView.
if ( isSelected && IS_ANDROID ) {
overlay = (
<View style={ style[ 'videopress-player__overlay' ] }>
<Pressable
style={ style[ 'videopress-player__open-embed-button' ] }
onPress={ () => {
requestEmbedFullscreenPreview( html, title );
} }
/>
Comment on lines +155 to +160
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following some of the issues we spotted when testing (wordpress-mobile/gutenberg-mobile#5758), I'm wondering if we should limit opening the WebView until the video reaches a ready state. Maybe we could wait until the player is ready and loaded to enable this button, WDYT?

I was also thinking if we could get the HTML from the WebView we display within the editor to pass it to the new WebView, but seems this data is not exposed by the react-native-webview library.

In any case, since the companion PRs to this one have been merged, I'll go ahead and merge it as-is. Hence, potential improvements to this approach would need a separate PR.

</View>
);
}

// Show the loading overlay when:
// 1. Player is not ready
// 2. Player is loaded but preview is not ready
const showLoadingOverlay = ! isPlayerReady || ( isPlayerLoaded && ! isPreviewReady );

return (
<View style={ [ style[ 'videopress-player' ], { aspectRatio } ] }>
{ ! isSelected && <View style={ style[ 'videopress-player__overlay' ] } /> }
{ overlay }
{ showLoadingOverlay && loadingOverlay }
{ html && (
<SandBox
Expand Down
5 changes: 5 additions & 0 deletions ...kages/videopress/src/client/block-editor/blocks/video/components/player/style.native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
z-index: 1;
}

.videopress-player__open-embed-button {
width: 100%;
height: 100%;
fluiddot marked this conversation as resolved.
Show resolved Hide resolved
}

.videopress-player__loading {
display: flex;
justify-content: space-evenly;
Expand Down