Code review fixes

Author: Keavon

tools/crate-hierarchy-viz/src/main.rs

@@ -83,10 +83,7 @@ fn collect_all_dependencies(crate_name: &str, dep_map: &HashMap<String, HashSet<
 }
 
 fn main() -> Result<()> {
-	let output_path = std::env::args().nth(1).map(PathBuf::from).unwrap_or_else(|| {
-		eprintln!("Usage: crate-hierarchy-viz <output-file>");
-		std::process::exit(1);
-	});
+	let output_path = std::env::args().nth(1).map(PathBuf::from).ok_or_else(|| anyhow::anyhow!("Usage: crate-hierarchy-viz <output-file>"))?;
 
 	let workspace_root = std::env::current_dir().unwrap();
 	let workspace_toml_path = workspace_root.join("Cargo.toml");
@@ -217,7 +214,12 @@ fn generate_dot(crates: &[CrateInfo]) -> String {
 			"lightblue",
 			Box::new(|c| c.path.to_string_lossy().replace('\\', "/").contains("node-graph/nodes")),
 		),
-		("cluster_desktop", "Desktop", "lightgreen", Box::new(|c| c.path.to_string_lossy().contains("desktop"))),
+		(
+			"cluster_desktop",
+			"Desktop",
+			"lightgreen",
+			Box::new(|c| c.path.to_string_lossy().replace('\\', "/").contains("desktop")),
+		),
 	];
 
 	for (id, label, color, filter) in clusters {

tools/editor-message-tree/src/main.rs

@@ -3,11 +3,8 @@ use editor::utility_types::DebugMessageTree;
 use std::io::Write;
 use std::path::PathBuf;
 
-fn main() {
-	let output_path = std::env::args().nth(1).map(PathBuf::from).unwrap_or_else(|| {
-		eprintln!("Usage: editor-message-tree <output-file>");
-		std::process::exit(1);
-	});
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+	let output_path = std::env::args().nth(1).map(PathBuf::from).ok_or("Usage: editor-message-tree <output-file>")?;
 
 	if let Some(parent) = output_path.parent() {
 		std::fs::create_dir_all(parent).unwrap();
@@ -22,6 +19,8 @@ fn main() {
 			print_tree_node(variant, "", is_last, &mut file);
 		}
 	}
+
+	Ok(())
 }
 
 fn print_tree_node(tree: &DebugMessageTree, prefix: &str, is_last: bool, file: &mut std::fs::File) {

tools/node-docs/src/main.rs

@@ -7,11 +7,8 @@ use crate::utility::*;
 use convert_case::{Case, Casing};
 use std::collections::HashMap;
 
-fn main() {
-	let output_path = std::env::args().nth(1).unwrap_or_else(|| {
-		eprintln!("Usage: node-docs <output-directory>");
-		std::process::exit(1);
-	});
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+	let output_path = std::env::args().nth(1).ok_or("Usage: node-docs <output-directory>")?;
 
 	// TODO: Also obtain document nodes, not only proto nodes
 	let nodes = graphene_std::registry::NODE_METADATA.lock().unwrap();
@@ -45,4 +42,6 @@ fn main() {
 			page_node::write_node_page(index, id, metadata, &category_path);
 		}
 	}
+
+	Ok(())
 }

website/static/js/page/contributor-guide/crate-hierarchy.js

@@ -24,18 +24,26 @@ document.addEventListener("DOMContentLoaded", () => {
 	const zoomOutBtn = controls.querySelector(".zoom-out");
 	if (!(zoomInBtn instanceof HTMLButtonElement) || !(zoomOutBtn instanceof HTMLButtonElement)) return;
 
-	// Lock the viewport height to the SVG's natural rendered height
-	viewport.style.height = `${svg.getBoundingClientRect().height}px`;
+	// Lock the viewport height to the SVG's natural rendered height (ignoring any zoom transform)
+	const updateViewportHeight = () => {
+		const prevTransform = svg.style.transform;
+		svg.style.transform = "";
+		viewport.style.height = `${svg.getBoundingClientRect().height}px`;
+		svg.style.transform = prevTransform;
+	};
+	updateViewportHeight();
+	window.addEventListener("resize", updateViewportHeight);
 
 	const MIN_SCALE = 1;
-	const MAX_SCALE = 2.5;
+	const MAX_SCALE = 4;
 	const ZOOM_STEP = 0.15;
 	const BUTTON_ZOOM_STEP = 0.5;
 	const ANIMATION_DURATION = 200;
 
 	let scale = MIN_SCALE;
 	let panX = 0;
 	let panY = 0;
+	let animationFrameId = 0;
 	let isDragging = false;
 	let dragStartX = 0;
 	let dragStartY = 0;
@@ -92,6 +100,8 @@ document.addEventListener("DOMContentLoaded", () => {
 	}
 
 	function animateZoomAt(/** @type {number} */ clientX, /** @type {number} */ clientY, /** @type {number} */ newTargetScale) {
+		cancelAnimationFrame(animationFrameId);
+
 		const targetScale = Math.min(MAX_SCALE, Math.max(MIN_SCALE, newTargetScale));
 		const startScale = scale;
 		const startPanX = panX;
@@ -107,16 +117,16 @@ document.addEventListener("DOMContentLoaded", () => {
 		const targetPanY = pointY - contentY * targetScale;
 
 		const startTime = performance.now();
-		function step(/** @type {number} */ now) {
+		const step = (/** @type {number} */ now) => {
 			const t = Math.min(1, (now - startTime) / ANIMATION_DURATION);
 			const ease = t * (2 - t); // ease-out quadratic
 			scale = startScale + (targetScale - startScale) * ease;
 			panX = startPanX + (targetPanX - startPanX) * ease;
 			panY = startPanY + (targetPanY - startPanY) * ease;
 			applyTransform();
-			if (t < 1) requestAnimationFrame(step);
-		}
-		requestAnimationFrame(step);
+			if (t < 1) animationFrameId = requestAnimationFrame(step);
+		};
+		animationFrameId = requestAnimationFrame(step);
 	}
 
 	// Scroll wheel zoom