- Introduced `getLayerMask` utility to streamline layer mask retrieval. - Updated layer rendering logic to incorporate layer masks and opacity adjustments. - Added functionality to prevent dropping a group into its descendants. - Enhanced image texture rendering to support opacity parameters across various rendering functions. - Implemented group layer bounds application for better scaling and positioning. - Added tests to ensure correct behavior when handling layer masks and group layers. - Created new types for asset generation provenance to track generated assets more effectively.
195 lines
6.7 KiB
TypeScript
195 lines
6.7 KiB
TypeScript
import type { ImageDocument } from "@core/document";
|
|
import type { Rect } from "@core/geometry";
|
|
import type { Layer } from "@core/layer";
|
|
import { getLayerMask } from "@core/layer-mask-utils";
|
|
import type { ArtboardId, LayerId } from "@core/id";
|
|
import type { TransformTarget } from "./transform";
|
|
|
|
export function resolveTransformTargetBounds(document: ImageDocument, target: TransformTarget): Rect | undefined {
|
|
switch (target.type) {
|
|
case "artboard":
|
|
return document.artboards.find((artboard) => artboard.id === target.id)?.bounds;
|
|
case "layer": {
|
|
const layer = findLayer(document, target.id);
|
|
return layer ? resolveLayerBounds(document, layer) : undefined;
|
|
}
|
|
}
|
|
}
|
|
|
|
export function applyTransformTargetBounds(document: ImageDocument, target: TransformTarget, bounds: Rect): ImageDocument {
|
|
switch (target.type) {
|
|
case "artboard":
|
|
return {
|
|
...document,
|
|
artboards: document.artboards.map((artboard) => (artboard.id === target.id ? { ...artboard, bounds: { ...bounds } } : artboard)),
|
|
};
|
|
case "layer":
|
|
return applyLayerBounds(document, target.id, bounds);
|
|
}
|
|
}
|
|
|
|
export function selectedTransformTarget(document: ImageDocument, selection: { artboardId?: ArtboardId; layerIds: LayerId[] }): TransformTarget | undefined {
|
|
if (selection.layerIds.length === 1 && selection.layerIds[0]) return { type: "layer", id: selection.layerIds[0] };
|
|
if (selection.artboardId) return { type: "artboard", id: selection.artboardId };
|
|
return undefined;
|
|
}
|
|
|
|
function applyLayerBounds(document: ImageDocument, layerId: LayerId, bounds: Rect): ImageDocument {
|
|
const layer = findLayer(document, layerId);
|
|
if (!layer) return document;
|
|
if (layer.type === "group") return applyGroupLayerBounds(document, layer.id, bounds);
|
|
|
|
const layerMask = getLayerMask(layer);
|
|
const targetLayerIds = layerMask ? [layerId, layerMask.maskLayerId] : [layerId];
|
|
|
|
return targetLayerIds.reduce(
|
|
(nextDocument, targetLayerId) => ({
|
|
...nextDocument,
|
|
artboards: nextDocument.artboards.map((artboard) => ({
|
|
...artboard,
|
|
layers: applyLayerBoundsInTree(nextDocument, artboard.layers, targetLayerId, bounds),
|
|
})),
|
|
}),
|
|
document,
|
|
);
|
|
}
|
|
|
|
function applyGroupLayerBounds(document: ImageDocument, groupId: LayerId, bounds: Rect): ImageDocument {
|
|
const group = findLayer(document, groupId);
|
|
if (!group || group.type !== "group") return document;
|
|
|
|
const initialBounds = resolveLayerBounds(document, group);
|
|
if (!initialBounds || initialBounds.w === 0 || initialBounds.h === 0) return document;
|
|
|
|
const scale = {
|
|
x: bounds.w / initialBounds.w,
|
|
y: bounds.h / initialBounds.h,
|
|
};
|
|
|
|
return {
|
|
...document,
|
|
artboards: document.artboards.map((artboard) => ({
|
|
...artboard,
|
|
layers: applyGroupLayerBoundsInTree(document, artboard.layers, groupId, initialBounds, bounds, scale),
|
|
})),
|
|
};
|
|
}
|
|
|
|
function applyGroupLayerBoundsInTree(document: ImageDocument, layers: Layer[], groupId: LayerId, initialBounds: Rect, bounds: Rect, scale: { x: number; y: number }): Layer[] {
|
|
return layers.map((layer) => {
|
|
if (layer.type === "group" && layer.id === groupId) {
|
|
return {
|
|
...layer,
|
|
children: layer.children.map((child) => scaleLayerSubtree(document, child, initialBounds, bounds, scale)),
|
|
};
|
|
}
|
|
if (layer.type === "group") return { ...layer, children: applyGroupLayerBoundsInTree(document, layer.children, groupId, initialBounds, bounds, scale) };
|
|
return layer;
|
|
});
|
|
}
|
|
|
|
function scaleLayerSubtree(document: ImageDocument, layer: Layer, initialBounds: Rect, bounds: Rect, scale: { x: number; y: number }): Layer {
|
|
if (layer.type === "group") {
|
|
return {
|
|
...layer,
|
|
children: layer.children.map((child) => scaleLayerSubtree(document, child, initialBounds, bounds, scale)),
|
|
};
|
|
}
|
|
|
|
const asset = document.assets.find((candidate) => candidate.id === layer.assetId);
|
|
if (!asset) return layer;
|
|
|
|
return {
|
|
...layer,
|
|
transform: {
|
|
...layer.transform,
|
|
position: {
|
|
x: bounds.x + (layer.transform.position.x - initialBounds.x) * scale.x,
|
|
y: bounds.y + (layer.transform.position.y - initialBounds.y) * scale.y,
|
|
},
|
|
scale: {
|
|
x: layer.transform.scale.x * scale.x,
|
|
y: layer.transform.scale.y * scale.y,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
function applyLayerBoundsInTree(document: ImageDocument, layers: Layer[], layerId: LayerId, bounds: Rect): Layer[] {
|
|
return layers.map((layer) => {
|
|
if (layer.id === layerId && (layer.type === "image" || layer.type === "raster")) {
|
|
const asset = document.assets.find((candidate) => candidate.id === layer.assetId);
|
|
if (!asset) return layer;
|
|
|
|
return {
|
|
...layer,
|
|
transform: {
|
|
...layer.transform,
|
|
position: { x: bounds.x, y: bounds.y },
|
|
scale: {
|
|
x: bounds.w / asset.intrinsicSize.w,
|
|
y: bounds.h / asset.intrinsicSize.h,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
if (layer.type === "group") return { ...layer, children: applyLayerBoundsInTree(document, layer.children, layerId, bounds) };
|
|
return layer;
|
|
});
|
|
}
|
|
|
|
function findLayer(document: ImageDocument, layerId: LayerId): Layer | undefined {
|
|
for (const artboard of document.artboards) {
|
|
const layer = findLayerInTree(artboard.layers, layerId);
|
|
if (layer) return layer;
|
|
}
|
|
|
|
return undefined;
|
|
}
|
|
|
|
function findLayerInTree(layers: Layer[], layerId: LayerId): Layer | undefined {
|
|
for (const layer of layers) {
|
|
if (layer.id === layerId) return layer;
|
|
if (layer.type === "group") {
|
|
const child = findLayerInTree(layer.children, layerId);
|
|
if (child) return child;
|
|
}
|
|
}
|
|
|
|
return undefined;
|
|
}
|
|
|
|
function resolveLayerBounds(document: ImageDocument, layer: Layer): Rect | undefined {
|
|
switch (layer.type) {
|
|
case "group":
|
|
return unionRects(layer.children.flatMap((child) => {
|
|
const bounds = resolveLayerBounds(document, child);
|
|
return bounds ? [bounds] : [];
|
|
}));
|
|
case "image":
|
|
case "raster": {
|
|
const asset = document.assets.find((candidate) => candidate.id === layer.assetId);
|
|
if (!asset) return undefined;
|
|
|
|
return {
|
|
x: layer.transform.position.x,
|
|
y: layer.transform.position.y,
|
|
w: asset.intrinsicSize.w * layer.transform.scale.x,
|
|
h: asset.intrinsicSize.h * layer.transform.scale.y,
|
|
};
|
|
}
|
|
}
|
|
}
|
|
|
|
function unionRects(rects: Rect[]): Rect | undefined {
|
|
if (rects.length === 0) return undefined;
|
|
|
|
const minX = Math.min(...rects.map((rect) => rect.x));
|
|
const minY = Math.min(...rects.map((rect) => rect.y));
|
|
const maxX = Math.max(...rects.map((rect) => rect.x + rect.w));
|
|
const maxY = Math.max(...rects.map((rect) => rect.y + rect.h));
|
|
|
|
return { x: minX, y: minY, w: maxX - minX, h: maxY - minY };
|
|
}
|