From e83badf767da482dc3b3a1b774d68ef48a5290d9 Mon Sep 17 00:00:00 2001
From: Jack Kavanagh <jackkav@gmail.com>
Date: Tue, 20 Sep 2022 14:44:47 +0200
Subject: [PATCH] fix: url bar auto-focus (#5199)

* connect unique key hack up to focus useEffect

* fix lint

Co-authored-by: Filipe Freire <livrofubia@gmail.com>
---
 .../src/ui/components/panes/request-pane.tsx  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/insomnia/src/ui/components/panes/request-pane.tsx b/packages/insomnia/src/ui/components/panes/request-pane.tsx
index a13816e473..999271bac7 100644
--- a/packages/insomnia/src/ui/components/panes/request-pane.tsx
+++ b/packages/insomnia/src/ui/components/panes/request-pane.tsx
@@ -3,7 +3,6 @@ import { deconstructQueryStringToParams, extractQueryStringFromUrl } from 'insom
 import React, { FC, useCallback, useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
-import { useMount } from 'react-use';
 
 import { getContentTypeFromHeaders } from '../../../common/constants';
 import * as models from '../../../models';
@@ -99,17 +98,6 @@ export const RequestPane: FC<Props> = ({
       });
     }
   }, [request]);
-
-  const requestUrlBarRef = useRef<RequestUrlBarHandle>(null);
-  useMount(() => {
-    requestUrlBarRef.current?.focusInput();
-  });
-  useEffect(() => {
-    requestUrlBarRef.current?.focusInput();
-  }, [
-    request?._id, // happens when the user switches requests
-    settings.hasPromptedAnalytics, // happens when the user dismisses the analytics modal
-  ]);
   const gitVersion = useGitVCSVersion();
   const activeRequestSyncVersion = useActiveRequestSyncVCSVersion();
   const activeEnvironment = useSelector(selectActiveEnvironment);
@@ -117,6 +105,15 @@ export const RequestPane: FC<Props> = ({
   // Force re-render when we switch requests, the environment gets modified, or the (Git|Sync)VCS version changes
   const uniqueKey = `${activeEnvironment?.modified}::${request?._id}::${gitVersion}::${activeRequestSyncVersion}::${activeRequestMeta?.activeResponseId}`;
 
+  const requestUrlBarRef = useRef<RequestUrlBarHandle>(null);
+  useEffect(() => {
+    requestUrlBarRef.current?.focusInput();
+  }, [
+    request?._id, // happens when the user switches requests
+    settings.hasPromptedAnalytics, // happens when the user dismisses the analytics modal
+    uniqueKey,
+  ]);
+
   if (!request) {
     return (
       <PlaceholderRequestPane />