From e3703ff09c26abffebb57b7f78ea7d6c1bd2f071 Mon Sep 17 00:00:00 2001 From: Marc Stammerjohann Date: Mon, 2 Dec 2019 17:32:35 +0100 Subject: [PATCH] feat(overlay): content viewchild static true * remove unused imports --- .../overlay-content/overlay-content.component.ts | 15 ++------------- .../core/src/lib/overlay/overlay.component.ts | 2 +- .../src/lib/popover/popover-element.directive.ts | 4 +--- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/projects/core/src/lib/overlay/overlay-content/overlay-content.component.ts b/projects/core/src/lib/overlay/overlay-content/overlay-content.component.ts index dccee683..787269ab 100644 --- a/projects/core/src/lib/overlay/overlay-content/overlay-content.component.ts +++ b/projects/core/src/lib/overlay/overlay-content/overlay-content.component.ts @@ -1,13 +1,4 @@ -import { - Component, - OnInit, - HostBinding, - AfterViewInit, - EventEmitter, - AfterContentInit, - AfterContentChecked, - AfterViewChecked -} from '@angular/core'; +import { Component, HostBinding } from '@angular/core'; import { SafeStyle, DomSanitizer } from '@angular/platform-browser'; @Component({ @@ -15,7 +6,7 @@ import { SafeStyle, DomSanitizer } from '@angular/platform-browser'; templateUrl: './overlay-content.component.html', styleUrls: ['./overlay-content.component.scss'] }) -export class FivOverlayContent implements OnInit { +export class FivOverlayContent { @HostBinding('style') get myStyle(): SafeStyle { return this.priority @@ -26,6 +17,4 @@ export class FivOverlayContent implements OnInit { priority: number; constructor(private sanitizer: DomSanitizer) {} - - ngOnInit() {} } diff --git a/projects/core/src/lib/overlay/overlay.component.ts b/projects/core/src/lib/overlay/overlay.component.ts index 4e6530bf..ffeaa358 100644 --- a/projects/core/src/lib/overlay/overlay.component.ts +++ b/projects/core/src/lib/overlay/overlay.component.ts @@ -19,7 +19,7 @@ import { FivOverlayService } from './overlay.service'; export class FivOverlay { private componentRef: ComponentRef; - @ViewChild('content', { static: false }) ngContent: TemplateRef; + @ViewChild('content', { static: true }) ngContent: TemplateRef; @Input() priority; @Output() afterInit = new EventEmitter(); private _open = false; diff --git a/projects/core/src/lib/popover/popover-element.directive.ts b/projects/core/src/lib/popover/popover-element.directive.ts index 0c8f46b9..2fe9c223 100644 --- a/projects/core/src/lib/popover/popover-element.directive.ts +++ b/projects/core/src/lib/popover/popover-element.directive.ts @@ -1,7 +1,5 @@ import { FivPopover } from './popover.component'; import { Directive, ElementRef, Input, AfterViewInit } from '@angular/core'; -import { tap, delay } from 'rxjs/operators'; -import { of } from 'rxjs'; @Directive({ selector: '[fivPopover]', @@ -9,7 +7,7 @@ import { of } from 'rxjs'; }) export class PopoverElementDirective implements AfterViewInit { _show: boolean; - ready: boolean = false; + ready = false; @Input('fivPopover.delay') delay = 150; @Input() fivPopover: FivPopover;