fix fullWidth logic

stashapp · Jul 31, 2023 · bfad6f0 · bfad6f0
1 parent be219eb
commit bfad6f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx b/ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx
@@ -336,7 +336,10 @@ const MoviePage: React.FC<IProps> = ({ movie }) => {
   function maybeRenderDetails() {
     if (!isEditing) {
       return (
-        <MovieDetailsPanel movie={movie} fullWidth={!compactExpandedDetails} />
+        <MovieDetailsPanel
+          movie={movie}
+          fullWidth={!collapsed && !compactExpandedDetails}
+        />
       );
     }
   }

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -386,7 +386,7 @@ const PerformerPage: React.FC<IProps> = ({ performer }) => {
         <PerformerDetailsPanel
           performer={performer}
           collapsed={collapsed}
-          fullWidth={!compactExpandedDetails}
+          fullWidth={!collapsed && !compactExpandedDetails}
         />
       );
     }
@@ -552,7 +552,9 @@ const PerformerPage: React.FC<IProps> = ({ performer }) => {
         <div className="detail-container">
           <div className="detail-header-image">
             {encodingImage ? (
-              <LoadingIndicator message={`${intl.formatMessage({ id: "encoding_image" })}...`} />
+              <LoadingIndicator
+                message={`${intl.formatMessage({ id: "encoding_image" })}...`}
+              />
             ) : (
               renderImage()
             )}

diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -293,7 +293,7 @@ const StudioPage: React.FC<IProps> = ({ studio }) => {
         <StudioDetailsPanel
           studio={studio}
           collapsed={collapsed}
-          fullWidth={!compactExpandedDetails}
+          fullWidth={!collapsed && !compactExpandedDetails}
         />
       );
     }

diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -328,7 +328,12 @@ const TagPage: React.FC<IProps> = ({ tag }) => {
 
   function maybeRenderDetails() {
     if (!isEditing) {
-      return <TagDetailsPanel tag={tag} fullWidth={!compactExpandedDetails} />;
+      return (
+        <TagDetailsPanel
+          tag={tag}
+          fullWidth={!collapsed && !compactExpandedDetails}
+        />
+      );
     }
   }