Merge pull request #326 from hydralauncher/fix/video-controller-not-clickable-on-game-details

Fix/video controller not clickable on game details

.github/workflows/lint.yml

@@ -1,6 +1,6 @@
 name: Lint
 
-on: [pull_request, push]
+on: [push]
 
 jobs:
   lint:

src/locales/en/translation.json

@@ -96,7 +96,11 @@
     "dont_show_it_again": "Don't show it again",
     "copy_to_clipboard": "Copy",
     "copied_to_clipboard": "Copied",
-    "got_it": "Got it"
+    "got_it": "Got it",
+    "previous_screenshot": "Previous screenshot",
+    "next_screenshot": "Next screenshot",
+    "screenshot": "Screenshot {{number}}",
+    "open_screenshot": "Open screenshot {{number}}"
   },
   "activation": {
     "title": "Activate Hydra",

src/locales/pt/translation.json

@@ -92,7 +92,11 @@
     "dont_show_it_again": "Não mostrar novamente",
     "copy_to_clipboard": "Copiar",
     "copied_to_clipboard": "Copiado",
-    "got_it": "Entendi"
+    "got_it": "Entendi",
+    "previous_screenshot": "Captura de tela anterior",
+    "next_screenshot": "Próxima captura de tela",
+    "screenshot": "Captura de tela {{number}}",
+    "open_screenshot": "Ver captura de tela {{number}}"
   },
   "activation": {
     "title": "Ativação",

src/renderer/src/pages/game-details/gallery-slider.css.ts

@@ -1,3 +1,4 @@
+import { recipe } from "@vanilla-extract/recipes";
 import { SPACING_UNIT, vars } from "../../theme.css";
 import { style } from "@vanilla-extract/css";
 
@@ -13,7 +14,7 @@ export const gallerySliderMedia = style({
   width: "100%",
   height: "100%",
   display: "block",
-  flexShrink: 0,
+  flexShrink: "0",
   flexGrow: "0",
   transition: "translate 0.3s ease-in-out",
   borderRadius: "4px",
@@ -54,42 +55,77 @@ export const gallerySliderPreview = style({
   },
 });
 
-export const gallerySliderMediaPreview = style({
+export const mediaPreviewButton = recipe({
-  cursor: "pointer",
+  base: {
-  width: "20%",
+    cursor: "pointer",
-  height: "20%",
+    width: "20%",
-  display: "block",
+    height: "20%",
-  flexShrink: 0,
+    display: "block",
-  flexGrow: 0,
+    flexShrink: "0",
-  opacity: 0.3,
+    flexGrow: "0",
-  transition: "translate 0.3s ease-in-out, opacity 0.2s ease",
+    opacity: "0.3",
-  borderRadius: "4px",
+    transition: "translate 0.3s ease-in-out, opacity 0.2s ease",
-  border: `solid 1px ${vars.color.border}`,
+    borderRadius: "4px",
-  ":hover": {
+    border: `solid 1px ${vars.color.border}`,
-    opacity: "1",
+    ":hover": {
+      opacity: "0.8",
+    },
+  },
+  variants: {
+    active: {
+      true: {
+        opacity: "1",
+      },
+    },
   },
 });
 
-export const gallerySliderMediaPreviewActive = style({
+export const mediaPreview = style({
-  opacity: 1,
+  width: "100%",
+  height: "100%",
+  display: "flex",
+  flex: "1",
 });
 
-export const gallerySliderButton = style({
+export const gallerySliderButton = recipe({
-  all: "unset",
+  base: {
-  display: "block",
+    position: "absolute",
-  position: "absolute",
+    alignSelf: "center",
-  top: 0,
+    cursor: "pointer",
-  bottom: 0,
+    backgroundColor: "rgba(0, 0, 0, 0.4)",
-  padding: "1rem",
+    transition: "all 0.2s ease-in-out",
-  cursor: "pointer",
+    borderRadius: "50%",
-  transition: "background-color 100ms ease-in-out",
+    color: vars.color.muted,
-  ":hover": {
+    width: "48px",
-    backgroundColor: "rgb(0, 0, 0, 0.2)",
+    height: "48px",
+    ":hover": {
+      backgroundColor: "rgba(0, 0, 0, 0.6)",
+    },
+    ":active": {
+      transform: "scale(0.95)",
+    },
+  },
+  variants: {
+    direction: {
+      left: {
+        left: "0",
+        marginLeft: `${SPACING_UNIT}px`,
+        transform: `translateX(${-(48 + SPACING_UNIT)}px)`,
+      },
+      right: {
+        right: "0",
+        marginRight: `${SPACING_UNIT}px`,
+        transform: `translateX(${48 + SPACING_UNIT}px)`,
+      },
+    },
+    visible: {
+      true: {
+        transform: "translateX(0)",
+        opacity: "1",
+      },
+      false: {
+        opacity: "0",
+      },
+    },
   },
 });
-
-export const gallerySliderIcons = style({
-  fill: vars.color.muted,
-  width: "2rem",
-  height: "2rem",
-});

src/renderer/src/pages/game-details/gallery-slider.tsx

@@ -1,7 +1,10 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
-import { ShopDetails, SteamMovies, SteamScreenshot } from "@types";
 import { ChevronRightIcon, ChevronLeftIcon } from "@primer/octicons-react";
+
+import type { ShopDetails } from "@types";
+
 import * as styles from "./gallery-slider.css";
+import { useTranslation } from "react-i18next";
 
 export interface GallerySliderProps {
   gameDetails: ShopDetails | null;
@@ -9,6 +12,12 @@ export interface GallerySliderProps {
 
 export function GallerySlider({ gameDetails }: GallerySliderProps) {
   const scrollContainerRef = useRef<HTMLDivElement>(null);
+  const mediaContainerRef = useRef<HTMLDivElement>(null);
+
+  const { t } = useTranslation("game_details");
+
+  const hasScreenshots = gameDetails && gameDetails.screenshots.length;
+  const hasMovies = gameDetails && gameDetails.movies?.length;
 
   const [mediaCount] = useState<number>(() => {
     if (gameDetails) {
@@ -25,7 +34,7 @@ export function GallerySlider({ gameDetails }: GallerySliderProps) {
   });
 
   const [mediaIndex, setMediaIndex] = useState<number>(0);
-  const [arrowShow, setArrowShow] = useState(false);
+  const [showArrows, setShowArrows] = useState(false);
 
   const showNextImage = () => {
     setMediaIndex((index: number) => {
@@ -47,6 +56,20 @@ export function GallerySlider({ gameDetails }: GallerySliderProps) {
     setMediaIndex(0);
   }, [gameDetails]);
 
+  useEffect(() => {
+    if (hasMovies && mediaContainerRef.current) {
+      mediaContainerRef.current.childNodes.forEach((node, index) => {
+        if (node instanceof HTMLVideoElement) {
+          if (index == mediaIndex) {
+            node.play();
+          } else {
+            node.pause();
+          }
+        }
+      });
+    }
+  }, [hasMovies, mediaContainerRef, mediaIndex]);
+
   useEffect(() => {
     if (scrollContainerRef.current) {
       const container = scrollContainerRef.current;
@@ -57,92 +80,107 @@ export function GallerySlider({ gameDetails }: GallerySliderProps) {
     }
   }, [gameDetails, mediaIndex, mediaCount]);
 
-  const hasScreenshots = gameDetails && gameDetails.screenshots.length;
+  const previews = useMemo(() => {
-  const hasMovies = gameDetails && gameDetails.movies?.length;
+    const screenshotPreviews =
+      gameDetails?.screenshots.map(({ id, path_thumbnail }) => ({
+        id,
+        thumbnail: path_thumbnail,
+      })) ?? [];
+
+    if (gameDetails?.movies) {
+      const moviePreviews = gameDetails.movies.map(({ id, thumbnail }) => ({
+        id,
+        thumbnail,
+      }));
+
+      return [...moviePreviews, ...screenshotPreviews];
+    }
+
+    return screenshotPreviews;
+  }, [gameDetails]);
 
   return (
     <>
       {hasScreenshots && (
         <div className={styles.gallerySliderContainer}>
           <div
-            onMouseEnter={() => setArrowShow(true)}
+            onMouseEnter={() => setShowArrows(true)}
-            onMouseLeave={() => setArrowShow(false)}
+            onMouseLeave={() => setShowArrows(false)}
             className={styles.gallerySliderAnimationContainer}
+            ref={mediaContainerRef}
           >
             {gameDetails.movies &&
-              gameDetails.movies.map((video: SteamMovies) => (
+              gameDetails.movies.map((video) => (
                 <video
                   key={video.id}
                   controls
                   className={styles.gallerySliderMedia}
                   poster={video.thumbnail}
                   style={{ translate: `${-100 * mediaIndex}%` }}
-                  autoPlay
                   loop
                   muted
+                  tabIndex={-1}
                 >
-                  <source src={video.webm.max.replace("http", "https")} />
+                  <source src={video.mp4.max.replace("http", "https")} />
                 </video>
               ))}
-            {gameDetails.screenshots &&
-              gameDetails.screenshots.map(
-                (image: SteamScreenshot, i: number) => (
-                  <img
-                    key={"image-" + i}
-                    className={styles.gallerySliderMedia}
-                    src={image.path_full}
-                    style={{ translate: `${-100 * mediaIndex}%` }}
-                  />
-                )
-              )}
-            {arrowShow && (
-              <>
-                <button
-                  onClick={showPrevImage}
-                  type="button"
-                  className={styles.gallerySliderButton}
-                  style={{ left: 0 }}
-                >
-                  <ChevronLeftIcon className={styles.gallerySliderIcons} />
-                </button>
 
-                <button
+            {hasScreenshots &&
-                  onClick={showNextImage}
+              gameDetails.screenshots.map((image, i) => (
-                  type="button"
+                <img
-                  className={styles.gallerySliderButton}
+                  key={image.id}
-                  style={{ right: 0 }}
+                  className={styles.gallerySliderMedia}
-                >
+                  src={image.path_full}
-                  <ChevronRightIcon className={styles.gallerySliderIcons} />
+                  style={{ translate: `${-100 * mediaIndex}%` }}
-                </button>
+                  alt={t("screenshot", { number: i + 1 })}
-              </>
+                />
-            )}
+              ))}
+
+            <button
+              onClick={showPrevImage}
+              type="button"
+              className={styles.gallerySliderButton({
+                visible: showArrows,
+                direction: "left",
+              })}
+              aria-label={t("previous_screenshot")}
+              tabIndex={0}
+            >
+              <ChevronLeftIcon size={36} />
+            </button>
+
+            <button
+              onClick={showNextImage}
+              type="button"
+              className={styles.gallerySliderButton({
+                visible: showArrows,
+                direction: "right",
+              })}
+              aria-label={t("next_screenshot")}
+              tabIndex={0}
+            >
+              <ChevronRightIcon size={36} />
+            </button>
           </div>
 
           <div className={styles.gallerySliderPreview} ref={scrollContainerRef}>
-            {hasMovies &&
+            {previews.map((media, i) => (
-              gameDetails.movies?.map((video: SteamMovies, i: number) => (
+              <button
+                key={media.id}
+                type="button"
+                className={styles.mediaPreviewButton({
+                  active: mediaIndex === i,
+                })}
+                onClick={() => setMediaIndex(i)}
+                aria-label={t("open_screenshot", { number: i + 1 })}
+              >
                 <img
-                  key={video.id}
+                  src={media.thumbnail}
-                  onClick={() => setMediaIndex(i)}
+                  className={styles.mediaPreview}
-                  src={video.thumbnail}
+                  alt={t("screenshot", { number: i + 1 })}
-                  className={`${styles.gallerySliderMediaPreview} ${mediaIndex === i ? styles.gallerySliderMediaPreviewActive : ""}`}
                 />
-              ))}
+              </button>
-            {gameDetails.screenshots &&
+            ))}
-              gameDetails.screenshots.map(
-                (image: SteamScreenshot, i: number) => (
-                  <img
-                    key={"image-thumb-" + i}
-                    onClick={() =>
-                      setMediaIndex(
-                        i + (gameDetails.movies ? gameDetails.movies.length : 0)
-                      )
-                    }
-                    className={`${styles.gallerySliderMediaPreview} ${mediaIndex === i + (gameDetails.movies ? gameDetails.movies.length : 0) ? styles.gallerySliderMediaPreviewActive : ""}`}
-                    src={image.path_full}
-                  />
-                )
-              )}
           </div>
         </div>
       )}