Skip to content

Add linkText to AlphabetHints #4689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielcovill wants to merge 3 commits into
base: master
Choose a base branch
from
+99 −11
Open

Add linkText to AlphabetHints #4689

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4a9297
Add linkText to AlphabetHints so it's easier to discern scroll/frame …
danielcovill Apr 27, 2025
e9a75a5
Merge branch 'master' into highlight-scroll-hints
Jul 6, 2025
dea7538
Enhance link hinting with scroll marker and overlap handling
Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions content_scripts/link_hints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class LocalHint {
element; // The clickable element.
image; // When element is an <area> (image map), `image` is its associated image.
rect; // The rectangle where the hint should shown, to avoid overlapping with other hints.
linkText; // Used in FilterHints.
showLinkText; // Used in FilterHints.
linkText;
showLinkText;
// The reason that an element has a link hint when the reason isn't obvious, e.g. the body of a
// frame so that the frame can be focused. This reason is shown to the user in the hint's caption.
reason;
Expand Down Expand Up @@ -792,18 +792,21 @@ class AlphabetHints {
this.hintKeystrokeQueue = [];
}

renderMarker(marker) {
let linkText = marker.linkText;
console.log(linkText);
Copy link
Owner

@philc philc Jun 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log statement left in.

const caption = marker.hintString.toUpperCase()
+ (marker.localHint.showLinkText ? ": " + linkText : "");
marker.element.innerHTML = spanWrap(caption);
}

fillInMarkers(hintMarkers) {
const hintStrings = this.hintStrings(hintMarkers.length);
if (hintMarkers.length != hintStrings.length) {
Copy link
Owner

@philc philc Jun 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this safety check no longer needed?

// This can only happen if the user's linkHintCharacters setting is empty.
console.warn("Unable to generate link hint strings.");
} else {
for (let i = 0; i < hintMarkers.length; i++) {
const marker = hintMarkers[i];
marker.hintString = hintStrings[i];
if (marker.isLocalMarker()) {
marker.element.innerHTML = spanWrap(marker.hintString.toUpperCase());
}
let i = 0;
for (const marker of hintMarkers) {
marker.hintString = hintStrings[i++];
if (marker.isLocalMarker()) {
this.renderMarker(marker);
}
}
}
Expand Down Expand Up @@ -1186,13 +1189,13 @@ const LocalHints = {
break;
case "body":
isClickable ||= (element === document.body) && !windowIsFocused() &&
(globalThis.innerWidth > 3) && (globalThis.innerHeight > 3) &&
((document.body != null ? document.body.tagName.toLowerCase() : undefined) !==
"frameset")
(globalThis.innerWidth > 3) && (globalThis.innerHeight > 3) &&
((document.body != null ? document.body.tagName.toLowerCase() : undefined) !==
"frameset")
? (reason = "Frame.")
: undefined;
isClickable ||= (element === document.body) && windowIsFocused() &&
Scroller.isScrollableElement(element)
Scroller.isScrollableElement(element)
? (reason = "Scroll.")
: undefined;
break;
Expand Down Expand Up @@ -1411,10 +1414,8 @@ const LocalHints = {
hint.rect.left += left;
}

if (Settings.get("filterLinkHints")) {
for (const hint of nonOverlappingHints) {
Object.assign(hint, this.generateLinkText(hint));
}
for (const hint of nonOverlappingHints) {
Object.assign(hint, this.generateLinkText(hint));
}
return nonOverlappingHints;
},
Expand Down