@gradio/upload 0.12.0 → 0.12.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @gradio/upload
 
+## 0.12.2
+
+### Dependency updates
+
+- @gradio/atoms@0.7.9
+- @gradio/client@1.5.0
+- @gradio/icons@0.7.0
+
+## 0.12.1
+
+### Fixes
+
+- [#8879](https://github.com/gradio-app/gradio/pull/8879) [`67c08bf`](https://github.com/gradio-app/gradio/commit/67c08bfb9e59d801081591b8a59232c32d4467cf) - Fix file uploading in iOS.  Thanks @hannahblair!
+- [#8905](https://github.com/gradio-app/gradio/pull/8905) [`4b14ea8`](https://github.com/gradio-app/gradio/commit/4b14ea860d5055410a3a2257974b61a5c8eaac9d) - Allow use of file extensions in gr.File in iOS.  Thanks @hannahblair!
+
+### Dependency updates
+
+- @gradio/atoms@0.7.8
+- @gradio/icons@0.6.1
+- @gradio/utils@0.5.2
+
 ## 0.12.0
 
 ### Features

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@gradio/upload",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Gradio UI packages",
   "type": "module",
   "main": "src/index.ts",
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@gradio/icons": "^0.6.0",
-    "@gradio/utils": "^0.5.1",
-    "@gradio/atoms": "^0.7.7",
+    "@gradio/atoms": "^0.7.9",
+    "@gradio/client": "^1.5.0",
+    "@gradio/icons": "^0.7.0",
     "@gradio/wasm": "^0.12.0",
-    "@gradio/client": "^1.4.0"
+    "@gradio/utils": "^0.5.2"
   },
   "main_changeset": true,
   "exports": {

package/src/Upload.svelte

@@ -25,10 +25,28 @@
 	let upload_id: string;
 	let file_data: FileData[];
 	let accept_file_types: string | null;
+	let use_post_upload_validation: boolean | null = null;
+
+	const get_ios = (): boolean => {
+		if (typeof navigator !== "undefined") {
+			const userAgent = navigator.userAgent.toLowerCase();
+			return userAgent.indexOf("iphone") > -1 || userAgent.indexOf("ipad") > -1;
+		}
+		return false;
+	};
+
+	$: ios = get_ios();
 
 	const dispatch = createEventDispatcher();
 	const validFileTypes = ["image", "video", "audio", "text", "file"];
-	const processFileType = (type: string): string => {
+	const process_file_type = (type: string): string => {
+		if (ios && type.startsWith(".")) {
+			use_post_upload_validation = true;
+			return type;
+		}
+		if (ios && type.includes("file/*")) {
+			return "*";
+		}
 		if (type.startsWith(".") || type.endsWith("/*")) {
 			return type;
 		}
@@ -41,9 +59,11 @@
 	$: if (filetype == null) {
 		accept_file_types = null;
 	} else if (typeof filetype === "string") {
-		accept_file_types = processFileType(filetype);
+		accept_file_types = process_file_type(filetype);
+	} else if (ios && filetype.includes("file/*")) {
+		accept_file_types = "*";
 	} else {
-		filetype = filetype.map(processFileType);
+		filetype = filetype.map(process_file_type);
 		accept_file_types = filetype.join(", ");
 	}
 
@@ -110,10 +130,53 @@
 			(f) =>
 				new File([f], f instanceof File ? f.name : "file", { type: f.type })
 		);
+
+		if (ios && use_post_upload_validation) {
+			_files = _files.filter((file) => {
+				if (is_valid_file(file)) {
+					return true;
+				}
+				dispatch(
+					"error",
+					`Invalid file type: ${file.name}. Only ${filetype} allowed.`
+				);
+				return false;
+			});
+
+			if (_files.length === 0) {
+				return [];
+			}
+		}
+
 		file_data = await prepare_files(_files);
 		return await handle_upload(file_data);
 	}
 
+	function is_valid_file(file: File): boolean {
+		if (!filetype) return true;
+
+		const allowed_types = Array.isArray(filetype) ? filetype : [filetype];
+
+		return allowed_types.some((type) => {
+			const processed_type = process_file_type(type);
+
+			if (processed_type.startsWith(".")) {
+				return file.name.toLowerCase().endsWith(processed_type.toLowerCase());
+			}
+
+			if (processed_type === "*") {
+				return true;
+			}
+
+			if (processed_type.endsWith("/*")) {
+				const [category] = processed_type.split("/");
+				return file.type.startsWith(category + "/");
+			}
+
+			return file.type === processed_type;
+		});
+	}
+
 	async function load_files_from_upload(e: Event): Promise<void> {
 		const target = e.target as HTMLInputElement;
 		if (!target.files) return;