From 82939b9e068c859a8335e601fe9fe7fc686dd71e Mon Sep 17 00:00:00 2001 From: Rudy Celekli Date: Sun, 18 Oct 2026 16:22:16 -0400 Subject: [PATCH] fix(visual-track): stop offsetting fitted media by the Clip border twice Co-Authored-By: Claude Opus 5.5 --- packages/visual-track/src/lower.ts | 13 +++++++++---- packages/visual-track/test/visual-track.test.ts | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/visual-track/src/lower.ts b/packages/visual-track/src/lower.ts index 27887d674..85330b502 100644 --- a/packages/visual-track/src/lower.ts +++ b/packages/visual-track/src/lower.ts @@ -122,6 +122,11 @@ function sampleElements( xPx: layer.source.extent.widthPx / 2, yPx: layer.source.extent.heightPx / 2, }, layer.mapping); + // Layers are absolutely positioned inside the bordered frame element, so CSS places them from + // its padding edge. The mapping is already inset by the border; measure from that edge too. + const border = clip.treatment.border?.widthPx ?? 0; + const originX = clip.frame.xPx + border; + const originY = clip.frame.yPx + border; const sampling = `${layer.id}:sampling`; const appearance = `${layer.id}:appearance`; const mapping = `${layer.id}:mapping`; @@ -136,7 +141,7 @@ function sampleElements( { name: "left", value: 0 }, { name: "position", value: "absolute" }, { name: "top", value: 0 }, - { name: "transform-origin", value: `${px(sourceCenter.xPx - clip.frame.xPx)} ${px(sourceCenter.yPx - clip.frame.yPx)}` }, + { name: "transform-origin", value: `${px(sourceCenter.xPx - originX)} ${px(sourceCenter.yPx - originY)}` }, { name: "width", value: "100%" }, ], ...(() => { @@ -148,15 +153,15 @@ function sampleElements( }; })(), }; - const localTx = layer.mapping.tx - clip.frame.xPx; - const localTy = layer.mapping.ty - clip.frame.yPx; + const localTx = layer.mapping.tx - originX; + const localTy = layer.mapping.ty - originY; const corners = [ { xPx: 0, yPx: 0 }, { xPx: layer.source.extent.widthPx, yPx: 0 }, { xPx: layer.source.extent.widthPx, yPx: layer.source.extent.heightPx }, { xPx: 0, yPx: layer.source.extent.heightPx }, ].map((point) => mapSpatialPoint(point, layer.mapping)) - .map((point) => `${px(point.xPx - clip.frame.xPx)} ${px(point.yPx - clip.frame.yPx)}`); + .map((point) => `${px(point.xPx - originX)} ${px(point.yPx - originY)}`); const appearanceStyle: VisualStyleDeclaration[] = [ { name: "filter", value: filter(layer) }, { name: "height", value: "100%" }, diff --git a/packages/visual-track/test/visual-track.test.ts b/packages/visual-track/test/visual-track.test.ts index dee615eb4..2792b36e0 100644 --- a/packages/visual-track/test/visual-track.test.ts +++ b/packages/visual-track/test/visual-track.test.ts @@ -237,7 +237,8 @@ test("a Clip keeps ordered Paint/sample layers, two-frame fit and frame treatmen { name: "left", value: 0 }, { name: "position", value: "absolute" }, { name: "top", value: 0 }, - { name: "transform-origin", value: "200px 150px" }, + // Layers sit inside the frame's 2px border, so their local origin is the padding edge. + { name: "transform-origin", value: "198px 148px" }, { name: "width", value: "100%" }, ]); const mapping = elements.find((element) => element.id === "content:mapping"); @@ -246,7 +247,7 @@ test("a Clip keeps ordered Paint/sample layers, two-frame fit and frame treatmen { name: "left", value: 0 }, { name: "position", value: "absolute" }, { name: "top", value: 0 }, - { name: "transform", value: "matrix(0.345,0,0,0.345,62,12)" }, + { name: "transform", value: "matrix(0.345,0,0,0.345,60,10)" }, { name: "transform-origin", value: "0 0" }, { name: "width", value: "800px" }, ]);