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

chore: cleanup

Browse Source
This commit is contained in:
Nathan Walker
2020-07-06 14:34:21 -07:00
parent 6336eac4b5
commit dfeaa84c2c
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nativescript-core/ui/core/properties/index.ts
View File

@@ -822,7 +822,6 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
public _valueConverter?: (value: string) => any;
constructor(options: CssAnimationPropertyOptions<T, U>) {
const { valueConverter, equalityComparer, valueChanged, defaultValue } = options;
const propertyName = options.name;
this.name = propertyName;
@@ -847,7 +846,7 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
const defaultValueKey = Symbol(defaultName);
this.defaultValueKey = defaultValueKey;
this.defaultValue = defaultValue;
this.defaultValue = options.defaultValue;
const cssValue = Symbol(cssName);
const styleValue = Symbol(`local:${propertyName}`);
@@ -904,8 +903,8 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
}
}
} else {
if (valueConverter && typeof boxedValue === 'string') {
boxedValue = valueConverter(boxedValue);
if (options.valueConverter && typeof boxedValue === 'string') {
boxedValue = options.valueConverter(boxedValue);
}
this[symbol] = boxedValue;
if (this[computedSource] <= propertySource) {
@@ -918,10 +917,10 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
const source = this[computedSource];
const isSet = source !== ValueSource.Default;
const computedValueChanged = oldValue !== value && (!equalityComparer || !equalityComparer(oldValue, value));
const computedValueChanged = oldValue !== value && (!options.equalityComparer || !options.equalityComparer(oldValue, value));
if (computedValueChanged && valueChanged) {
valueChanged(this, oldValue, value);
if (computedValueChanged && options.valueChanged) {
options.valueChanged(this, oldValue, value);
}
if (view[setNative] && (computedValueChanged || isSet !== wasSet)) {
@@ -932,14 +931,14 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
} else {
if (isSet) {
if (!wasSet && !(defaultValueKey in this)) {
this[defaultValueKey] = view[getDefault] ? view[getDefault]() : defaultValue;
this[defaultValueKey] = view[getDefault] ? view[getDefault]() : options.defaultValue;
}
view[setNative](value);
} else if (wasSet) {
if (defaultValueKey in this) {
view[setNative](this[defaultValueKey]);
} else {
view[setNative](defaultValue);
view[setNative](options.defaultValue);
}
}
}

2
nativescript-core/ui/styling/style-properties.d.ts vendored
View File

@@ -1,4 +1,4 @@
import { TransformFunctionsInfo } from '../animation/animation';
import { TransformFunctionsInfo } from '../animation';
import { Color } from '../../color';
import { CssProperty, CssAnimationProperty, ShorthandProperty, InheritedCssProperty } from '../core/properties';
import { Style } from '../styling/style';