Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Angular: Run setProps in the NgZone #12382

Merged
merged 6 commits into from
Dec 1, 2020
Merged

Angular: Run setProps in the NgZone #12382

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c58bd4
Run setProps in the NgZone
Marklb Sep 4, 2020
c1f7f0a
Add semicolon
Marklb Sep 4, 2020
6f8e63e
Merge branch 'next' into marklb/setprops-in-ngzone
Marklb Nov 18, 2020
915f16f
Re-emit story data in ngZone
Marklb Nov 18, 2020
b9ba7a8
Fix lint error
Marklb Nov 21, 2020
b776663
Merge branch 'next' into marklb/setprops-in-ngzone
gaetanmaisse Nov 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions app/angular/src/client/preview/angular/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// @ts-ignore
import { document } from 'global';
import { enableProdMode, NgModule, Component, NgModuleRef, Type } from '@angular/core';
import { enableProdMode, NgModule, Component, NgModuleRef, Type, NgZone } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { BrowserModule } from '@angular/platform-browser';
import { ReplaySubject } from 'rxjs';
import { Observable, ReplaySubject, Subscriber } from 'rxjs';
import { StoryFn } from '@storybook/addons';
import { AppComponent } from './components/app.component';
import { STORY } from './app.token';
Expand All @@ -18,13 +18,27 @@ declare global {

let platform: any = null;
let promises: Promise<NgModuleRef<any>>[] = [];
let storyData = new ReplaySubject(1);
let storyData = new ReplaySubject<StoryFnAngularReturnType>(1);

const moduleClass = class DynamicModule {};
const componentClass = class DynamicComponent {};

type DynamicComponentType = typeof componentClass;

function storyDataFactory<T>(data: Observable<T>) {
return (ngZone: NgZone) => new Observable((subscriber: Subscriber<T>) => {
const sub = data.subscribe(
(v: T) => { ngZone.run(() => subscriber.next(v)); },
(err) => { ngZone.run(() => subscriber.error(err)); },
() => { ngZone.run(() => subscriber.complete()); }
);

return () => {
sub.unsubscribe();
};
});
};

const getModule = (
declarations: (Type<any> | any[])[],
entryComponents: (Type<any> | any[])[],
Expand All @@ -34,13 +48,16 @@ const getModule = (
) => {
// Complete last ReplaySubject and create a new one for the current module
storyData.complete();
storyData = new ReplaySubject(1);
storyData = new ReplaySubject<StoryFnAngularReturnType>(1);
storyData.next(data);

const moduleMeta = {
declarations: [...declarations, ...(moduleMetadata.declarations || [])],
imports: [BrowserModule, FormsModule, ...(moduleMetadata.imports || [])],
providers: [{ provide: STORY, useValue: storyData }, ...(moduleMetadata.providers || [])],
providers: [
{ provide: STORY, useFactory: storyDataFactory(storyData.asObservable()), deps: [ NgZone ] },
...(moduleMetadata.providers || [])
],
entryComponents: [...entryComponents, ...(moduleMetadata.entryComponents || [])],
schemas: [...(moduleMetadata.schemas || [])],
bootstrap: [...bootstrap],
Expand Down