Merge pull request #1337 from mohamed1408/Updating_URL_Issue#1273

fixes #1273 - Updating or Removing URL Query Params not updating the …
responsively-org · Dec 14, 2024 · 3cf60a0 · 3cf60a0
2 parents f7c0976 + 42dd557
commit 3cf60a0
Showing 1 changed file with 9 additions and 3 deletions.
diff --git 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,15 @@ const AddressBar = () => {
     setPermissionRequest(null);
   };
 
-  const handleKeyDown: KeyboardEventHandler<HTMLInputElement> = () => {
-    if (!isSuggesting) {
+  const handleKeyDown: KeyboardEventHandler<HTMLInputElement> = (
+    e: React.KeyboardEvent<HTMLInputElement>
+  ) => {
+    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);
     }
   };