feat(reader): add mark-read and mark-unread shortcuts

xwcoder · xwcoder · commit d2a49da6dd1d · 2023-11-17T14:42:32.000+08:00
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
@@ -49,7 +49,9 @@
         "k": "Previous item",
         "o": "Open item",
         "u": "Close item",
-        "v": "Open item in browser"
+        "v": "Open item in browser",
+        "shifti": "Mark as read",
+        "shiftu": "Mark as unread"
       }
     }
   },
diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json
@@ -49,7 +49,9 @@
         "k": "上一条",
         "o": "打开条目",
         "u": "关闭条目",
-        "v": "浏览器中打开"
+        "v": "浏览器中打开",
+        "shifti": "标记为已读",
+        "shiftu": "标记为未读"
       }
     }
   },
diff --git a/src/ui/apps/reader/keyboard-shortcuts-panel.tsx b/src/ui/apps/reader/keyboard-shortcuts-panel.tsx
@@ -77,6 +77,16 @@ function KeyboardShortcutsPanel() {
       keys: ['v'],
       text: intl.get('reader.keyboard.keys.v'),
     },
+    {
+      keys: ['shift', 'i'],
+      connector: '+',
+      text: intl.get('reader.keyboard.keys.shifti'),
+    },
+    {
+      keys: ['shift', 'u'],
+      text: intl.get('reader.keyboard.keys.shiftu'),
+      connector: '+',
+    },
   ].map((item) => {
     const keys = item.keys.map((k, index, v) => (
       <span
@@ -87,15 +97,22 @@ function KeyboardShortcutsPanel() {
         >
           {k}
         </span>
-        {index !== v.length - 1 ? <span> then </span> : null}
+        {index !== v.length - 1 ? (
+          <span>
+            {' '}
+            {item.connector ?? 'then'}
+            {' '}
+          </span>
+        ) : null}
       </span>
     ))
+
     return (
       <div
         key={item.keys.join('')}
       >
         <span
-          className="inline-block w-14 text-right"
+          className="inline-block w-16 text-right"
         >
           {keys}
         </span>
diff --git a/src/ui/apps/reader/use-keyboard.ts b/src/ui/apps/reader/use-keyboard.ts
@@ -39,6 +39,8 @@ iregister(['v'], () => {
 iregister(['x'], () => readerStore.toggleSelected())
 iregister(['*', 'a'], () => readerStore.selectAll())
 iregister(['*', 'n'], () => readerStore.deselectAll())
+iregister(['shift', 'i'], () => readerStore.markRead())
+iregister(['shift', 'u'], () => readerStore.markUnread())
 
 iregister(['g', 's'], () => readerStore.changeTab('starred'))
 iregister(['g', 'a'], () => readerStore.changeTab('all'))
diff --git a/src/ui/store/reader.ts b/src/ui/store/reader.ts
@@ -252,11 +252,16 @@ export class ReaderStore {
     articleService.markRead(articles.map((v) => v.id!), status)
   }
 
-  markRead(id: number | number []) {
+  private getSelectedIds() {
+    const articles = this.opened ? [this.activeArticle] : this.articles.filter((v) => v.selected)
+    return articles.map((v) => v.id!)
+  }
+
+  markRead(id: number | number [] = this.getSelectedIds()) {
     this.markReadStatus(id, 1)
   }
 
-  markUnread(id: number | number []) {
+  markUnread(id: number | number [] = this.getSelectedIds()) {
     this.markReadStatus(id, 0)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@`
`49`	`49`	`"k": "Previous item",`
`50`	`50`	`"o": "Open item",`
`51`	`51`	`"u": "Close item",`
`52`		`- "v": "Open item in browser"`
	`52`	`+ "v": "Open item in browser",`
	`53`	`+ "shifti": "Mark as read",`
	`54`	`+ "shiftu": "Mark as unread"`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`	`},`
Original file line number	Diff line number	Diff line change
`@@ -252,11 +252,16 @@ export class ReaderStore {`
`252`	`252`	`articleService.markRead(articles.map((v) => v.id!), status)`
`253`	`253`	`}`
`254`	`254`
`255`		`- markRead(id: number \| number []) {`
	`255`	`+ private getSelectedIds() {`
	`256`	`+ const articles = this.opened ? [this.activeArticle] : this.articles.filter((v) => v.selected)`
	`257`	`+ return articles.map((v) => v.id!)`
	`258`	`+ }`
	`259`	`+`
	`260`	`+ markRead(id: number \| number [] = this.getSelectedIds()) {`
`256`	`261`	`this.markReadStatus(id, 1)`
`257`	`262`	`}`
`258`	`263`
`259`		`- markUnread(id: number \| number []) {`
	`264`	`+ markUnread(id: number \| number [] = this.getSelectedIds()) {`
`260`	`265`	`this.markReadStatus(id, 0)`
`261`	`266`	`}`
`262`	`267`