honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ivy): remove code duplication in native nodes manipulation (#27925)

Browse Source 
PR Close #27925
This commit is contained in:
Pawel Kozlowski 2019-01-04 12:08:04 +01:00 committed by Kara Erickson
parent 3ac249b2ab
commit d80c32310a
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/src/render3/node_manipulation.ts
View File

@ -202,13 +202,9 @@ function executeNodeAction(
action: WalkTNodeTreeAction, renderer: Renderer3, parent: RElement | null, action: WalkTNodeTreeAction, renderer: Renderer3, parent: RElement | null,
node: RComment | RElement | RText, beforeNode?: RNode | null) { node: RComment | RElement | RText, beforeNode?: RNode | null) {
if (action === WalkTNodeTreeAction.Insert) { if (action === WalkTNodeTreeAction.Insert) {
isProceduralRenderer(renderer !) ? nativeInsertBefore(renderer, parent !, node, beforeNode || null);
(renderer as ProceduralRenderer3).insertBefore(parent !, node, beforeNode as RNode | null) :
parent !.insertBefore(node, beforeNode as RNode | null, true);
} else if (action === WalkTNodeTreeAction.Detach) { } else if (action === WalkTNodeTreeAction.Detach) {
isProceduralRenderer(renderer !) ? nativeRemoveChild(renderer, parent !, node);
(renderer as ProceduralRenderer3).removeChild(parent !, node) :
parent !.removeChild(node);
} else if (action === WalkTNodeTreeAction.Destroy) { } else if (action === WalkTNodeTreeAction.Destroy) {
ngDevMode && ngDevMode.rendererDestroyNode++; ngDevMode && ngDevMode.rendererDestroyNode++;
(renderer as ProceduralRenderer3).destroyNode !(node); (renderer as ProceduralRenderer3).destroyNode !(node);
@ -633,6 +629,14 @@ export function nativeInsertBefore(
} }
} }
/**
* Removes a native child node from a given native parent node.
*/
export function nativeRemoveChild(renderer: Renderer3, parent: RElement, child: RNode): void {
isProceduralRenderer(renderer) ? renderer.removeChild(parent as RElement, child) :
parent !.removeChild(child);
}
/** /**
* Returns a native parent of a given native node. * Returns a native parent of a given native node.
*/ */
@ -721,9 +725,7 @@ export function removeChild(childTNode: TNode, childEl: RNode | null, currentVie
// We only remove the element if not in View or not projected. // We only remove the element if not in View or not projected.
if (childEl !== null && canInsertNativeNode(childTNode, currentView)) { if (childEl !== null && canInsertNativeNode(childTNode, currentView)) {
const parentNative = getParentNative(childTNode, currentView) !as RElement; const parentNative = getParentNative(childTNode, currentView) !as RElement;
const renderer = currentView[RENDERER]; nativeRemoveChild(currentView[RENDERER], parentNative, childEl);
isProceduralRenderer(renderer) ? renderer.removeChild(parentNative as RElement, childEl) :
parentNative !.removeChild(childEl);
return true; return true;
} }
return false; return false;

2
packages/core/test/bundling/hello_world/bundle.golden_symbols.json
View File

@ -258,7 +258,7 @@
"name": "getDirectiveDef" "name": "getDirectiveDef"
}, },
{ {
"name": "getFirstParentNative" "name": "getFirstNonICUParent"
}, },
{ {
"name": "getHighestElementContainer" "name": "getHighestElementContainer"

5
packages/core/test/bundling/todo/bundle.golden_symbols.json
View File

@ -675,7 +675,7 @@
"name": "getElementDepthCount" "name": "getElementDepthCount"
}, },
{ {
"name": "getFirstParentNative" "name": "getFirstNonICUParent"
}, },
{ {
"name": "getFirstTemplatePass" "name": "getFirstTemplatePass"
@ -1004,6 +1004,9 @@
{ {
"name": "nativeParentNode" "name": "nativeParentNode"
}, },
{
"name": "nativeRemoveChild"
},
{ {
"name": "nextContext" "name": "nextContext"
}, },