Removed JS fullscreening for Android (#2013)
This commit is contained in:
50
Video.js
50
Video.js
@@ -1,6 +1,6 @@
|
||||
import React, { Component } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image, Platform, UIManager, findNodeHandle, Dimensions } from 'react-native';
|
||||
import { StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image, Platform, findNodeHandle } from 'react-native';
|
||||
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
|
||||
import TextTrackType from './TextTrackType';
|
||||
import FilterType from './FilterType';
|
||||
@@ -21,34 +21,7 @@ export default class Video extends Component {
|
||||
|
||||
this.state = {
|
||||
showPoster: !!props.poster,
|
||||
androidFullScreen: false,
|
||||
videoContainerLayout_x: 0,
|
||||
videoContainerLayout_y: 0,
|
||||
};
|
||||
this.getDimension();
|
||||
}
|
||||
|
||||
/**
|
||||
* @description this is will set the width and height needs to be considered for full screen
|
||||
*/
|
||||
getDimension() {
|
||||
if (Dimensions.get('window').width < Dimensions.get('window').height) {
|
||||
this.width = Math.round(Dimensions.get('window').height);
|
||||
this.height = Math.round(Dimensions.get('window').width);
|
||||
}
|
||||
else {
|
||||
this.width = Math.round(Dimensions.get('window').width);
|
||||
this.height = Math.round(Dimensions.get('window').height);
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
UIManager.measure(findNodeHandle(this._videoContainer), (x, y) => {
|
||||
this.setState({
|
||||
videoContainerLayout_x: x,
|
||||
videoContainerLayout_y: y,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
setNativeProps(nativeProps) {
|
||||
@@ -172,7 +145,6 @@ export default class Video extends Component {
|
||||
};
|
||||
|
||||
_onFullscreenPlayerWillPresent = (event) => {
|
||||
Platform.OS === 'android' && this.setState({ androidFullScreen: true });
|
||||
if (this.props.onFullscreenPlayerWillPresent) {
|
||||
this.props.onFullscreenPlayerWillPresent(event.nativeEvent);
|
||||
}
|
||||
@@ -185,7 +157,6 @@ export default class Video extends Component {
|
||||
};
|
||||
|
||||
_onFullscreenPlayerWillDismiss = (event) => {
|
||||
Platform.OS === 'android' && this.setState({ androidFullScreen: false });
|
||||
if (this.props.onFullscreenPlayerWillDismiss) {
|
||||
this.props.onFullscreenPlayerWillDismiss(event.nativeEvent);
|
||||
}
|
||||
@@ -342,25 +313,8 @@ export default class Video extends Component {
|
||||
resizeMode: this.props.posterResizeMode || 'contain',
|
||||
};
|
||||
|
||||
//androidFullScreen property will only impact on android. It will be always false for iOS.
|
||||
const videoStyle = this.state.androidFullScreen ? {
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
width: this.width,
|
||||
height: this.height,
|
||||
backgroundColor: '#ffffff',
|
||||
justifyContent: 'center',
|
||||
zIndex: 99999,
|
||||
marginTop: -1 * (this.state.videoContainerLayout_y ? parseFloat(this.state.videoContainerLayout_y) : 0), //margin: 0 - is not working properly. So, updated all the margin individually with 0.
|
||||
marginLeft: -1 * (this.state.videoContainerLayout_x ? parseFloat(this.state.videoContainerLayout_x) : 0),
|
||||
} : {};
|
||||
|
||||
return (
|
||||
<View ref={(videoContainer) => {
|
||||
this._videoContainer = videoContainer;
|
||||
return videoContainer;
|
||||
}} style={[nativeProps.style, videoStyle]}>
|
||||
<View style={nativeProps.style}>
|
||||
<RCTVideo
|
||||
ref={this._assignRoot}
|
||||
{...nativeProps}
|
||||
|
Reference in New Issue
Block a user