From 7ea3ffb4f00acb89e948f824f8c0162fefbeb7c8 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 22 Aug 2018 19:20:41 +0900
Subject: [PATCH] refs #543 Start focus with j key in favourite

---
 .../Contents/Cards/Notification/Favourite.vue         |  2 +-
 .../Contents/Cards/Notification/Follow.vue            |  2 +-
 .../Contents/Cards/Notification/Reblog.vue            |  2 +-
 .../TimelineSpace/Contents/Notifications.vue          | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
index 30b679d7..9777c088 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
@@ -2,7 +2,7 @@
 <div
   class="status"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k']} : {}"
   @shortkey="handleStatusControl"
   ref="status"
   @click="$emit('select')"
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
index 62845009..6fb8f8cc 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
@@ -2,7 +2,7 @@
 <div
   class="follow"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k']} : {}"
   @shortkey="handleStatusControl"
   ref="status"
   @click="$emit('select')"
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
index cec7685b..f3ffca24 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
@@ -2,7 +2,7 @@
 <div
   class="status"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k']} : {}"
   @shortkey="handleStatusControl"
   ref="status"
   @click="$emit('select')"
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index 2883ae5e..cdd516cd 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="notifications">
+<div id="notifications" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -157,6 +157,15 @@ export default {
     },
     focusNotification (index) {
       this.focusedIndex = index
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedIndex) {
+            this.focusedIndex = 0
+          }
+          break
+      }
     }
   }
 }