Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Mobile - Disable FastImage on Android (#43322)
  • Loading branch information
Gerardo Pacheco committed Aug 25, 2022
commit f41577eb8ebc854e62b8f1fa9c8a200321935839
39 changes: 9 additions & 30 deletions packages/components/src/mobile/image/index.native.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
/**
* External dependencies
*/
import {
Image as RNImage,
Text,
View,
useWindowDimensions,
} from 'react-native';
import { Image as RNImage, Text, View } from 'react-native';
import FastImage from 'react-native-fast-image';

/**
Expand All @@ -16,7 +11,7 @@ import { __ } from '@wordpress/i18n';
import { Icon } from '@wordpress/components';
import { image as icon } from '@wordpress/icons';
import { usePreferredColorSchemeStyle } from '@wordpress/compose';
import { useEffect, useState, useRef, Platform } from '@wordpress/element';
import { useEffect, useState, Platform } from '@wordpress/element';

/**
* Internal dependencies
Expand Down Expand Up @@ -59,14 +54,14 @@ const ImageComponent = ( {
} ) => {
const [ imageData, setImageData ] = useState( null );
const [ containerSize, setContainerSize ] = useState( null );
const [ shouldUseFallback, setShouldUseFallback ] = useState( false );
const { height: windowHeight, width: windowWidth } = useWindowDimensions();
const isLandscape = useRef( windowWidth > windowHeight );

const Image = ! shouldUseFastImage ? RNImage : FastImage;
const imageResizeMode = ! shouldUseFastImage
? resizeMode
: FastImage.resizeMode[ resizeMode ];
// Disabled for Android due to https://github.com/WordPress/gutenberg/issues/43149
const Image =
! shouldUseFastImage || Platform.isAndroid ? RNImage : FastImage;
const imageResizeMode =
! shouldUseFastImage || Platform.isAndroid
? resizeMode
: FastImage.resizeMode[ resizeMode ];

useEffect( () => {
let isCurrent = true;
Expand All @@ -89,21 +84,6 @@ const ImageComponent = ( {
return () => ( isCurrent = false );
}, [ url ] );

// Workaround for Android where changing the orientation breaks FastImage
// for now if there's any orientation changes, it will use the fallback
// prop to use the default Image component.
// https://github.com/WordPress/gutenberg/issues/42869
useEffect( () => {
if ( Platform.isAndroid && shouldUseFastImage ) {
const isCurrentOrientationLandscape = windowWidth > windowHeight;

if ( isLandscape.current !== isCurrentOrientationLandscape ) {
setShouldUseFallback( true );
isLandscape.current = isCurrentOrientationLandscape;
}
}
}, [ windowHeight, windowWidth ] );

const onContainerLayout = ( event ) => {
const { height, width } = event.nativeEvent.layout;

Expand Down Expand Up @@ -250,7 +230,6 @@ const ImageComponent = ( {
resizeMethod: 'scale',
} ) }
resizeMode={ imageResizeMode }
fallback={ shouldUseFallback }
/>
</View>
) }
Expand Down