refined-github · fregante · Jun 16, 2026 · Jun 15, 2026 · Jun 15, 2026 · Jun 15, 2026
diff --git a/eslint-rules/restricted-syntax.js b/eslint-rules/restricted-syntax.js
@@ -46,10 +46,15 @@ const restrictedSyntax = {
 		selector: '*[test.type="CallExpression"][test.callee.name="$optional"],'
 			+ '*[test.type="UnaryExpression"][test.operator="!"][test.argument.type="CallExpression"][test.argument.callee.name="$optional"]',
 	}],
-	'byo/data-hotkey-imports-tooltip': ['error', {
-		message: 'JSX elements with `data-hotkey` must import `tooltip.js`',
-		selector: String.raw`Program:has(JSXAttribute[name.name="data-hotkey"])
-			:not(:has(ImportDeclaration[source.value=/\/helpers\/tooltip\.js$/]))`,
+	'byo/prefer-tooltipped': ['error', {
+		selector:
+			'JSXOpeningElement:has(JSXAttribute[name.name="data-hotkey"]) > JSXAttribute[name.name=/^(title|aria-label)$/]',
+		message:
+			"Elements with hotkeys require a mention in the tooltip, which requires: import addTooltip from '../helpers/tooltip.js';",
+	}, {
+		message: 'JSX elements with `data-hotkey` must be wrapped in `tooltipped()`',
+		selector:
+			'JSXOpeningElement:not(:has(JSXAttribute[name.name="hidden"])) > JSXAttribute[name.name="data-hotkey"]:not(CallExpression[callee.name="tooltipped"] JSXAttribute[name.name="data-hotkey"])',
 Attaches a tooltip to an existing element. Don't use this with JSX. 
 @example addTooltip('Does something', $('.some-existing-button')) 
 Attaches a tooltip to an existing element. Don't use this with JSX. 
  
 @example addTooltip('Does something', $('.some-existing-button')) 
 	}],
 };
 

diff --git a/eslint-suppressions.json b/eslint-suppressions.json
@@ -1,2 +1,7 @@
 {
+  "source/features/releases-tab.tsx": {
+    "byo/prefer-tooltipped": {
+      "count": 2
+    }
+  }
 }
diff --git a/source/features/select-notifications.tsx b/source/features/select-notifications.tsx
@@ -21,6 +21,7 @@ import {botLinksNotificationSelectors} from '../github-helpers/selectors.js';
 import {is, not} from '../helpers/css-selectors.js';
 import onetime from '../helpers/onetime.js';
 import observe from '../helpers/selector-observer.js';
+import {tooltipped} from '../helpers/tooltip.js';
 
 const prIcons = [
 	'.octicon-git-pull-request',
@@ -126,16 +127,21 @@ const createDropdown = onetime(() => (
 		className="details-reset details-overlay position-relative rgh-select-notifications mr-2 tmp-mr-2"
 		onToggle={resetFilters}
 	>
-		<summary
-			className="h6" // `h6` matches "Select all" style
-			data-hotkey="Shift+S"
-			aria-haspopup="menu"
-			// Don't use tooltipped, it remains visible when the dropdown is open
-			title="Hotkey: Shift+S"
-			role="button"
-		>
-			Select by <span className="dropdown-caret ml-1 tmp-ml-1" />
-		</summary>
+		{
+			tooltipped(
+				{
+					label: 'Open the notifications filter dropdown',
+					shortcut: 'Shift+S',
+				},
+				<summary
+					className="h6" // `h6` matches "Select all" style
+					data-hotkey="Shift+S"
+					aria-haspopup="menu"
+					role="button"
+				>
+					Select by <span className="dropdown-caret ml-1 tmp-ml-1" />
+				</summary>,
+			)}
 		<details-menu
 			className="SelectMenu left-0"
 			aria-label="Select by"