Rewrite

keyboard-watcher.user.js

@@ -2,14 +2,14 @@
 // @name        ycombinator-keys
 // @namespace   https://gitea.amine-bouabdallaoui.fr/AmineB/ycombinator-keys
 // @license     gpl-3.0-only
-// @match       http*://news.ycombinator.com/*
+// @match       *://news.ycombinator.com/*
 // @icon        https://gitea.amine-bouabdallaoui.fr/AmineB/ycombinator-keys/raw/branch/main/icons/48.png
 // @grant       none
-// @version     5
+// @version     4
 // @author      AmineB
 // @description Ycombinator keyboard nav.
-// @downloadURL https://gitea.amine-bouabdallaoui.fr/brian6932/ycombinator-keys/raw/branch/main/keyboard-watcher.user.js
+// @downloadURL https://gitea.amine-bouabdallaoui.fr/AmineB/ycombinator-keys/raw/branch/main/keyboard-watcher.user.js
-// @updateURL   https://gitea.amine-bouabdallaoui.fr/brian6932/ycombinator-keys/raw/branch/main/keyboard-watcher.user.js
+// @updateURL   https://gitea.amine-bouabdallaoui.fr/AmineB/ycombinator-keys/raw/branch/main/keyboard-watcher.user.js
 // ==/UserScript==
 // jshint esversion: 11
 
@@ -18,8 +18,12 @@ globalThis.document.styleSheets[0].insertRule('tbody tr.athing>td.title>span.tit
 const requery = () => globalThis.document.querySelectorAll('tbody tr.athing')
 let
 	query = requery(),
-	selected = -1
+	selected = -1,
+	lastCollapsed
 const
+	input = new Set()
+		.add('INPUT')
+		.add('TEXTAREA'),
 	// This is a Firefox only option. For some reason older versions of Firefox can't set outline: none.
 	focusInvisible = { __proto__: null, focusVisible: false },
 	isComment = () => query[selected].classList.contains('comtr'),
@@ -34,59 +38,74 @@ const
 			query[selected].lastChild.firstChild.firstChild.focus(focusInvisible)
 	},
 	keydown = event => {
-		switch (event.key) {
+		if (!input.has(event.target.tagName))
-			case 'j':
+			switch (event.key) {
-				if (selected + 1 === query.length)
+				case 'j':
-					return
+					const lastIndex = query.length - 1
+					if (selected === lastIndex)
+						return
 
-				if (selected !== -1)
+					if (selected !== -1)
-					query[selected].style.boxShadow = ''
+						query[selected].style.boxShadow = ''
 
-				while (selected < query.length && query[++selected].classList.contains('noshow'));
+					let hiddenChain = 0
-				highlightSelected()
+					while (selected < lastIndex) {
-				return
+						const hidden = query[++selected].classList.contains('noshow')
-			case 'k':
+						hiddenChain = hiddenChain * hidden + hidden
-				if (selected <= 0)
-					return
 
-				query[selected].style.boxShadow = ''
+						if (!hidden) {
-				while (selected >= 0 && query[--selected].classList.contains('noshow'));
+							lastCollapsed = query[selected].classList.contains('coll') ? selected : undefined
-				highlightSelected()
-				return
-			case 'h':
-				if (globalThis.location.pathname === '/hidden')
-					for (const selector of query[selected].nextSibling.querySelectorAll('a'))
-						if (selector.innerText === 'un-hide') {
-							selector.click()
 							break
 						}
-						else
+					}
-							query[selected].nextSibling.querySelector('a.clicky.hider')?.click()
+
-				if (selected + 1 <= query.length)
+					selected -= hiddenChain * (selected - hiddenChain === lastCollapsed)
 					highlightSelected()
-				return
-			case 'c':
-				globalThis.open('https://news.ycombinator.com/item?id=' + query[selected].id, '_self')
-				return
-			case 'C':
-				globalThis.open('https://news.ycombinator.com/item?id=' + query[selected].id)
-				return
-			case 'r':
-				if (!isComment())
 					return
-				globalThis.open(query[selected].querySelector('div.reply a').href, '_self')
+				case 'k':
-				return
+					if (selected <= 0)
-			case 'R':
+						return
-				if (!isComment())
+
+					query[selected].style.boxShadow = ''
+
+					while (selected >= 0 && query[--selected].classList.contains('noshow'));
+					highlightSelected()
 					return
-				globalThis.open(query[selected].querySelector('div.reply a').href)
+				case 'h':
-				return
+					if (globalThis.location.pathname === '/hidden')
-			case 'u':
+						for (const selector of query[selected].nextSibling.querySelectorAll('a'))
-				globalThis.open((isComment() ? query[selected] : query[selected].nextSibling).querySelector('a.hnuser').href, '_self')
+							if (selector.innerText === 'un-hide') {
-				return
+								selector.click()
-			case 'U':
+								break
-				globalThis.open((isComment() ? query[selected] : query[selected].nextSibling).querySelector('a.hnuser').href)
+							}
-		}
+							else
+								query[selected].nextSibling.querySelector('a.clicky.hider')?.click()
+
+					if (selected + 1 <= query.length)
+						highlightSelected()
+					return
+				case 'c':
+					globalThis.open('https://news.ycombinator.com/item?id=' + query[selected].id, '_self')
+					return
+				case 'C':
+					globalThis.open('https://news.ycombinator.com/item?id=' + query[selected].id)
+					return
+				case 'r':
+					if (!isComment())
+						return
+					globalThis.open(query[selected].querySelector('div.reply a').href, '_self')
+					return
+				case 'R':
+					if (!isComment())
+						return
+					globalThis.open(query[selected].querySelector('div.reply a').href)
+					return
+				case 'u':
+					globalThis.open((isComment() ? query[selected] : query[selected].nextSibling).querySelector('a.hnuser').href, '_self')
+					return
+				case 'U':
+					globalThis.open((isComment() ? query[selected] : query[selected].nextSibling).querySelector('a.hnuser').href)
+			}
 	},
 	listen = () => globalThis.document.addEventListener('keydown', keydown)