From 7451adcada8424621ab39f433524b6bc3d713394 Mon Sep 17 00:00:00 2001
From: TheDiaval <thediavall@gmail.com>
Date: Thu, 1 Aug 2019 13:07:11 +0300
Subject: [PATCH 1/2] fix(theme-basic): navigation dropdown visibility and
 alignment

---
 .../layout-application.component.html         |  1 +
 .../layout-application.component.ts           | 31 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html
index c3c3ef0ada..60712cee30 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html
@@ -15,6 +15,7 @@
 
     <ng-template #dropdownLink let-route>
       <li
+        #navbarRootDropdown
         class="nav-item dropdown"
         ngbDropdown
         display="static"
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
index d86f3ed3ae..f676f6d229 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
@@ -8,13 +8,23 @@ import {
   SessionState,
   takeUntilDestroy,
 } from '@abp/ng.core';
-import { AfterViewInit, Component, OnDestroy, TemplateRef, TrackByFunction, ViewChild } from '@angular/core';
+import {
+  AfterViewInit,
+  Component,
+  OnDestroy,
+  QueryList,
+  TemplateRef,
+  TrackByFunction,
+  ViewChild,
+  ViewChildren,
+} from '@angular/core';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { Navigate, RouterState } from '@ngxs/router-plugin';
 import { Select, Store } from '@ngxs/store';
 import { OAuthService } from 'angular-oauth2-oidc';
 import compare from 'just-compare';
-import { Observable, fromEvent } from 'rxjs';
-import { filter, map, debounceTime } from 'rxjs/operators';
+import { fromEvent, Observable } from 'rxjs';
+import { debounceTime, filter, map } from 'rxjs/operators';
 import snq from 'snq';
 import { LayoutAddNavigationElement } from '../../actions';
 import { Layout } from '../../models/layout';
@@ -46,6 +56,9 @@ export class LayoutApplicationComponent implements AfterViewInit, OnDestroy {
   @ViewChild('language', { static: false, read: TemplateRef })
   languageRef: TemplateRef<any>;
 
+  @ViewChildren('navbarRootDropdown', { read: NgbDropdown })
+  navbarRootDropdowns: QueryList<NgbDropdown>;
+
   isOpenChangePassword: boolean = false;
 
   isOpenProfile: boolean = false;
@@ -85,8 +98,14 @@ export class LayoutApplicationComponent implements AfterViewInit, OnDestroy {
 
   private checkWindowWidth() {
     setTimeout(() => {
-      if (window.innerWidth < 768) this.isDropdownChildDynamic = false;
-      else this.isDropdownChildDynamic = true;
+      if (window.innerWidth < 768) {
+        this.isDropdownChildDynamic = false;
+        this.navbarRootDropdowns.forEach(item => {
+          item.close();
+        });
+      } else {
+        this.isDropdownChildDynamic = true;
+      }
     }, 0);
   }
 
@@ -117,7 +136,7 @@ export class LayoutApplicationComponent implements AfterViewInit, OnDestroy {
     fromEvent(window, 'resize')
       .pipe(
         takeUntilDestroy(this),
-        debounceTime(350),
+        debounceTime(250),
       )
       .subscribe(() => {
         this.checkWindowWidth();

From d49de5f88b93ab83f7e969d7adb0a3d668709325 Mon Sep 17 00:00:00 2001
From: TheDiaval <thediavall@gmail.com>
Date: Thu, 1 Aug 2019 13:32:42 +0300
Subject: [PATCH 2/2] fix(theme-basic): close navbar dropdowns on window resize

---
 .../layout-application/layout-application.component.ts      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
index f676f6d229..c20efd9a3a 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
@@ -98,11 +98,11 @@ export class LayoutApplicationComponent implements AfterViewInit, OnDestroy {
 
   private checkWindowWidth() {
     setTimeout(() => {
+      this.navbarRootDropdowns.forEach(item => {
+        item.close();
+      });
       if (window.innerWidth < 768) {
         this.isDropdownChildDynamic = false;
-        this.navbarRootDropdowns.forEach(item => {
-          item.close();
-        });
       } else {
         this.isDropdownChildDynamic = true;
       }