From b014778761dd8e53408082d7092e7f90ec32505d Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 19 Jan 2019 16:04:06 -0800
Subject: [PATCH] fix: fix keyboard shortcuts in notifications (#903)

fixes #894
---
 .../_components/status/Notification.html      |  2 +-
 .../timeline/NotificationVirtualListItem.html |  1 +
 tests/spec/025-shortcuts-status.js            | 22 +++++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/routes/_components/status/Notification.html b/src/routes/_components/status/Notification.html
index 0864c66..be6e3eb 100644
--- a/src/routes/_components/status/Notification.html
+++ b/src/routes/_components/status/Notification.html
@@ -1,6 +1,6 @@
 {#if status}
   <Status {index} {length} {timelineType} {timelineValue} {focusSelector}
-          {status} {notification} {active} on:recalculateHeight
+          {status} {notification} {active} {shortcutScope} on:recalculateHeight
   />
 {:else}
   <article class="notification-article {active ? 'active' : ''}"
diff --git a/src/routes/_components/timeline/NotificationVirtualListItem.html b/src/routes/_components/timeline/NotificationVirtualListItem.html
index eaf1129..e42a00c 100644
--- a/src/routes/_components/timeline/NotificationVirtualListItem.html
+++ b/src/routes/_components/timeline/NotificationVirtualListItem.html
@@ -3,6 +3,7 @@
   timelineType={virtualProps.timelineType}
   timelineValue={virtualProps.timelineValue}
   focusSelector={virtualProps.focusSelector}
+  shortcutScope={virtualKey}
   index={virtualIndex}
   length={virtualLength}
   {active}
diff --git a/tests/spec/025-shortcuts-status.js b/tests/spec/025-shortcuts-status.js
index 91960b8..e5bcff1 100644
--- a/tests/spec/025-shortcuts-status.js
+++ b/tests/spec/025-shortcuts-status.js
@@ -6,8 +6,9 @@ import {
   getNthStatusMedia,
   getNthStatusSensitiveMediaButton,
   getNthStatusSpoiler,
-  getUrl,
-  scrollToStatus } from '../utils'
+  getUrl, notificationsNavButton,
+  scrollToStatus
+} from '../utils'
 import { homeTimeline } from '../fixtures'
 import { loginAsFoobar } from '../roles'
 import { indexWhere } from '../../src/routes/_utils/arrays'
@@ -126,3 +127,20 @@ test('Shortcut f toggles favorite status', async t => {
     .pressKey('f')
     .expect(getNthFavorited(idx)).eql('false')
 })
+
+test('Shortcut f toggles favorite status in notification', async t => {
+  let idx = 0
+  await loginAsFoobar(t)
+  await t
+    .expect(getUrl()).eql('http://localhost:4002/')
+    .click(notificationsNavButton)
+    .expect(getUrl()).contains('/notifications')
+    .expect(getNthStatus(idx).exists).ok({ timeout: 30000 })
+    .expect(getNthFavorited(idx)).eql('false')
+    .pressKey('j '.repeat(idx + 1))
+    .expect(getNthStatus(idx).hasClass('status-active')).ok()
+    .pressKey('f')
+    .expect(getNthFavorited(idx)).eql('true')
+    .pressKey('f')
+    .expect(getNthFavorited(idx)).eql('false')
+})