feat(component-loader): simplified show method usage

valor-software · Dec 15, 2016 · 0767edf · 0767edf
1 parent ea1de3c
commit 0767edf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/component-loader/component-loader.class.ts b/src/component-loader/component-loader.class.ts
@@ -111,18 +111,18 @@ export class ComponentLoader<T> {
     return this;
   }
 
-  public show(content?: string | TemplateRef<any>, mixin?: any): ComponentRef<T> {
+  public show(opts: {content?: string | TemplateRef<any>, [key:string]: any} = {}): ComponentRef<T> {
     this._subscribePositioning();
 
     if (!this._componentRef) {
       this.onBeforeShow.emit();
-      this._contentRef = this._getContentRef(content);
+      this._contentRef = this._getContentRef(opts.content);
       const injector = ReflectiveInjector.resolveAndCreate(this._providers, this._injector);
       this._componentRef = this._viewContainerRef
         .createComponent(this._componentFactory, 0, injector, this._contentRef.nodes);
       this.instance = this._componentRef.instance;
 
-      Object.assign(this._componentRef.instance, mixin || {});
+      Object.assign(this._componentRef.instance, opts);
 
       if (this.container === 'body' && typeof document !== 'undefined') {
         document.querySelector(this.container as string)

diff --git a/src/modal/modal.component.ts b/src/modal/modal.component.ts
@@ -229,7 +229,7 @@ export class ModalDirective implements AfterViewInit, OnDestroy {
       this._backdrop
         .attach(ModalBackdropComponent)
         .to('body')
-        .show(null, {isAnimated: false});
+        .show({isAnimated: false});
       this.backdrop = this._backdrop._componentRef;
 
       if (this.isAnimated) {

diff --git a/src/popover/popover.directive.ts b/src/popover/popover.directive.ts
@@ -81,7 +81,8 @@ export class PopoverDirective implements OnInit, OnDestroy {
       .attach(PopoverContainerComponent)
       .to(this.container)
       .position({attachment: this.placement})
-      .show(this.popover, {
+      .show({
+        content: this.popover,
         placement: this.placement,
         title: this.popoverTitle
       });

diff --git a/src/tooltip/tooltip.directive.ts b/src/tooltip/tooltip.directive.ts
@@ -180,7 +180,8 @@ export class TooltipDirective implements OnInit, OnDestroy {
       .attach(TooltipContainerComponent)
       .to(this.container)
       .position({attachment: this.placement})
-      .show(this.tooltip, {
+      .show({
+        content: this.tooltip,
         placement: this.placement,
         title: this.tooltipTitle
       });

diff --git a/src/typeahead/typeahead.directive.ts b/src/typeahead/typeahead.directive.ts
@@ -199,7 +199,7 @@ export class TypeaheadDirective implements OnInit, OnDestroy {
       // todo: add append to body, after updating positioning service
       // .to(this.container)
       // .position({attachment: 'bottom left'})
-      .show(null, {
+      .show({
         typeaheadRef: this,
         placement: this.placement,
         animation: false