Add review fixes

Author: TrueDoctor

client/web/src/components/panels/LayerTree.vue

@@ -330,7 +330,10 @@ export default defineComponent({
 				const responsePath = updateData.path;
 				const responseLayer = updateData.data;
 
-				const index = this.layers.findIndex((layer: LayerPanelEntry) => responsePath.length === layer.path.length && responsePath.every((this_i, i) => this_i === layer.path[i]));
+				const index = this.layers.findIndex((layer: LayerPanelEntry) => {
+					const pathLengthsEqual = responsePath.length === layer.path.length;
+					return pathLengthsEqual && responsePath.every((index, i) => index === layer.path[i]);
+				});
 				if (index >= 0) this.layers[index] = responseLayer;
 
 				this.setBlendModeForSelectedLayers();

core/document/src/intersection.rs

@@ -11,6 +11,7 @@ impl Quad {
 		let size = bbox[1] - bbox[0];
 		Self([bbox[0], bbox[0] + size * DVec2::X, bbox[0] + size * DVec2::Y, bbox[1]])
 	}
+
 	pub fn lines(&self) -> [Line; 4] {
 		[
 			Line::new(to_point(self.0[0]), to_point(self.0[1])),
@@ -39,12 +40,8 @@ fn to_point(vec: DVec2) -> Point {
 
 pub fn intersect_quad_bez_path(quad: Quad, shape: &BezPath, closed: bool) -> bool {
 	// check if outlines intersect
-	for path_segment in shape.segments() {
-		for line in quad.lines() {
-			if !path_segment.intersect_line(line).is_empty() {
-				return true;
-			}
-		}
+	if shape.segments().any(|path_segment| quad.lines().iter().any(|line| !path_segment.intersect_line(*line).is_empty())) {
+		return true;
 	}
 	// check if selection is entirely within the shape
 	if closed && quad.0.iter().any(|q| shape.contains(to_point(*q))) {

core/document/src/layers/folder.rs

@@ -30,9 +30,10 @@ impl LayerData for Folder {
 	}
 
 	fn bounding_box(&self, transform: glam::DAffine2) -> Option<[DVec2; 2]> {
-		let mut layers_non_empty_bounding_boxes = self.layers.iter().filter_map(|layer| layer.data.bounding_box(transform * layer.transform)).peekable();
-		layers_non_empty_bounding_boxes.peek()?;
-		layers_non_empty_bounding_boxes.reduce(|a, b| [a[0].min(b[0]), a[1].max(b[1])])
+		self.layers
+			.iter()
+			.filter_map(|layer| layer.data.bounding_box(transform * layer.transform))
+			.reduce(|a, b| [a[0].min(b[0]), a[1].max(b[1])])
 	}
 }
 

core/document/src/layers/simple_shape.rs

@@ -78,13 +78,13 @@ impl Shape {
 	}
 
 	pub fn shape(sides: u8, style: PathStyle) -> Self {
-		use std::f64::consts::PI;
+		use std::f64::consts::{FRAC_PI_2, PI};
 		fn unit_rotation(theta: f64) -> DVec2 {
 			DVec2::new(theta.sin(), theta.cos())
 		}
 		let mut path = kurbo::BezPath::new();
 		let apothem_offset_angle = 2. * PI / (sides as f64);
-		let offset = ((sides + 1) % 2) as f64 * PI / 2.; // rotate odd sided shaps by 90 degrees
+		let offset = ((sides + 1) % 2) as f64 * FRAC_PI_2; // rotate odd sided shapes by 90 degrees
 
 		let relative_points = (0..sides).map(|i| apothem_offset_angle * i as f64 + offset).map(unit_rotation);
 		let min = relative_points.clone().reduce(|a, b| a.min(b)).unwrap_or_default();

core/editor/src/document/layer_panel.rs

@@ -28,6 +28,7 @@ impl LayerData {
 			scale: 1.,
 		}
 	}
+
 	pub fn snapped_angle(&self) -> f64 {
 		let increment_radians: f64 = ROTATE_SNAP_INTERVAL.to_radians();
 		if self.snap_rotate {
@@ -36,7 +37,9 @@ impl LayerData {
 			self.rotation
 		}
 	}
+
 	pub fn calculate_offset_transform(&self, offset: DVec2) -> DAffine2 {
+		// TODO: replace with DAffine2::from_scale_angle_translation and fix the errors
 		let offset_transform = DAffine2::from_translation(offset);
 		let scale_transform = DAffine2::from_scale(DVec2::new(self.scale, self.scale));
 		let angle_transform = DAffine2::from_angle(self.snapped_angle());
@@ -53,8 +56,6 @@ pub fn layer_data<'a>(layer_data: &'a mut HashMap<Vec<LayerId>, LayerData>, path
 }
 
 pub fn layer_panel_entry(layer_data: &LayerData, transform: DAffine2, layer: &Layer, path: Vec<LayerId>) -> LayerPanelEntry {
-	let blend_mode = layer.blend_mode;
-	let opacity = layer.opacity;
 	let layer_type: LayerType = (&layer.data).into();
 	let name = layer.name.clone().unwrap_or_else(|| format!("Unnamed {}", layer_type));
 	let arr = layer.data.bounding_box(transform).unwrap_or([DVec2::ZERO, DVec2::ZERO]);
@@ -79,9 +80,9 @@ pub fn layer_panel_entry(layer_data: &LayerData, transform: DAffine2, layer: &La
 	LayerPanelEntry {
 		name,
 		visible: layer.visible,
-		blend_mode,
-		opacity,
-		layer_type,
+		blend_mode: layer.blend_mode,
+		opacity: layer.opacity,
+		layer_type: (&layer.data).into(),
 		layer_data: *layer_data,
 		path,
 		thumbnail,

core/editor/src/tool/tools/eyedropper.rs

@@ -24,7 +24,7 @@ impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Eyedropper {
 		if let Some(path) = data.0.document.intersects_quad_root(quad).last() {
 			if let Ok(layer) = data.0.document.layer(path) {
 				if let LayerDataType::Shape(s) = &layer.data {
-					s.style.fill().map(|fill| {
+					s.style.fill().and_then(|fill| {
 						fill.color().map(|color| match action {
 							ToolMessage::Eyedropper(EyedropperMessage::LeftMouseDown) => responses.push_back(ToolMessage::SelectPrimaryColor(color).into()),
 							ToolMessage::Eyedropper(EyedropperMessage::RightMouseDown) => responses.push_back(ToolMessage::SelectSecondaryColor(color).into()),