Fix toggle issues in sidenav (pinning and on page refresh)

pull/1349/head
lacksfish 6 months ago committed by ShahanaFarooqui
parent 21d65fcc6c
commit 99812c58c9

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -19,7 +19,7 @@
<rtl-top-menu />
</div>
</mat-toolbar>
<mat-sidenav-container>
<mat-sidenav-container (backdropClick)="backdropClicked()">
<mat-sidenav #sideNavigation class="sidenav mat-elevation-z6" [perfectScrollbar] [opened]="flgSideNavOpened && flgLoggedIn" [mode]="(flgSidenavPinned && !smallScreen) ? 'side' : 'over'">
<rtl-side-navigation fxFlex="100" (ChildNavClicked)="onNavigationClicked($event)" />
</mat-sidenav>
@ -27,7 +27,7 @@
<div class="inner-sidenav-content" fxLayout="column" fxFlex="100" fxLayoutAlign="start stretch">
<router-outlet #outlet="outlet" />
</div>
</mat-sidenav-content>>
</mat-sidenav-content>
</mat-sidenav-container>
<div *ngIf="!settings.themeColor" class="rtl-spinner">
<mat-spinner color="accent" />

@ -159,7 +159,9 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
}
ngAfterViewInit() {
if (this.smallScreen || !this.flgLoggedIn) { this.sideNavigation.close(); }
if (this.smallScreen || !this.flgLoggedIn) {
this.sideNavigation.close();
}
this.commonService.setContainerSize(this.sideNavContent.elementRef.nativeElement.clientWidth, this.sideNavContent.elementRef.nativeElement.clientHeight);
}
@ -170,6 +172,14 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
onNavigationClicked(event: any) {
if (this.smallScreen) {
this.flgSideNavOpened = !this.flgSideNavOpened;
this.sideNavigation.close();
}
}
backdropClicked() {
if (!this.flgSidenavPinned || this.smallScreen) {
this.flgSideNavOpened = !this.flgSideNavOpened;
this.sideNavigation.close();
}
}

Loading…
Cancel
Save