Merge branch 'main' into endring-send-inn-arbeidssokerstatus

navikt · Jan 14, 2025 · 24ad9bc · 24ad9bc
2 parents 3123687 + 3720d39
commit 24ad9bc
Show file tree

Hide file tree

Showing 3 changed files with 1,098 additions and 768 deletions.
diff --git a/app/components/aktivitet-modal/AktivitetModal.tsx b/app/components/aktivitet-modal/AktivitetModal.tsx
@@ -1,5 +1,6 @@
 import { Alert, Button, Heading, Modal } from "@navikt/ds-react";
 import { useActionData, useFetcher, useNavigation } from "@remix-run/react";
+import { useEffect, useRef } from "react";
 import { ValidatedForm } from "remix-validated-form";
 
 import { useLocale } from "~/hooks/useLocale";
@@ -42,6 +43,7 @@ export function AktivitetModal({
   const fetcher = useFetcher();
   const navigation = useNavigation();
   const isSubmitting = useIsSubmitting(navigation);
+  const modalRef = useRef<HTMLDivElement>(null);
 
   const slettHandler = () => {
     fetcher.submit(
@@ -55,6 +57,12 @@ export function AktivitetModal({
     lukkModal();
   };
 
+  useEffect(() => {
+    if (modalAapen) {
+      modalRef?.current?.scrollTo({ top: 0 });
+    }
+  }, [modalAapen]);
+
   return (
     <Modal
       className={styles.modal}
@@ -73,7 +81,7 @@ export function AktivitetModal({
           {valgtDato && <FormattertDato locale={locale} dato={valgtDato} ukedag />}
         </Heading>
       </Modal.Header>
-      <Modal.Body>
+      <Modal.Body ref={modalRef}>
         {dag && (
           <ValidatedForm method="post" key="lagre-ny-aktivitet" validator={validator()}>
             <input type="hidden" name="dato" defaultValue={valgtDato} />