From 4a4917e4edcec4b8c4cd77f599d5025a9fa361e3 Mon Sep 17 00:00:00 2001
From: _Bastler <git@bstly.de>
Date: Wed, 7 Dec 2022 21:29:32 +0100
Subject: [PATCH] fix mobile search, reorder menu

---
 ngsw-config.json             |  2 +-
 package-lock.json            |  4 ++--
 package.json                 |  2 +-
 src/app/ui/main/main.ui.html | 24 ++++++++++++------------
 src/app/ui/main/main.ui.ts   | 10 ++++++----
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ngsw-config.json b/ngsw-config.json
index 1af9f50..ace6c43 100644
--- a/ngsw-config.json
+++ b/ngsw-config.json
@@ -2,7 +2,7 @@
   "$schema": "./node_modules/@angular/service-worker/config/schema.json",
   "index": "/index.html",
   "appData": {
-    "version": "1.5.1"
+    "version": "1.5.2"
   },
   "assetGroups": [
     {
diff --git a/package-lock.json b/package-lock.json
index e846cbd..e909770 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "bstlboard",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "bstlboard",
-      "version": "1.5.1",
+      "version": "1.5.2",
       "license": "AGPL3",
       "dependencies": {
         "@angular-material-components/datetime-picker": "^9.0.0",
diff --git a/package.json b/package.json
index 6962028..4c956ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bstlboard",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "license": "AGPL3",
   "scripts": {
     "ng": "ng",
diff --git a/src/app/ui/main/main.ui.html b/src/app/ui/main/main.ui.html
index ffb987a..0b83150 100644
--- a/src/app/ui/main/main.ui.html
+++ b/src/app/ui/main/main.ui.html
@@ -45,10 +45,10 @@
 </mat-toolbar>
 
 <mat-sidenav-container>
-  <mat-sidenav #sidenav [mode]="isBiggerScreen() ? 'side' : 'over'" [(opened)]="opened"
+  <mat-sidenav #sidenav [mode]="isBiggerScreen() ? 'side' : 'over'" [(opened)]="opened || searchFocus"
     (click)="!isBiggerScreen() && this.close()">
-    <mat-nav-list>
-      <ui-viewmenu *ngIf="authenticated"></ui-viewmenu>
+    <mat-nav-list *ngIf="authenticated">
+      <ui-viewmenu></ui-viewmenu>
       <mat-divider *ngIf="moderator"></mat-divider>
       <a *ngIf="moderator" routerLink="/moderation/entries" routerLinkActive="active" mat-list-item>
         <mat-icon matListItemIcon>report</mat-icon>
@@ -58,12 +58,18 @@
         <mat-icon matListItemIcon>feedback</mat-icon>
         <span>{{'moderation.comments' | i18n}}</span>
       </a>
-      <mat-divider *ngIf="authenticated"></mat-divider>
-      <a *ngIf="authenticated" routerLink="/bookmarks" routerLinkActive="active" mat-list-item>
+      <mat-divider></mat-divider>
+      <a routerLink="/bookmarks" routerLinkActive="active" mat-list-item>
         <mat-icon matListItemIcon>bookmarks</mat-icon>
         <span>{{'bookmarks' | i18n}}</span>
       </a>
-      <mat-divider *ngIf="authenticated"></mat-divider>
+    </mat-nav-list>
+    <mat-form-field *ngIf="authenticated" (click)="preventClose($event)">
+      <input matInput type="text" (change)="search($event.target && $event.target.value || undefined, $event)"
+        placeholder="{{'search' | i18n}}" (focus)="searchFocus = true" (blur)="searchFocus = false">
+    </mat-form-field>
+    <span class="spacer"></span>
+    <mat-nav-list>
       <a (click)="openExternal($event,'https://wiki.bstly.de/services/bstlboard#faq','_blank')"
         routerLinkActive="active" mat-list-item>
         <mat-icon matListItemIcon>help</mat-icon>
@@ -71,12 +77,6 @@
       </a>
     </mat-nav-list>
 
-    <mat-form-field *ngIf="authenticated" (click)="preventClose($event)">
-      <input matInput type="text" (change)="search($event.target && $event.target.value || undefined, $event)"
-        placeholder="{{'search' | i18n}}">
-    </mat-form-field>
-
-    <span class="spacer"></span>
     <mat-nav-list>
       <mat-divider></mat-divider>
       <a (click)="openExternal($event,'https://www.bstly.de/imprint/')" mat-list-item style="font-size: 0.7em;">
diff --git a/src/app/ui/main/main.ui.ts b/src/app/ui/main/main.ui.ts
index 4da22ef..22e66ec 100644
--- a/src/app/ui/main/main.ui.ts
+++ b/src/app/ui/main/main.ui.ts
@@ -27,11 +27,12 @@ export class UiMain {
   locales;
   authenticated: boolean = false;
   moderator: boolean = false;
+  searchFocus: boolean = false;
 
   touchThresh: number = 150;
   touchStartX: number;
   touchX: number;
-  
+
   version = packageJson.version;
 
   constructor(
@@ -105,13 +106,14 @@ export class UiMain {
   }
 
   search(text, event) {
-    if (text) {
-      this.router.navigate(["search"], { queryParams: { q: text } });
-    }
     event.target.value = '';
+    event.target.blur();
     if (!this.isBiggerScreen()) {
       this.close();
     }
+    if (text) {
+      this.router.navigate(["search"], { queryParams: { q: text } });
+    }
   }
 
   toggleDarkTheme() {