From 9509dca0e79fa3271bbe8896c7248391722a9d30 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Wed, 2 Jul 2025 16:19:18 -0500
Subject: [PATCH 1/6] Issue 53394: FileInput revert removal of the
 "-fileUpload" suffix from inputId

---
 packages/components/releaseNotes/components.md               | 4 ++++
 .../src/internal/components/forms/input/FileInput.tsx        | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 79f643d78a..0dfa4d177d 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,10 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.53.TBD
+*Released*: TBD July 2025
+- Issue 53394: FileInput revert removal of the "-fileUpload" suffix from inputId
+
 ### version 6.53.0
 *Released*: 1 July 2025
 - Remove AssayResultsForSamplesButton, AssayResultsForSamplesMenuItem
diff --git a/packages/components/src/internal/components/forms/input/FileInput.tsx b/packages/components/src/internal/components/forms/input/FileInput.tsx
index a3374914d1..b99d8728c4 100644
--- a/packages/components/src/internal/components/forms/input/FileInput.tsx
+++ b/packages/components/src/internal/components/forms/input/FileInput.tsx
@@ -199,7 +199,8 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
         } = this.props;
         const { data, file, isDisabled, isHover } = this.state;
 
-        const inputId = this.getInputName();
+        const name = this.getInputName();
+        const inputId = `${name}-fileUpload`; // Issue 53394: needs to be a distinct input id so it doesn't collide with other elements on the page for this fieldKey
         let body;
 
         if (file) {
@@ -235,7 +236,7 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
                         disabled={this.state.isDisabled}
                         type="file"
                         className="file-upload__input" // This class makes the file input hidden
-                        name={inputId}
+                        name={name}
                         id={inputId}
                         multiple={false}
                         onChange={this.onChange}

From 680dee3482fbf7a709d03cc483d3355986afd247 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Wed, 2 Jul 2025 16:19:33 -0500
Subject: [PATCH 2/6] 6.53.0-fileInputId53394.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index f53f279e7e..2a46bc05ad 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.0",
+  "version": "6.53.0-fileInputId53394.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.53.0",
+      "version": "6.53.0-fileInputId53394.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 32e7a0ef85..a45bde417a 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.0",
+  "version": "6.53.0-fileInputId53394.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 03ed1baa529b1e29b51c295d5c580c7cb66c7e41 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Thu, 3 Jul 2025 15:24:23 -0500
Subject: [PATCH 3/6] 6.53.2-fileInputId53394.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 98524082c8..7b1282abc8 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.2",
+  "version": "6.53.2-fileInputId53394.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.53.2",
+      "version": "6.53.2-fileInputId53394.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index b9be0f31e5..aa4865bb2f 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.2",
+  "version": "6.53.2-fileInputId53394.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From c805f86a396f6167f66f6a3666567ee6eebb1430 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Mon, 7 Jul 2025 08:38:19 -0500
Subject: [PATCH 4/6] npm run lint-branch-fix

---
 .../components/forms/input/FileInput.tsx      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/internal/components/forms/input/FileInput.tsx b/packages/components/src/internal/components/forms/input/FileInput.tsx
index b99d8728c4..9e557cd9f3 100644
--- a/packages/components/src/internal/components/forms/input/FileInput.tsx
+++ b/packages/components/src/internal/components/forms/input/FileInput.tsx
@@ -210,10 +210,10 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
             body = (
                 <div
                     className={attachedFileClass}
-                    onDrop={this.onDrop}
                     onDragEnter={this.onDrag}
-                    onDragOver={this.onDrag}
                     onDragLeave={this.onDragLeave}
+                    onDragOver={this.onDrag}
+                    onDrop={this.onDrop}
                 >
                     <span className="fa fa-times-circle attached-file__remove-icon" onClick={this.onRemove} />
                     <span className="fa fa-file-text attached-file--icon" />
@@ -224,8 +224,8 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
         } else if (data?.get('value')) {
             body = (
                 <FileColumnRenderer
-                    isFileLink={queryColumn?.rangeURI === FILELINK_RANGE_URI}
                     data={data}
+                    isFileLink={queryColumn?.rangeURI === FILELINK_RANGE_URI}
                     onRemove={isDisabled ? undefined : this.onRemove}
                 />
             );
@@ -233,14 +233,14 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
             body = (
                 <>
                     <input
-                        disabled={this.state.isDisabled}
-                        type="file"
                         className="file-upload__input" // This class makes the file input hidden
-                        name={name}
+                        disabled={this.state.isDisabled}
                         id={inputId}
                         multiple={false}
+                        name={name}
                         onChange={this.onChange}
                         ref={this.fileInput}
+                        type="file"
                     />
 
                     {/* We render a label here so click and drag events propagate to the input above */}
@@ -250,12 +250,12 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
                             'file-upload__is-hover': isHover && !isDisabled,
                         })}
                         htmlFor={inputId}
-                        onDrop={this.onDrop}
                         onDragEnter={this.onDrag}
-                        onDragOver={this.onDrag}
                         onDragLeave={this.onDragLeave}
+                        onDragOver={this.onDrag}
+                        onDrop={this.onDrop}
                     >
-                        <i className="fa fa-cloud-upload" aria-hidden="true" />
+                        <i aria-hidden="true" className="fa fa-cloud-upload" />
                         &nbsp;
                         <span>Select file or drag and drop here.</span>
                         <div className="file-upload__error-message">{this.state.error}</div>
@@ -279,11 +279,11 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
                     renderFieldLabel(queryColumn)
                 ) : (
                     <FieldLabel
+                        column={queryColumn}
+                        isDisabled={isDisabled}
                         labelOverlayProps={labelOverlayProps}
                         showLabel={showLabel}
                         showToggle={allowDisable}
-                        column={queryColumn}
-                        isDisabled={isDisabled}
                         toggleProps={{
                             onClick: toggleDisabledTooltip ? undefined : this.toggleDisabled,
                             toolTip: toggleDisabledTooltip,

From 7d1d38fb9d01a8b2b6815b4bb3509a864e61019c Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Mon, 7 Jul 2025 08:38:57 -0500
Subject: [PATCH 5/6] 6.53.3

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 7b1282abc8..976d2939e5 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.2-fileInputId53394.0",
+  "version": "6.53.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.53.2-fileInputId53394.0",
+      "version": "6.53.3",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index aa4865bb2f..91753e4d0a 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.53.2-fileInputId53394.0",
+  "version": "6.53.3",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From e2fb0a29d52742811f5590c0e88b1e95c6132209 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Mon, 7 Jul 2025 08:41:05 -0500
Subject: [PATCH 6/6] Update release notes with version number and release date

---
 packages/components/releaseNotes/components.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 8578c99bf4..8647e23ac6 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,8 +1,8 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
-### version 6.53.TBD
-*Released*: TBD July 2025
+### version 6.53.3
+*Released*: 7 July 2025
 - Issue 53394: FileInput revert removal of the "-fileUpload" suffix from inputId
 
 ### version 6.53.2