From c676ffb6cc18b64d238a19e9a760fa8c1482c861 Mon Sep 17 00:00:00 2001
From: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:35:46 +0200
Subject: [PATCH] Fix scene marker form resetting

---
 .../Scenes/SceneDetails/SceneMarkerForm.tsx    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
index 9529a98fe2f..37650954b01 100644
--- 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>;