From 17db8159849c781276511ff37fe6849e38dfa2fc Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Sat, 22 Jul 2023 20:42:52 +0300
Subject: [PATCH] Fixed: (UI) Ensure autofocus on filter input in Manual Import

Fixes #3905
---
 .../src/InteractiveImport/Album/SelectAlbumModalContent.js | 7 +++++--
 .../InteractiveImport/Artist/SelectArtistModalContent.js   | 7 +++++--
 src/NzbDrone.Core/Localization/Core/en.json                | 3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.js b/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.js
index 33c3185576..561a9fcfae 100644
--- a/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.js
+++ b/frontend/src/InteractiveImport/Album/SelectAlbumModalContent.js
@@ -88,14 +88,17 @@ class SelectAlbumModalContent extends Component {
           }
           <TextInput
             className={styles.filterInput}
-            placeholder={translate('FilterPlaceHolder')}
+            placeholder={translate('FilterAlbumPlaceholder')}
             name="filter"
             value={filter}
             autoFocus={true}
             onChange={this.onFilterChange}
           />
 
-          <Scroller className={styles.scroller}>
+          <Scroller
+            className={styles.scroller}
+            autoFocus={false}
+          >
             {
               <Table
                 columns={columns}
diff --git a/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.js b/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.js
index 981cda21e7..2dceb979e1 100644
--- a/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.js
+++ b/frontend/src/InteractiveImport/Artist/SelectArtistModalContent.js
@@ -56,14 +56,17 @@ class SelectArtistModalContent extends Component {
         >
           <TextInput
             className={styles.filterInput}
-            placeholder={translate('FilterPlaceHolder')}
+            placeholder={translate('FilterArtistPlaceholder')}
             name="filter"
             value={filter}
             autoFocus={true}
             onChange={this.onFilterChange}
           />
 
-          <Scroller className={styles.scroller}>
+          <Scroller
+            className={styles.scroller}
+            autoFocus={false}
+          >
             {
               items.map((item) => {
                 return item.artistName.toLowerCase().includes(filter) ?
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 1734a2afd7..4312d8ab98 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -352,7 +352,8 @@
   "FileNames": "File Names",
   "Filename": "Filename",
   "Files": "Files",
-  "FilterPlaceHolder": "Filter artist",
+  "FilterAlbumPlaceholder": "Filter album",
+  "FilterArtistPlaceholder": "Filter artist",
   "Filters": "Filters",
   "FirstAlbum": "First Album",
   "FirstAlbumData": "Monitor the first albums. All other albums will be ignored",