bullet_train-fields 1.7.17 → 1.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea795bdf61d25fd9f74878d7cba64dce840b8e86a0eaba6fff611952b7063e8
-  data.tar.gz: b204540e4973df6c404535d198d3a94de37203ff1a394b19c555e642bcac7006
+  metadata.gz: f9b14ac3386fb54947b395cdfe52c4b6e67daf66d85bfc2835ca57a902f595f3
+  data.tar.gz: 3f83062cbb1c93c12aba34a905e6b7e9aad844d9d2d5bea3cb838fc7aae70ffd
 SHA512:
-  metadata.gz: c745588654f061b8193f5e3f2641b8a5190d6cf67098886fe49556239e9f9f38bea95de760e767e89627f70056bd03141dbf9abfff65112feb9cd25c321a612d
-  data.tar.gz: 950055225b86c1ea4a087a8426bbab88f2628c81fc4c42d864abe93e6e7ee8df9beae3785a6366d4888101258e8da27a1af8b474ab5ed14ed16ac7247dd86f0a
+  metadata.gz: b156011b5b6c7829d09d15afc81bffa8db7731d979353e8e32e2faa87a3af647bc0877209276561faa39c2dba63115962744414e8779de6f8e0e9e1c954a4bcd
+  data.tar.gz: 44096f02396db0eab961f73859d980cbd4b13aede5f99b9af82ee0a3a6a869565f9da8aee74d6ab6bd30ca1774f5ccb54790779e93eda0c880c3144100d6af5c

data/app/javascript/controllers/fields/file_field_controller.js

@@ -7,11 +7,23 @@ export default class extends Controller {
     "downloadFileButton",
     "removeFileButton",
     "selectFileButton",
+    "selectFileButtonText",
+    "selectFileButtonIcon",
+    "selectedFileListContainer",
+    "selectedFileList",
+    "selectedFileRowTemplate",
     "progressBar",
     "progressLabel",
   ];
 
+  static values = {
+    selectDifferentFile: String
+  }
+
   connect() {
+    const statusText = this.selectFileButtonTextTarget;
+    this.originalStatusText = statusText.innerText;
+
     // Add upload event listeners
     const initializeListener = document.addEventListener(
       "direct-upload:initialize",
@@ -77,16 +89,56 @@ export default class extends Controller {
     this.removeFileFlagTarget.value = true;
   }
 
-  handleFileSelected() {
-    const statusText = this.selectFileButtonTarget.querySelector("span");
-    const icon = this.selectFileButtonTarget.querySelector("i");
-
+  handleFileSelected(event) {
     if (this.hasDownloadFileButtonTarget) {
       this.downloadFileButtonTarget.remove();
     }
 
-    statusText.innerText = "Select Another File";
-    icon.classList.remove("ti-upload");
-    icon.classList.add("ti-check");
+    const files = event.target.files;
+    this.updateSelectedFileList(files);
+  }
+
+  cancelFileUpload(event){
+    const fileInput = this.fileFieldTarget;
+    const files = fileInput.files;
+    const fileToCancel = event.target.dataset.filename;
+
+    const dt = new DataTransfer();
+    for (const file of files) {
+      if(file.name != fileToCancel){
+        dt.items.add(file);
+      }
+    }
+    fileInput.files = dt.files;
+    this.updateSelectedFileList(dt.files);
+  }
+
+  updateSelectedFileList(files){
+    const statusText = this.selectFileButtonTextTarget;
+    const icon = this.selectFileButtonIconTarget;
+
+    this.selectedFileListTarget.innerHTML = "";
+
+    if(files.length){
+      for (const file of files) {
+        this.addSelectedFile(file);
+      }
+      statusText.innerText = this.selectDifferentFileValue;
+      icon.classList.remove("ti-upload");
+      icon.classList.add("ti-check");
+      this.selectedFileListContainerTarget.classList.remove('hidden')
+    }else{
+      statusText.innerText = this.originalStatusText;
+      icon.classList.add("ti-upload");
+      icon.classList.remove("ti-check");
+      this.selectedFileListContainerTarget.classList.add('hidden')
+    }
+  }
+
+  addSelectedFile(file){
+    let template = this.selectedFileRowTemplateTarget.innerHTML;
+    template = template.replaceAll("@FILENAME@", file.name);
+    this.selectedFileListTarget.insertAdjacentHTML('beforeend', template);
   }
+
 }

data/app/javascript/controllers/fields/file_item_controller.js

@@ -5,6 +5,7 @@ export default class extends Controller {
     "removeFileFlag",
     "downloadFileButton",
     "removeFileButton",
+    "cancelRemoveFileButton",
     "fileName"
   ];
 
@@ -16,8 +17,20 @@ export default class extends Controller {
     }
 
     this.removeFileButtonTarget.classList.add("hidden");
-    this.fileNameTarget.classList.add("hidden");
+    this.cancelRemoveFileButtonTarget.classList.remove("hidden");
     this.removeFileFlagTarget.value = this.idValue;
+    this.element.classList.add("bg-red-100", "dark:bg-red-700");
+  }
+
+  cancelRemoveFile(){
+    if (this.hasDownloadFileButtonTarget) {
+      this.downloadFileButtonTarget.classList.remove("hidden");
+    }
+
+    this.removeFileButtonTarget.classList.remove("hidden");
+    this.cancelRemoveFileButtonTarget.classList.add("hidden");
+    this.removeFileFlagTarget.value = null;
+    this.element.classList.remove("bg-red-100", "dark:bg-red-700/40");
   }
 
 }

data/lib/bullet_train/fields/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Fields
-    VERSION = "1.7.17"
+    VERSION = "1.7.18"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-fields
 version: !ruby/object:Gem::Version
-  version: 1.7.17
+  version: 1.7.18
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard