Handle label reactively for dropdown item

Vastra-Gotalandsregionen · Dec 10, 2020 · 8e67588 · 8e67588
1 parent b85bdde
commit 8e67588
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/projects/komponentkartan/src/lib/controls/dropdown-select/dropdown-item.component.ts b/projects/komponentkartan/src/lib/controls/dropdown-select/dropdown-item.component.ts
@@ -1,10 +1,10 @@
-import { Component, Input, EventEmitter, Output, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
+import { Component, Input, EventEmitter, Output, ViewChild, ElementRef } from '@angular/core';
 
 @Component({
   selector: 'vgr-dropdown-item',
   templateUrl: './dropdown-item.component.html'
 })
-export class DropdownItemComponent implements AfterViewInit {
+export class DropdownItemComponent {
 
   @Input() selectedLabel: string;
   @Input() value: any;
@@ -14,19 +14,16 @@ export class DropdownItemComponent implements AfterViewInit {
   @Output() next = new EventEmitter();
   @Output() nextMatch = new EventEmitter<string>();
   @ViewChild('item') item: ElementRef;
-  label: string;
+
+  get label(): string {
+    return this.value;
+  };
+
   multi = false;
   selected = false;
   visible = true;
   hasFocus = false;
 
-  ngAfterViewInit() {
-    this.label = (this.item.nativeElement as Node).textContent.trim();
-    if (this.value === undefined) {
-      this.value = this.label;
-    }
-  }
-
   toggleSelect() {
     if (this.multi) {
       this.selected = !this.selected;

diff --git a/projects/komponentkartan/src/lib/controls/modal/modal.component.ts b/projects/komponentkartan/src/lib/controls/modal/modal.component.ts
@@ -1,4 +1,3 @@
-
 import {
   Component, AfterViewChecked, QueryList, forwardRef, ElementRef, ContentChildren, Renderer2, OnDestroy, Output, EventEmitter
 } from '@angular/core';