Disallow passing a loaded template

fboeller · Mar 7, 2021 · 5ca41e5 · 5ca41e5
1 parent 3474ab2
commit 5ca41e5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/projects/example-app/src/app/examples/default-example/default-example.component.html b/projects/example-app/src/app/examples/default-example/default-example.component.html
@@ -5,10 +5,6 @@ <h2>Default usage example</h2>
     `LoadableModule` is imported with the default loading and error components.
   </p>
   <app-load-form (loadable)="loadable = $event"></app-load-form>
-  <div>
-    <h3>State of the loadable</h3>
-    <pre>{{ loadable | json }}</pre>
-  </div>
   <ld-loadable [loadable]="loadable">
     <h3>Loaded</h3>
     <pre>{{ loadable | loadedValue | json }}</pre>

diff --git a/projects/ngx-loadable/src/lib/angular/loadable/loadable.component.ts b/projects/ngx-loadable/src/lib/angular/loadable/loadable.component.ts
@@ -76,6 +76,10 @@ export class LoadableComponent implements OnChanges, AfterViewInit {
   ) {}
 
   updateContent(): void {
+    if (this.loadingState === 'loaded') {
+      return;
+    }
+    this.templateRef = this.templates[this.loadingState];
     const defaultComponent = this.defaultComponents[this.loadingState];
     if (!this.templateRef && defaultComponent && this.content) {
       this.content.clear();
@@ -95,10 +99,7 @@ export class LoadableComponent implements OnChanges, AfterViewInit {
     }
     if ('loadable' in changes || 'templates' in changes) {
       this.defaultComponentRef?.destroy();
-      if (this.loadingState !== 'loaded') {
-        this.templateRef = this.templates[this.loadingState];
-        this.updateContent();
-      }
+      this.updateContent();
     }
   }
 

diff --git a/projects/ngx-loadable/src/lib/angular/module.options.ts b/projects/ngx-loadable/src/lib/angular/module.options.ts
@@ -5,7 +5,6 @@ import { LoadableLoadingComponent } from './loadable-loading/loadable-loading.co
 export type DefaultComponents = {
   idle?: Type<{}>;
   loading?: Type<{}>;
-  loaded?: Type<{ value: any }>;
   error?: Type<{ error: any }>;
 };