From 6ab20db473b6582eb53b4302476a0b83a0c8c71c Mon Sep 17 00:00:00 2001
From: HardiReady <hardi@noarch.de>
Date: Mon, 1 Oct 2018 07:53:38 +0200
Subject: [PATCH] Dismiss bottom sheet on navigate (CC-56)

---
 package.json                                              | 2 +-
 .../decoration-overview/decoration-overview.component.ts  | 8 ++++++--
 .../src/app/pub/rank-overview/rank-overview.component.ts  | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 212fa65..2adfecd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,
   "scripts": {
diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.ts b/static/src/app/pub/decoration-overview/decoration-overview.component.ts
index 82996ec..b2de28d 100644
--- a/static/src/app/pub/decoration-overview/decoration-overview.component.ts
+++ b/static/src/app/pub/decoration-overview/decoration-overview.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 
 import {Fraction} from '../../utils/fraction.enum';
@@ -14,7 +14,7 @@ import {Location} from '@angular/common';
   templateUrl: './decoration-overview.component.html',
   styleUrls: ['./decoration-overview.component.css']
 })
-export class DecorationOverviewComponent implements OnInit {
+export class DecorationOverviewComponent implements OnInit, OnDestroy {
 
   decorations: Decoration[];
 
@@ -54,6 +54,10 @@ export class DecorationOverviewComponent implements OnInit {
         });
   };
 
+  ngOnDestroy() {
+    this.bottomSheet.dismiss();
+  }
+
   switchFraction(value: any) {
     this.medals = this.decorations.filter(d => d.fraction === value && d.isMedal);
     this.ribbons = this.decorations.filter(d => d.fraction === value && !d.isMedal);
diff --git a/static/src/app/pub/rank-overview/rank-overview.component.ts b/static/src/app/pub/rank-overview/rank-overview.component.ts
index 293cd2d..f4931b3 100644
--- a/static/src/app/pub/rank-overview/rank-overview.component.ts
+++ b/static/src/app/pub/rank-overview/rank-overview.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Fraction} from '../../utils/fraction.enum';
 import {Rank} from '../../models/model-interfaces';
@@ -12,7 +12,7 @@ import {UserListSheetComponent} from '../user-list-sheet/user-list-sheet.compone
   templateUrl: './rank-overview.component.html',
   styleUrls: ['./rank-overview.component.css']
 })
-export class RankOverviewComponent implements OnInit {
+export class RankOverviewComponent implements OnInit, OnDestroy {
 
   ranksOpfor: Rank[];
 
@@ -37,6 +37,10 @@ export class RankOverviewComponent implements OnInit {
         });
   };
 
+  ngOnDestroy() {
+    this.bottomSheet.dismiss();
+  }
+
   selectRow(rank: Rank) {
     this.bottomSheet.open(UserListSheetComponent, {data: {rank: rank}});
   }
-- 
2.25.1