From 06d8353f4f5702f9b5bf67fb5f6ec84a3b016fa5 Mon Sep 17 00:00:00 2001
From: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com>
Date: Wed, 18 Oct 2023 04:14:11 +0200
Subject: [PATCH] Fix tagger result styling (#4222)

* Fix tagger result styling
* Fix DEFAULT_SLIDESHOW_DELAY
---
 ui/v2.5/src/components/Performers/styles.scss |  3 --
 .../Tagger/scenes/PerformerResult.tsx         | 49 ++++++++++---------
 .../components/Tagger/scenes/StudioResult.tsx | 49 ++++++++++---------
 ui/v2.5/src/hooks/Lightbox/Lightbox.tsx       |  2 +-
 4 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index f2d233725..1679ac337 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -208,10 +208,7 @@
 
 .performer-disambiguation {
   color: $text-muted;
-  /* stylelint-disable */
   font-size: 0.875em;
-  /* stylelint-enable */
-  padding-right: 0.5rem;
 }
 
 .performer-result .performer-details > span {
diff --git a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
index 9d58f1f6f..27fe9bd69 100755
--- a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
@@ -15,16 +15,14 @@ import { getStashboxBase } from "src/utils/stashbox";
 
 interface IPerformerName {
   performer: GQL.ScrapedPerformer | Performer;
-  className?: string;
-  baseURL: string | undefined;
   id: string | undefined | null;
+  baseURL: string | undefined;
 }
 
 const PerformerName: React.FC<IPerformerName> = ({
   performer,
-  className,
-  baseURL,
   id,
+  baseURL,
 }) => {
   const name =
     baseURL && id ? (
@@ -36,14 +34,14 @@ const PerformerName: React.FC<IPerformerName> = ({
     );
 
   return (
-    <span className={className}>
+    <>
       <span>{name}</span>
       {performer.disambiguation && (
         <span className="performer-disambiguation">
           {` (${performer.disambiguation})`}
         </span>
       )}
-    </span>
+    </>
   );
 };
 
@@ -117,12 +115,13 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
       <div className="row no-gutters my-2">
         <div className="entity-name">
           <FormattedMessage id="countables.performers" values={{ count: 1 }} />:
-          <PerformerName
-            performer={performer}
-            className="ml-2"
-            id={performer.remote_site_id}
-            baseURL={stashboxPerformerPrefix}
-          />
+          <b className="ml-2">
+            <PerformerName
+              performer={performer}
+              id={performer.remote_site_id}
+              baseURL={stashboxPerformerPrefix}
+            />
+          </b>
         </div>
         <span className="ml-auto">
           <OptionalField
@@ -135,12 +134,13 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
               <span className="mr-2">
                 <FormattedMessage id="component_tagger.verb_matched" />:
               </span>
-              <PerformerName
-                performer={matchedPerformer}
-                className="ml-3 text-right"
-                id={matchedPerformer.id}
-                baseURL={performerURLPrefix}
-              />
+              <b className="col-3 text-right">
+                <PerformerName
+                  performer={matchedPerformer}
+                  id={matchedPerformer.id}
+                  baseURL={performerURLPrefix}
+                />
+              </b>
             </div>
           </OptionalField>
         </span>
@@ -169,12 +169,13 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
     <div className="row no-gutters align-items-center mt-2">
       <div className="entity-name">
         <FormattedMessage id="countables.performers" values={{ count: 1 }} />:
-        <PerformerName
-          performer={performer}
-          className="ml-2"
-          id={performer.remote_site_id}
-          baseURL={stashboxPerformerPrefix}
-        />
+        <b className="ml-2">
+          <PerformerName
+            performer={performer}
+            id={performer.remote_site_id}
+            baseURL={stashboxPerformerPrefix}
+          />
+        </b>
       </div>
       <ButtonGroup>
         <Button variant="secondary" onClick={() => onCreate()}>
diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
index 3cfed7f3f..56b72d9f9 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
@@ -12,6 +12,25 @@ import { OptionalField } from "../IncludeButton";
 import { faSave } from "@fortawesome/free-solid-svg-icons";
 import { getStashboxBase } from "src/utils/stashbox";
 
+interface IStudioName {
+  studio: GQL.ScrapedStudio | GQL.SlimStudioDataFragment;
+  id: string | undefined | null;
+  baseURL: string | undefined;
+}
+
+const StudioName: React.FC<IStudioName> = ({ studio, id, baseURL }) => {
+  const name =
+    baseURL && id ? (
+      <a href={`${baseURL}${id}`} target="_blank" rel="noreferrer">
+        {studio.name}
+      </a>
+    ) : (
+      studio.name
+    );
+
+  return <span>{name}</span>;
+};
+
 interface IStudioResultProps {
   studio: GQL.ScrapedStudio;
   selectedID: string | undefined;
@@ -58,24 +77,6 @@ const StudioResult: React.FC<IStudioResultProps> = ({
 
   if (stashLoading) return <div>Loading studio</div>;
 
-  const StudioName = ({
-    name,
-    baseURL,
-    id,
-  }: {
-    name: string;
-    baseURL: string | undefined;
-    id: string | undefined | null;
-  }) => {
-    return baseURL && id ? (
-      <a href={`${baseURL}${id}`} target="_blank" rel="noreferrer">
-        {name}
-      </a>
-    ) : (
-      <span>name</span>
-    );
-  };
-
   if (matchedStudio && matchedStashID) {
     return (
       <div className="row no-gutters my-2">
@@ -83,9 +84,9 @@ const StudioResult: React.FC<IStudioResultProps> = ({
           <FormattedMessage id="countables.studios" values={{ count: 1 }} />:
           <b className="ml-2">
             <StudioName
-              name={studio.name}
-              baseURL={stashboxStudioPrefix}
+              studio={studio}
               id={studio.remote_site_id}
+              baseURL={stashboxStudioPrefix}
             />
           </b>
         </div>
@@ -102,9 +103,9 @@ const StudioResult: React.FC<IStudioResultProps> = ({
               </span>
               <b className="col-3 text-right">
                 <StudioName
-                  name={matchedStudio.name}
-                  baseURL={studioURLPrefix}
+                  studio={matchedStudio}
                   id={matchedStudio.id}
+                  baseURL={studioURLPrefix}
                 />
               </b>
             </div>
@@ -137,9 +138,9 @@ const StudioResult: React.FC<IStudioResultProps> = ({
         <FormattedMessage id="countables.studios" values={{ count: 1 }} />:
         <b className="ml-2">
           <StudioName
-            name={studio.name}
-            baseURL={stashboxStudioPrefix}
+            studio={studio}
             id={studio.remote_site_id}
+            baseURL={stashboxStudioPrefix}
           />
         </b>
       </div>
diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 03b8eaede..a3e72a50b 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -70,7 +70,7 @@ const CLASSNAME_NAV = `${CLASSNAME}-nav`;
 const CLASSNAME_NAVIMAGE = `${CLASSNAME_NAV}-image`;
 const CLASSNAME_NAVSELECTED = `${CLASSNAME_NAV}-selected`;
 
-const DEFAULT_SLIDESHOW_DELAY = 5;
+const DEFAULT_SLIDESHOW_DELAY = 5000;
 const SECONDS_TO_MS = 1000;
 const MIN_VALID_INTERVAL_SECONDS = 1;
 const MIN_ZOOM = 0.1;