[RN] aspect-ratio: preserve mode when width === height

If the view gets resized to a 1:1 aspect ratio, remember the previous mode to
avoid flickering when going back to a larger size or different aspect ratio.
This commit is contained in:
Saúl Ibarra Corretgé 2018-01-31 17:35:40 +01:00 committed by Lyubo Marinov
parent 083f6b400b
commit b4d44f367d
1 changed files with 19 additions and 5 deletions

View File

@ -3,6 +3,8 @@
import { SET_ASPECT_RATIO } from './actionTypes'; import { SET_ASPECT_RATIO } from './actionTypes';
import { ASPECT_RATIO_NARROW, ASPECT_RATIO_WIDE } from './constants'; import { ASPECT_RATIO_NARROW, ASPECT_RATIO_WIDE } from './constants';
import type { Dispatch } from 'redux';
/** /**
* Sets the aspect ratio of the app's user interface based on specific width and * Sets the aspect ratio of the app's user interface based on specific width and
* height. * height.
@ -10,13 +12,25 @@ import { ASPECT_RATIO_NARROW, ASPECT_RATIO_WIDE } from './constants';
* @param {number} width - The width of the app's user interface. * @param {number} width - The width of the app's user interface.
* @param {number} height - The height of the app's user interface. * @param {number} height - The height of the app's user interface.
* @returns {{ * @returns {{
* type: SET_ASPECT_RATIO, * type: SET_ASPECT_RATIO,
* aspectRatio: Symbol * aspectRatio: Symbol
* }} * }}
*/ */
export function setAspectRatio(width: number, height: number): Object { export function setAspectRatio(width: number, height: number): Object {
return { return (dispatch: Dispatch<*>, getState: Function) => {
type: SET_ASPECT_RATIO, // Don't change the aspect ratio if width and height are the same, that
aspectRatio: width < height ? ASPECT_RATIO_NARROW : ASPECT_RATIO_WIDE // is, if we transition to a 1:1 aspect ratio.
if (width !== height) {
const aspectRatio
= width < height ? ASPECT_RATIO_NARROW : ASPECT_RATIO_WIDE;
if (aspectRatio
!== getState()['features/base/aspect-ratio'].aspectRatio) {
return dispatch({
type: SET_ASPECT_RATIO,
aspectRatio
});
}
}
}; };
} }