From 2e2eec7195d64d72bee3c1ab9239055318424a56 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Mon, 26 Oct 2020 11:10:46 +0300 Subject: [PATCH] Add search bindings for 'Esc' & 'Enter' hits Signed-off-by: Alex Andreev --- src/renderer/components/dock/pod-log-search.tsx | 14 +++++++++++++- src/renderer/components/input/input.tsx | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/dock/pod-log-search.tsx b/src/renderer/components/dock/pod-log-search.tsx index 3f39db7cb4..8549e9ccaa 100644 --- a/src/renderer/components/dock/pod-log-search.tsx +++ b/src/renderer/components/dock/pod-log-search.tsx @@ -40,6 +40,16 @@ export const PodLogSearch = observer((props: PodLogSearchProps) => { toNextOverlay(); } + const onClear = () => { + setSearch(""); + } + + const onKeyDown = (evt: React.KeyboardEvent) => { + if (evt.key === "Enter") { + onNextOverlay(); + } + } + useEffect(() => { // Refresh search when logs changed searchStore.onSearch(logs); @@ -52,6 +62,8 @@ export const PodLogSearch = observer((props: PodLogSearchProps) => { onChange={setSearch} closeIcon={false} contentRight={totalFinds > 0 && findCounts} + onClear={onClear} + onKeyDown={onKeyDown} /> { setSearch("")} + onClick={onClear} /> ); diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx index 9bd67f8887..cd3e998a55 100644 --- a/src/renderer/components/input/input.tsx +++ b/src/renderer/components/input/input.tsx @@ -214,6 +214,10 @@ export class Input extends React.Component { onKeyDown(evt: React.KeyboardEvent) { const modified = evt.shiftKey || evt.metaKey || evt.altKey || evt.ctrlKey; + if (this.props.onKeyDown) { + this.props.onKeyDown(evt); + } + switch (evt.key) { case "Enter": if (this.props.onSubmit && !modified && !evt.repeat) {