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

fix(core): type collisions with namespace (#8809)

Browse Source
This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/ui/animation/animation-interfaces.ts
View File

@@ -1,6 +1,6 @@
// Types
import { View } from '../core/view';
import { PercentLength } from '../styling/style-properties';
import { PercentLengthType } from '../styling/style-properties';
import { Color } from '../../color';
export type Transformation = {
@@ -53,8 +53,8 @@ export interface AnimationDefinition {
backgroundColor?: Color;
translate?: Pair;
scale?: Pair;
height?: PercentLength | string;
width?: PercentLength | string;
height?: PercentLengthType | string;
width?: PercentLengthType | string;
rotate?: number;
duration?: number;
delay?: number;

6
packages/core/ui/animation/index.d.ts vendored
View File

@@ -1,6 +1,6 @@
import { View } from '../core/view';
import { Color } from '../../color';
import { PercentLength } from '../styling/style-properties';
import { PercentLengthType } from '../styling/style-properties';
export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
@@ -36,12 +36,12 @@ export interface AnimationDefinition {
/**
* Animates the height of a view.
*/
height?: PercentLength | string;
height?: PercentLengthType | string;
/**
* Animates the width of a view.
*/
width?: PercentLength | string;
width?: PercentLengthType | string;
/**
* Animates the rotate affine transform of the view. Value should be a number specifying the rotation amount in degrees.

10
packages/core/ui/animation/keyframe-animation.ts
View File

@@ -1,14 +1,14 @@
import { View } from '../core/view';
import { Color } from '../../color';
import { AnimationCurve } from '../enums';
import { Enums } from '../enums';
import { Trace } from '../../trace';
// Types.
import { unsetValue } from '../core/properties';
import { Animation } from '.';
import { backgroundColorProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, rotateProperty, opacityProperty, rotateXProperty, rotateYProperty, widthProperty, heightProperty, PercentLength } from '../styling/style-properties';
import { backgroundColorProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, rotateProperty, opacityProperty, rotateXProperty, rotateYProperty, widthProperty, heightProperty, PercentLength, PercentLengthType } from '../styling/style-properties';
export class Keyframes {
name: string;
@@ -28,7 +28,7 @@ export class KeyframeDeclaration {
export class KeyframeInfo {
public duration: number;
public declarations: Array<KeyframeDeclaration>;
public curve?: any = AnimationCurve.ease;
public curve?: any = Enums.AnimationCurve.ease;
}
export class KeyframeAnimationInfo {
@@ -48,8 +48,8 @@ interface Keyframe {
translate?: { x: number; y: number };
rotate?: { x: number; y: number; z: number };
opacity?: number;
width?: PercentLength;
height?: PercentLength;
width?: PercentLengthType;
height?: PercentLengthType;
valueSource?: 'keyframe' | 'animation';
duration?: number;
curve?: any;