javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

dependency-observable changes (#2584)

Browse Source 
* Improved es6.d.ts
Small perf improvement in resetValues

* Fix tslint errors

* Removed all comments from es6.d.ts (TSLint hell)
This commit is contained in:
Hristo Hristov
2016-08-15 15:14:03 +03:00
committed by GitHub
parent ddc351f78c
commit fc0048c4a1
5 changed files with 68 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tns-core-modules/es6.d.ts vendored
View File

@ -1,9 +1,20 @@
declare var Symbol: any;
interface Symbol {
toString(): string;
valueOf(): Object;
}
interface SymbolConstructor {
prototype: Symbol;
(description?: string | number): symbol;
}
declare var Symbol: SymbolConstructor;
interface ObjectConstructor {
assign(target: any, ...sources: any[]): any;
is(value1: any, value2: any): boolean;
setPrototypeOf(o: any, proto: any): any;
getOwnPropertySymbols(o: any): symbol[];
}
declare var Object: ObjectConstructor;

1
tns-core-modules/ui/core/dependency-observable.d.ts vendored
View File

@ -243,6 +243,7 @@ declare module "ui/core/dependency-observable" {
/**
* Iterates all the properties which have a PropertyEntry registered for this instance.
*/
_resetValues(valueSource: number): void;
_eachSetProperty(callback: (property: Property) => boolean): void;
_eachSetPropertyValue(callback: (property: Property, value: any) => void): void;
//@endprivate

103
tns-core-modules/ui/core/dependency-observable.ts
View File

@ -77,40 +77,23 @@ export class PropertyMetadata implements definition.PropertyMetadata {
}
}
// function property(property: Property): PropertyDecorator {
// function _getValue() {
// return this._getValue(property);
// }
// function _setValue(value: any) {
// this._setValueInternal(property, value, ValueSource.Local);
// }
// return (target: Object, propertyKey: string) => {
// Object.defineProperty(target, propertyKey, {
// get: _getValue,
// set: _setValue,
// enumerable: true,
// configurable: true
// });
// };
// }
export class Property implements definition.Property {
public key: string;
public id: number;
public defaultValue;
public onValidateValue;
public equalityComparer;
public inheritable;
public affectsStyle;
public affectsLayout;
public onValueChanged: definition.PropertyChangedCallback;
public nameEvent: string;
public onValidateValue;
public onValueChanged: definition.PropertyChangedCallback;
constructor(public name: string, public ownerType: string, public metadata: PropertyMetadata, public valueConverter?: (value: string) => any) {
// register key
this.key = generatePropertyKey(name, ownerType, true);
if (propertyFromKey[this.key]) {
throw new Error("Property " + name + " already registered for type " + ownerType + ".");
}
@ -150,7 +133,6 @@ export class PropertyEntry implements definition.PropertyEntry {
public visualStateValue: any;
constructor(public property: Property) {
this.property = property;
}
public resetValue() {
@ -159,8 +141,6 @@ export class PropertyEntry implements definition.PropertyEntry {
}
}
var defaultValueForPropertyPerType: Map<string, any> = new Map<string, any>();
export class DependencyObservable extends Observable implements definition.DependencyObservable {
private _propertyEntries = {};
@ -206,17 +186,15 @@ export class DependencyObservable extends Observable implements definition.Depen
}
private _getDefaultValue(property: Property): any {
if (property.defaultValueGetter) { // we check for cached properties only for these which have 'defaultValueGetter' defined;
if (property.defaultValueGetter) {
// we check for cached properties only for these which have 'defaultValueGetter' defined;
// When DependencyProperties are removed from Style - fix this check.
var view = (<any>this)._view || this;
let key = types.getClass(view) + "." + property.id;
let defaultValue = defaultValueForPropertyPerType.get(key);
if (!defaultValueForPropertyPerType.has(key) && view._nativeView) {
let defaultValueResult = property.defaultValueGetter(this);
defaultValue = defaultValueResult.result;
if (defaultValueResult.cacheable) {
defaultValueForPropertyPerType.set(key, defaultValue);
}
let defaultValueResult = property.defaultValueGetter(this);
let defaultValue = defaultValueResult.result;
if (defaultValueResult.cacheable) {
let entry = new PropertyEntry(property);
entry.effectiveValue = defaultValue;
this._propertyEntries[property.id] = entry;
}
return defaultValue;
@ -225,13 +203,25 @@ export class DependencyObservable extends Observable implements definition.Depen
return property.defaultValue;
}
public _resetValue(property: Property, source: number = ValueSource.Local) {
public _resetValues(valueSource: number): void {
for (let i = 0, keys = Object.keys(this._propertyEntries); i < keys.length; i++) {
let key = keys[i];
let entry: PropertyEntry = this._propertyEntries[key];
this._resetValueInternal(entry.property, entry, valueSource);
}
}
public _resetValue(property: Property, valueSource: number = ValueSource.Local): void {
let entry: PropertyEntry = this._propertyEntries[property.id];
if (!entry) {
return;
}
switch (source) {
this._resetValueInternal(property, entry, valueSource);
}
private _resetValueInternal(property: Property, entry: PropertyEntry, valueSource: number): void {
switch (valueSource) {
case ValueSource.Inherited:
entry.inheritedValue = undefined;
break;
@ -247,7 +237,7 @@ export class DependencyObservable extends Observable implements definition.Depen
}
let currentValueSource = entry.valueSource;
if (currentValueSource !== source) {
if (currentValueSource !== valueSource) {
// If current valueSource is larget than the one we reset - do nothing.
// We are reseting property will lower priority and it won't change effectValue;
// Reseting larger source means we somehow was able to set value without updating currentValueSource which is clearly a bug.
@ -255,15 +245,15 @@ export class DependencyObservable extends Observable implements definition.Depen
}
let currentValue = entry.effectiveValue;
let newValue = this.getEffectiveValue(currentValueSource, entry, property);
let newValue = this.getEffectiveValueAndUpdateEntry(currentValueSource, entry, property);
if (!property.equalityComparer(currentValue, newValue)) {
// If we fallback to defalutValue - remove propertyEntry.
if (entry.valueSource === ValueSource.Default) {
delete this._propertyEntries[property.id];
}
else {
entry.effectiveValue = newValue;
}
// // If we fallback to defalutValue - remove propertyEntry.
// if (entry.valueSource === ValueSource.Default) {
// delete this._propertyEntries[property.id];
// }
// else {
entry.effectiveValue = newValue;
// }
this._onPropertyChanged(property, currentValue, newValue);
}
@ -314,7 +304,9 @@ export class DependencyObservable extends Observable implements definition.Depen
for (let i = 0, keys = Object.keys(this._propertyEntries); i < keys.length; i++) {
let key = keys[i];
let entry: PropertyEntry = this._propertyEntries[key];
callback(entry.property, entry.effectiveValue);
if (!callback(entry.property, entry.effectiveValue)) {
break;
}
}
}
@ -345,28 +337,25 @@ export class DependencyObservable extends Observable implements definition.Depen
let currentValue;
if (!entry) {
entry = new PropertyEntry(property);
entry.effectiveValue = this._getDefaultValue(property);
this._propertyEntries[property.id] = entry;
currentValue = this._getDefaultValue(property);
// In rare case when we set local value equal to default value we need to update effectiveValue as well.
// Otherwise effectiveValue will stay undefined.
if (property.equalityComparer(currentValue, realValue)) {
entry.effectiveValue = realValue;
}
}
else {
currentValue = entry.effectiveValue;
}
currentValue = entry.effectiveValue;
switch (source) {
case ValueSource.Inherited:
entry.inheritedValue = realValue;
break;
case ValueSource.Css:
entry.cssValue = realValue;
break;
case ValueSource.Local:
entry.localValue = realValue;
break;
case ValueSource.VisualState:
entry.visualStateValue = realValue;
break;
@ -386,7 +375,7 @@ export class DependencyObservable extends Observable implements definition.Depen
}
}
private getEffectiveValue(currentValueSource: number, entry: PropertyEntry, property: Property): any {
private getEffectiveValueAndUpdateEntry(currentValueSource: number, entry: PropertyEntry, property: Property): any {
let newValue: any;
switch (currentValueSource) {
case ValueSource.Inherited:

10
tns-core-modules/ui/core/view-common.ts
View File

@ -1061,10 +1061,14 @@ export class View extends ProxyObject implements definition.View {
view.onUnloaded();
}
view._setValue(ProxyObject.bindingContextProperty, undefined, ValueSource.Inherited);
view._eachSetProperty((property) => {
view.unsetInheritedProperties();
}
public unsetInheritedProperties(): void {
this._setValue(ProxyObject.bindingContextProperty, undefined, ValueSource.Inherited);
this._eachSetProperty((property) => {
if (!(property instanceof styling.Property) && property.inheritable) {
view._resetValue(property, ValueSource.Inherited);
this._resetValue(property, ValueSource.Inherited);
}
return true;
});

23
tns-core-modules/ui/styling/style.ts
View File

@ -891,20 +891,11 @@ export class Style extends DependencyObservable implements styling.Style {
public _resetCssValues() {
this._view._unregisterAllAnimations();
const that = this;
this._eachSetProperty(function (property: Property) {
that._resetValue(property, ValueSource.Css);
return true;
});
this._resetValues(ValueSource.Css);
}
public _resetLocalValues() {
const that = this;
this._eachSetProperty(function (property: Property) {
that._resetValue(property);
return true;
});
this._resetValues(ValueSource.Local);
}
public _inheritStyleProperties(parent: View) {
@ -918,16 +909,6 @@ export class Style extends DependencyObservable implements styling.Style {
});
}
// public _inheritStyleProperty(property: Property, value: any) {
// // let currentParent = this._view.parent;
// // if (currentParent) {
// // let valueSource = currentParent.style._getValueSource(property);
// // if (valueSource > ValueSource.Default) {
// this._setValue(property, value, ValueSource.Inherited);
// // }
// // }
// }
public _onPropertyChanged(property: Property, oldValue: any, newValue: any) {
if (trace.enabled) {
trace.write(