From f305210d2270e71bcbeb86b1192afe8dbc698720 Mon Sep 17 00:00:00 2001 From: mohamed1408 <51641929+mohamed1408@users.noreply.github.com> Date: Sun, 17 Nov 2024 23:06:14 +0530 Subject: [PATCH 1/3] fixes #1273 - Updating or Removing URL Query Params not updating the page --- .../renderer/components/ToolBar/AddressBar/index.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx b/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx index 8ac801144..7d888e01c 100644 --- a/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx +++ b/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx @@ -74,7 +74,7 @@ const AddressBar = () => { } newAddress = protocol + typedAddress; } - + if (url && url !== typedAddress) setTypedAddress(url); dispatch(setAddress(newAddress)); }, [dispatch, typedAddress] @@ -131,9 +131,13 @@ const AddressBar = () => { setPermissionRequest(null); }; - const handleKeyDown: KeyboardEventHandler = () => { - if (!isSuggesting) { + const handleKeyDown: KeyboardEventHandler = (e) => { + if (!isSuggesting && !['Escape', 'Enter'].includes(e.key)) { setIsSuggesting(true); + } else if (e.key === 'Escape' && isSuggesting) { + setIsSuggesting(false); + } else if (e.key === 'Enter' && !isSuggesting) { + dispatchAddress(typedAddress); } }; From 8e5f82bf89162fea0e3a1020ae3948adb3cda8bd Mon Sep 17 00:00:00 2001 From: mohamed1408 <51641929+mohamed1408@users.noreply.github.com> Date: Sun, 17 Nov 2024 23:25:21 +0530 Subject: [PATCH 2/3] fixes #1273 Added type for KeyboardEvent --- .../src/renderer/components/ToolBar/AddressBar/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx b/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx index 7d888e01c..b40036d64 100644 --- a/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx +++ b/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx @@ -131,7 +131,7 @@ const AddressBar = () => { setPermissionRequest(null); }; - const handleKeyDown: KeyboardEventHandler = (e) => { + const handleKeyDown: KeyboardEventHandler = (e: React.KeyboardEvent) => { if (!isSuggesting && !['Escape', 'Enter'].includes(e.key)) { setIsSuggesting(true); } else if (e.key === 'Escape' && isSuggesting) { From 42dd557971f1f86a2b1b77cbf1cb08edd93860c6 Mon Sep 17 00:00:00 2001 From: mohamed1408 <51641929+mohamed1408@users.noreply.github.com> Date: Sun, 17 Nov 2024 23:31:06 +0530 Subject: [PATCH 3/3] Update index.tsx --- .../src/renderer/components/ToolBar/AddressBar/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx b/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx index b40036d64..703c18639 100644 --- a/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx +++ b/desktop-app/src/renderer/components/ToolBar/AddressBar/index.tsx @@ -131,7 +131,9 @@ const AddressBar = () => { setPermissionRequest(null); }; - const handleKeyDown: KeyboardEventHandler = (e: React.KeyboardEvent) => { + const handleKeyDown: KeyboardEventHandler = ( + e: React.KeyboardEvent + ) => { if (!isSuggesting && !['Escape', 'Enter'].includes(e.key)) { setIsSuggesting(true); } else if (e.key === 'Escape' && isSuggesting) {