From 2f60d78e18f3dc05be7fb49bb6e716b9ea96350a Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lhirt@owncloud.com>
Date: Fri, 4 Oct 2019 14:36:41 +0200
Subject: [PATCH] Add close button and trigger close on route change

Adjusted aria-label
---
 apps/files/src/components/FileActions.vue | 29 +++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/files/src/components/FileActions.vue b/apps/files/src/components/FileActions.vue
index cbd6f78d433..dd93499b85a 100644
--- a/apps/files/src/components/FileActions.vue
+++ b/apps/files/src/components/FileActions.vue
@@ -1,7 +1,13 @@
 <template>
   <div v-if="isOpen" :id="id" uk-offcanvas="mode: slide" class="oc-file-actions uk-offcanvas-bottom uk-open" style="display: block !important;">
     <div class="uk-offcanvas-bar">
-      <span v-text="_label"></span>
+      <oc-button
+        icon="close"
+        class="uk-position-top-right uk-position-absolute uk-margin-top uk-margin-right"
+        @click="closeActions"
+        aria-label="$_closeActionsButtonLabel"
+      />
+      <div v-text="$_label" class="uk-margin-small-bottom" />
       <ul class="uk-nav">
         <li v-for="(action, i) in actions" :key="i">
           <a class="uk-inline" @click="selectAction(action)">
@@ -30,6 +36,21 @@ export default {
       isOpen: false
     }
   },
+  computed: {
+    $_label () {
+      const translated = this.$gettext('Open %{fileName} in')
+      return this.$gettextInterpolate(translated, { fileName: this.filename })
+    },
+
+    $_closeActionsButtonLabel () {
+      return this.$gettext('Close file actions menu')
+    }
+  },
+  watch: {
+    $route () {
+      this.closeActions()
+    }
+  },
   mounted () {
     this.$root.$on('oc-file-actions:open', file => {
       this.showActions(file)
@@ -50,12 +71,6 @@ export default {
       this.closeActions()
       action.onClick()
     }
-  },
-  computed: {
-    _label () {
-      const translated = this.$gettext('Open %{fileName} in')
-      return this.$gettextInterpolate(translated, { fileName: this.filename })
-    }
   }
 }
 </script>