* removeFocus setFocus methods produce unhandled errors kolkov#45

fixed * onEnter method produce unhandled errors kolkov#19 fixed
RomanKyklin · Nov 25, 2021 · 71edf33 · 71edf33
1 parent d3ad811
commit 71edf33
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/projects/ngx-dadata/src/lib/ngx-dadata.component.ts b/projects/ngx-dadata/src/lib/ngx-dadata.component.ts
@@ -77,7 +77,7 @@ export class NgxDadataComponent implements OnInit, ControlValueAccessor, OnChang
   // @Output() selectedData = new EventEmitter<DaDataAddress | DaDataFIO | DaDataBank | DaDataParty | DaDataEmail>();
   // @Output() selectedString = new EventEmitter<string>();
 
-  @ViewChild('inputValue', { static: true }) inputValue: ElementRef;
+  @ViewChild('inputValue', {static: true}) inputValue: ElementRef;
 
   private inputString$ = new Subject<string>();
 
@@ -182,6 +182,9 @@ export class NgxDadataComponent implements OnInit, ControlValueAccessor, OnChang
 
   onEnter(event: KeyboardEvent) {
     this.selectedSuggestion = this.data[this.currentFocus];
+    if (!this.selectedSuggestion) {
+      return;
+    }
     this.inputValue.nativeElement.value = this.selectedSuggestion.value;
     this.data = [];
     this.currentFocus = -1;
@@ -193,12 +196,18 @@ export class NgxDadataComponent implements OnInit, ControlValueAccessor, OnChang
 
   setFocus(id: number) {
     const activeEl = document.getElementById(id + 'item');
+    if (!activeEl) {
+      return;
+    }
     this.r.addClass(activeEl, 'active');
   }
 
   removeFocus(id: number) {
     if (id !== -1) {
       const activeEl = document.getElementById(id + 'item');
+      if (!activeEl) {
+        return;
+      }
       this.r.removeClass(activeEl, 'active');
     }
   }