Upload folder using huggingface_hub

6.20.0/imageeditor/shared/ImageEditor.svelte

@@ -102,11 +102,19 @@
 	let pixi_target: HTMLDivElement;
 	let pixi_target_crop: HTMLDivElement;
 
+	let layer_options_key: string | undefined | null = null;
 	$effect(() => {
-		if (check_if_should_init()) {
-			editor.set_layer_options(layer_options);
-			refresh_tools();
-		}
+		if (!check_if_should_init()) return;
+
+		const next_layer_options_key = JSON.stringify(layer_options);
+		if (next_layer_options_key === layer_options_key) return;
+
+		layer_options_key = next_layer_options_key;
+		editor.set_layer_options(layer_options);
+	});
+
+	$effect(() => {
+		refresh_tools();
 	});
 
 	function refresh_tools(): void {
@@ -765,7 +773,8 @@
 		on_drag_change: (dragging) => (is_dragging = dragging),
 		on_files: handle_files,
 		accepted_types: "image/*",
-		disable_click: disable_click
+		disable_click: disable_click,
+		ignore_click_selector: ".toolbar-wrap"
 	}}
 	aria-label={"Click to upload or drop files"}
 	aria-dropeffect="copy"

6.20.0/imageeditor/shared/Toolbar.svelte

@@ -16,12 +16,12 @@
 	import {
 		Image,
 		Brush,
+		BrushSize,
 		Erase,
 		Crop,
 		Upload,
 		ImagePaste,
 		Webcam,
-		Circle,
 		Resize,
 		ColorPickerSolid
 	} from "@gradio/icons";
@@ -108,7 +108,7 @@
 	);
 </script>
 
-<div class="toolbar-wrap">
+<div class="toolbar-wrap" onclick={(e) => e.stopPropagation()}>
 	<div class="half-container">
 		{#if can_edit_image}
 			<IconButton
@@ -228,7 +228,7 @@
 				offset={0}
 			/>
 			<IconButton
-				Icon={Circle}
+				Icon={BrushSize}
 				label="Brush Size"
 				onclick={(e) => handle_subtool_click(e, "size")}
 				highlight={subtool === "size"}
@@ -263,7 +263,7 @@
 
 		{#if tool === "erase" && eraser_options}
 			<IconButton
-				Icon={Circle}
+				Icon={BrushSize}
 				label="Eraser Size"
 				onclick={(e) => handle_subtool_click(e, "size")}
 				highlight={subtool === "size"}

6.20.0/imageeditor/shared/brush/BrushOptions.svelte

@@ -105,8 +105,12 @@
 	const debounced_close_preview = debounce(handle_close_preview, 1000);
 
 	$effect(() => {
+		if (!show_size) {
+			preview = false;
+			return;
+		}
+
 		selected_size;
-		selected_color;
 		handle_preview();
 	});
 

6.20.0/imageeditor/shared/brush/brush.ts

@@ -150,22 +150,23 @@ export class BrushTool implements Tool {
 	 * @param {Subtool} subtool - The current subtool.
 	 */
 	set_tool(tool: ToolbarTool, subtool: Subtool): void {
-		this.current_tool = tool;
-		this.current_subtool = subtool;
+		const new_mode = tool === "erase" ? "erase" : "draw";
+		const mode_changed = this.state.mode !== new_mode;
+		const needs_brush_tool = tool === "erase" || tool === "draw";
 
-		if (this.current_tool !== "erase" && this.current_tool !== "draw") {
+		if (this.is_drawing && (!needs_brush_tool || mode_changed)) {
 			this.commit_pending_changes();
 		}
 
+		this.current_tool = tool;
+		this.current_subtool = subtool;
+
 		if (this.brush_cursor) {
 			const should_be_active = tool === "draw" || tool === "erase";
 
 			this.brush_cursor.set_active(should_be_active);
 		}
 
-		const new_mode = tool === "erase" ? "erase" : "draw";
-		const mode_changed = this.state.mode !== new_mode;
-		const needs_brush_tool = tool === "erase" || tool === "draw";
 		const textures_initialized =
 			this.brush_textures?.textures_initialized ?? false;
 
@@ -179,10 +180,7 @@ export class BrushTool implements Tool {
 				Math.round(current_bounds.height) !== Math.round(tex_dims.height);
 		}
 
-		if (
-			needs_brush_tool &&
-			(mode_changed || !textures_initialized || dimensions_changed)
-		) {
+		if (needs_brush_tool && (!textures_initialized || dimensions_changed)) {
 			this.brush_textures?.initialize_textures();
 		}