From 8a3d364a5067f421af080eaaa50c9407245d285c Mon Sep 17 00:00:00 2001
From: Cagatay Civici <cagatay.civici@gmail.com>
Date: Mon, 28 Oct 2024 22:28:44 +0300
Subject: [PATCH] Fixed #6663, Fixed #6664

---
 .../src/fileupload/style/FileUploadStyle.js        | 14 ++++----------
 .../themes/src/presets/aura/fileupload/index.js    |  6 +++++-
 .../themes/src/presets/lara/fileupload/index.js    |  6 +++++-
 .../src/presets/material/fileupload/index.js       |  6 +++++-
 .../themes/src/presets/nora/fileupload/index.js    |  6 +++++-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/packages/primevue/src/fileupload/style/FileUploadStyle.js b/packages/primevue/src/fileupload/style/FileUploadStyle.js
index 234507764..c742b0465 100644
--- a/packages/primevue/src/fileupload/style/FileUploadStyle.js
+++ b/packages/primevue/src/fileupload/style/FileUploadStyle.js
@@ -27,24 +27,22 @@ const theme = ({ dt }) => `
 
 .p-fileupload-content {
     border: 1px solid transparent;
-    position: relative;
+    display: flex;
+    flex-direction: column;
+    gap: ${dt('fileupload.content.gap')};
     transition: border-color ${dt('fileupload.transition.duration')};
     padding: ${dt('fileupload.content.padding')};
 }
 
 .p-fileupload-content .p-progressbar {
     width: 100%;
-    position: absolute;
-    inset-block-start: 0;
-    inset-inline-start: 0;
     height: ${dt('fileupload.progressbar.height')};
 }
 
 .p-fileupload-file-list {
     display: flex;
     flex-direction: column;
-    gap: 0.5rem;
-    margin-block-start: 1.125rem;
+    gap: ${dt('fileupload.filelist.gap')};
 }
 
 .p-fileupload-file {
@@ -78,10 +76,6 @@ const theme = ({ dt }) => `
     border: 1px dashed ${dt('fileupload.content.highlight.border.color')};
 }
 
-.p-fileupload-advanced .p-message {
-    margin-block-start: 0;
-}
-
 .p-fileupload-basic {
     display: flex;
     flex-wrap: wrap;
diff --git a/packages/themes/src/presets/aura/fileupload/index.js b/packages/themes/src/presets/aura/fileupload/index.js
index 6b0f42a6a..25829b7d2 100644
--- a/packages/themes/src/presets/aura/fileupload/index.js
+++ b/packages/themes/src/presets/aura/fileupload/index.js
@@ -16,7 +16,8 @@ export default {
     },
     content: {
         highlightBorderColor: '{primary.color}',
-        padding: '0 1.125rem 1.125rem 1.125rem'
+        padding: '0 1.125rem 1.125rem 1.125rem',
+        gap: '1rem'
     },
     file: {
         padding: '1rem',
@@ -26,6 +27,9 @@ export default {
             gap: '0.5rem'
         }
     },
+    fileList: {
+        gap: '0.5rem'
+    },
     progressbar: {
         height: '0.25rem'
     },
diff --git a/packages/themes/src/presets/lara/fileupload/index.js b/packages/themes/src/presets/lara/fileupload/index.js
index 1121baa7d..e0b0f4ec1 100644
--- a/packages/themes/src/presets/lara/fileupload/index.js
+++ b/packages/themes/src/presets/lara/fileupload/index.js
@@ -15,7 +15,8 @@ export default {
     },
     content: {
         highlightBorderColor: '{primary.color}',
-        padding: '1.125rem'
+        padding: '1.125rem',
+        gap: '1rem'
     },
     file: {
         padding: '1rem',
@@ -25,6 +26,9 @@ export default {
             gap: '0.5rem'
         }
     },
+    fileList: {
+        gap: '0.5rem'
+    },
     progressbar: {
         height: '0.25rem'
     },
diff --git a/packages/themes/src/presets/material/fileupload/index.js b/packages/themes/src/presets/material/fileupload/index.js
index b8596750a..6b1987fe3 100644
--- a/packages/themes/src/presets/material/fileupload/index.js
+++ b/packages/themes/src/presets/material/fileupload/index.js
@@ -16,7 +16,8 @@ export default {
     },
     content: {
         highlightBorderColor: '{primary.color}',
-        padding: '0 1.25rem 1.25rem 1.25rem'
+        padding: '0 1.25rem 1.25rem 1.25rem',
+        gap: '1rem'
     },
     file: {
         padding: '1rem',
@@ -26,6 +27,9 @@ export default {
             gap: '0.5rem'
         }
     },
+    fileList: {
+        gap: '0.5rem'
+    },
     progressbar: {
         height: '0.25rem'
     },
diff --git a/packages/themes/src/presets/nora/fileupload/index.js b/packages/themes/src/presets/nora/fileupload/index.js
index 6b0f42a6a..25829b7d2 100644
--- a/packages/themes/src/presets/nora/fileupload/index.js
+++ b/packages/themes/src/presets/nora/fileupload/index.js
@@ -16,7 +16,8 @@ export default {
     },
     content: {
         highlightBorderColor: '{primary.color}',
-        padding: '0 1.125rem 1.125rem 1.125rem'
+        padding: '0 1.125rem 1.125rem 1.125rem',
+        gap: '1rem'
     },
     file: {
         padding: '1rem',
@@ -26,6 +27,9 @@ export default {
             gap: '0.5rem'
         }
     },
+    fileList: {
+        gap: '0.5rem'
+    },
     progressbar: {
         height: '0.25rem'
     },