From 83cdc004db4887865c894850a67b4e3cbefec74c Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Tue, 7 Jan 2025 10:56:33 +0300 Subject: [PATCH 1/4] Fixed dom structure --- src/layout/applayout.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/layout/applayout.ts b/src/layout/applayout.ts index f8e88f0..5bef5fd 100644 --- a/src/layout/applayout.ts +++ b/src/layout/applayout.ts @@ -4,7 +4,6 @@ import { CommonModule } from '@angular/common'; import { AppTopBar } from '@/src/layout/apptopbar'; import { AppSidebar } from '@/src/layout/appsidebar'; import { NavigationEnd, Router, RouterModule } from '@angular/router'; -import { AppConfigurator } from '@/src/layout/appconfigurator'; import { AppFooter } from '@/src/layout/appfooter'; import { filter, Subscription } from 'rxjs'; import { LayoutService } from '@/src/service/layout/layout.service'; @@ -12,19 +11,16 @@ import { LayoutService } from '@/src/service/layout/layout.service'; @Component({ selector: 'app-layout', standalone: true, - imports: [CommonModule, ToastModule, AppTopBar, AppSidebar, RouterModule, AppFooter, AppConfigurator], + imports: [CommonModule, ToastModule, AppTopBar, AppSidebar, RouterModule, AppFooter], template: `
-
- -
+
-
` }) From f48b56e95a793df538adbe29a6407bce1cc63c0a Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Tue, 7 Jan 2025 11:03:55 +0300 Subject: [PATCH 2/4] Cleanup unused code --- src/layout/applayout.ts | 19 +++---------------- src/layout/apptopbar.ts | 12 +++--------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/layout/applayout.ts b/src/layout/applayout.ts index 5bef5fd..acc5103 100644 --- a/src/layout/applayout.ts +++ b/src/layout/applayout.ts @@ -49,20 +49,6 @@ export class AppLayout { }); } - if (!this.profileMenuOutsideClickListener) { - this.profileMenuOutsideClickListener = this.renderer.listen('document', 'click', (event) => { - const isOutsideClicked = !( - this.appTopBar.menu.nativeElement.isSameNode(event.target) || - this.appTopBar.menu.nativeElement.contains(event.target) || - this.appTopBar.topbarMenuButton.nativeElement.isSameNode(event.target) || - this.appTopBar.topbarMenuButton.nativeElement.contains(event.target) - ); - - if (isOutsideClicked) { - } - }); - } - if (this.layoutService.layoutState().staticMenuMobileActive) { this.blockBodyScroll(); } @@ -73,11 +59,12 @@ export class AppLayout { }); } - isOutsideClicked(event) { + isOutsideClicked(event: MouseEvent) { const sidebarEl = document.querySelector('.layout-sidebar'); const topbarEl = document.querySelector('.layout-menu-button'); + const eventTarget = event.target as Node; - return !(sidebarEl.isSameNode(event.target) || sidebarEl.contains(event.target) || topbarEl.isSameNode(event.target) || topbarEl.contains(event.target)); + return !(sidebarEl.isSameNode(eventTarget) || sidebarEl.contains(eventTarget) || topbarEl.isSameNode(eventTarget) || topbarEl.contains(eventTarget)); } hideMenu() { diff --git a/src/layout/apptopbar.ts b/src/layout/apptopbar.ts index 630d6d8..b2eb2ce 100644 --- a/src/layout/apptopbar.ts +++ b/src/layout/apptopbar.ts @@ -44,7 +44,6 @@ import { LayoutService } from '@/src/service/layout/layout.service';
-