fix(component): add TComp generic for component load type

worktile · Dec 17, 2020 · c53e105 · c53e105
1 parent 9a1af6a
commit c53e105
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/planet/src/application/planet-application-ref.ts b/packages/planet/src/application/planet-application-ref.ts
@@ -15,10 +15,10 @@ export interface BootstrapOptions {
 
 export type BootstrapAppModule = (portalApp?: PlanetPortalApplication) => Promise<NgModuleRef<any>>;
 
-export type PlantComponentFactory = <TData>(
+export type PlantComponentFactory = <TData, TComp>(
     componentName: string,
     config: PlantComponentConfig<TData>
-) => PlanetComponentRef<TData>;
+) => PlanetComponentRef<TComp>;
 
 export class PlanetApplicationRef {
     public appModuleRef: NgModuleRef<any>;

diff --git a/packages/planet/src/component/planet-component-loader.ts b/packages/planet/src/component/planet-component-loader.ts
@@ -140,12 +140,16 @@ export class PlanetComponentLoader {
         });
     }
 
-    load<TData = any>(app: string, componentName: string, config: PlantComponentConfig<TData>) {
+    load<TData = unknown, TComp = unknown>(
+        app: string,
+        componentName: string,
+        config: PlantComponentConfig<TData>
+    ): Observable<PlanetComponentRef<TComp>> {
         const result = this.getPlantAppRef(app).pipe(
             map(appRef => {
                 const componentFactory = appRef.getComponentFactory();
                 if (componentFactory) {
-                    return componentFactory<TData>(componentName, config);
+                    return componentFactory<TData, TComp>(componentName, config);
                 } else {
                     throw new Error(`${app} not registered components`);
                 }

diff --git a/packages/planet/src/component/planet-component-ref.ts b/packages/planet/src/component/planet-component-ref.ts
@@ -1,8 +1,8 @@
 import { ComponentRef, ElementRef } from '@angular/core';
 
-export class PlanetComponentRef<TData = any> {
+export class PlanetComponentRef<TComp = any> {
     wrapperElement: HTMLElement;
-    componentInstance: TData;
-    componentRef: ComponentRef<TData>;
+    componentInstance: TComp;
+    componentRef: ComponentRef<TComp>;
     dispose: () => void;
 }