GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-05 16:11:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12514 from Marklb/marklb/unsub-prop-subscriptions

Browse Source 
Angular: Unsubscribe prop subscriptions
This commit is contained in:
Michael Shilman 2020-09-24 14:05:41 +08:00 committed by GitHub
commit 592923dd1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/angular/src/client/preview/angular/components/app.component.ts
View File

@ -33,6 +33,8 @@ export class AppComponent implements OnInit, OnDestroy {
subscription: Subscription;
propSubscriptions = new Map<any, { prop: any, sub: Subscription }>();
constructor(
private cfr: ComponentFactoryResolver,
private changeDetectorRef: ChangeDetectorRef,
@ -64,6 +66,13 @@ export class AppComponent implements OnInit, OnDestroy {
if (this.subscription) {
this.subscription.unsubscribe();
}
this.propSubscriptions.forEach(v => {
if (!v.sub.closed) {
v.sub.unsubscribe();
}
})
this.propSubscriptions.clear();
}
/**
@ -93,7 +102,7 @@ export class AppComponent implements OnInit, OnDestroy {
}
}
} else if (typeof value === 'function' && key !== 'ngModelChange') {
instanceProperty.subscribe(value);
this.setPropSubscription(key, instanceProperty, value);
}
});
@ -123,4 +132,26 @@ export class AppComponent implements OnInit, OnDestroy {
instance.registerOnChange(props.ngModelChange);
}
}
/**
* Store ref to subscription for cleanup in 'ngOnDestroy' and check if
* observable needs to be resubscribed to, before creating a new subscription.
*/
private setPropSubscription(key: string, instanceProperty: Observable<any>, value: any): void {
if (this.propSubscriptions.has(key)) {
const v = this.propSubscriptions.get(key);
if (v.prop === value) {
// Prop hasn't changed, so the existing subscription can stay.
return;
}
// Now that the value has changed, unsubscribe from the previous value's subscription.
if (!v.sub.closed) {
v.sub.unsubscribe();
}
}
const sub = instanceProperty.subscribe(value);
this.propSubscriptions.set(key, { prop: value, sub });
}
}