erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-07 22:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #10695 from keymanapp/fix/web/banner-interaction-no-suggestions

Browse source 
fix(web): disables banner interaction when suggestions are absent
This commit is contained in:
Joshua Horton 2024-02-15 15:25:04 +07:00 • committed by GitHub
commit 62e80cd826
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
web/src/engine/osk/src/banner/suggestionBanner.ts
View file

@ -498,7 +498,9 @@ export class SuggestionBanner extends Banner {
const optionBounding = option.div.getBoundingClientRect();
if(optionBounding.left <= sample.clientX && sample.clientX < optionBounding.right) {
return option;
// If there is no backing suggestion, then there's no real selection.
// May happen when no suggestions are available.
return option.suggestion ? option : null;
} else {
const dist = (sample.clientX < optionBounding.left ? -1 : 1) * (sample.clientX - optionBounding.left);
@ -509,7 +511,8 @@ export class SuggestionBanner extends Banner {
}
}
return bestMatch;
// If there is no backing suggestion, then there's no real selection.
return bestMatch.suggestion ? bestMatch : null;
}
};
@ -557,7 +560,7 @@ export class SuggestionBanner extends Banner {
sourceTracker.source = source;
sourceTracker.scrollingHandler = (sample) => {
const newScrollLeft = this.scrollState.updateTo(sample);
this.highlightAnimation.setBaseScroll(newScrollLeft);
this.highlightAnimation?.setBaseScroll(newScrollLeft);
// Only re-enable the original suggestion, even if the touchpoint finds
// itself over a different suggestion. Might happen if a scroll boundary
@ -578,9 +581,9 @@ export class SuggestionBanner extends Banner {
};
sourceTracker.suggestion = source.currentSample.item;
markSelection(sourceTracker.suggestion);
source.currentSample.item.highlight(true);
if(sourceTracker.suggestion) {
markSelection(sourceTracker.suggestion);
}
const terminationHandler = () => {
if(sourceTracker.suggestion) {