Merge pull request #2702 from amcdnl/entry-comps

fix: add entry components to modulemetadata - #2701
storybookjs · Jan 9, 2018 · a5d439c · a5d439c
2 parents 748e494 + 4041ddc
commit a5d439c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/angular/src/client/preview/angular/helpers.ts b/app/angular/src/client/preview/angular/helpers.ts
@@ -59,6 +59,7 @@ const getComponentMetadata = ({
     schemas: [],
     declarations: [],
     providers: [],
+    entryComponents: [],
   },
 }: NgStory) => {
   if (!component || typeof component !== 'function') {
@@ -73,7 +74,7 @@ const getComponentMetadata = ({
     (<any>propsMetadata)[key] = (<any>propsMeta)[key];
   });
 
-  const { imports = [], schemas = [], declarations = [], providers = [] } = moduleMetadata;
+  const { imports = [], schemas = [], declarations = [], providers = [], entryComponents = [] } = moduleMetadata;
 
   return {
     component,
@@ -86,6 +87,7 @@ const getComponentMetadata = ({
       schemas,
       declarations,
       providers,
+      entryComponents,
     },
   };
 };
@@ -118,13 +120,14 @@ const getModule = (
     schemas: [],
     declarations: [],
     providers: [],
+    entryComponents: [],
   }
 ): IModule => {
   const moduleMeta = new NgModule({
     declarations: [...declarations, ...moduleMetadata.declarations],
     imports: [BrowserModule, FormsModule, ...moduleMetadata.imports],
     providers: [{ provide: STORY, useValue: Object.assign({}, data) }, ...moduleMetadata.providers],
-    entryComponents: [...entryComponents],
+    entryComponents: [...entryComponents, ...moduleMetadata.entryComponents],
     schemas: [...moduleMetadata.schemas],
     bootstrap: [...bootstrap],
   });

diff --git a/app/angular/src/client/preview/angular/types.ts b/app/angular/src/client/preview/angular/types.ts
@@ -3,6 +3,7 @@ export interface NgModuleMetadata {
   imports: Array<any>;
   schemas: Array<any>;
   providers: Array<any>;
+  entryComponents: Array<any>;
 }
 
 export interface ICollection {