Skip to content

Open source CapCut alternative.

TypeScript

fix(site): mask and wipe geometry follow what the preview draws [rebuild]

David Le0262f1d82385
diff --git a/site/packages/effects-kit/src/render.ts b/site/packages/effects-kit/src/render.ts
index e69ff941..4e68fa01 100644
--- a/site/packages/effects-kit/src/render.ts
+++ b/site/packages/effects-kit/src/render.ts
@@ -495,7 +495,7 @@ export async function paintElement(
// A wipe uncovers the element from its left edge: clip to the uncovered
// share of its box and paint the whole thing behind it.
if (reveal <= 0) return;
- const b = await measureElementBounds(overlay, frame, env);
+ const b = await measureElementBounds(overlay, frame, env, { pad: false });
ctx.save();
ctx.beginPath();
ctx.rect(b.cx - b.w / 2, b.cy - b.h / 2, b.w * reveal, b.h);
@@ -579,11 +579,14 @@ export async function renderElementPng(
/** An element's resting box in output pixels (center + size), rotation left
* to the caller. Conservative on purpose: it feeds the animated-region crop,
- * where a few spare pixels beat a clipped shadow. */
+ * where a few spare pixels beat a clipped shadow. `pad: false` drops that
+ * slack and returns the box the DOM lays out, which is what a wipe clips to.
+ */
export async function measureElementBounds(
overlay: Overlay,
frame: PaintFrame,
- env: RenderEnv
+ env: RenderEnv,
+ opts?: { pad?: boolean }
): Promise<{ cx: number; cy: number; w: number; h: number }> {
const cx = overlay.x * frame.width;
const cy = overlay.y * frame.height;
@@ -629,6 +632,7 @@ export async function measureElementBounds(
w += PLATE_PAD_X * fpx * 2;
h += PLATE_PAD_Y * fpx * 2;
}
+ if (opts?.pad === false) return { cx, cy, w, h };
const strokePad = (o.stroke?.width ?? 0) * fpx * 2;
const shadow = resolveShadow(o.shadow);
const shadowPad = shadow ? (shadow.blur + Math.abs(shadow.offsetY)) * frame.scale : 0;
diff --git a/site/src/cut/components/OverlayLayer.tsx b/site/src/cut/components/OverlayLayer.tsx
index 85b3e45d..711e39df 100644
--- a/site/src/cut/components/OverlayLayer.tsx
+++ b/site/src/cut/components/OverlayLayer.tsx
@@ -1422,7 +1422,8 @@ export function MaskGizmoCore({
left: `calc(50% + ${cx}px)`,
top: `calc(50% + ${cy}px)`,
width: Math.max(1, w),
- height: Math.max(1, h),
+ // A linear mask is a line: its frame has no height to lift over.
+ height: m.kind === "linear" ? 1 : Math.max(1, h),
transform: `translate(-50%, -50%) rotate(${f.rotation}deg)`,
}}
onRotate={rotateMask}