cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): allow to detach OnPush components (#16394)

Browse Source 
Fixes #9720
This commit is contained in:
Tobias Bosch 2017-04-27 16:15:10 -07:00 committed by Miško Hevery
parent 392d584572
commit aa8bba4865
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/view/refs.ts
View File

@ -236,11 +236,11 @@ export class ViewRef_ implements EmbeddedViewRef<any>, InternalViewRef {
get destroyed(): boolean { return (this._view.state & ViewState.Destroyed) !== 0; } get destroyed(): boolean { return (this._view.state & ViewState.Destroyed) !== 0; }
markForCheck(): void { markParentViewsForCheck(this._view); } markForCheck(): void { markParentViewsForCheck(this._view); }
detach(): void { this._view.state &= ~ViewState.ChecksEnabled; } detach(): void { this._view.state &= ~ViewState.Attached; }
detectChanges(): void { Services.checkAndUpdateView(this._view); } detectChanges(): void { Services.checkAndUpdateView(this._view); }
checkNoChanges(): void { Services.checkNoChangesView(this._view); } checkNoChanges(): void { Services.checkNoChangesView(this._view); }
reattach(): void { this._view.state |= ViewState.ChecksEnabled; } reattach(): void { this._view.state |= ViewState.Attached; }
onDestroy(callback: Function) { onDestroy(callback: Function) {
if (!this._view.disposables) { if (!this._view.disposables) {
this._view.disposables = []; this._view.disposables = [];

9
packages/core/src/view/types.ts
View File

@ -324,9 +324,12 @@ export interface ViewData {
*/ */
export const enum ViewState { export const enum ViewState {
FirstCheck = 1 << 0, FirstCheck = 1 << 0,
ChecksEnabled = 1 << 1, Attached = 1 << 1,
Errored = 1 << 2, ChecksEnabled = 1 << 2,
Destroyed = 1 << 3 Errored = 1 << 3,
Destroyed = 1 << 4,
CatDetectChanges = Attached | ChecksEnabled,
} }
export interface DisposableFn { (): void; } export interface DisposableFn { (): void; }

6
packages/core/src/view/view.ts
View File

@ -211,7 +211,7 @@ function createView(
viewContainerParent: null, parentNodeDef, viewContainerParent: null, parentNodeDef,
context: null, context: null,
component: null, nodes, component: null, nodes,
state: ViewState.FirstCheck | ViewState.ChecksEnabled, root, renderer, state: ViewState.FirstCheck | ViewState.CatDetectChanges, root, renderer,
oldValues: new Array(def.bindingCount), disposables oldValues: new Array(def.bindingCount), disposables
}; };
return view; return view;
@ -542,13 +542,13 @@ function callViewAction(view: ViewData, action: ViewAction) {
const viewState = view.state; const viewState = view.state;
switch (action) { switch (action) {
case ViewAction.CheckNoChanges: case ViewAction.CheckNoChanges:
if ((viewState & ViewState.ChecksEnabled) && if ((viewState & ViewState.CatDetectChanges) === ViewState.CatDetectChanges &&
(viewState & (ViewState.Errored | ViewState.Destroyed)) === 0) { (viewState & (ViewState.Errored | ViewState.Destroyed)) === 0) {
checkNoChangesView(view); checkNoChangesView(view);
} }
break; break;
case ViewAction.CheckAndUpdate: case ViewAction.CheckAndUpdate:
if ((viewState & ViewState.ChecksEnabled) && if ((viewState & ViewState.CatDetectChanges) === ViewState.CatDetectChanges &&
(viewState & (ViewState.Errored | ViewState.Destroyed)) === 0) { (viewState & (ViewState.Errored | ViewState.Destroyed)) === 0) {
checkAndUpdateView(view); checkAndUpdateView(view);
} }

16
packages/core/test/linker/change_detection_integration_spec.ts
View File

@ -1175,6 +1175,21 @@ export function main() {
expect(renderLog.log).toEqual([]); expect(renderLog.log).toEqual([]);
})); }));
it('Detached should disable OnPush', fakeAsync(() => {
const ctx = createCompFixture('<push-cmp [value]="value"></push-cmp>');
ctx.componentInstance.value = 0;
ctx.detectChanges();
renderLog.clear();
const cmp: CompWithRef = queryDirs(ctx.debugElement, PushComp)[0];
cmp.changeDetectorRef.detach();
ctx.componentInstance.value = 1;
ctx.detectChanges();
expect(renderLog.log).toEqual([]);
}));
it('Detached view can be checked locally', fakeAsync(() => { it('Detached view can be checked locally', fakeAsync(() => {
const ctx = createCompFixture('<wrap-comp-with-ref></wrap-comp-with-ref>'); const ctx = createCompFixture('<wrap-comp-with-ref></wrap-comp-with-ref>');
const cmp: CompWithRef = queryDirs(ctx.debugElement, CompWithRef)[0]; const cmp: CompWithRef = queryDirs(ctx.debugElement, CompWithRef)[0];
@ -1225,7 +1240,6 @@ export function main() {
ctx.detectChanges(); ctx.detectChanges();
expect(cmp.renderCount).toBe(count); expect(cmp.renderCount).toBe(count);
})); }));
}); });