From e569b5ba32127d8962842e334883aa4ec66051f6 Mon Sep 17 00:00:00 2001
From: Jip Fr <jipfrijlink@gmail.com>
Date: Mon, 23 Oct 2023 16:30:20 +0200
Subject: [PATCH] Re-add caption delay

---
 src/components/player/atoms/Settings.tsx      |  2 +-
 .../atoms/settings/CaptionSettingsView.tsx    | 21 ++++++++++++++++---
 src/components/player/base/SubtitleView.tsx   |  5 +++--
 src/stores/subtitles/index.ts                 |  8 +++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/components/player/atoms/Settings.tsx b/src/components/player/atoms/Settings.tsx
index 63029d1e..cc02ee4e 100644
--- a/src/components/player/atoms/Settings.tsx
+++ b/src/components/player/atoms/Settings.tsx
@@ -51,7 +51,7 @@ function SettingsOverlay({ id }: { id: string }) {
             <CaptionsView id={id} />
           </Menu.CardWithScrollable>
         </OverlayPage>
-        <OverlayPage id={id} path="/captions/settings" width={343} height={360}>
+        <OverlayPage id={id} path="/captions/settings" width={343} height={430}>
           <Menu.Card>
             <CaptionSettingsView id={id} />
           </Menu.Card>
diff --git a/src/components/player/atoms/settings/CaptionSettingsView.tsx b/src/components/player/atoms/settings/CaptionSettingsView.tsx
index c42abb12..53d67cd5 100644
--- a/src/components/player/atoms/settings/CaptionSettingsView.tsx
+++ b/src/components/player/atoms/settings/CaptionSettingsView.tsx
@@ -40,6 +40,7 @@ function CaptionSetting(props: {
   max: number;
   label: string;
   min: number;
+  decimalsAllowed?: number;
 }) {
   const inputRef = useRef<HTMLInputElement | null>(null);
   const ref = useRef<HTMLDivElement>(null);
@@ -131,7 +132,10 @@ function CaptionSetting(props: {
               onBlur={(e) => {
                 setIsFocused(false);
                 const num = Number((e.target as HTMLInputElement).value);
-                if (!Number.isNaN(num)) props.onChange?.(Math.round(num));
+                if (!Number.isNaN(num))
+                  props.onChange?.(
+                    (props.decimalsAllowed ?? 0) === 0 ? Math.round(num) : num
+                  );
               }}
               ref={inputRef}
               onChange={(e) =>
@@ -142,13 +146,13 @@ function CaptionSetting(props: {
             <button
               className={inputClasses}
               onClick={() => {
-                setInputValue(Math.floor(props.value).toString());
+                setInputValue(props.value.toFixed(props.decimalsAllowed ?? 0));
                 setIsFocused(true);
               }}
               type="button"
               tabIndex={0}
             >
-              {textTransformer(Math.floor(props.value).toString())}
+              {textTransformer(props.value.toFixed(props.decimalsAllowed ?? 0))}
             </button>
           )}
         </div>
@@ -163,7 +167,9 @@ export function CaptionSettingsView({ id }: { id: string }) {
   const router = useOverlayRouter(id);
   const styling = useSubtitleStore((s) => s.styling);
   const overrideCasing = useSubtitleStore((s) => s.overrideCasing);
+  const delay = useSubtitleStore((s) => s.delay);
   const setOverrideCasing = useSubtitleStore((s) => s.setOverrideCasing);
+  const setDelay = useSubtitleStore((s) => s.setDelay);
   const updateStyling = useSubtitleStore((s) => s.updateStyling);
 
   return (
@@ -172,6 +178,15 @@ export function CaptionSettingsView({ id }: { id: string }) {
         Custom captions
       </Menu.BackLink>
       <Menu.Section className="space-y-6">
+        <CaptionSetting
+          label="Caption delay"
+          max={10}
+          min={-10}
+          onChange={(v) => setDelay(v)}
+          value={delay}
+          textTransformer={(s) => `${s}s`}
+          decimalsAllowed={1}
+        />
         <CaptionSetting
           label="Text size"
           max={200}
diff --git a/src/components/player/base/SubtitleView.tsx b/src/components/player/base/SubtitleView.tsx
index 9737a67e..3f030e6a 100644
--- a/src/components/player/base/SubtitleView.tsx
+++ b/src/components/player/base/SubtitleView.tsx
@@ -70,6 +70,7 @@ export function SubtitleRenderer() {
   const srtData = usePlayerStore((s) => s.caption.selected?.srtData);
   const styling = useSubtitleStore((s) => s.styling);
   const overrideCasing = useSubtitleStore((s) => s.overrideCasing);
+  const delay = useSubtitleStore((s) => s.delay);
 
   const parsedCaptions = useMemo(
     () => (srtData ? parseSubtitles(srtData) : []),
@@ -79,9 +80,9 @@ export function SubtitleRenderer() {
   const visibileCaptions = useMemo(
     () =>
       parsedCaptions.filter(({ start, end }) =>
-        captionIsVisible(start, end, 0, videoTime)
+        captionIsVisible(start, end, delay, videoTime)
       ),
-    [parsedCaptions, videoTime]
+    [parsedCaptions, videoTime, delay]
   );
 
   return (
diff --git a/src/stores/subtitles/index.ts b/src/stores/subtitles/index.ts
index bf22b071..45da117a 100644
--- a/src/stores/subtitles/index.ts
+++ b/src/stores/subtitles/index.ts
@@ -24,9 +24,11 @@ export interface SubtitleStore {
   lastSelectedLanguage: string | null;
   styling: SubtitleStyling;
   overrideCasing: boolean;
+  delay: number;
   updateStyling(newStyling: Partial<SubtitleStyling>): void;
   setLanguage(language: string | null): void;
   setOverrideCasing(enabled: boolean): void;
+  setDelay(delay: number): void;
 }
 
 // TODO add migration from previous stored settings
@@ -36,6 +38,7 @@ export const useSubtitleStore = create(
       enabled: false,
       lastSelectedLanguage: null,
       overrideCasing: false,
+      delay: 0,
       styling: {
         color: "#ffffff",
         backgroundOpacity: 0.5,
@@ -62,6 +65,11 @@ export const useSubtitleStore = create(
           s.overrideCasing = enabled;
         });
       },
+      setDelay(delay) {
+        set((s) => {
+          s.delay = delay;
+        });
+      },
     })),
     {
       name: "__MW::subtitles",