Skip to content
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

Jump to bottom

fix(ios): selection range sync for long contexts #10956

Merged
merged 2 commits into from
Mar 19, 2024
Merged

fix(ios): selection range sync for long contexts #10956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b11a5d
fix(ios): selection range sync for long contexts
Mar 6, 2024
3240ee7
fix(ios): hard context resets
Mar 12, 2024
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
11 changes: 9 additions & 2 deletions ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,16 @@ function setKeymanContext(text, doSync, selStart, selLength) {
let selEnd = selStart + selLength;
selEnd = isNaN(selEnd) ? undefined : selEnd;

const shouldReset = keyman.context.updateContext(text, selStart, selEnd);
if(!doSync || shouldReset) {
if(doSync) {
const shouldReset = keyman.context.updateContext(text, selStart, selEnd);
if(shouldReset) {
keyman.resetContext();
}
} else {
// if not in "sync" mode, we have a hard context reset; just full-reset it.
keyman.context.setText(text);
keyman.context.setSelection(selStart, selStart+selLength);
keyman.resetContext();
}
}

Expand Down
16 changes: 11 additions & 5 deletions web/src/app/webview/src/contextManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,24 @@ export class ContextHost extends Mock {

updateContext(text: string, selStart: number, selEnd: number): boolean {
let shouldResetContext = false;
if(text != this.text) {
let tempMock = new Mock(text, selStart ?? text._kmwLength(), selEnd ?? text._kmwLength());

let newLeft = tempMock.getTextBeforeCaret();
let oldLeft = this.getTextBeforeCaret();
let tempMock = new Mock(text, selStart ?? text._kmwLength(), selEnd ?? text._kmwLength());
let newLeft = tempMock.getTextBeforeCaret();
let oldLeft = this.getTextBeforeCaret();

if(text != this.text) {
let unexpectedBeforeCharCount = findCommonSubstringEndIndex(newLeft, oldLeft, true) + 1;
shouldResetContext = !!unexpectedBeforeCharCount;
}

if(shouldResetContext) {
this.text = text;
this.selStart = selStart;
this.selEnd = selEnd;
} else {
// Transform selection coordinates to their location within the longform context window.
let delta = oldLeft._kmwLength() - newLeft._kmwLength();
this.selStart = selStart - delta;
this.selEnd = selEnd - delta;
}

if(selStart === undefined || selEnd === undefined) {
Expand Down
Loading