FileUpload.Dropzone: id prop settes på button (#2817)

navikt · Mar 22, 2024 · d991011 · d991011
1 parent b6086f7
commit d991011
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/proud-seahorses-wink.md b/.changeset/proud-seahorses-wink.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": patch
+---
+
+FileUpload.Dropzone: id prop settes på button
diff --git a/@navikt/core/react/src/form/file-upload/parts/dropzone/Dropzone.tsx b/@navikt/core/react/src/form/file-upload/parts/dropzone/Dropzone.tsx
@@ -30,6 +30,7 @@ const Dropzone = forwardRef<HTMLInputElement, FileUploadDropzoneProps>(
       disabled,
       translations,
       onClick,
+      id: buttonId,
       ...rest
     } = props;
 
@@ -46,7 +47,10 @@ const Dropzone = forwardRef<HTMLInputElement, FileUploadDropzoneProps>(
     const _disabled = disabled ?? fileLimitReached;
 
     const { inputProps, errorId, showErrorMsg, hasError, inputDescriptionId } =
-      useFormField({ ...props, disabled: _disabled }, "fileUpload");
+      useFormField(
+        { ...omit(props, ["id"]), disabled: _disabled },
+        "fileUpload",
+      );
     const {
       id: inputId,
       "aria-describedby": ariaDescribedby,
@@ -129,8 +133,9 @@ const Dropzone = forwardRef<HTMLInputElement, FileUploadDropzoneProps>(
                 <BodyShort as="div">{translate("dropzone.or")}</BodyShort>
               </div>
               <Button
-                {...omit(rest, ["errorId", "id"])}
+                {...omit(rest, ["errorId"])}
                 {...inputPropsRest}
+                id={buttonId}
                 aria-describedby={cl(labelId, ariaDescribedby)}
                 className="navds-dropzone__area-button"
                 type="button"