refactor(core): remove _tViewNode field from ViewRef (#36814)

The _tViewNode field (that was marked as internal) on the ViewRef is not
necessery as a reference to a relevant TView is available as a local
variable.

PR Close #36814
This commit is contained in:
pkozlowski-opensource 2020-04-27 12:03:43 +02:00 committed by Kara Erickson
parent 7a30153aa1
commit ddaa124162
7 changed files with 12 additions and 17 deletions

View File

@ -3,7 +3,7 @@
"master": { "master": {
"uncompressed": { "uncompressed": {
"runtime-es2015": 1485, "runtime-es2015": 1485,
"main-es2015": 143350, "main-es2015": 142812,
"polyfills-es2015": 36657 "polyfills-es2015": 36657
} }
} }
@ -21,7 +21,7 @@
"master": { "master": {
"uncompressed": { "uncompressed": {
"runtime-es2015": 1485, "runtime-es2015": 1485,
"main-es2015": 149471, "main-es2015": 148933,
"polyfills-es2015": 36657 "polyfills-es2015": 36657
} }
} }

View File

@ -26,10 +26,11 @@ import {getComponentDef} from './definition';
import {NodeInjector} from './di'; import {NodeInjector} from './di';
import {assignTViewNodeToLView, createLView, createTView, elementCreate, locateHostElement, renderView} from './instructions/shared'; import {assignTViewNodeToLView, createLView, createTView, elementCreate, locateHostElement, renderView} from './instructions/shared';
import {ComponentDef} from './interfaces/definition'; import {ComponentDef} from './interfaces/definition';
import {TContainerNode, TElementContainerNode, TElementNode, TNode} from './interfaces/node'; import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType} from './interfaces/node';
import {domRendererFactory3, RendererFactory3, RNode} from './interfaces/renderer'; import {domRendererFactory3, RendererFactory3, RNode} from './interfaces/renderer';
import {LView, LViewFlags, TVIEW, TViewType} from './interfaces/view'; import {LView, LViewFlags, TVIEW, TViewType} from './interfaces/view';
import {MATH_ML_NAMESPACE, SVG_NAMESPACE} from './namespaces'; import {MATH_ML_NAMESPACE, SVG_NAMESPACE} from './namespaces';
import {assertNodeOfPossibleTypes} from './node_assert';
import {writeDirectClass} from './node_manipulation'; import {writeDirectClass} from './node_manipulation';
import {extractAttrsAndClassesFromSelector, stringifyCSSSelectorList} from './node_selector_matcher'; import {extractAttrsAndClassesFromSelector, stringifyCSSSelectorList} from './node_selector_matcher';
import {enterView, leaveView} from './state'; import {enterView, leaveView} from './state';
@ -234,7 +235,8 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
if (!rootSelectorOrNode || isIsolated) { if (!rootSelectorOrNode || isIsolated) {
// The host element of the internal or isolated root view is attached to the component's host // The host element of the internal or isolated root view is attached to the component's host
// view node. // view node.
componentRef.hostView._tViewNode!.child = tElementNode; ngDevMode && assertNodeOfPossibleTypes(rootTView.node, TNodeType.View);
rootTView.node!.child = tElementNode;
} }
return componentRef; return componentRef;
} }
@ -275,7 +277,7 @@ export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
super(); super();
this.instance = instance; this.instance = instance;
this.hostView = this.changeDetectorRef = new RootViewRef<T>(_rootLView); this.hostView = this.changeDetectorRef = new RootViewRef<T>(_rootLView);
this.hostView._tViewNode = assignTViewNodeToLView(_rootLView[TVIEW], null, -1, _rootLView); assignTViewNodeToLView(_rootLView[TVIEW], null, -1, _rootLView);
this.componentType = componentType; this.componentType = componentType;
} }

View File

@ -266,7 +266,7 @@ function createTNodeAtIndex(
} }
export function assignTViewNodeToLView( export function assignTViewNodeToLView(
tView: TView, tParentNode: TNode|null, index: number, lView: LView): TViewNode { tView: TView, tParentNode: TNode|null, index: number, lView: LView): void {
// View nodes are not stored in data because they can be added / removed at runtime (which // View nodes are not stored in data because they can be added / removed at runtime (which
// would cause indices to change). Their TNodes are instead stored in tView.node. // would cause indices to change). Their TNodes are instead stored in tView.node.
let tNode = tView.node; let tNode = tView.node;
@ -279,7 +279,7 @@ export function assignTViewNodeToLView(
TNodeType.View, index, null, null) as TViewNode; TNodeType.View, index, null, null) as TViewNode;
} }
return lView[T_HOST] = tNode as TViewNode; lView[T_HOST] = tNode as TViewNode;
} }

View File

@ -26,7 +26,7 @@ export function assertNodeType(tNode: TNode, type: TNodeType): asserts tNode is
assertEqual(tNode.type, type, `should be a ${typeName(type)}`); assertEqual(tNode.type, type, `should be a ${typeName(type)}`);
} }
export function assertNodeOfPossibleTypes(tNode: TNode, ...types: TNodeType[]): void { export function assertNodeOfPossibleTypes(tNode: TNode|null, ...types: TNodeType[]): void {
assertDefined(tNode, 'should be called with a TNode'); assertDefined(tNode, 'should be called with a TNode');
const found = types.some(type => tNode.type === type); const found = types.some(type => tNode.type === type);
assertEqual( assertEqual(

View File

@ -119,9 +119,7 @@ export function createTemplateRef<T>(
renderView(embeddedTView, embeddedLView, context); renderView(embeddedTView, embeddedLView, context);
const viewRef = new ViewRef<T>(embeddedLView); return new ViewRef<T>(embeddedLView);
viewRef._tViewNode = embeddedLView[T_HOST] as TViewNode;
return viewRef;
} }
}; };
} }

View File

@ -33,11 +33,6 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
private _appRef: ApplicationRef|null = null; private _appRef: ApplicationRef|null = null;
private _viewContainerRef: viewEngine_ViewContainerRef|null = null; private _viewContainerRef: viewEngine_ViewContainerRef|null = null;
/**
* @internal
*/
public _tViewNode: TViewNode|null = null;
get rootNodes(): any[] { get rootNodes(): any[] {
const lView = this._lView; const lView = this._lView;
if (lView[HOST] == null) { if (lView[HOST] == null) {

View File

@ -86,7 +86,7 @@ export function assertNotDefined<T>(actual: T, msg: string) {
} }
} }
export function assertDefined<T>(actual: T, msg: string) { export function assertDefined<T>(actual: T|null|undefined, msg: string): asserts actual is T {
if (actual == null) { if (actual == null) {
throwError(msg, actual, null, '!='); throwError(msg, actual, null, '!=');
} }