fix(reg): Fix shappes offset being ignored

src/Uno.UI.Composition/Composition/CompositionShape.skia.cs

@@ -3,13 +3,47 @@
 using SkiaSharp;
 using System;
 using System.Numerics;
+using Uno.Extensions;
 using Uno.UI.Composition;
 
 namespace Windows.UI.Composition;
 
 public partial class CompositionShape
 {
+	internal virtual void Render(in DrawingSession session)
+	{
+		using var localSession = BeginDrawing(in session);
+
+		Draw(in session); // We use the session on purpose here!
+	}
+
 	internal virtual void Draw(in DrawingSession session)
 	{
 	}
+
+	private DrawingSession? BeginDrawing(in DrawingSession session)
+	{
+		var offset = Offset;
+		var transform = this.GetTransform();
+
+		if (offset == Vector2.Zero && transform is { IsIdentity: true })
+		{
+			return default; // Use the session without saving it, nothing to dispose
+		}
+
+		session.Surface.Canvas.Save();
+
+		if (offset != Vector2.Zero)
+		{
+			session.Surface.Canvas.Translate(offset.X, offset.Y);
+		}
+
+		if (transform is { IsIdentity: false })
+		{
+			var skTransform = transform.ToSKMatrix();
+			session.Surface.Canvas.Concat(ref skTransform);
+		}
+
+		return session;
+	}
 }

src/Uno.UI.Composition/Composition/ShapeVisual.skia.cs

@@ -27,24 +27,7 @@ public partial class ShapeVisual
 
 			for (var i = 0; i < shapes.Count; i++)
 			{
-				var shape = shapes[i];
-				var shapeTransform = shape.GetTransform();
-
-				if (shapeTransform.IsIdentity)
-				{
-					shape.Draw(in session);
-				}
-				else
-				{
-					var shapeTransformMatrix = shapeTransform.ToSKMatrix();
-
-					session.Surface.Canvas.Save();
-					session.Surface.Canvas.Concat(ref shapeTransformMatrix);
-
-					shape.Draw(in session);
-
-					session.Surface.Canvas.Restore();
-				}
+				shapes[i].Render(in session);
 			}
 		}
 

src/Uno.UI.Composition/Composition/Visual.skia.cs

 #nullable enable
-#define TRACE_COMPOSITION
+//#define TRACE_COMPOSITION
 
 using System;
 using System.Linq;