erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-09 18:35:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11032 from keymanapp/fix/web/7866-layer-switch-key-deletes-selection

Browse source 
fix(web): prevent layer switch key from erasing selection
This commit is contained in:
Marc Durdin 2024-03-29 15:22:58 +11:00 • committed by GitHub
commit 4e403e9374
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/web/keyboard-processor/src/text/outputTarget.ts
View file

@ -21,15 +21,17 @@ export function isEmptyTransform(transform: Transform) {
export class TextTransform implements Transform {
readonly insert: string;
readonly deleteLeft: number;
readonly deleteRight?: number;
readonly deleteRight: number;
readonly erasedSelection: boolean;
constructor(insert: string, deleteLeft: number, deleteRight?: number) {
constructor(insert: string, deleteLeft: number, deleteRight: number, erasedSelection: boolean) {
this.insert = insert;
this.deleteLeft = deleteLeft;
this.deleteRight = deleteRight || 0;
this.deleteRight = deleteRight;
this.erasedSelection = erasedSelection;
}
public static readonly nil = new TextTransform('', 0, 0);
public static readonly nil = new TextTransform('', 0, 0, false);
}
export class Transcription {
@ -138,7 +140,7 @@ export default abstract class OutputTarget {
// caret mid-word..
const deletedRight = fromRight.substring(0, rightDivergenceIndex + 1)._kmwLength();
return new TextTransform(insertedText, deletedLeft, deletedRight);
return new TextTransform(insertedText, deletedLeft, deletedRight, original.getSelectedText() && !this.getSelectedText());
}
buildTranscriptionFrom(original: OutputTarget, keyEvent: KeyEvent, readonly: boolean, alternates?: Alternate[]): Transcription {

6
common/web/keyboard-processor/tests/node/transcriptions.js
View file

@ -448,7 +448,8 @@ but not himself.`; // Sheev Palpatine, in the Star Wars prequels.
assert.deepEqual(transform, {
insert: '',
deleteLeft: 0,
deleteRight: 0
deleteRight: 0,
erasedSelection: true
});
});
@ -459,7 +460,8 @@ but not himself.`; // Sheev Palpatine, in the Star Wars prequels.
const transform = {
insert: '',
deleteLeft: 0,
deleteRight: 0
deleteRight: 0,
erasedSelection: true
};
target.apply(transform);

6
web/src/app/webview/src/contextManager.ts
View file

@ -1,4 +1,4 @@
import { type Keyboard, Mock, OutputTarget, Transcription, findCommonSubstringEndIndex } from '@keymanapp/keyboard-processor';
import { type Keyboard, Mock, OutputTarget, Transcription, findCommonSubstringEndIndex, isEmptyTransform } from '@keymanapp/keyboard-processor';
import { KeyboardStub } from 'keyman/engine/package-cache';
import { ContextManagerBase, ContextManagerConfiguration } from 'keyman/engine/main';
import { WebviewConfiguration } from './configuration.js';
@ -41,7 +41,9 @@ export class ContextHost extends Mock {
// Signal the necessary text changes to the embedding app, if it exists.
if(this.oninserttext) {
this.oninserttext(transform.deleteLeft, transform.insert, transform.deleteRight);
if(!isEmptyTransform(transform) || transform.erasedSelection) {
this.oninserttext(transform.deleteLeft, transform.insert, transform.deleteRight);
}
}
}