Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

chore(react/ribbon): focus on search textbox

Browse Source
This commit is contained in:
Elian Doran
2025-08-24 16:45:17 +03:00
parent b9193a5562
commit 3f105f7b8b
4 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/client/src/components/app_context.ts
View File

@@ -85,7 +85,6 @@ export type CommandMappings = {
focusTree: CommandData; focusTree: CommandData;
focusOnTitle: CommandData; focusOnTitle: CommandData;
focusOnDetail: CommandData; focusOnDetail: CommandData;
focusOnSearchDefinition: Required<CommandData>;
searchNotes: CommandData & { searchNotes: CommandData & {
searchString?: string; searchString?: string;
ancestorNoteId?: string | null; ancestorNoteId?: string | null;

2
apps/client/src/components/root_command_executor.ts
View File

@@ -43,8 +43,6 @@ export default class RootCommandExecutor extends Component {
const noteContext = await appContext.tabManager.openTabWithNoteWithHoisting(searchNote.noteId, { const noteContext = await appContext.tabManager.openTabWithNoteWithHoisting(searchNote.noteId, {
activate: true activate: true
}); });
appContext.triggerCommand("focusOnSearchDefinition", { ntxId: noteContext.ntxId });
} }
async searchInSubtreeCommand({ notePath }: CommandListenerData<"searchInSubtree">) { async searchInSubtreeCommand({ notePath }: CommandListenerData<"searchInSubtree">) {

3
apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx
View File

@@ -254,6 +254,9 @@ function SearchStringOption({ note, refreshResults, error, ...restProps }: Searc
placement: "bottom" placement: "bottom"
}); });
// Auto-focus.
useEffect(() => inputRef.current?.focus(), []);
useEffect(() => { useEffect(() => {
if (error) { if (error) {
showTooltip(); showTooltip();

18
apps/client/src/widgets/search_options/search_string.ts
View File

@@ -1,18 +0,0 @@
import AbstractSearchOption from "./abstract_search_option.js";
import SpacedUpdate from "../../services/spaced_update.js";
import server from "../../services/server.js";
import shortcutService from "../../services/shortcuts.js";
import appContext, { type EventData } from "../../components/app_context.js";
import { t } from "../../services/i18n.js";
import { Tooltip } from "bootstrap";
export default class SearchString extends AbstractSearchOption {
focusOnSearchDefinitionEvent() {
this.$searchString
.val(String(this.$searchString.val()).trim() ?? appContext.lastSearchString)
.focus()
.select();
this.spacedUpdate.scheduleUpdate();
}
}