javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(root-layout): check type for translate and scale values (#10288)

Browse Source
This commit is contained in:
Shiva Prasad
2023-05-11 14:14:52 +12:00
committed by GitHub
parent 204e876866
commit 874f6b6e65
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/ui/layouts/root-layout/root-layout-common.ts
View File

@ -5,6 +5,7 @@ import { GridLayout } from '../grid-layout';
import { RootLayout, RootLayoutOptions, ShadeCoverOptions, TransitionAnimation } from '.'; import { RootLayout, RootLayoutOptions, ShadeCoverOptions, TransitionAnimation } from '.';
import { Animation } from '../../animation'; import { Animation } from '../../animation';
import { AnimationDefinition } from '../../animation'; import { AnimationDefinition } from '../../animation';
import { isNumber } from '../../../utils/types';
@CSSType('RootLayout') @CSSType('RootLayout')
export class RootLayoutBase extends GridLayout { export class RootLayoutBase extends GridLayout {
@ -382,8 +383,8 @@ export class RootLayoutBase extends GridLayout {
target: targetView, target: targetView,
...defaultTransitionAnimation, ...defaultTransitionAnimation,
...(exitTo || {}), ...(exitTo || {}),
translate: { x: exitTo.translateX || defaultTransitionAnimation.translateX, y: exitTo.translateY || defaultTransitionAnimation.translateY }, translate: { x: isNumber(exitTo.translateX) ? exitTo.translateX : defaultTransitionAnimation.translateX, y: isNumber(exitTo.translateY) ? exitTo.translateY : defaultTransitionAnimation.translateY },
scale: { x: exitTo.scaleX || defaultTransitionAnimation.scaleX, y: exitTo.scaleY || defaultTransitionAnimation.scaleY }, scale: { x: isNumber(exitTo.scaleX) ? exitTo.scaleX : defaultTransitionAnimation.scaleX, y: isNumber(exitTo.scaleY) ? exitTo.scaleY : defaultTransitionAnimation.scaleY },
}; };
} }