✔ Fix Side Menu Nav ~

bifeldy · Apr 30, 2023 · 854121d · 854121d
1 parent 2c51693
commit 854121d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 13 deletions.
diff --git a/dist/fansubid/browser/index.html b/dist/fansubid/browser/index.html
@@ -63,7 +63,7 @@
       <noscript>🎉 Harap Menyalakan JavaScript Untuk Dapat Mengakses Website Ini ✨</noscript>
     </div>
     <app-root></app-root>
-  <script src="runtime.c58400fc93d5aa8a.js" type="module"></script><script src="polyfills.325a71d3e423341a.js" type="module"></script><script src="scripts.03e7a8120a25f41a.js" defer></script><script src="main.27e1ed4f2274ec82.js" type="module"></script>
+  <script src="runtime.c58400fc93d5aa8a.js" type="module"></script><script src="polyfills.325a71d3e423341a.js" type="module"></script><script src="scripts.03e7a8120a25f41a.js" defer></script><script src="main.51e4918079f07a11.js" type="module"></script>
 
 
 </body></html>
diff --git a/dist/fansubid/browser/main.27e1ed4f2274ec82.js b/dist/fansubid/browser/main.27e1ed4f2274ec82.js
diff --git a/dist/fansubid/browser/main.51e4918079f07a11.js b/dist/fansubid/browser/main.51e4918079f07a11.js
diff --git a/dist/fansubid/browser/ngsw.json b/dist/fansubid/browser/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1682840128531,
+  "timestamp": 1682843271772,
   "index": "/index.html",
   "assetGroups": [
     {
@@ -39,7 +39,7 @@
         "/common.352e8983d5b95d05.js",
         "/favicon.ico",
         "/index.html",
-        "/main.27e1ed4f2274ec82.js",
+        "/main.51e4918079f07a11.js",
         "/manifest.webmanifest",
         "/polyfills.325a71d3e423341a.js",
         "/runtime.c58400fc93d5aa8a.js",
@@ -110,8 +110,8 @@
     "/938.ff68b5c4111cea5e.js": "080c0a983ed364772d347904ee047a1536afb931",
     "/common.352e8983d5b95d05.js": "177e7ac9ed10a52b1fcd43bf59721e0ede7d7bec",
     "/favicon.ico": "071facb8fab2e4b3493dcfbb0b02d7bd21bca97e",
-    "/index.html": "c29b398916666406deef79178a3ae88ac187dc92",
-    "/main.27e1ed4f2274ec82.js": "27ae423fa22dbbc560aefbd693bb83f394ee2e8c",
+    "/index.html": "92ff6ba9e0bd842bd194b8c2862d2e88b9bdf25f",
+    "/main.51e4918079f07a11.js": "0dab75cd859889c4b13af75f64891d6ebb2a7b96",
     "/manifest.webmanifest": "eafb5426cdc9fd714787e5453af315b9972875a3",
     "/polyfills.325a71d3e423341a.js": "18f8a8b77e7d11be1385d438c6d218cc68c0edb3",
     "/runtime.c58400fc93d5aa8a.js": "451c08e996608473517fbcb54fc183a43d278473",

diff --git a/dist/fansubid/server/main.js b/dist/fansubid/server/main.js
diff --git a/src/app/_shared/components/left-menu/left-menu.component.ts b/src/app/_shared/components/left-menu/left-menu.component.ts
@@ -73,11 +73,15 @@ export class LeftMenuComponent implements OnInit, OnDestroy {
   }
 
   onMouseHoverIn(): void {
-    this.lms.onMouseHoverIn();
+    if (this.gs.isDesktop) {
+      this.lms.onMouseHoverIn();
+    }
   }
 
   onMouseHoverOut(): void {
-    this.lms.onMouseHoverOut();
+    if (this.gs.isDesktop) {
+      this.lms.onMouseHoverOut();
+    }
   }
 
   logout(): void {

diff --git a/src/app/_shared/services/left-menu.service.ts b/src/app/_shared/services/left-menu.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { MatSidenav } from '@angular/material/sidenav';
 
 import { GlobalService } from './global.service';
 
@@ -9,7 +10,7 @@ import { Menu } from '../../../models/menu';
 })
 export class LeftMenuService {
 
-  sideNav = null;
+  sideNav: MatSidenav = null;
   sideNavExpanded = false;
 
   linkText = false;
@@ -104,7 +105,17 @@ export class LeftMenuService {
   }
 
   onSideNavToggleView(): void {
-    this.sideNav.toggle();
+    if (this.sideNav.opened) {
+      this.sideNav.close();
+      if (!this.gs.isDesktop) {
+        this.onMouseHoverOut();
+      }
+    } else {
+      this.sideNav.open();
+      if (!this.gs.isDesktop) {
+        this.onMouseHoverIn();
+      }
+    }
   }
 
   onSideNavToggleExpanded(): void {

diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -8,7 +8,7 @@
 <mat-sidenav-container class="sidenav-container" [hasBackdrop]="LMS.sideNavExpanded || rightSidePanel['isOpen']">
 
   <!-- Left Side Menu -->
-  <mat-sidenav #leftSideNav disableClose [mode]="'side'" [opened]="LMS.opened" [ngStyle]="{
+  <mat-sidenav #leftSideNav disableClose [mode]="sideNavType" [opened]="LMS.opened" [ngStyle]="{
     'background-image': 'url(' + GS.leftMenuImage + ')'
   }" style="background-position: bottom center; background-size: 128px; background-repeat: no-repeat;">
     <app-left-menu></app-left-menu>

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, HostListener, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, NavigationStart } from '@angular/router';
-import { MatSidenav } from '@angular/material/sidenav';
+import { MatDrawerMode, MatSidenav } from '@angular/material/sidenav';
 import { MatSnackBar } from '@angular/material/snack-bar';
 
 import { onMainContentChange } from './_shared/animations/anim-side-menu';
@@ -34,6 +34,10 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
   @HostListener('window:dblclick', ['$event']) windowDoubleClick;
   @HostListener('window:beforeunload', ['$event']) windowBeforeUnloaded;
 
+  get sideNavType(): MatDrawerMode {
+    return this.gs.isDesktop ? 'side' : 'over';
+  }
+
   @HostListener('window:resize', ['$event'])
   onResize(event) {
     this.gs.onResize(event);