javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ListView items' dom-nodes are disposed before remove (#4369)

Browse Source 
* FIX: ListView items' dom nodes are disposed before remove

* Extend property black list

* More attribute changed checks
This commit is contained in:
Alexander Vakrilov
2017-06-13 16:37:23 +03:00
committed by GitHub
parent c62e79e17b
commit 114b969986
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tns-core-modules/debugger/dom-node.ts
View File

@ -18,14 +18,19 @@ const propertyBlacklist = [
"effectiveBorderBottomWidth",
"effectiveBorderLeftWidth",
"effectiveMinWidth",
"effectiveMinHeight",
"nodeName",
"nodeType",
"decodeWidth",
"decodeHeight"
]
"decodeHeight",
"ng-reflect-items",
"domNode",
"touchListenerIsSet",
"bindingContext"
];
function notifyInspector(callback: (inspector: Inspector) => void) {
const ins = (<any>global).__inspector
const ins = (<any>global).__inspector;
if (ins) {
callback(ins);
}
@ -35,9 +40,9 @@ function valueToString(value: any): string {
if (typeof value === "undefined" || value === null) {
return "";
} else if (value instanceof Color) {
return value.toString()
} else if (typeof value === "object") {
return PercentLength.convertToString(value)
return value.toString();
} else if (typeof value === "object" && value.unit) {
return PercentLength.convertToString(value);
} else {
return value + "";
}
@ -76,7 +81,7 @@ export class DOMNode {
nodeType;
nodeName;
localName;
nodeValue = '';
nodeValue = "";
attributes: string[] = [];
viewRef: WeakRef<ViewBase>;
@ -89,7 +94,7 @@ export class DOMNode {
// Load all attributes
this.loadAttributes();
registerNode(this);
}
@ -121,7 +126,6 @@ export class DOMNode {
onChildAdded(childView: ViewBase): void {
notifyInspector((ins) => {
const view = this.viewRef.get();
childView.ensureDomNode();
let previousChild: ViewBase;
view.eachChild((child) => {
@ -135,19 +139,22 @@ export class DOMNode {
});
const index = !!previousChild ? previousChild._domId : 0;
childView.ensureDomNode();
ins.childNodeInserted(this.nodeId, index, childView.domNode.toJSON());
});
}
onChildRemoved(view: ViewBase): void {
notifyInspector((ins) => {
ins.childNodeRemoved(this.nodeId, view.domNode.nodeId);
ins.childNodeRemoved(this.nodeId, view._domId);
});
}
attributeModified(name: string, value: any) {
notifyInspector((ins) => {
ins.attributeModified(this.nodeId, name, valueToString(value));
if (propertyBlacklist.indexOf(name) < 0) {
ins.attributeModified(this.nodeId, name, valueToString(value));
}
});
}
@ -193,5 +200,5 @@ export class DOMNode {
children: this.children.map(c => c.toObject()),
attributes: this.attributes
};
};
}
}