Merge pull request #3168 from metabrainz/remove-playlist-addtrack-aut…

…ofocus Playlist page: Prevent autofocus on add-track component
metabrainz · Feb 10, 2025 · 0fa1341 · 0fa1341
2 parents 9525dd5 + d417306
commit 0fa1341
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/frontend/js/src/playlists/Playlist.tsx b/frontend/js/src/playlists/Playlist.tsx
@@ -37,7 +37,6 @@ import {
   getPlaylistId,
   getRecordingMBIDFromJSPFTrack,
   isPlaylistOwner,
-  JSPFTrackToListen,
   LISTENBRAINZ_URI_PREFIX,
   PLAYLIST_TRACK_URI_PREFIX,
   PLAYLIST_URI_PREFIX,
@@ -98,14 +97,12 @@ export default function PlaylistPage() {
 
   // Ref
   const socketRef = React.useRef<Socket | null>(null);
+  const searchInputRef = React.useRef<HTMLInputElement>(null);
 
   // States
   const [playlist, setPlaylist] = React.useState<JSPFPlaylist>(
     playlistProps?.playlist || {}
   );
-  const [coverArtConfig, setCoverArtConfig] = React.useState<
-    CoverArtGridOptions
-  >(playlistProps?.cover_art || {});
   const { track: tracks } = playlist;
 
   // Functions
@@ -529,15 +526,17 @@ export default function PlaylistPage() {
         </div>
         {userHasRightToEdit && tracks && tracks.length > 10 && (
           <div className="text-center">
-            <a
+            <button
               className="btn btn-primary"
               type="button"
-              href="#add-track"
               style={{ marginBottom: "1em" }}
+              onClick={() => {
+                searchInputRef.current?.focus();
+              }}
             >
               <FontAwesomeIcon icon={faPlusCircle as IconProp} />
               &nbsp;&nbsp;Add a track
-            </a>
+            </button>
           </div>
         )}
         <div id="listens row">
@@ -573,6 +572,8 @@ export default function PlaylistPage() {
                 &nbsp;&nbsp;Add a track
               </span>
               <SearchTrackOrMBID
+                ref={searchInputRef}
+                autofocus={false}
                 onSelectRecording={addTrack}
                 expectedPayload="trackmetadata"
               />

diff --git a/frontend/js/src/utils/SearchTrackOrMBID.tsx b/frontend/js/src/utils/SearchTrackOrMBID.tsx
@@ -35,12 +35,18 @@ type ConditionalReturnValue =
     };
 
 type SearchTrackOrMBIDProps = {
+  autofocus?: boolean;
   defaultValue?: string;
   expectedPayload: PayloadType;
 } & ConditionalReturnValue;
 
 const SearchTrackOrMBID = forwardRef(function SearchTrackOrMBID(
-  { onSelectRecording, expectedPayload, defaultValue }: SearchTrackOrMBIDProps,
+  {
+    onSelectRecording,
+    expectedPayload,
+    defaultValue,
+    autofocus = true,
+  }: SearchTrackOrMBIDProps,
   inputRefForParent
 ) {
   const { APIService } = useContext(GlobalAppContext);
@@ -69,10 +75,12 @@ const SearchTrackOrMBID = forwardRef(function SearchTrackOrMBID(
 
   // Autofocus once on load
   useEffect(() => {
-    setTimeout(() => {
-      inputRefLocal?.current?.focus();
-    }, 500);
-  }, []);
+    if (autofocus) {
+      setTimeout(() => {
+        inputRefLocal?.current?.focus();
+      }, 500);
+    }
+  }, [autofocus]);
 
   const handleError = useCallback(
     (error: string | Error, title?: string): void => {