From 76bc9689f69d3cb6074c50f0d05e9de4d214d90d Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 23 Oct 2019 12:01:09 +0300
Subject: [PATCH] refactor(theme-basic): organize collapse animations

---
 .../application-layout.component.html         | 74 +++++++++++++------
 .../application-layout.component.ts           |  7 +-
 .../theme-basic/src/lib/constants/styles.ts   |  4 +
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
index fc156b103f..bdff409ce0 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
@@ -40,16 +40,16 @@
           <ng-template #dropdownLink let-route>
             <li
               #navbarRootDropdown
-              ngbDropdown
               [abpPermission]="route.requiredPolicy"
               [abpVisibility]="routeContainer"
-              class="nav-item"
+              class="nav-item dropdown"
               display="static"
-              (click)="$event.preventDefault(); $event.stopPropagation()"
+              (click)="
+                navbarRootDropdown.expand ? (navbarRootDropdown.expand = false) : (navbarRootDropdown.expand = true)
+              "
             >
               <a
-                ngbDropdownToggle
-                class="nav-link"
+                class="nav-link dropdown-toggle"
                 data-toggle="dropdown"
                 aria-haspopup="true"
                 aria-expanded="false"
@@ -57,14 +57,25 @@
               >
                 <i *ngIf="route.iconClass" [ngClass]="route.iconClass"></i> {{ route.name | abpLocalization }}
               </a>
-              <div #routeContainer ngbDropdownMenu class="dropdown-menu border-0 shadow-sm">
-                <ng-template
-                  #forTemplate
-                  ngFor
-                  [ngForOf]="route.children"
-                  [ngForTrackBy]="trackByFn"
-                  [ngForTemplate]="childWrapper"
-                ></ng-template>
+              <div
+                #routeContainer
+                class="dropdown-menu border-0 shadow-sm"
+                [class.d-block]="smallScreen"
+                [class.overflow-hidden]="smallScreen"
+                (click)="$event.preventDefault(); $event.stopPropagation()"
+              >
+                <div
+                  class="abp-collapsed abp-main-nav-dropdown"
+                  [class.expanded]="smallScreen ? navbarRootDropdown.expand : true"
+                >
+                  <ng-template
+                    #forTemplate
+                    ngFor
+                    [ngForOf]="route.children"
+                    [ngForTrackBy]="trackByFn"
+                    [ngForTemplate]="childWrapper"
+                  ></ng-template>
+                </div>
               </div>
             </li>
           </ng-template>
@@ -90,6 +101,7 @@
               [abpVisibility]="childrenContainer"
               class="dropdown-submenu"
               ngbDropdown
+              #dropdownSubmenu="ngbDropdown"
               [display]="isDropdownChildDynamic ? 'dynamic' : 'static'"
               placement="right-top"
               [autoClose]="true"
@@ -107,13 +119,23 @@
                   {{ child.name | abpLocalization }}
                 </a>
               </div>
-              <div #childrenContainer ngbDropdownMenu class="dropdown-menu border-0 shadow-sm">
-                <ng-template
-                  ngFor
-                  [ngForOf]="child.children"
-                  [ngForTrackBy]="trackByFn"
-                  [ngForTemplate]="childWrapper"
-                ></ng-template>
+              <div
+                #childrenContainer
+                class="dropdown-menu border-0 shadow-sm"
+                [class.d-block]="smallScreen"
+                [class.overflow-hidden]="smallScreen"
+              >
+                <div
+                  class="abp-collapsed abp-main-nav-dropdown"
+                  [class.expanded]="smallScreen ? dropdownSubmenu.isOpen() : true"
+                >
+                  <ng-template
+                    ngFor
+                    [ngForOf]="child.children"
+                    [ngForTrackBy]="trackByFn"
+                    [ngForTemplate]="childWrapper"
+                  ></ng-template>
+                </div>
               </div>
             </div>
           </ng-template>
@@ -162,7 +184,10 @@
         [class.d-block]="smallScreen"
         [class.overflow-hidden]="smallScreen"
       >
-        <div class="abp-collapsed" [class.expanded]="smallScreen ? languageDropdown.isOpen() : true">
+        <div
+          class="abp-collapsed abp-main-nav-dropdown"
+          [class.expanded]="smallScreen ? languageDropdown.isOpen() : true"
+        >
           <a
             *ngFor="let lang of dropdownLanguages$ | async"
             href="javascript:void(0)"
@@ -178,7 +203,7 @@
 
 <ng-template #currentUser>
   <li *ngIf="(currentUser$ | async)?.isAuthenticated" class="nav-item">
-    <div ngbDropdown #currentUserDropdown="ngbDropdown" display="static">
+    <div ngbDropdown class="dropdown" #currentUserDropdown="ngbDropdown" display="static">
       <a
         ngbDropdownToggle
         class="nav-link"
@@ -197,7 +222,10 @@
         [class.overflow-hidden]="smallScreen"
         [class.d-block]="smallScreen"
       >
-        <div class="abp-collapsed" [class.expanded]="smallScreen ? currentUserDropdown.isOpen() : true">
+        <div
+          class="abp-collapsed abp-main-nav-dropdown"
+          [class.expanded]="smallScreen ? currentUserDropdown.isOpen() : true"
+        >
           <a class="dropdown-item" routerLink="/account/manage-profile">{{
             'AbpAccount::ManageYourProfile' | abpLocalization
           }}</a>
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
index d51ca54062..78c358ca69 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
@@ -20,6 +20,7 @@ import {
   TrackByFunction,
   ViewChild,
   ViewChildren,
+  ElementRef,
 } from '@angular/core';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { Navigate, RouterState } from '@ngxs/router-plugin';
@@ -60,9 +61,6 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
   @ViewChild('language', { static: false, read: TemplateRef })
   languageRef: TemplateRef<any>;
 
-  @ViewChildren('navbarRootDropdown', { read: NgbDropdown })
-  navbarRootDropdowns: QueryList<NgbDropdown>;
-
   isDropdownChildDynamic: boolean;
 
   isCollapsed = true;
@@ -105,9 +103,6 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
   constructor(private store: Store, private oauthService: OAuthService, private renderer: Renderer2) {}
 
   private checkWindowWidth() {
-    this.navbarRootDropdowns.forEach(item => {
-      item.close();
-    });
     setTimeout(() => {
       if (window.innerWidth < 768) {
         this.isDropdownChildDynamic = false;
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts
index e51c4937b3..df2238d866 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts
@@ -65,4 +65,8 @@ export default `
     font-size: 0.8em;
 }
 
+
+.abp-main-nav-dropdown {
+  margin-top: -50%;
+}
 `;