Fix scene marker form resetting

stashapp · Jul 27, 2023 · c676ffb · c676ffb
1 parent a0986f8
commit c676ffb
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { Button, Form } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import { useFormik } from "formik";
@@ -40,12 +40,16 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
     tag_ids: yup.array(yup.string().required()).defined(),
   });
 
-  const initialValues = {
-    title: marker?.title ?? "",
-    seconds: marker?.seconds ?? Math.round(getPlayerPosition() ?? 0),
-    primary_tag_id: marker?.primary_tag.id ?? "",
-    tag_ids: marker?.tags.map((tag) => tag.id) ?? [],
-  };
+  // useMemo to only run getPlayerPosition when the input marker actually changes
+  const initialValues = useMemo(
+    () => ({
+      title: marker?.title ?? "",
+      seconds: marker?.seconds ?? Math.round(getPlayerPosition() ?? 0),
+      primary_tag_id: marker?.primary_tag.id ?? "",
+      tag_ids: marker?.tags.map((tag) => tag.id) ?? [],
+    }),
+    [marker]
+  );
 
   type InputValues = yup.InferType<typeof schema>;