From 1ea7807f9924e9ec763e4f47a5ce0a38bf3b4055 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Mon, 23 Dec 2024 00:59:13 +0100 Subject: [PATCH] Properly position "track" button in track search Regression a4f1aa323441438e118c52780c8bbc0913c09ce0 --- .../tracker/components/TrackerSearch.tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/modules/tracker/components/TrackerSearch.tsx b/src/modules/tracker/components/TrackerSearch.tsx index bac508c2..fec4572c 100644 --- a/src/modules/tracker/components/TrackerSearch.tsx +++ b/src/modules/tracker/components/TrackerSearch.tsx @@ -35,6 +35,7 @@ import { MangaType } from '@/lib/graphql/generated/graphql.ts'; import { MangaIdInfo } from '@/modules/manga/Manga.types.ts'; import { getErrorMessage } from '@/lib/HelperFunctions.ts'; +import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts'; export const TrackerSearch = ({ manga, @@ -61,6 +62,8 @@ export const TrackerSearch = ({ const searchResults = trackerSearch.data?.searchTracker.trackSearches ?? []; const hasResults = !!searchResults.length; + const hasNoResults = !trackerSearch.loading && !trackerSearch.error && !hasResults; + const hasError = !!trackerSearch.error && !trackerSearch.loading; useEffect(() => { setSelectedTrackerRemoteId(trackedId); @@ -77,9 +80,7 @@ export const TrackerSearch = ({ !!selectedTrackerRemoteId && !!searchResults.find((searchResult) => searchResult.remoteId === selectedTrackerRemoteId), [selectedTrackerRemoteId, searchResults], - ) && - !trackerSearch.loading && - !trackerSearch.error; + ) && !hasError; const trackManga = () => { if (selectedTrackerRemoteId === undefined) { @@ -147,12 +148,17 @@ export const TrackerSearch = ({ /> - - {!trackerSearch.loading && !trackerSearch.error && !hasResults && ( - - )} + + {hasNoResults && } {trackerSearch.loading && } - {trackerSearch.error && !trackerSearch.loading && ( + {hasError && (