obsidian-plugin/quorafind_Obsidian-Float-Search
1
0
Fork 0
mirror of https://github.com/quorafind/Obsidian-Float-Search.git synced 2026-07-22 07:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix IME composition in floating search

Browse source
This commit is contained in:
mountainseaWZX 2026-05-22 21:08:58 +08:00
parent 16fcf917a6
commit 5050f1c758
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/floatSearchIndex.ts
View file

@ -1629,6 +1629,9 @@ class FloatSearchModal extends Modal {
}
inputEl.focus();
inputEl.onkeydown = (e) => {
if (e.isComposing || e.key === "Process" || e.keyCode === 229) {
return;
}
const currentView = this.searchLeaf.view as SearchView;
switch (e.key) {
case "ArrowDown":
@ -1965,6 +1968,14 @@ class FloatSearchCmdkModal extends SuggestModal<CmdkResult> {
private fileLeaf: WorkspaceLeaf | undefined;
private fileEmbeddedView: EmbeddedView | undefined;
private searchAbort: AbortController | null = null;
private isComposing = false;
private readonly onCompositionStart = () => {
this.isComposing = true;
this.hidePreview();
};
private readonly onCompositionEnd = () => {
this.isComposing = false;
};
constructor(plugin: FloatSearchPlugin) {
super(plugin.app);
@ -1989,6 +2000,14 @@ class FloatSearchCmdkModal extends SuggestModal<CmdkResult> {
(this as any).resultContainerEl
);
this.bodyEl.appendChild((this as any).resultContainerEl);
this.inputEl.addEventListener(
"compositionstart",
this.onCompositionStart
);
this.inputEl.addEventListener(
"compositionend",
this.onCompositionEnd
);
}
// Required by SuggestModal but unused — we drive the chooser directly
@ -2391,13 +2410,18 @@ class FloatSearchCmdkModal extends SuggestModal<CmdkResult> {
// @ts-ignore
onSelectedChange = debounce(
(result: CmdkResult, _evt: Event | null) => {
if (this.isComposing) {
this.hidePreview();
return;
}
if (result?.type === "create" || !result?.file) {
this.hidePreview();
} else {
this.showPreview(result);
}
},
100
200
);
private hidePreview() {
@ -2442,10 +2466,21 @@ class FloatSearchCmdkModal extends SuggestModal<CmdkResult> {
});
}
this.inputEl.focus();
if (!this.isComposing && document.activeElement !== this.inputEl) {
this.inputEl.focus();
}
}
onClose() {
this.inputEl.removeEventListener(
"compositionstart",
this.onCompositionStart
);
this.inputEl.removeEventListener(
"compositionend",
this.onCompositionEnd
);
this.isComposing = false;
this.fileLeaf?.detach();
this.fileEmbeddedView?.unload();
}

4
src/leafView.ts
View file

@ -521,7 +521,9 @@ export class EmbeddedView extends nosuper(HoverPopover) {
this.opening = false;
if (this.detaching) this.hide();
}
this.plugin.app.workspace.setActiveLeaf(leaf);
if (openState?.active !== false) {
this.plugin.app.workspace.setActiveLeaf(leaf);
}
return leaf;
}