Add support meta method on File or Blob subclasses

phoenixframework · Oct 4, 2023 · d386704 · d386704
1 parent 9da3029
commit d386704
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 12 deletions.
diff --git a/assets/js/phoenix_live_view/upload_entry.js b/assets/js/phoenix_live_view/upload_entry.js
@@ -96,7 +96,8 @@ export default class UploadEntry {
       relative_path: this.file.webkitRelativePath,
       size: this.file.size,
       type: this.file.type,
-      ref: this.ref
+      ref: this.ref,
+      meta: typeof(this.file.meta) === "function" ? this.file.meta() : undefined
     }
   }
 

diff --git a/lib/phoenix_live_view/test/live_view_test.ex b/lib/phoenix_live_view/test/live_view_test.ex
@@ -1174,6 +1174,7 @@ defmodule Phoenix.LiveViewTest do
     * `:size` - the byte size of the content
     * `:type` - the MIME type of the file
     * `:relative_path` - for simulating webkitdirectory metadata
+    * `:meta` - optional metadata sent by the client
 
   ## Examples
 

diff --git a/lib/phoenix_live_view/upload_config.ex b/lib/phoenix_live_view/upload_config.ex
@@ -18,7 +18,8 @@ defmodule Phoenix.LiveView.UploadEntry do
             client_relative_path: nil,
             client_size: nil,
             client_type: nil,
-            client_last_modified: nil
+            client_last_modified: nil,
+            client_meta: nil
 
   @type t :: %__MODULE__{
           progress: integer(),
@@ -33,7 +34,8 @@ defmodule Phoenix.LiveView.UploadEntry do
           client_relative_path: String.t() | nil,
           client_size: integer() | nil,
           client_type: String.t() | nil,
-          client_last_modified: integer() | nil
+          client_last_modified: integer() | nil,
+          client_meta: map() | nil
         }
 
   @doc false
@@ -558,7 +560,8 @@ defmodule Phoenix.LiveView.UploadConfig do
       client_relative_path: Map.get(client_entry, "relative_path"),
       client_size: Map.fetch!(client_entry, "size"),
       client_type: Map.fetch!(client_entry, "type"),
-      client_last_modified: Map.get(client_entry, "last_modified")
+      client_last_modified: Map.get(client_entry, "last_modified"),
+      client_meta: Map.get(client_entry, "meta"),
     }
 
     {:ok, entry}

diff --git a/priv/static/phoenix_live_view.cjs.js b/priv/static/phoenix_live_view.cjs.js
diff --git a/priv/static/phoenix_live_view.cjs.js.map b/priv/static/phoenix_live_view.cjs.js.map
diff --git a/priv/static/phoenix_live_view.esm.js b/priv/static/phoenix_live_view.esm.js
diff --git a/priv/static/phoenix_live_view.esm.js.map b/priv/static/phoenix_live_view.esm.js.map
diff --git a/priv/static/phoenix_live_view.js b/priv/static/phoenix_live_view.js
@@ -856,7 +856,8 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
         relative_path: this.file.webkitRelativePath,
         size: this.file.size,
         type: this.file.type,
-        ref: this.ref
+        ref: this.ref,
+        meta: typeof this.file.meta === "function" ? this.file.meta() : void 0
       };
     }
     uploader(uploaders) {

diff --git a/priv/static/phoenix_live_view.min.js b/priv/static/phoenix_live_view.min.js