Merge branch 'development' into dev_feature_customBtn

valor-software · Aug 2, 2021 · b65cc46 · b65cc46
2 parents f248850 + c0beddb
commit b65cc46
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/modal/bs-modal-ref.service.ts b/src/modal/bs-modal-ref.service.ts
@@ -14,7 +14,7 @@ export class BsModalRef<T = any> {
   /**
    *  Allow user to ID for the modal. Otherwise, a unique number will be given
    */
-  id?: number;
+  id?: number | string;
 
   /**
    * Reference to a component inside the modal. Null if modal's been created with TemplateRef

diff --git a/src/modal/bs-modal.service.ts b/src/modal/bs-modal.service.ts
@@ -78,7 +78,7 @@ export class BsModalService {
     return this._showModal<T>(content);
   }
 
-  hide(id?: number) {
+  hide(id?: number | string) {
     if (this.modalsCount === 1 || id == null) {
       this._hideBackdrop();
       this.resetScrollbar();
@@ -164,7 +164,7 @@ export class BsModalService {
     return bsModalRef;
   }
 
-  _hideModal(id?: number): void {
+  _hideModal(id?: number | string): void {
     if (id != null) {
       const indexToRemove = this.loaders.findIndex(loader => loader.instance?.config.id === id);
       const modalLoader = this.loaders[indexToRemove];
@@ -245,7 +245,7 @@ export class BsModalService {
     this.loaders.push(loader);
   }
 
-  private removeLoaders(id?: number): void {
+  private removeLoaders(id?: number | string): void {
     if (id != null) {
       const indexToRemove = this.loaders.findIndex(loader => loader.instance?.config.id === id);
       if (indexToRemove >= 0) {

diff --git a/src/modal/modal-options.class.ts b/src/modal/modal-options.class.ts
@@ -6,7 +6,7 @@ export class ModalOptions<T = Record<string, unknown>> {
   /**
    *  Allow user to ID for the modal. Otherwise, a unique number will be given
    */
-  id?: number;
+  id?: number | string;
   /**
    *  Includes a modal-backdrop element. Alternatively,
    *  specify static for a backdrop which doesn't close the modal on click.

diff --git a/src/typeahead/typeahead.directive.ts b/src/typeahead/typeahead.directive.ts
@@ -322,10 +322,10 @@ export class TypeaheadDirective implements OnInit, OnDestroy {
       this.typeaheadOnBlur.emit(this._container.active);
     }
 
-    if (!this.container && this._matches.length === 0) {
+    if (!this.container && this._matches?.length === 0) {
       this.typeaheadOnBlur.emit(new TypeaheadMatch(
         this.element.nativeElement.value,
-        this.element.nativeElement.value,
+        this.element.nativeElement.value, 
         false));
     }
   }