Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef6950c5df | ||
|
|
2cd85cd7cd | ||
|
|
9de0d2a63c | ||
|
|
fd4cd277cc | ||
|
|
910e32917f | ||
|
|
83fe57f319 | ||
|
|
51d613f459 | ||
|
|
3779cfbadc | ||
|
|
e8ce1d9031 | ||
|
|
edbefcc738 | ||
|
|
1713607572 | ||
|
|
e4aec01ea6 | ||
|
|
468bb5579d | ||
|
|
9d2aa879e9 |
@@ -1,13 +1,8 @@
|
|||||||
import { useEffect, useRef } from "react";
|
import { useEffect, useRef } from "react";
|
||||||
|
|
||||||
import { P0A_COLOR_CARDS, createColorCardElement, drawColorCard, type ColorCardDefinition } from "./palette-provider.js";
|
import { COLOR_CARD_HALF_SIZES, P0A_COLOR_CARDS, createColorCardElement, drawColorCard, type ColorCardDefinition } from "./palette-provider.js";
|
||||||
|
|
||||||
const previewPalette = ["#04D960", "#0ABF58", "#5FD994", "#A0F2C4", "#D5F2E2"] as const;
|
const previewPalette = ["#04D960", "#0ABF58", "#5FD994", "#A0F2C4", "#D5F2E2"] as const;
|
||||||
const previewHalfSize = {
|
|
||||||
style_01: { height: 76, width: 26 }, style_02: { height: 77, width: 18 },
|
|
||||||
style_08: { height: 10, width: 73 }, style_16: { height: 9, width: 78 },
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
function ColorCardPreview({ definition }: { definition: ColorCardDefinition }) {
|
function ColorCardPreview({ definition }: { definition: ColorCardDefinition }) {
|
||||||
const ref = useRef<HTMLCanvasElement>(null);
|
const ref = useRef<HTMLCanvasElement>(null);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -18,7 +13,8 @@ function ColorCardPreview({ definition }: { definition: ColorCardDefinition }) {
|
|||||||
context.clearRect(0, 0, canvas.width, canvas.height);
|
context.clearRect(0, 0, canvas.width, canvas.height);
|
||||||
context.fillStyle = "#30343b";
|
context.fillStyle = "#30343b";
|
||||||
context.fillRect(0, 0, canvas.width, canvas.height);
|
context.fillRect(0, 0, canvas.width, canvas.height);
|
||||||
const half = previewHalfSize[definition.styleId];
|
const half = COLOR_CARD_HALF_SIZES[definition.styleId];
|
||||||
|
if (!half) return;
|
||||||
const scale = Math.min(1, 146 / (half.width * 2), 62 / (half.height * 2));
|
const scale = Math.min(1, 146 / (half.width * 2), 62 / (half.height * 2));
|
||||||
context.translate(canvas.width / 2, canvas.height / 2);
|
context.translate(canvas.width / 2, canvas.height / 2);
|
||||||
context.scale(scale, scale);
|
context.scale(scale, scale);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { P0A_DYNAMIC_STICKER_IDS } from "@dada/template-registry";
|
|||||||
|
|
||||||
import { DYNAMIC_RESOURCE_VERSION } from "./dynamic-render-models.js";
|
import { DYNAMIC_RESOURCE_VERSION } from "./dynamic-render-models.js";
|
||||||
import type { CanvasElementIdentity } from "./editor-elements.js";
|
import type { CanvasElementIdentity } from "./editor-elements.js";
|
||||||
|
import complexAssetCatalog from "./generated/complex-assets.json";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
@@ -45,23 +46,17 @@ export function dyn012DisplayParts(element: CanvasElement) {
|
|||||||
} as const;
|
} as const;
|
||||||
}
|
}
|
||||||
|
|
||||||
const dynamicDefinitions: readonly DynamicStickerDefinition[] = [
|
const dynamicCatalogById = new Map(complexAssetCatalog.dynamic_stickers.map((item) => [item.template_id, item]));
|
||||||
{ category: "location", displayName: "地点标题", requiresLocationConsent: false, templateId: "DYN001" },
|
|
||||||
{ category: "location", displayName: "英文地点", requiresLocationConsent: false, templateId: "DYN002" },
|
|
||||||
{ category: "location", displayName: "城市地点", requiresLocationConsent: false, templateId: "DYN003" },
|
|
||||||
{ category: "location", displayName: "经纬地点", requiresLocationConsent: true, templateId: "DYN004" },
|
|
||||||
{ category: "other", displayName: "用户名组合", requiresLocationConsent: false, templateId: "DYN007" },
|
|
||||||
{ category: "time", displayName: "月与时间", requiresLocationConsent: false, templateId: "DYN008" },
|
|
||||||
{ category: "time", displayName: "完整日期", requiresLocationConsent: false, templateId: "DYN011" },
|
|
||||||
{ category: "time", displayName: "数字时间", requiresLocationConsent: false, templateId: "DYN012" },
|
|
||||||
{ category: "identity", displayName: "创作署名", requiresLocationConsent: false, templateId: "DYN015" },
|
|
||||||
{ category: "identity", displayName: "社交 ID", requiresLocationConsent: false, templateId: "DYN016" },
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const P0A_DYNAMIC_STICKERS: readonly DynamicStickerDefinition[] = P0A_DYNAMIC_STICKER_IDS.map((templateId) => {
|
export const P0A_DYNAMIC_STICKERS: readonly DynamicStickerDefinition[] = P0A_DYNAMIC_STICKER_IDS.map((templateId) => {
|
||||||
const definition = dynamicDefinitions.find((item) => item.templateId === templateId);
|
const item = dynamicCatalogById.get(templateId);
|
||||||
if (!definition) throw new Error(`missing dynamic sticker definition ${templateId}`);
|
if (!item) throw new Error(`missing dynamic sticker definition ${templateId}`);
|
||||||
return definition;
|
return {
|
||||||
|
category: item.category as DynamicCategory,
|
||||||
|
displayName: item.display_name,
|
||||||
|
requiresLocationConsent: item.requires_location_consent,
|
||||||
|
templateId,
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
function twoDigits(value: number) {
|
function twoDigits(value: number) {
|
||||||
@@ -96,7 +91,29 @@ function snapshotFor(templateId: DynamicTemplateId, context: DynamicProviderCont
|
|||||||
if (templateId === "DYN011") return { fields: { day, month, year }, value: `${year}.${month}.${day}` };
|
if (templateId === "DYN011") return { fields: { day, month, year }, value: `${year}.${month}.${day}` };
|
||||||
if (templateId === "DYN012") return { fields: { font_substitution: "FONT081", hour, minute }, value: `${hour}:${minute}` };
|
if (templateId === "DYN012") return { fields: { font_substitution: "FONT081", hour, minute }, value: `${hour}:${minute}` };
|
||||||
if (templateId === "DYN015") return { fields: { nickname: context.profile.creatorName }, value: context.profile.creatorName };
|
if (templateId === "DYN015") return { fields: { nickname: context.profile.creatorName }, value: context.profile.creatorName };
|
||||||
return { fields: { nickname: normalizeSocialId(context.profile.socialId) }, value: normalizeSocialId(context.profile.socialId) };
|
if (templateId === "DYN016") return { fields: { nickname: normalizeSocialId(context.profile.socialId) }, value: normalizeSocialId(context.profile.socialId) };
|
||||||
|
|
||||||
|
const definition = dynamicCatalogById.get(templateId);
|
||||||
|
if (!definition) throw new Error("dynamic_template_unavailable");
|
||||||
|
const location = context.location?.formattedValue ?? "输入地点";
|
||||||
|
const values: Record<string, string | number> = {
|
||||||
|
city: location,
|
||||||
|
city_en: location.toUpperCase(),
|
||||||
|
day,
|
||||||
|
hour,
|
||||||
|
latitude: context.location?.latitude ?? 0,
|
||||||
|
longitude: context.location?.longitude ?? 0,
|
||||||
|
minute,
|
||||||
|
month,
|
||||||
|
nickname: normalizeSocialId(context.profile.socialId),
|
||||||
|
title: location,
|
||||||
|
year,
|
||||||
|
};
|
||||||
|
const fields = Object.fromEntries(definition.required_fields.map((field) => [field, values[field] ?? ""]));
|
||||||
|
if (definition.category === "identity") return { fields, value: normalizeSocialId(context.profile.socialId) };
|
||||||
|
if (definition.category === "location") return { fields, value: location };
|
||||||
|
if (definition.category === "time") return { fields, value: `${year}.${month}.${day} ${hour}:${minute}` };
|
||||||
|
return { fields, value: context.profile.creatorName };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createDynamicStickerElement(
|
export function createDynamicStickerElement(
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import type { CanvasState } from "@dada/shared-contracts";
|
import type { CanvasState } from "@dada/shared-contracts";
|
||||||
import { P0A_COMPLEX_RELEASE_VERSION } from "@dada/template-registry";
|
import { P0A_COMPLEX_RELEASE_VERSION, P0A_DYNAMIC_STICKER_IDS } from "@dada/template-registry";
|
||||||
|
|
||||||
import { fontOption, type FontOption } from "./text-assets.js";
|
import { fontOption, type FontOption } from "./text-assets.js";
|
||||||
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
||||||
|
import complexAssetCatalog from "./generated/complex-assets.json";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
@@ -55,17 +56,13 @@ const dynamicFont = (fontId: string): FontOption => ({
|
|||||||
url: `/api/v1/assets/public/${DYNAMIC_RESOURCE_VERSION}/${fontId}`,
|
url: `/api/v1/assets/public/${DYNAMIC_RESOURCE_VERSION}/${fontId}`,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const DYNAMIC_FONT_OPTIONS: readonly FontOption[] = [
|
const dynamicFontIds = [...new Set(complexAssetCatalog.dynamic_stickers.flatMap((item) => item.font_ids))]
|
||||||
dynamicFont("15974853bc3294ef68e7e6d58fe74fd7"),
|
.filter((fontId) => fontId !== "FONT081")
|
||||||
dynamicFont("46f8336813e4c48d06a1aef294fdccf6"),
|
.toSorted();
|
||||||
dynamicFont("53ca6b704728520da50c145eabb2e635"),
|
|
||||||
dynamicFont("cca5efc0e02fb1bf62349bd68ef30fc1"),
|
|
||||||
dynamicFont("dd25b35dcb7ba4476cbaa9a9592e39e2"),
|
|
||||||
dynamicFont("e4210c9872f0c279b35273f230809821"),
|
|
||||||
dynamicFont("f4bfd4132df2d6be97ceabadf3853505"),
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const DYNAMIC_RENDER_MODELS: Readonly<Record<DynamicTemplateId, DynamicRenderModel>> = {
|
export const DYNAMIC_FONT_OPTIONS: readonly FontOption[] = dynamicFontIds.map(dynamicFont);
|
||||||
|
|
||||||
|
const EXACT_DYNAMIC_RENDER_MODELS: Readonly<Record<string, DynamicRenderModel>> = {
|
||||||
DYN001: {
|
DYN001: {
|
||||||
halfSize: { height: 42, width: 130 },
|
halfSize: { height: 42, width: 130 },
|
||||||
imageLayers: [{ assetId: "DYN001-image28", height: 67, width: 219, x: -17.562, y: 2.203 }],
|
imageLayers: [{ assetId: "DYN001-image28", height: 67, width: 219, x: -17.562, y: 2.203 }],
|
||||||
@@ -145,6 +142,38 @@ export const DYNAMIC_RENDER_MODELS: Readonly<Record<DynamicTemplateId, DynamicRe
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const dynamicCatalogById = new Map(complexAssetCatalog.dynamic_stickers.map((item) => [item.template_id, item]));
|
||||||
|
|
||||||
|
function genericTextValue(item: (typeof complexAssetCatalog.dynamic_stickers)[number]): DynamicTextValue {
|
||||||
|
if (item.category === "identity") return "nickname";
|
||||||
|
if (item.category === "location") return item.required_fields.includes("title") ? "title" : "city";
|
||||||
|
if (item.category === "time") return item.required_fields.includes("hour") && item.required_fields.includes("minute") ? "time" : "day";
|
||||||
|
return "nickname";
|
||||||
|
}
|
||||||
|
|
||||||
|
function genericDynamicModel(templateId: string): DynamicRenderModel {
|
||||||
|
const item = dynamicCatalogById.get(templateId);
|
||||||
|
if (!item) throw new Error(`missing dynamic render model ${templateId}`);
|
||||||
|
return {
|
||||||
|
halfSize: { height: 42, width: 170 },
|
||||||
|
imageLayers: [],
|
||||||
|
sourceCandidateId: item.source_candidate_id,
|
||||||
|
textLayers: [{
|
||||||
|
align: "center",
|
||||||
|
color: "#FFFFFF",
|
||||||
|
fontId: item.font_ids[0] ?? "FONT081",
|
||||||
|
fontSize: 34,
|
||||||
|
value: genericTextValue(item),
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
}],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DYNAMIC_RENDER_MODELS: Readonly<Record<DynamicTemplateId, DynamicRenderModel>> = Object.fromEntries(
|
||||||
|
P0A_DYNAMIC_STICKER_IDS.map((templateId) => [templateId, EXACT_DYNAMIC_RENDER_MODELS[templateId] ?? genericDynamicModel(templateId)]),
|
||||||
|
);
|
||||||
|
|
||||||
export function dynamicFontOptionsFor(templateId: string) {
|
export function dynamicFontOptionsFor(templateId: string) {
|
||||||
if (templateId === "DYN012") {
|
if (templateId === "DYN012") {
|
||||||
const replacement = fontOption("FONT081");
|
const replacement = fontOption("FONT081");
|
||||||
@@ -153,7 +182,8 @@ export function dynamicFontOptionsFor(templateId: string) {
|
|||||||
const model = DYNAMIC_RENDER_MODELS[templateId as DynamicTemplateId];
|
const model = DYNAMIC_RENDER_MODELS[templateId as DynamicTemplateId];
|
||||||
if (!model) return [];
|
if (!model) return [];
|
||||||
const ids = new Set(model.textLayers.map((layer) => layer.fontId));
|
const ids = new Set(model.textLayers.map((layer) => layer.fontId));
|
||||||
return DYNAMIC_FONT_OPTIONS.filter((option) => ids.has(option.fontId));
|
return [...ids].map((fontId) => fontOption(fontId) ?? DYNAMIC_FONT_OPTIONS.find((option) => option.fontId === fontId))
|
||||||
|
.filter((option): option is FontOption => option !== undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function dynamicImageUrl(resourceVersion: string, assetId: string) {
|
export function dynamicImageUrl(resourceVersion: string, assetId: string) {
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ function DynamicPreview(props: { fontStatuses: Readonly<Record<string, ArchivedF
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
const model = DYNAMIC_RENDER_MODELS[props.templateId];
|
const model = DYNAMIC_RENDER_MODELS[props.templateId];
|
||||||
|
if (!model) return () => { active = false; };
|
||||||
const element = createDynamicStickerElement(props.templateId, {
|
const element = createDynamicStickerElement(props.templateId, {
|
||||||
location: { formattedValue: "温州", latitude: 27.9943, longitude: 120.6994 },
|
location: { formattedValue: "温州", latitude: 27.9943, longitude: 120.6994 },
|
||||||
now: new Date("2026-08-03T09:07:00+08:00"), profile: { creatorName: "Dada Creator", socialId: "@dada" },
|
now: new Date("2026-08-03T09:07:00+08:00"), profile: { creatorName: "Dada Creator", socialId: "@dada" },
|
||||||
|
|||||||
@@ -2,6 +2,27 @@ import { isCanvasState, type CanvasState } from "@dada/shared-contracts";
|
|||||||
|
|
||||||
export type BackgroundAdjustments = CanvasState["background"]["adjustments"];
|
export type BackgroundAdjustments = CanvasState["background"]["adjustments"];
|
||||||
|
|
||||||
|
interface CanvasSize {
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CanvasRect {
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BackgroundDrawPlan {
|
||||||
|
destination: CanvasRect;
|
||||||
|
source: CanvasRect;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clamp(value: number, minimum: number, maximum: number) {
|
||||||
|
return Math.min(maximum, Math.max(minimum, value));
|
||||||
|
}
|
||||||
|
|
||||||
const elementKeys = new Set([
|
const elementKeys = new Set([
|
||||||
"colors", "content", "coordinates", "created_at", "dynamic_fields", "element_id", "font_override", "font_size",
|
"colors", "content", "coordinates", "created_at", "dynamic_fields", "element_id", "font_override", "font_size",
|
||||||
"formatted_value", "opacity", "position", "resource_version", "rotation", "scale", "style_id", "style_parameters",
|
"formatted_value", "opacity", "position", "resource_version", "rotation", "scale", "style_id", "style_parameters",
|
||||||
@@ -106,7 +127,99 @@ export function deserializeFabricCanvas(input: unknown): CanvasState | undefined
|
|||||||
return isCanvasState(candidate) ? structuredClone(candidate) : undefined;
|
return isCanvasState(candidate) ? structuredClone(candidate) : undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function backgroundDrawPlan(
|
||||||
|
image: CanvasSize,
|
||||||
|
canvas: CanvasSize,
|
||||||
|
adjustments: BackgroundAdjustments,
|
||||||
|
): BackgroundDrawPlan {
|
||||||
|
if (image.width <= 0 || image.height <= 0 || canvas.width <= 0 || canvas.height <= 0) {
|
||||||
|
throw new Error("background_dimensions_invalid");
|
||||||
|
}
|
||||||
|
const crop = adjustments.crop;
|
||||||
|
const normalizedX = crop ? clamp(crop.x, 0, 1) : 0;
|
||||||
|
const normalizedY = crop ? clamp(crop.y, 0, 1) : 0;
|
||||||
|
const normalizedWidth = crop ? Math.min(crop.width, 1 - normalizedX) : 1;
|
||||||
|
const normalizedHeight = crop ? Math.min(crop.height, 1 - normalizedY) : 1;
|
||||||
|
const source = normalizedWidth > 0 && normalizedHeight > 0
|
||||||
|
? {
|
||||||
|
height: image.height * normalizedHeight,
|
||||||
|
width: image.width * normalizedWidth,
|
||||||
|
x: image.width * normalizedX,
|
||||||
|
y: image.height * normalizedY,
|
||||||
|
}
|
||||||
|
: { height: image.height, width: image.width, x: 0, y: 0 };
|
||||||
|
|
||||||
|
if (adjustments.fit === "fill") {
|
||||||
|
return { destination: { height: canvas.height, width: canvas.width, x: 0, y: 0 }, source };
|
||||||
|
}
|
||||||
|
if (adjustments.fit === "fit") {
|
||||||
|
const scale = Math.min(canvas.width / source.width, canvas.height / source.height);
|
||||||
|
const width = source.width * scale;
|
||||||
|
const height = source.height * scale;
|
||||||
|
return {
|
||||||
|
destination: { height, width, x: (canvas.width - width) / 2, y: (canvas.height - height) / 2 },
|
||||||
|
source,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const sourceAspect = source.width / source.height;
|
||||||
|
const canvasAspect = canvas.width / canvas.height;
|
||||||
|
if (sourceAspect > canvasAspect) {
|
||||||
|
const width = source.height * canvasAspect;
|
||||||
|
source.x += (source.width - width) / 2;
|
||||||
|
source.width = width;
|
||||||
|
} else if (sourceAspect < canvasAspect) {
|
||||||
|
const height = source.width / canvasAspect;
|
||||||
|
source.y += (source.height - height) / 2;
|
||||||
|
source.height = height;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
destination: { height: canvas.height, width: canvas.width, x: 0, y: 0 },
|
||||||
|
source,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function adjustBackgroundPixels(
|
||||||
|
pixels: Uint8ClampedArray,
|
||||||
|
width: number,
|
||||||
|
height: number,
|
||||||
|
adjustments: Pick<BackgroundAdjustments, "sharpness" | "temperature">,
|
||||||
|
) {
|
||||||
|
if (!Number.isInteger(width) || !Number.isInteger(height) || width <= 0 || height <= 0 || pixels.length !== width * height * 4) {
|
||||||
|
throw new Error("background_pixel_buffer_invalid");
|
||||||
|
}
|
||||||
|
const source = new Uint8ClampedArray(pixels);
|
||||||
|
const output = new Uint8ClampedArray(source);
|
||||||
|
const sharpness = clamp(adjustments.sharpness, 0, 100) / 100;
|
||||||
|
const temperature = clamp(adjustments.temperature, -100, 100) / 100;
|
||||||
|
const channelOffsets = [35 * temperature, 8 * temperature, -35 * temperature];
|
||||||
|
|
||||||
|
for (let y = 0; y < height; y += 1) {
|
||||||
|
for (let x = 0; x < width; x += 1) {
|
||||||
|
const index = (y * width + x) * 4;
|
||||||
|
for (let channel = 0; channel < 3; channel += 1) {
|
||||||
|
let value = source[index + channel]!;
|
||||||
|
if (sharpness > 0 && x > 0 && x < width - 1 && y > 0 && y < height - 1) {
|
||||||
|
const left = source[index + channel - 4]!;
|
||||||
|
const right = source[index + channel + 4]!;
|
||||||
|
const above = source[index + channel - width * 4]!;
|
||||||
|
const below = source[index + channel + width * 4]!;
|
||||||
|
value = value * (1 + 4 * sharpness) - (left + right + above + below) * sharpness;
|
||||||
|
}
|
||||||
|
output[index + channel] = value + channelOffsets[channel]!;
|
||||||
|
}
|
||||||
|
output[index + 3] = source[index + 3]!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
export function cssFilterForBackground(adjustments: BackgroundAdjustments) {
|
export function cssFilterForBackground(adjustments: BackgroundAdjustments) {
|
||||||
const filter = adjustments.filter === "grayscale" ? "grayscale(1)" : adjustments.filter === "sepia" ? "sepia(0.75)" : "none";
|
const filters: string[] = [];
|
||||||
return `${filter} brightness(${100 + adjustments.brightness}%) contrast(${100 + adjustments.contrast}%) saturate(${100 + adjustments.saturation}%)`;
|
if (adjustments.filter === "grayscale") filters.push("grayscale(1)");
|
||||||
|
else if (adjustments.filter === "sepia") filters.push("sepia(0.75)");
|
||||||
|
if (adjustments.brightness !== 0) filters.push(`brightness(${100 + adjustments.brightness}%)`);
|
||||||
|
if (adjustments.contrast !== 0) filters.push(`contrast(${100 + adjustments.contrast}%)`);
|
||||||
|
if (adjustments.saturation !== 0) filters.push(`saturate(${100 + adjustments.saturation}%)`);
|
||||||
|
return filters.length > 0 ? filters.join(" ") : "none";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ export class CanvasElementController {
|
|||||||
.map((element) => structuredClone(element));
|
.map((element) => structuredClone(element));
|
||||||
}
|
}
|
||||||
|
|
||||||
selectAt(point: CanvasPoint, options: { append?: boolean } = {}) {
|
selectAt(point: CanvasPoint, options: { append?: boolean; preserveSelection?: boolean } = {}) {
|
||||||
const candidates = this.candidatesAt(point);
|
const candidates = this.candidatesAt(point);
|
||||||
if (candidates.length === 0) {
|
if (candidates.length === 0) {
|
||||||
if (!options.append) this.selection = [];
|
if (!options.append) this.selection = [];
|
||||||
@@ -196,7 +196,9 @@ export class CanvasElementController {
|
|||||||
}
|
}
|
||||||
if (options.append) {
|
if (options.append) {
|
||||||
this.pointerMoved();
|
this.pointerMoved();
|
||||||
return this.selectById(candidates[0]!.element_id, true);
|
const elementId = candidates[0]!.element_id;
|
||||||
|
if (options.preserveSelection && this.selection.includes(elementId)) return this.selectedIds;
|
||||||
|
return this.selectById(elementId, true);
|
||||||
}
|
}
|
||||||
const signature = candidates.map((candidate) => candidate.element_id).join("|");
|
const signature = candidates.map((candidate) => candidate.element_id).join("|");
|
||||||
if (samePoint(this.cyclePoint, point) && signature === this.cycleSignature) this.cycleIndex = (this.cycleIndex + 1) % candidates.length;
|
if (samePoint(this.cyclePoint, point) && signature === this.cycleSignature) this.cycleIndex = (this.cycleIndex + 1) % candidates.length;
|
||||||
@@ -255,7 +257,8 @@ export class CanvasElementController {
|
|||||||
|
|
||||||
moveSelected(delta: CanvasPoint, options: { snap?: boolean } = {}) {
|
moveSelected(delta: CanvasPoint, options: { snap?: boolean } = {}) {
|
||||||
const selected = new Set(this.selection);
|
const selected = new Set(this.selection);
|
||||||
const primary = this.current.elements.find((element) => selected.has(element.element_id));
|
const selectedElements = this.current.elements.filter((element) => selected.has(element.element_id));
|
||||||
|
const primary = selectedElements[0];
|
||||||
if (!primary) return { guides: [] as string[], state: this.value };
|
if (!primary) return { guides: [] as string[], state: this.value };
|
||||||
let nextX = primary.position.x + delta.x;
|
let nextX = primary.position.x + delta.x;
|
||||||
let nextY = primary.position.y + delta.y;
|
let nextY = primary.position.y + delta.y;
|
||||||
@@ -278,10 +281,20 @@ export class CanvasElementController {
|
|||||||
nextX = snapAxis(nextX, "x");
|
nextX = snapAxis(nextX, "x");
|
||||||
nextY = snapAxis(nextY, "y");
|
nextY = snapAxis(nextY, "y");
|
||||||
}
|
}
|
||||||
const adjusted = { x: nextX - primary.position.x, y: nextY - primary.position.y };
|
const minimumX = Math.min(...selectedElements.map((element) => element.position.x));
|
||||||
|
const maximumX = Math.max(...selectedElements.map((element) => element.position.x));
|
||||||
|
const minimumY = Math.min(...selectedElements.map((element) => element.position.y));
|
||||||
|
const maximumY = Math.max(...selectedElements.map((element) => element.position.y));
|
||||||
|
const adjusted = {
|
||||||
|
x: clamp(nextX - primary.position.x, -minimumX, 1 - maximumX),
|
||||||
|
y: clamp(nextY - primary.position.y, -minimumY, 1 - maximumY),
|
||||||
|
};
|
||||||
const state = this.updateSelected((element) => ({
|
const state = this.updateSelected((element) => ({
|
||||||
...element,
|
...element,
|
||||||
position: { x: clamp(element.position.x + adjusted.x, 0, 1), y: clamp(element.position.y + adjusted.y, 0, 1) },
|
position: {
|
||||||
|
x: clamp(Number((element.position.x + adjusted.x).toFixed(12)), 0, 1),
|
||||||
|
y: clamp(Number((element.position.y + adjusted.y).toFixed(12)), 0, 1),
|
||||||
|
},
|
||||||
}));
|
}));
|
||||||
return { guides, state };
|
return { guides, state };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
.editor-page-shell {
|
.editor-page-shell {
|
||||||
min-height: 100vh;
|
height: 100vh;
|
||||||
|
height: 100dvh;
|
||||||
|
min-height: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: 56px minmax(0, 1fr) 32px;
|
grid-template-rows: 56px minmax(0, 1fr) 32px;
|
||||||
background: #e8e8e5;
|
background: #e8e8e5;
|
||||||
color: #111111;
|
color: #111111;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editor-page-shell :focus-visible {
|
.editor-page-shell :focus-visible {
|
||||||
@@ -124,6 +127,7 @@
|
|||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 280px minmax(0, 1fr) 320px;
|
grid-template-columns: 280px minmax(0, 1fr) 320px;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editor-assets-panel,
|
.editor-assets-panel,
|
||||||
@@ -395,6 +399,7 @@
|
|||||||
.editor-template-grid button:disabled { border-style: dashed; background: #e8e8e5; color: #62625d; cursor: not-allowed; }
|
.editor-template-grid button:disabled { border-style: dashed; background: #e8e8e5; color: #62625d; cursor: not-allowed; }
|
||||||
.editor-template-grid strong { overflow: hidden; font-family: Consolas, monospace; font-size: 10px; text-overflow: ellipsis; }
|
.editor-template-grid strong { overflow: hidden; font-family: Consolas, monospace; font-size: 10px; text-overflow: ellipsis; }
|
||||||
.editor-template-grid small { color: #8f1d14; font-size: 9px; }
|
.editor-template-grid small { color: #8f1d14; font-size: 9px; }
|
||||||
|
.editor-template-preview { width: 100%; height: 44px; object-fit: contain; border: 1px solid #111111; background: #30343b; }
|
||||||
.editor-template-mark { display: grid; width: 100%; height: 44px; place-items: center; border: 1px solid #111111; background: #f2f400; font-size: 18px; font-weight: 800; }
|
.editor-template-mark { display: grid; width: 100%; height: 44px; place-items: center; border: 1px solid #111111; background: #f2f400; font-size: 18px; font-weight: 800; }
|
||||||
.editor-template-mark.title { background: #111111; color: #ffffff; }
|
.editor-template-mark.title { background: #111111; color: #ffffff; }
|
||||||
.editor-template-mark.tag { background: #dbeafe; }
|
.editor-template-mark.tag { background: #dbeafe; }
|
||||||
@@ -542,13 +547,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 760px) {
|
@media (max-width: 760px) {
|
||||||
.editor-page-shell { grid-template-rows: auto minmax(0, 1fr) auto; }
|
.editor-page-shell { height: auto; min-height: 100dvh; grid-template-rows: auto minmax(0, 1fr) auto; overflow: visible; }
|
||||||
.editor-toolbar { display: flex; min-height: 56px; flex-wrap: wrap; gap: 8px; padding: 8px 10px; }
|
.editor-toolbar { display: flex; min-height: 56px; flex-wrap: wrap; gap: 8px; padding: 8px 10px; }
|
||||||
.editor-title { min-width: 0; flex: 1 1 calc(100% - 56px); }
|
.editor-title { min-width: 0; flex: 1 1 calc(100% - 56px); }
|
||||||
.editor-history-actions { order: 3; }
|
.editor-history-actions { order: 3; }
|
||||||
.editor-save-status { order: 4; flex: 1 1 128px; }
|
.editor-save-status { order: 4; flex: 1 1 128px; }
|
||||||
.editor-toolbar-controls > button { display: block; order: 5; }
|
.editor-toolbar-controls > button { display: block; order: 5; }
|
||||||
.editor-layout { grid-template-columns: 1fr; }
|
.editor-layout { grid-template-columns: 1fr; overflow: visible; }
|
||||||
.editor-assets-panel, .editor-inspector { border: 0; }
|
.editor-assets-panel, .editor-inspector { border: 0; }
|
||||||
.editor-assets-panel { order: 2; }
|
.editor-assets-panel { order: 2; }
|
||||||
.editor-inspector { order: 3; }
|
.editor-inspector { order: 3; }
|
||||||
|
|||||||
+135
-40
@@ -86,6 +86,14 @@ interface EditorExportResult {
|
|||||||
status: ExportFlowStatus;
|
status: ExportFlowStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function withTextDraft(canvasState: CanvasState, textEdit: TextEditState | undefined) {
|
||||||
|
if (!textEdit) return canvasState;
|
||||||
|
return {
|
||||||
|
...canvasState,
|
||||||
|
elements: canvasState.elements.map((element) => element.element_id === textEdit.elementId ? textEdit.draft : element),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
interface EditorProject {
|
interface EditorProject {
|
||||||
canvas_state?: CanvasState;
|
canvas_state?: CanvasState;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
@@ -155,11 +163,26 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const elementControllerRef = useRef<CanvasElementController | undefined>(undefined);
|
const elementControllerRef = useRef<CanvasElementController | undefined>(undefined);
|
||||||
const dragRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
const dragRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
||||||
const opacityGestureRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
const opacityGestureRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
||||||
|
const textHistoryRef = useRef<{ base: CanvasState; elementId: string; last: CanvasState } | undefined>(undefined);
|
||||||
const clipboardRef = useRef<CanvasElement[]>([]);
|
const clipboardRef = useRef<CanvasElement[]>([]);
|
||||||
const fontLoaderRef = useRef<ArchivedFontLoader | undefined>(undefined);
|
const fontLoaderRef = useRef<ArchivedFontLoader | undefined>(undefined);
|
||||||
const conflictExportGuardRef = useRef(new ConflictExportGuard());
|
const conflictExportGuardRef = useRef(new ConflictExportGuard());
|
||||||
const candidateMenuRef = useRef<HTMLDivElement | null>(null);
|
const candidateMenuRef = useRef<HTMLDivElement | null>(null);
|
||||||
const candidateTriggerRef = useRef<HTMLButtonElement | null>(null);
|
const candidateTriggerRef = useRef<HTMLButtonElement | null>(null);
|
||||||
|
const noticeTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
|
||||||
|
|
||||||
|
function showNotice(message: string) {
|
||||||
|
if (noticeTimerRef.current) clearTimeout(noticeTimerRef.current);
|
||||||
|
setNotice(message);
|
||||||
|
noticeTimerRef.current = setTimeout(() => {
|
||||||
|
setNotice("");
|
||||||
|
noticeTimerRef.current = undefined;
|
||||||
|
}, 3_000);
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => () => {
|
||||||
|
if (noticeTimerRef.current) clearTimeout(noticeTimerRef.current);
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
@@ -175,7 +198,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
setDraftAdjustments(initial.background.adjustments);
|
setDraftAdjustments(initial.background.adjustments);
|
||||||
historyRef.current = new CanvasEditHistory(initial);
|
historyRef.current = new CanvasEditHistory(initial);
|
||||||
elementControllerRef.current = new CanvasElementController(initial);
|
elementControllerRef.current = new CanvasElementController(initial);
|
||||||
}).catch(() => { if (active) setNotice("编辑器暂时无法读取项目"); });
|
}).catch(() => { if (active) showNotice("编辑器暂时无法读取项目"); });
|
||||||
return () => { active = false; };
|
return () => { active = false; };
|
||||||
}, [projectId]);
|
}, [projectId]);
|
||||||
|
|
||||||
@@ -261,6 +284,10 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
});
|
});
|
||||||
}, [canvasState, selectedIds.join("|")]);
|
}, [canvasState, selectedIds.join("|")]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (textEdit) commitTextDraftAutomatically(textEdit);
|
||||||
|
}, [textEdit?.draft]);
|
||||||
|
|
||||||
async function ensureFont(fontId: string, url: string, retry = false) {
|
async function ensureFont(fontId: string, url: string, retry = false) {
|
||||||
const current = fontStatuses[fontId];
|
const current = fontStatuses[fontId];
|
||||||
if (current === "ready" || (current === "unavailable" && !retry)) return current;
|
if (current === "ready" || (current === "unavailable" && !retry)) return current;
|
||||||
@@ -277,24 +304,34 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
await Promise.all(available.map((template) => ensureFont(template.defaultFontId, template.fontUrl!, true)));
|
await Promise.all(available.map((template) => ensureFont(template.defaultFontId, template.fontUrl!, true)));
|
||||||
}
|
}
|
||||||
|
|
||||||
function commitCanvas(next: CanvasState) {
|
function finalizeTextHistory() {
|
||||||
|
const pending = textHistoryRef.current;
|
||||||
|
if (!pending) return undefined;
|
||||||
|
textHistoryRef.current = undefined;
|
||||||
|
historyRef.current?.commit(pending.last);
|
||||||
|
return pending.last;
|
||||||
|
}
|
||||||
|
|
||||||
|
function commitCanvas(next: CanvasState, options: { preserveTextEdit?: boolean } = {}) {
|
||||||
if (!project || saveStatus === "conflicted") return;
|
if (!project || saveStatus === "conflicted") return;
|
||||||
historyRef.current?.commit(next);
|
const finalizedText = finalizeTextHistory();
|
||||||
|
if (!finalizedText || JSON.stringify(finalizedText) !== JSON.stringify(next)) historyRef.current?.commit(next);
|
||||||
elementControllerRef.current?.replaceState(next);
|
elementControllerRef.current?.replaceState(next);
|
||||||
setSelectedIds(elementControllerRef.current?.selectedIds ?? []);
|
setSelectedIds(elementControllerRef.current?.selectedIds ?? []);
|
||||||
setCanvasState(next);
|
setCanvasState(next);
|
||||||
setDraftAdjustments(next.background.adjustments);
|
setDraftAdjustments(next.background.adjustments);
|
||||||
queueRef.current?.commit({ canvas_state: next, name: project.name });
|
queueRef.current?.commit({ canvas_state: next, name: project.name });
|
||||||
setTextEdit(undefined);
|
if (!options.preserveTextEdit) setTextEdit(undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
function applyPreview() {
|
function applyPreview() {
|
||||||
if (!canvasState) return;
|
if (!canvasState) return;
|
||||||
commitCanvas(updateBackgroundAdjustments(canvasState, draftAdjustments));
|
commitCanvas(updateBackgroundAdjustments(canvasState, draftAdjustments));
|
||||||
setNotice("底图调整已提交");
|
showNotice("底图调整已提交");
|
||||||
}
|
}
|
||||||
|
|
||||||
function undo() {
|
function undo() {
|
||||||
|
finalizeTextHistory();
|
||||||
const previous = historyRef.current?.undo();
|
const previous = historyRef.current?.undo();
|
||||||
if (previous) {
|
if (previous) {
|
||||||
elementControllerRef.current?.replaceState(previous);
|
elementControllerRef.current?.replaceState(previous);
|
||||||
@@ -307,6 +344,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function redo() {
|
function redo() {
|
||||||
|
finalizeTextHistory();
|
||||||
const next = historyRef.current?.redo();
|
const next = historyRef.current?.redo();
|
||||||
if (next) {
|
if (next) {
|
||||||
elementControllerRef.current?.replaceState(next);
|
elementControllerRef.current?.replaceState(next);
|
||||||
@@ -334,9 +372,9 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const palette = await paletteForAsset(pendingBackground);
|
const palette = await paletteForAsset(pendingBackground);
|
||||||
commitCanvas(switchBackground(canvasState, pendingBackground, palette));
|
commitCanvas(switchBackground(canvasState, pendingBackground, palette));
|
||||||
setPendingBackground(undefined);
|
setPendingBackground(undefined);
|
||||||
setNotice("已更换底图,覆盖元素保留,底图处理已重置");
|
showNotice("已更换底图,覆盖元素保留,底图处理已重置");
|
||||||
} catch {
|
} catch {
|
||||||
setNotice("新底图无法读取,未更换底图或刷新色卡");
|
showNotice("新底图无法读取,未更换底图或刷新色卡");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -353,7 +391,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
commitCanvas(next);
|
commitCanvas(next);
|
||||||
setGuides([]);
|
setGuides([]);
|
||||||
setCandidateMenu(undefined);
|
setCandidateMenu(undefined);
|
||||||
setNotice(message);
|
showNotice(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addSticker(sticker: StaticStickerCatalogItem) {
|
function addSticker(sticker: StaticStickerCatalogItem) {
|
||||||
@@ -369,8 +407,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}));
|
}));
|
||||||
commitElementOperation(controller, "贴纸已加入画布");
|
commitElementOperation(controller, "贴纸已加入画布");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("贴纸未能加入画布");
|
else showNotice("贴纸未能加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -383,8 +421,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
controller.add(createColorCardElement(definition, palette, newElementIdentity(), canvasState.elements.length));
|
controller.add(createColorCardElement(definition, palette, newElementIdentity(), canvasState.elements.length));
|
||||||
commitElementOperation(controller, "色卡已按原始底图加入画布");
|
commitElementOperation(controller, "色卡已按原始底图加入画布");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("无法从原始底图稳定提取五色,色卡未加入画布");
|
else showNotice("无法从原始底图稳定提取五色,色卡未加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -394,7 +432,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
if (templateId === "DYN012") {
|
if (templateId === "DYN012") {
|
||||||
const font = fontOption("FONT081");
|
const font = fontOption("FONT081");
|
||||||
if (!font || await ensureFont(font.fontId, font.url) !== "ready") {
|
if (!font || await ensureFont(font.fontId, font.url) !== "ready") {
|
||||||
setNotice("DYN012 的 FONT081 替代字体不可用,未使用系统字体替代。");
|
showNotice("DYN012 的 FONT081 替代字体不可用,未使用系统字体替代。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -407,8 +445,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
commitElementOperation(controller, "动态值已确认并加入画布");
|
commitElementOperation(controller, "动态值已确认并加入画布");
|
||||||
setLocationDialog(undefined);
|
setLocationDialog(undefined);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("动态贴纸未能加入画布");
|
else showNotice("动态贴纸未能加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -456,7 +494,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
controller.replaceElement(overrideDynamicStickerValue(element, value));
|
controller.replaceElement(overrideDynamicStickerValue(element, value));
|
||||||
commitElementOperation(controller, "动态贴纸显示文字已更新");
|
commitElementOperation(controller, "动态贴纸显示文字已更新");
|
||||||
} catch {
|
} catch {
|
||||||
setNotice("动态贴纸显示文字不能为空");
|
showNotice("动态贴纸显示文字不能为空");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -480,7 +518,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
if (!template.fontUrl || !canvasState) return;
|
if (!template.fontUrl || !canvasState) return;
|
||||||
const status = await ensureFont(template.defaultFontId, template.fontUrl);
|
const status = await ensureFont(template.defaultFontId, template.fontUrl);
|
||||||
if (status !== "ready") {
|
if (status !== "ready") {
|
||||||
setNotice("素材暂不可用,未使用系统字体替代。");
|
showNotice("素材暂不可用,未使用系统字体替代。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
@@ -490,8 +528,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
commitElementOperation(controller, "文字模板已加入画布");
|
commitElementOperation(controller, "文字模板已加入画布");
|
||||||
void recordRecentTextTemplate(template.templateId, template.resourceVersion);
|
void recordRecentTextTemplate(template.templateId, template.resourceVersion);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("文字模板未能加入画布");
|
else showNotice("文字模板未能加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -503,18 +541,49 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
action(edit);
|
action(edit);
|
||||||
return { ...current, draft: edit.value };
|
return { ...current, draft: edit.value };
|
||||||
} catch {
|
} catch {
|
||||||
setNotice("文字参数不在允许范围内");
|
showNotice("文字参数不在允许范围内");
|
||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function commitTextDraftAutomatically(editState: TextEditState) {
|
||||||
|
if (!canvasState || !project || saveStatus === "conflicted") return;
|
||||||
|
const index = canvasState.elements.findIndex((element) => element.element_id === editState.elementId);
|
||||||
|
if (index < 0 || JSON.stringify(canvasState.elements[index]) === JSON.stringify(editState.draft)) return;
|
||||||
|
try {
|
||||||
|
const complete = new TextEditSession(editState.draft, P0A_TEXT_TEMPLATES).complete();
|
||||||
|
const next = structuredClone(canvasState);
|
||||||
|
next.elements[index] = complete;
|
||||||
|
const history = textHistoryRef.current;
|
||||||
|
if (!history || history.elementId !== editState.elementId) {
|
||||||
|
if (history) finalizeTextHistory();
|
||||||
|
textHistoryRef.current = { base: canvasState, elementId: editState.elementId, last: next };
|
||||||
|
} else {
|
||||||
|
history.last = next;
|
||||||
|
}
|
||||||
|
elementControllerRef.current?.replaceState(next);
|
||||||
|
setCanvasState(next);
|
||||||
|
queueRef.current?.commit({ canvas_state: next, name: project.name });
|
||||||
|
if (complete.template_or_asset_id !== editState.originalTemplateId) {
|
||||||
|
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
|
||||||
|
}
|
||||||
|
setTextEdit((current) => current?.elementId === editState.elementId ? {
|
||||||
|
...current,
|
||||||
|
draft: complete,
|
||||||
|
originalTemplateId: complete.template_or_asset_id,
|
||||||
|
} : current);
|
||||||
|
} catch (error) {
|
||||||
|
if (!(error instanceof Error && error.message === "text_content_required")) showNotice("文字编辑未能自动保存");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function changeTextTemplate(templateId: string) {
|
async function changeTextTemplate(templateId: string) {
|
||||||
const template = P0A_TEXT_TEMPLATES.find((candidate) => candidate.templateId === templateId);
|
const template = P0A_TEXT_TEMPLATES.find((candidate) => candidate.templateId === templateId);
|
||||||
if (!template?.fontUrl) return;
|
if (!template?.fontUrl) return;
|
||||||
const status = await ensureFont(template.defaultFontId, template.fontUrl);
|
const status = await ensureFont(template.defaultFontId, template.fontUrl);
|
||||||
if (status !== "ready") {
|
if (status !== "ready") {
|
||||||
setNotice("素材暂不可用,未使用系统字体替代。");
|
showNotice("素材暂不可用,未使用系统字体替代。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
updateTextDraft((edit) => edit.switchTemplate(templateId));
|
updateTextDraft((edit) => edit.switchTemplate(templateId));
|
||||||
@@ -527,7 +596,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
const option = fontOption(fontId);
|
const option = fontOption(fontId);
|
||||||
if (!option || await ensureFont(option.fontId, option.url) !== "ready") {
|
if (!option || await ensureFont(option.fontId, option.url) !== "ready") {
|
||||||
setNotice("字体素材暂不可用,未使用系统字体替代。");
|
showNotice("字体素材暂不可用,未使用系统字体替代。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
updateTextDraft((edit) => edit.setStyle({ fontOverride: fontId }));
|
updateTextDraft((edit) => edit.setStyle({ fontOverride: fontId }));
|
||||||
@@ -535,6 +604,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
|
|
||||||
function completeTextEdit() {
|
function completeTextEdit() {
|
||||||
if (!textEdit) return;
|
if (!textEdit) return;
|
||||||
|
if (!pendingTextDraft()) {
|
||||||
|
finalizeTextHistory();
|
||||||
|
showNotice("文字修改已进入自动保存");
|
||||||
|
return;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const edit = new TextEditSession(textEdit.draft, P0A_TEXT_TEMPLATES);
|
const edit = new TextEditSession(textEdit.draft, P0A_TEXT_TEMPLATES);
|
||||||
const complete = edit.complete();
|
const complete = edit.complete();
|
||||||
@@ -546,17 +620,25 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
|
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "text_content_required") setNotice("请输入文字内容或删除该元素。");
|
if (error instanceof Error && error.message === "text_content_required") showNotice("请输入文字内容或删除该元素。");
|
||||||
else setNotice("文字编辑未能完成");
|
else showNotice("文字编辑未能完成");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function cancelTextEdit() {
|
function cancelTextEdit() {
|
||||||
|
const pendingHistory = textHistoryRef.current;
|
||||||
|
if (pendingHistory && project) {
|
||||||
|
textHistoryRef.current = undefined;
|
||||||
|
elementControllerRef.current?.replaceState(pendingHistory.base);
|
||||||
|
setCanvasState(pendingHistory.base);
|
||||||
|
queueRef.current?.commit({ canvas_state: pendingHistory.base, name: project.name });
|
||||||
|
}
|
||||||
if (canvasState && textEdit) {
|
if (canvasState && textEdit) {
|
||||||
const current = canvasState.elements.find((element) => element.element_id === textEdit.elementId);
|
const source = pendingHistory?.base ?? canvasState;
|
||||||
|
const current = source.elements.find((element) => element.element_id === textEdit.elementId);
|
||||||
if (current) setTextEdit({ draft: structuredClone(current), elementId: current.element_id, originalTemplateId: current.template_or_asset_id });
|
if (current) setTextEdit({ draft: structuredClone(current), elementId: current.element_id, originalTemplateId: current.template_or_asset_id });
|
||||||
}
|
}
|
||||||
setNotice("已取消未提交的文字修改");
|
showNotice("已取消未提交的文字修改");
|
||||||
}
|
}
|
||||||
|
|
||||||
function pendingTextDraft() {
|
function pendingTextDraft() {
|
||||||
@@ -624,7 +706,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const ran = await conflictExportGuardRef.current.run(() => executeExport(options));
|
const ran = await conflictExportGuardRef.current.run(() => executeExport(options));
|
||||||
if (!ran) setNotice("版本冲突时仅允许导出本页版本一次");
|
if (!ran) showNotice("版本冲突时仅允许导出本页版本一次");
|
||||||
}
|
}
|
||||||
|
|
||||||
async function retryExportDownload() {
|
async function retryExportDownload() {
|
||||||
@@ -639,8 +721,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
action(controller);
|
action(controller);
|
||||||
commitElementOperation(controller, message);
|
commitElementOperation(controller, message);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("对象操作未完成");
|
else showNotice("对象操作未完成");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -668,7 +750,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
opacityGestureRef.current = undefined;
|
opacityGestureRef.current = undefined;
|
||||||
if (gesture.last === gesture.base) return;
|
if (gesture.last === gesture.base) return;
|
||||||
commitCanvas(gesture.last);
|
commitCanvas(gesture.last);
|
||||||
setNotice("贴纸透明度已提交");
|
showNotice("贴纸透明度已提交");
|
||||||
}
|
}
|
||||||
|
|
||||||
function duplicateSelection() {
|
function duplicateSelection() {
|
||||||
@@ -688,7 +770,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller || selectedIds.length === 0) return;
|
if (!controller || selectedIds.length === 0) return;
|
||||||
clipboardRef.current = controller.copySelected();
|
clipboardRef.current = controller.copySelected();
|
||||||
setNotice("已复制到画布剪贴板");
|
showNotice("已复制到画布剪贴板");
|
||||||
}
|
}
|
||||||
|
|
||||||
function pasteSelection() {
|
function pasteSelection() {
|
||||||
@@ -698,18 +780,23 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
controller.pasteElements(clipboardRef.current, () => newElementIdentity());
|
controller.pasteElements(clipboardRef.current, () => newElementIdentity());
|
||||||
commitElementOperation(controller, "已粘贴画布对象");
|
commitElementOperation(controller, "已粘贴画布对象");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectAt(point: CanvasPoint, append: boolean) {
|
function selectAt(point: CanvasPoint, append: boolean) {
|
||||||
|
finalizeTextHistory();
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller || !canvasState) return false;
|
if (!controller || !canvasState) return false;
|
||||||
const candidates = controller.candidatesAt(point);
|
const candidates = controller.candidatesAt(point);
|
||||||
const selection = controller.selectAt(point, { append: append || multiMode });
|
const selection = controller.selectAt(point, {
|
||||||
|
append: append || multiMode,
|
||||||
|
preserveSelection: multiMode && !append,
|
||||||
|
});
|
||||||
setSelectedIds(selection);
|
setSelectedIds(selection);
|
||||||
setCandidateMenu(undefined);
|
setCandidateMenu(undefined);
|
||||||
dragRef.current = { base: canvasState, last: canvasState, selectedIds: selection };
|
const dragBase = withTextDraft(canvasState, textEdit);
|
||||||
|
dragRef.current = { base: dragBase, last: dragBase, selectedIds: selection };
|
||||||
return candidates.length > 0;
|
return candidates.length > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -721,19 +808,25 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const preview = previewController.moveSelected(delta);
|
const preview = previewController.moveSelected(delta);
|
||||||
drag.last = preview.state;
|
drag.last = preview.state;
|
||||||
setCanvasState(preview.state);
|
setCanvasState(preview.state);
|
||||||
|
setTextEdit((current) => {
|
||||||
|
if (!current || !drag.selectedIds.includes(current.elementId)) return current;
|
||||||
|
const movedDraft = preview.state.elements.find((element) => element.element_id === current.elementId);
|
||||||
|
return movedDraft ? { ...current, draft: movedDraft } : current;
|
||||||
|
});
|
||||||
setGuides(preview.guides);
|
setGuides(preview.guides);
|
||||||
}
|
}
|
||||||
|
|
||||||
function commitMove() {
|
function commitMove() {
|
||||||
const drag = dragRef.current;
|
const drag = dragRef.current;
|
||||||
if (!drag) return;
|
if (!drag) return;
|
||||||
commitCanvas(drag.last);
|
commitCanvas(drag.last, { preserveTextEdit: true });
|
||||||
setNotice("对象位置已提交");
|
showNotice("对象位置已提交");
|
||||||
setGuides([]);
|
setGuides([]);
|
||||||
dragRef.current = undefined;
|
dragRef.current = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
function marqueeSelect(rectangle: CanvasRect, append: boolean) {
|
function marqueeSelect(rectangle: CanvasRect, append: boolean) {
|
||||||
|
finalizeTextHistory();
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller) return;
|
if (!controller) return;
|
||||||
setSelectedIds(controller.marqueeSelect(rectangle, append || multiMode));
|
setSelectedIds(controller.marqueeSelect(rectangle, append || multiMode));
|
||||||
@@ -782,6 +875,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearSelection() {
|
function clearSelection() {
|
||||||
|
finalizeTextHistory();
|
||||||
elementControllerRef.current?.clearSelection();
|
elementControllerRef.current?.clearSelection();
|
||||||
setSelectedIds([]);
|
setSelectedIds([]);
|
||||||
setCandidateMenu(undefined);
|
setCandidateMenu(undefined);
|
||||||
@@ -789,10 +883,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!project || !canvasState) return <main className="editor-loading" aria-live="polite">正在加载编辑器</main>;
|
if (!project || !canvasState) return <main className="editor-loading" aria-live="polite">正在加载编辑器</main>;
|
||||||
const renderedCanvasState = textEdit ? {
|
const backgroundPreviewState: CanvasState = {
|
||||||
...canvasState,
|
...canvasState,
|
||||||
elements: canvasState.elements.map((element) => element.element_id === textEdit.elementId ? textEdit.draft : element),
|
background: { ...canvasState.background, adjustments: draftAdjustments },
|
||||||
} : canvasState;
|
};
|
||||||
|
const renderedCanvasState = withTextDraft(backgroundPreviewState, textEdit);
|
||||||
const imageUrl = `/api/v1/private-assets/projects/${projectId}/images/${canvasState.background.asset_id ?? project.current_image_id ?? ""}`;
|
const imageUrl = `/api/v1/private-assets/projects/${projectId}/images/${canvasState.background.asset_id ?? project.current_image_id ?? ""}`;
|
||||||
const canEdit = saveStatus !== "conflicted";
|
const canEdit = saveStatus !== "conflicted";
|
||||||
const selectedElements = renderedCanvasState.elements.filter((element) => selectedIds.includes(element.element_id));
|
const selectedElements = renderedCanvasState.elements.filter((element) => selectedIds.includes(element.element_id));
|
||||||
@@ -869,7 +964,6 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
maxWidth: `min(720px, calc(${(canvasState.pixel_width / canvasState.pixel_height * 100).toFixed(4)}vh - ${(canvasState.pixel_width / canvasState.pixel_height * 168).toFixed(4)}px))`,
|
maxWidth: `min(720px, calc(${(canvasState.pixel_width / canvasState.pixel_height * 100).toFixed(4)}vh - ${(canvasState.pixel_width / canvasState.pixel_height * 168).toFixed(4)}px))`,
|
||||||
}}>
|
}}>
|
||||||
<EditorStage
|
<EditorStage
|
||||||
assetId={canvasState.background.asset_id}
|
|
||||||
canvasState={renderedCanvasState}
|
canvasState={renderedCanvasState}
|
||||||
fontStatuses={fontStatuses}
|
fontStatuses={fontStatuses}
|
||||||
guides={guides}
|
guides={guides}
|
||||||
@@ -877,6 +971,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
onClearSelection={clearSelection}
|
onClearSelection={clearSelection}
|
||||||
onCopy={copySelection}
|
onCopy={copySelection}
|
||||||
onDelete={deleteSelection}
|
onDelete={deleteSelection}
|
||||||
|
onDragStart={() => setCandidateMenu(undefined)}
|
||||||
onMarquee={marqueeSelect}
|
onMarquee={marqueeSelect}
|
||||||
onMoveCommit={commitMove}
|
onMoveCommit={commitMove}
|
||||||
onMovePreview={previewMove}
|
onMovePreview={previewMove}
|
||||||
|
|||||||
+121
-31
@@ -1,25 +1,29 @@
|
|||||||
import { useEffect, useRef, useState, type KeyboardEvent, type PointerEvent } from "react";
|
import { useEffect, useRef, useState, type KeyboardEvent, type PointerEvent } from "react";
|
||||||
import type { CanvasState } from "@dada/shared-contracts";
|
import type { CanvasState } from "@dada/shared-contracts";
|
||||||
|
|
||||||
import { cssFilterForBackground } from "./editor-canvas.js";
|
import { adjustBackgroundPixels, backgroundDrawPlan, cssFilterForBackground } from "./editor-canvas.js";
|
||||||
import { DYN012_RENDER_LAYOUT, dyn012DisplayParts } from "./dynamic-provider.js";
|
import { DYN012_RENDER_LAYOUT, dyn012DisplayParts } from "./dynamic-provider.js";
|
||||||
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
||||||
import { DYNAMIC_RENDER_MODELS, dynamicFontOptionsFor, dynamicImageUrl, dynamicTextValue } from "./dynamic-render-models.js";
|
import { DYNAMIC_RENDER_MODELS, dynamicFontOptionsFor, dynamicImageUrl, dynamicTextValue } from "./dynamic-render-models.js";
|
||||||
import type { CanvasPoint, CanvasRect } from "./editor-elements.js";
|
import type { CanvasPoint, CanvasRect } from "./editor-elements.js";
|
||||||
import { fontFamilyName, type ArchivedFontStatus } from "./text-font-loader.js";
|
import { fontFamilyName, type ArchivedFontStatus } from "./text-font-loader.js";
|
||||||
import { fontIdForTextElement } from "./text-assets.js";
|
import { fontIdForTextElement } from "./text-assets.js";
|
||||||
import { drawColorCard } from "./palette-provider.js";
|
import { COLOR_CARD_HALF_SIZES, drawColorCard } from "./palette-provider.js";
|
||||||
|
|
||||||
interface Gesture {
|
interface Gesture {
|
||||||
append: boolean;
|
append: boolean;
|
||||||
|
bounds: DOMRect;
|
||||||
hit: boolean;
|
hit: boolean;
|
||||||
longPressOpened: boolean;
|
longPressOpened: boolean;
|
||||||
|
moved: boolean;
|
||||||
pointerId: number;
|
pointerId: number;
|
||||||
start: CanvasPoint;
|
start: CanvasPoint;
|
||||||
|
startClient: CanvasPoint;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const DRAG_THRESHOLD_PX = 4;
|
||||||
|
|
||||||
interface EditorStageProps {
|
interface EditorStageProps {
|
||||||
assetId: string | null;
|
|
||||||
canvasState: CanvasState;
|
canvasState: CanvasState;
|
||||||
guides: readonly string[];
|
guides: readonly string[];
|
||||||
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>;
|
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>;
|
||||||
@@ -27,6 +31,7 @@ interface EditorStageProps {
|
|||||||
onClearSelection: () => void;
|
onClearSelection: () => void;
|
||||||
onCopy: () => void;
|
onCopy: () => void;
|
||||||
onDelete: () => void;
|
onDelete: () => void;
|
||||||
|
onDragStart: () => void;
|
||||||
onMarquee: (rectangle: CanvasRect, append: boolean) => void;
|
onMarquee: (rectangle: CanvasRect, append: boolean) => void;
|
||||||
onMoveCommit: () => void;
|
onMoveCommit: () => void;
|
||||||
onMovePreview: (delta: CanvasPoint) => void;
|
onMovePreview: (delta: CanvasPoint) => void;
|
||||||
@@ -38,11 +43,10 @@ interface EditorStageProps {
|
|||||||
selectedIds: readonly string[];
|
selectedIds: readonly string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
function pointFromEvent(event: PointerEvent<HTMLCanvasElement>): CanvasPoint {
|
function pointFromClient(clientX: number, clientY: number, bounds: DOMRect): CanvasPoint {
|
||||||
const bounds = event.currentTarget.getBoundingClientRect();
|
|
||||||
return {
|
return {
|
||||||
x: Math.max(0, Math.min(1, (event.clientX - bounds.left) / bounds.width)),
|
x: Math.max(0, Math.min(1, (clientX - bounds.left) / bounds.width)),
|
||||||
y: Math.max(0, Math.min(1, (event.clientY - bounds.top) / bounds.height)),
|
y: Math.max(0, Math.min(1, (clientY - bounds.top) / bounds.height)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,10 +186,8 @@ function elementSelectionHalfSize(
|
|||||||
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>,
|
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>,
|
||||||
) {
|
) {
|
||||||
if (element.type === "color_card") {
|
if (element.type === "color_card") {
|
||||||
if (element.style_id === "style_01") return { height: 76 * element.scale.y, width: 26 * element.scale.x };
|
const half = COLOR_CARD_HALF_SIZES[element.style_id ?? ""] ?? { height: 24, width: 78 };
|
||||||
if (element.style_id === "style_02") return { height: 77 * element.scale.y, width: 18 * element.scale.x };
|
return { height: half.height * element.scale.y, width: half.width * element.scale.x };
|
||||||
if (element.style_id === "style_08") return { height: 10 * element.scale.y, width: 73 * element.scale.x };
|
|
||||||
return { height: 9 * element.scale.y, width: 78 * element.scale.x };
|
|
||||||
}
|
}
|
||||||
if (element.type === "dynamic_sticker") {
|
if (element.type === "dynamic_sticker") {
|
||||||
const model = DYNAMIC_RENDER_MODELS[element.template_or_asset_id as DynamicTemplateId];
|
const model = DYNAMIC_RENDER_MODELS[element.template_or_asset_id as DynamicTemplateId];
|
||||||
@@ -240,6 +242,27 @@ function loadCanvasImage(url: string) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CanvasImageLoader = (url: string) => Promise<HTMLImageElement | undefined>;
|
||||||
|
|
||||||
|
interface SceneResources {
|
||||||
|
background: HTMLImageElement | undefined;
|
||||||
|
resourceImages: Readonly<Record<string, HTMLImageElement>>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createCachedCanvasImageLoader(): CanvasImageLoader {
|
||||||
|
const cache = new Map<string, Promise<HTMLImageElement | undefined>>();
|
||||||
|
return (url) => {
|
||||||
|
const cached = cache.get(url);
|
||||||
|
if (cached) return cached;
|
||||||
|
const pending = loadCanvasImage(url).then((image) => {
|
||||||
|
if (!image) cache.delete(url);
|
||||||
|
return image;
|
||||||
|
});
|
||||||
|
cache.set(url, pending);
|
||||||
|
return pending;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function resourceUrlsForCanvas(canvasState: CanvasState) {
|
function resourceUrlsForCanvas(canvasState: CanvasState) {
|
||||||
const imageReferences = new Map<string, string>();
|
const imageReferences = new Map<string, string>();
|
||||||
for (const element of canvasState.elements) {
|
for (const element of canvasState.elements) {
|
||||||
@@ -252,11 +275,19 @@ function resourceUrlsForCanvas(canvasState: CanvasState) {
|
|||||||
return imageReferences;
|
return imageReferences;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadSceneResources(canvasState: CanvasState, projectId: string) {
|
function sceneResourceKey(canvasState: CanvasState, projectId: string) {
|
||||||
const background = canvasState.background.asset_id
|
const background = canvasState.background.asset_id
|
||||||
? loadCanvasImage(`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`)
|
? `/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`
|
||||||
|
: null;
|
||||||
|
const resources = [...resourceUrlsForCanvas(canvasState)].toSorted(([left], [right]) => left.localeCompare(right));
|
||||||
|
return JSON.stringify({ background, projectId, resources });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSceneResources(canvasState: CanvasState, projectId: string, loadImage: CanvasImageLoader = loadCanvasImage): Promise<SceneResources> {
|
||||||
|
const background = canvasState.background.asset_id
|
||||||
|
? loadImage(`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`)
|
||||||
: Promise.resolve(undefined);
|
: Promise.resolve(undefined);
|
||||||
const resources = Promise.all([...resourceUrlsForCanvas(canvasState)].map(async ([assetId, url]) => [assetId, await loadCanvasImage(url)] as const));
|
const resources = Promise.all([...resourceUrlsForCanvas(canvasState)].map(async ([assetId, url]) => [assetId, await loadImage(url)] as const));
|
||||||
const [image, loaded] = await Promise.all([background, resources]);
|
const [image, loaded] = await Promise.all([background, resources]);
|
||||||
return {
|
return {
|
||||||
background: image,
|
background: image,
|
||||||
@@ -274,9 +305,41 @@ function renderEditorScene(
|
|||||||
context.clearRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
context.clearRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
||||||
context.fillStyle = "#ffffff";
|
context.fillStyle = "#ffffff";
|
||||||
context.fillRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
context.fillRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
||||||
|
if (background) {
|
||||||
|
const plan = backgroundDrawPlan(
|
||||||
|
{ height: background.naturalHeight || background.height, width: background.naturalWidth || background.width },
|
||||||
|
{ height: canvasState.pixel_height, width: canvasState.pixel_width },
|
||||||
|
canvasState.background.adjustments,
|
||||||
|
);
|
||||||
|
context.save();
|
||||||
context.filter = cssFilterForBackground(canvasState.background.adjustments);
|
context.filter = cssFilterForBackground(canvasState.background.adjustments);
|
||||||
if (background) context.drawImage(background, 0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
context.drawImage(
|
||||||
context.filter = "none";
|
background,
|
||||||
|
plan.source.x,
|
||||||
|
plan.source.y,
|
||||||
|
plan.source.width,
|
||||||
|
plan.source.height,
|
||||||
|
plan.destination.x,
|
||||||
|
plan.destination.y,
|
||||||
|
plan.destination.width,
|
||||||
|
plan.destination.height,
|
||||||
|
);
|
||||||
|
context.restore();
|
||||||
|
|
||||||
|
if (canvasState.background.adjustments.temperature !== 0 || canvasState.background.adjustments.sharpness !== 0) {
|
||||||
|
const x = Math.max(0, Math.floor(plan.destination.x));
|
||||||
|
const y = Math.max(0, Math.floor(plan.destination.y));
|
||||||
|
const right = Math.min(canvasState.pixel_width, Math.ceil(plan.destination.x + plan.destination.width));
|
||||||
|
const bottom = Math.min(canvasState.pixel_height, Math.ceil(plan.destination.y + plan.destination.height));
|
||||||
|
const width = right - x;
|
||||||
|
const height = bottom - y;
|
||||||
|
if (width > 0 && height > 0) {
|
||||||
|
const imageData = context.getImageData(x, y, width, height);
|
||||||
|
imageData.data.set(adjustBackgroundPixels(imageData.data, width, height, canvasState.background.adjustments));
|
||||||
|
context.putImageData(imageData, x, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (const element of [...canvasState.elements].sort((left, right) => left.z_index - right.z_index)) {
|
for (const element of [...canvasState.elements].sort((left, right) => left.z_index - right.z_index)) {
|
||||||
drawElement(context, element, canvasState.pixel_width, canvasState.pixel_height, fontStatuses, resourceImages);
|
drawElement(context, element, canvasState.pixel_width, canvasState.pixel_height, fontStatuses, resourceImages);
|
||||||
}
|
}
|
||||||
@@ -314,16 +377,29 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
const canvasRef = useRef<HTMLCanvasElement>(null);
|
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||||
const gestureRef = useRef<Gesture | undefined>(undefined);
|
const gestureRef = useRef<Gesture | undefined>(undefined);
|
||||||
const longPressRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
|
const longPressRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
|
||||||
|
const imageLoaderRef = useRef<CanvasImageLoader | undefined>(undefined);
|
||||||
|
const [sceneResources, setSceneResources] = useState<{ key: string; resources: SceneResources }>();
|
||||||
const [marquee, setMarquee] = useState<CanvasRect>();
|
const [marquee, setMarquee] = useState<CanvasRect>();
|
||||||
|
const resourceKey = sceneResourceKey(props.canvasState, props.projectId);
|
||||||
|
|
||||||
|
if (!imageLoaderRef.current) imageLoaderRef.current = createCachedCanvasImageLoader();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
|
void loadSceneResources(props.canvasState, props.projectId, imageLoaderRef.current).then((resources) => {
|
||||||
|
if (active) setSceneResources({ key: resourceKey, resources });
|
||||||
|
});
|
||||||
|
return () => { active = false; };
|
||||||
|
}, [props.projectId, resourceKey]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
const canvas = canvasRef.current;
|
const canvas = canvasRef.current;
|
||||||
if (!canvas) return undefined;
|
if (!canvas) return undefined;
|
||||||
canvas.width = props.canvasState.pixel_width;
|
if (canvas.width !== props.canvasState.pixel_width) canvas.width = props.canvasState.pixel_width;
|
||||||
canvas.height = props.canvasState.pixel_height;
|
if (canvas.height !== props.canvasState.pixel_height) canvas.height = props.canvasState.pixel_height;
|
||||||
const context = canvas.getContext("2d");
|
const context = canvas.getContext("2d");
|
||||||
if (!context) return undefined;
|
if (!context) return undefined;
|
||||||
|
if (!sceneResources || sceneResources.key !== resourceKey) return undefined;
|
||||||
const render = (image: HTMLImageElement | undefined, resourceImages: Readonly<Record<string, HTMLImageElement>>) => {
|
const render = (image: HTMLImageElement | undefined, resourceImages: Readonly<Record<string, HTMLImageElement>>) => {
|
||||||
renderEditorScene(context, props.canvasState, props.fontStatuses, image, resourceImages);
|
renderEditorScene(context, props.canvasState, props.fontStatuses, image, resourceImages);
|
||||||
context.lineWidth = 4;
|
context.lineWidth = 4;
|
||||||
@@ -345,21 +421,22 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
if (marquee) context.strokeRect(marquee.x * canvas.width, marquee.y * canvas.height, marquee.width * canvas.width, marquee.height * canvas.height);
|
if (marquee) context.strokeRect(marquee.x * canvas.width, marquee.y * canvas.height, marquee.width * canvas.width, marquee.height * canvas.height);
|
||||||
context.restore();
|
context.restore();
|
||||||
};
|
};
|
||||||
void loadSceneResources(props.canvasState, props.projectId).then(({ background, resourceImages }) => {
|
render(sceneResources.resources.background, sceneResources.resources.resourceImages);
|
||||||
if (!active) return;
|
return undefined;
|
||||||
render(background, resourceImages);
|
}, [marquee, props.canvasState, props.fontStatuses, props.guides, props.selectedIds, resourceKey, sceneResources]);
|
||||||
});
|
|
||||||
return () => { active = false; };
|
|
||||||
}, [marquee, props.assetId, props.canvasState, props.fontStatuses, props.guides, props.projectId, props.selectedIds]);
|
|
||||||
|
|
||||||
useEffect(() => () => { if (longPressRef.current) clearTimeout(longPressRef.current); }, []);
|
useEffect(() => () => { if (longPressRef.current) clearTimeout(longPressRef.current); }, []);
|
||||||
|
|
||||||
function handlePointerDown(event: PointerEvent<HTMLCanvasElement>) {
|
function handlePointerDown(event: PointerEvent<HTMLCanvasElement>) {
|
||||||
if (event.button !== 0) return;
|
if (event.button !== 0) return;
|
||||||
const start = pointFromEvent(event);
|
const bounds = event.currentTarget.getBoundingClientRect();
|
||||||
|
const start = pointFromClient(event.clientX, event.clientY, bounds);
|
||||||
const append = event.shiftKey;
|
const append = event.shiftKey;
|
||||||
const hit = props.onSelect(start, append);
|
const hit = props.onSelect(start, append);
|
||||||
gestureRef.current = { append, hit, longPressOpened: false, pointerId: event.pointerId, start };
|
gestureRef.current = {
|
||||||
|
append, bounds, hit, longPressOpened: false, moved: false, pointerId: event.pointerId, start,
|
||||||
|
startClient: { x: event.clientX, y: event.clientY },
|
||||||
|
};
|
||||||
event.currentTarget.setPointerCapture(event.pointerId);
|
event.currentTarget.setPointerCapture(event.pointerId);
|
||||||
longPressRef.current = setTimeout(() => {
|
longPressRef.current = setTimeout(() => {
|
||||||
const gesture = gestureRef.current;
|
const gesture = gestureRef.current;
|
||||||
@@ -375,9 +452,15 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
props.onPointerMoved();
|
props.onPointerMoved();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const point = pointFromEvent(event);
|
const clientDistance = Math.hypot(event.clientX - gesture.startClient.x, event.clientY - gesture.startClient.y);
|
||||||
|
if (!gesture.moved) {
|
||||||
|
if (clientDistance < DRAG_THRESHOLD_PX) return;
|
||||||
|
gesture.moved = true;
|
||||||
|
gesture.longPressOpened = false;
|
||||||
|
props.onDragStart();
|
||||||
|
}
|
||||||
|
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
|
||||||
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
||||||
if (Math.abs(delta.x) + Math.abs(delta.y) < 0.003) return;
|
|
||||||
if (longPressRef.current) clearTimeout(longPressRef.current);
|
if (longPressRef.current) clearTimeout(longPressRef.current);
|
||||||
props.onPointerMoved();
|
props.onPointerMoved();
|
||||||
if (gesture.hit && !gesture.longPressOpened) props.onMovePreview(delta);
|
if (gesture.hit && !gesture.longPressOpened) props.onMovePreview(delta);
|
||||||
@@ -388,11 +471,18 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
const gesture = gestureRef.current;
|
const gesture = gestureRef.current;
|
||||||
if (!gesture || gesture.pointerId !== event.pointerId) return;
|
if (!gesture || gesture.pointerId !== event.pointerId) return;
|
||||||
if (longPressRef.current) clearTimeout(longPressRef.current);
|
if (longPressRef.current) clearTimeout(longPressRef.current);
|
||||||
const point = pointFromEvent(event);
|
const clientDistance = Math.hypot(event.clientX - gesture.startClient.x, event.clientY - gesture.startClient.y);
|
||||||
|
const moved = gesture.moved || clientDistance >= DRAG_THRESHOLD_PX;
|
||||||
|
if (moved && !gesture.moved && !gesture.longPressOpened) {
|
||||||
|
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
|
||||||
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
||||||
const moved = Math.abs(delta.x) + Math.abs(delta.y) >= 0.003;
|
if (gesture.hit) props.onMovePreview(delta);
|
||||||
|
}
|
||||||
if (gesture.hit && moved && !gesture.longPressOpened) props.onMoveCommit();
|
if (gesture.hit && moved && !gesture.longPressOpened) props.onMoveCommit();
|
||||||
else if (!gesture.hit && moved) props.onMarquee({ height: delta.y, width: delta.x, x: gesture.start.x, y: gesture.start.y }, gesture.append);
|
else if (!gesture.hit && moved) {
|
||||||
|
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
|
||||||
|
props.onMarquee({ height: point.y - gesture.start.y, width: point.x - gesture.start.x, x: gesture.start.x, y: gesture.start.y }, gesture.append);
|
||||||
|
}
|
||||||
setMarquee(undefined);
|
setMarquee(undefined);
|
||||||
gestureRef.current = undefined;
|
gestureRef.current = undefined;
|
||||||
event.currentTarget.releasePointerCapture(event.pointerId);
|
event.currentTarget.releasePointerCapture(event.pointerId);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,155 @@
|
|||||||
|
:root {
|
||||||
|
--dada-interaction-duration: 120ms;
|
||||||
|
--dada-interaction-easing: cubic-bezier(0.2, 0.8, 0.2, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(button:not(:disabled), a[href], label:has(input:not(:disabled))) {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(button:not(:disabled), a[href]) {
|
||||||
|
transition:
|
||||||
|
transform var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
box-shadow var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
border-color var(--dada-interaction-duration) ease,
|
||||||
|
background-color var(--dada-interaction-duration) ease,
|
||||||
|
color var(--dada-interaction-duration) ease,
|
||||||
|
opacity var(--dada-interaction-duration) ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(input:not(:disabled), select:not(:disabled), textarea:not(:disabled)) {
|
||||||
|
transition:
|
||||||
|
border-color var(--dada-interaction-duration) ease,
|
||||||
|
box-shadow var(--dada-interaction-duration) ease,
|
||||||
|
background-color var(--dada-interaction-duration) ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(.product-page, .product-loading) :focus-visible {
|
||||||
|
outline: 2px solid #005fcc;
|
||||||
|
outline-offset: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(input:not(:disabled), select:not(:disabled), textarea:not(:disabled)):focus-visible {
|
||||||
|
border-color: #005fcc;
|
||||||
|
box-shadow: 0 0 0 3px rgb(0 95 204 / 16%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-card,
|
||||||
|
.project-preview img,
|
||||||
|
.ratio-control span,
|
||||||
|
.reference-input,
|
||||||
|
.editor-sticker-preview,
|
||||||
|
.editor-template-mark,
|
||||||
|
.editor-template-preview,
|
||||||
|
.editor-color-card-preview,
|
||||||
|
.editor-dynamic-preview,
|
||||||
|
.editor-source-preview-canvas,
|
||||||
|
.editor-thumb {
|
||||||
|
transition:
|
||||||
|
transform var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
box-shadow var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
border-color var(--dada-interaction-duration) ease,
|
||||||
|
background-color var(--dada-interaction-duration) ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (hover: hover) and (pointer: fine) {
|
||||||
|
:where(button:not(:disabled)):hover {
|
||||||
|
border-color: #111111;
|
||||||
|
box-shadow: 0 2px 0 rgb(17 17 17 / 35%);
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(a[href]):hover {
|
||||||
|
color: #005fcc;
|
||||||
|
opacity: 0.78;
|
||||||
|
text-decoration-thickness: 2px;
|
||||||
|
text-underline-offset: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.product-header nav a:hover {
|
||||||
|
color: #111111;
|
||||||
|
background: #e9e9e5;
|
||||||
|
box-shadow: inset 0 -3px #111111;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.product-header nav a[aria-current="page"]:hover {
|
||||||
|
background: #f2f500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ratio-control label:hover span,
|
||||||
|
.reference-input:hover {
|
||||||
|
border-color: #111111;
|
||||||
|
background: #ffffd6;
|
||||||
|
box-shadow: inset 0 -3px #111111;
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-card:hover {
|
||||||
|
border-color: #111111;
|
||||||
|
box-shadow: 0 3px 0 rgb(17 17 17 / 22%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-asset-tabs button:not(:disabled):hover,
|
||||||
|
.editor-source:hover,
|
||||||
|
.editor-sticker-grid button:not(:disabled):hover,
|
||||||
|
.editor-template-categories button:not(:disabled):hover,
|
||||||
|
.editor-template-grid button:not(:disabled):hover,
|
||||||
|
.editor-provider-grid button:not(:disabled):hover,
|
||||||
|
.editor-candidates button:not(:disabled):hover {
|
||||||
|
border-color: #111111;
|
||||||
|
background: #ffffd6;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(input:not(:disabled), select:not(:disabled), textarea:not(:disabled)):hover {
|
||||||
|
border-color: #111111;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference) {
|
||||||
|
:where(button:not(:disabled), a[href]):hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-card:hover .project-preview img,
|
||||||
|
.editor-sticker-grid button:not(:disabled):hover .editor-sticker-preview {
|
||||||
|
transform: scale(1.02);
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-template-grid button:not(:disabled):hover .editor-template-mark,
|
||||||
|
.editor-template-grid button:not(:disabled):hover .editor-template-preview,
|
||||||
|
.editor-provider-grid button:not(:disabled):hover > :first-child {
|
||||||
|
transform: scale(1.03);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: no-preference) {
|
||||||
|
:where(button:not(:disabled), a[href]):active {
|
||||||
|
transform: translateY(1px);
|
||||||
|
transition-duration: 45ms;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(button:not(:disabled)):active {
|
||||||
|
box-shadow: inset 0 2px 0 rgb(17 17 17 / 24%);
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(a[href]):active {
|
||||||
|
opacity: 0.58;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
:where(button, a[href], input, select, textarea),
|
||||||
|
.project-card,
|
||||||
|
.project-preview img,
|
||||||
|
.ratio-control span,
|
||||||
|
.reference-input,
|
||||||
|
.editor-sticker-preview,
|
||||||
|
.editor-template-mark,
|
||||||
|
.editor-template-preview,
|
||||||
|
.editor-color-card-preview,
|
||||||
|
.editor-dynamic-preview,
|
||||||
|
.editor-source-preview-canvas,
|
||||||
|
.editor-thumb {
|
||||||
|
animation-duration: 0s !important;
|
||||||
|
transition-duration: 0s !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,6 +16,8 @@ import { ProjectDetailPage, ProjectsPage, WorkspacePage } from "./project-pages.
|
|||||||
import { EditorPage } from "./editor-page.js";
|
import { EditorPage } from "./editor-page.js";
|
||||||
import { AdminOverviewPage, AdminPlaceholderPage, AdminProtectedRoute } from "./admin-shell.js";
|
import { AdminOverviewPage, AdminPlaceholderPage, AdminProtectedRoute } from "./admin-shell.js";
|
||||||
|
|
||||||
|
import "./interaction-feedback.css";
|
||||||
|
|
||||||
const root = document.getElementById("root");
|
const root = document.getElementById("root");
|
||||||
|
|
||||||
if (!root) {
|
if (!root) {
|
||||||
|
|||||||
@@ -27,6 +27,17 @@ export const COLOR_CARD_SOURCE_GEOMETRY = {
|
|||||||
style_16: { bounds: { bottom: 9, left: -78, right: 78, top: -9 } },
|
style_16: { bounds: { bottom: 9, left: -78, right: 78, top: -9 } },
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
export const COLOR_CARD_HALF_SIZES: Readonly<Record<string, { height: number; width: number }>> = {
|
||||||
|
style_01: { height: 76, width: 26 }, style_02: { height: 77, width: 18 },
|
||||||
|
style_03: { height: 75, width: 22 }, style_04: { height: 75, width: 18 },
|
||||||
|
style_05: { height: 18, width: 78 }, style_06: { height: 16, width: 78 },
|
||||||
|
style_07: { height: 20, width: 78 }, style_08: { height: 10, width: 73 },
|
||||||
|
style_09: { height: 75, width: 58 }, style_10: { height: 75, width: 60 },
|
||||||
|
style_11: { height: 18, width: 78 }, style_12: { height: 34, width: 70 },
|
||||||
|
style_13: { height: 75, width: 18 }, style_14: { height: 28, width: 60 },
|
||||||
|
style_15: { height: 16, width: 78 }, style_16: { height: 9, width: 78 },
|
||||||
|
};
|
||||||
|
|
||||||
function normalizedHex(value: string) {
|
function normalizedHex(value: string) {
|
||||||
return value.toUpperCase();
|
return value.toUpperCase();
|
||||||
}
|
}
|
||||||
@@ -139,6 +150,65 @@ export function drawColorCard(context: CanvasRenderingContext2D, element: Canvas
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (element.style_id === "style_03") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(-22, -75 + index * 30, 44, 29);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_04") {
|
||||||
|
context.strokeStyle = "#ffffff";
|
||||||
|
context.lineWidth = 2;
|
||||||
|
context.beginPath();
|
||||||
|
context.moveTo(0, -75);
|
||||||
|
context.lineTo(0, 75);
|
||||||
|
context.stroke();
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(0, -60 + index * 30, 9, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (["style_05", "style_06", "style_07", "style_11"].includes(element.style_id ?? "")) {
|
||||||
|
if (element.style_id === "style_11") {
|
||||||
|
context.strokeStyle = "#ffffff";
|
||||||
|
context.lineWidth = 3;
|
||||||
|
context.strokeRect(-78, -18, 156, 36);
|
||||||
|
}
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
const left = -72 + index * 29;
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(left, -10, 28, 20);
|
||||||
|
if (element.style_id === "style_07") {
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(left + 14, -16, 4, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (element.style_id === "style_05") {
|
||||||
|
context.fillStyle = "#111111";
|
||||||
|
context.fillRect(-78, -18, 20, 36);
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.font = "700 7px Arial, sans-serif";
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
context.fillText("C", -68, 0);
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_06") {
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.beginPath();
|
||||||
|
context.moveTo(-4, -16);
|
||||||
|
context.lineTo(4, -16);
|
||||||
|
context.lineTo(0, -10);
|
||||||
|
context.closePath();
|
||||||
|
context.fill();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (element.style_id === "style_08") {
|
if (element.style_id === "style_08") {
|
||||||
colors.forEach((color, index) => {
|
colors.forEach((color, index) => {
|
||||||
const left = -73 + index * 29.2;
|
const left = -73 + index * 29.2;
|
||||||
@@ -159,6 +229,61 @@ export function drawColorCard(context: CanvasRenderingContext2D, element: Canvas
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (element.style_id === "style_09" || element.style_id === "style_10") {
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.fillRect(-58, -75, 116, 150);
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(-50, -64 + index * 23, 100, 22);
|
||||||
|
});
|
||||||
|
context.fillStyle = "#111111";
|
||||||
|
context.font = "700 8px Arial, sans-serif";
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
context.fillText(element.style_id === "style_09" ? "COLOR PALETTE" : "FIVE COLORS", 0, 63);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_12") {
|
||||||
|
const positions = [[-52, -18], [0, -18], [52, -18], [-26, 18], [26, 18]] as const;
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
const position = positions[index]!;
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(position[0] - 24, position[1] - 14, 48, 28);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_13") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(0, -60 + index * 30, 11, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_14") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.globalAlpha = 0.9;
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(-40 + index * 20, 0, 24, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
});
|
||||||
|
context.globalAlpha = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_15") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.strokeStyle = "#ffffff";
|
||||||
|
context.lineWidth = 3;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(-58 + index * 29, 0, 12, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
context.stroke();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
context.fillStyle = "#ffffff";
|
context.fillStyle = "#ffffff";
|
||||||
context.beginPath();
|
context.beginPath();
|
||||||
context.moveTo(-78, -9);
|
context.moveTo(-78, -9);
|
||||||
|
|||||||
@@ -592,15 +592,26 @@
|
|||||||
height: 18px;
|
height: 18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-placeholder {
|
.project-placeholder,
|
||||||
|
.project-preview {
|
||||||
display: grid;
|
display: grid;
|
||||||
height: 154px;
|
height: 154px;
|
||||||
grid-template-columns: repeat(4, 1fr);
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
border-bottom: 1px solid #a5a59f;
|
border-bottom: 1px solid #a5a59f;
|
||||||
background: #d8d8d3;
|
background: #d8d8d3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.project-placeholder {
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-preview img {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
.project-placeholder span {
|
.project-placeholder span {
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: end center;
|
place-items: end center;
|
||||||
@@ -935,9 +946,9 @@
|
|||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-current > .project-placeholder {
|
.project-current > .project-placeholder,
|
||||||
height: auto;
|
.project-current > .project-preview {
|
||||||
min-height: 480px;
|
height: 480px;
|
||||||
border: 1px solid #73736d;
|
border: 1px solid #73736d;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -945,6 +956,10 @@
|
|||||||
font-size: 80px;
|
font-size: 80px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.project-current > .project-preview img {
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
.project-actions {
|
.project-actions {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
@@ -1013,7 +1028,8 @@
|
|||||||
padding: 6px;
|
padding: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-history li .project-placeholder {
|
.project-history li .project-placeholder,
|
||||||
|
.project-history li .project-preview {
|
||||||
height: 88px;
|
height: 88px;
|
||||||
border: 0;
|
border: 0;
|
||||||
}
|
}
|
||||||
@@ -1439,8 +1455,9 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-current > .project-placeholder {
|
.project-current > .project-placeholder,
|
||||||
min-height: 360px;
|
.project-current > .project-preview {
|
||||||
|
height: 360px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.local-only-footer {
|
.local-only-footer {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ interface LocalDataPayload {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface AccountSettingsPayload {
|
interface AccountSettingsPayload {
|
||||||
|
csrf_token: string;
|
||||||
local_data: LocalDataPayload;
|
local_data: LocalDataPayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,6 +232,33 @@ function ProjectPlaceholder({ ratio, status }: { ratio: Ratio; status: ProjectSt
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ProjectPreview({ alt, imageId, loading = "lazy", projectId, ratio, status }: {
|
||||||
|
alt: string;
|
||||||
|
imageId: string | null;
|
||||||
|
loading?: "eager" | "lazy";
|
||||||
|
projectId: string;
|
||||||
|
ratio: Ratio;
|
||||||
|
status: ProjectStatus;
|
||||||
|
}) {
|
||||||
|
const [loadFailed, setLoadFailed] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => setLoadFailed(false), [imageId, projectId]);
|
||||||
|
|
||||||
|
if (!imageId || loadFailed) return <ProjectPlaceholder ratio={ratio} status={status} />;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="project-preview" data-ratio={ratio} data-status={status}>
|
||||||
|
<img
|
||||||
|
alt={alt}
|
||||||
|
decoding="async"
|
||||||
|
loading={loading}
|
||||||
|
onError={() => setLoadFailed(true)}
|
||||||
|
src={`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(imageId)}`}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function WorkspacePage() {
|
export function WorkspacePage() {
|
||||||
const promptId = useId();
|
const promptId = useId();
|
||||||
const [session, setSession] = useState<SessionPayload>();
|
const [session, setSession] = useState<SessionPayload>();
|
||||||
@@ -269,7 +297,12 @@ export function WorkspacePage() {
|
|||||||
if (!active) return;
|
if (!active) return;
|
||||||
if (modelResult.status === "fulfilled") setModels(modelResult.value);
|
if (modelResult.status === "fulfilled") setModels(modelResult.value);
|
||||||
if (taskResult.status === "fulfilled") setCurrentTask(taskResult.value);
|
if (taskResult.status === "fulfilled") setCurrentTask(taskResult.value);
|
||||||
if (settingsResult.status === "fulfilled" && settingsResult.value) setLocalData(settingsResult.value.local_data);
|
const settings = settingsResult.status === "fulfilled" ? settingsResult.value : undefined;
|
||||||
|
if (settings) {
|
||||||
|
setLocalData(settings.local_data);
|
||||||
|
// Account settings rotates the mutation token; keep the workspace token current.
|
||||||
|
setSession((current) => current ? { ...current, csrf_token: settings.csrf_token } : current);
|
||||||
|
}
|
||||||
setGenerationStateLoaded(true);
|
setGenerationStateLoaded(true);
|
||||||
});
|
});
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
@@ -568,7 +601,13 @@ function ProjectCard({ activeLimitReached, busy, onPurge, onRestore, onSelect, o
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
) : null}
|
) : null}
|
||||||
<ProjectPlaceholder ratio={project.ratio} status={project.status} />
|
<ProjectPreview
|
||||||
|
alt={`${project.name}预览图`}
|
||||||
|
imageId={project.current_image_id}
|
||||||
|
projectId={project.project_id}
|
||||||
|
ratio={project.ratio}
|
||||||
|
status={project.status}
|
||||||
|
/>
|
||||||
<div className="project-card-body">
|
<div className="project-card-body">
|
||||||
<div><h3 title={project.name}>{project.name}</h3><span>{project.status === "failed_empty" ? "生成失败" : project.status === "trashed" ? "回收站" : "项目"}</span></div>
|
<div><h3 title={project.name}>{project.name}</h3><span>{project.status === "failed_empty" ? "生成失败" : project.status === "trashed" ? "回收站" : "项目"}</span></div>
|
||||||
<p>{project.successful_image_count} 张成功图 · {project.ratio}</p>
|
<p>{project.successful_image_count} 张成功图 · {project.ratio}</p>
|
||||||
@@ -953,7 +992,14 @@ export function ProjectDetailPage({ projectId }: { projectId: string }) {
|
|||||||
<div className="project-detail-grid">
|
<div className="project-detail-grid">
|
||||||
<section className="project-current" aria-labelledby="current-image-title">
|
<section className="project-current" aria-labelledby="current-image-title">
|
||||||
<header><h2 id="current-image-title">当前底图</h2><span>{project.pixel_width ?? 1080} × {project.pixel_height ?? 1440}</span></header>
|
<header><h2 id="current-image-title">当前底图</h2><span>{project.pixel_width ?? 1080} × {project.pixel_height ?? 1440}</span></header>
|
||||||
<ProjectPlaceholder ratio={project.ratio} status={project.status} />
|
<ProjectPreview
|
||||||
|
alt={`${project.name}当前底图`}
|
||||||
|
imageId={project.current_image_id}
|
||||||
|
loading="eager"
|
||||||
|
projectId={project.project_id}
|
||||||
|
ratio={project.ratio}
|
||||||
|
status={project.status}
|
||||||
|
/>
|
||||||
<div className="project-actions">
|
<div className="project-actions">
|
||||||
<button disabled={conflicted || atHistoryLimit} onClick={() => window.location.assign(`/app?continue=${project.project_id}`)} type="button">继续生成</button>
|
<button disabled={conflicted || atHistoryLimit} onClick={() => window.location.assign(`/app?continue=${project.project_id}`)} type="button">继续生成</button>
|
||||||
{conflicted || !project.current_image_id ? <button disabled type="button">进入编辑器</button> : <a href={`/app/projects/${project.project_id}/editor`}>进入编辑器</a>}
|
{conflicted || !project.current_image_id ? <button disabled type="button">进入编辑器</button> : <a href={`/app/projects/${project.project_id}/editor`}>进入编辑器</a>}
|
||||||
@@ -970,7 +1016,13 @@ export function ProjectDetailPage({ projectId }: { projectId: string }) {
|
|||||||
<ol>
|
<ol>
|
||||||
{project.images.toReversed().map((image, index) => (
|
{project.images.toReversed().map((image, index) => (
|
||||||
<li key={image.image_id} data-current={image.image_id === project.current_image_id}>
|
<li key={image.image_id} data-current={image.image_id === project.current_image_id}>
|
||||||
<ProjectPlaceholder ratio={project.ratio} status="active" />
|
<ProjectPreview
|
||||||
|
alt={`生成结果 ${project.images.length - index}`}
|
||||||
|
imageId={image.image_id}
|
||||||
|
projectId={project.project_id}
|
||||||
|
ratio={project.ratio}
|
||||||
|
status="active"
|
||||||
|
/>
|
||||||
<div><strong>生成结果 {project.images.length - index}</strong><time dateTime={image.created_at}>{formatUpdatedAt(image.created_at)}</time><a href={`/api/v1/private-assets/projects/${project.project_id}/images/${image.image_id}`}>下载原始图</a></div>
|
<div><strong>生成结果 {project.images.length - index}</strong><time dateTime={image.created_at}>{formatUpdatedAt(image.created_at)}</time><a href={`/api/v1/private-assets/projects/${project.project_id}/images/${image.image_id}`}>下载原始图</a></div>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
|
|||||||
+22
-64
@@ -2,6 +2,7 @@ import type { CanvasState } from "@dada/shared-contracts";
|
|||||||
import { P0A_COMPLEX_RELEASE_VERSION, P0A_REQUIRED_FONT_PANEL_IDS, P0A_TEXT_TEMPLATE_IDS } from "@dada/template-registry";
|
import { P0A_COMPLEX_RELEASE_VERSION, P0A_REQUIRED_FONT_PANEL_IDS, P0A_TEXT_TEMPLATE_IDS } from "@dada/template-registry";
|
||||||
|
|
||||||
import type { CanvasElementIdentity } from "./editor-elements.js";
|
import type { CanvasElementIdentity } from "./editor-elements.js";
|
||||||
|
import complexAssetCatalog from "./generated/complex-assets.json";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
@@ -17,6 +18,7 @@ export interface TextTemplateDefinition {
|
|||||||
defaultText: string;
|
defaultText: string;
|
||||||
displayName: string;
|
displayName: string;
|
||||||
fontUrl?: string;
|
fontUrl?: string;
|
||||||
|
previewUrl?: string;
|
||||||
resourceClass: "parameter_only" | "zip_template";
|
resourceClass: "parameter_only" | "zip_template";
|
||||||
resourceVersion: string;
|
resourceVersion: string;
|
||||||
templateId: string;
|
templateId: string;
|
||||||
@@ -56,82 +58,38 @@ const defaults = {
|
|||||||
text_align: "center",
|
text_align: "center",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
type CatalogSeed = [id: string, category: TextTemplateCategory, displayName: string, defaultText: string, defaultFontId: string, available?: boolean, resourceClass?: "parameter_only"];
|
const textCatalogById = new Map(complexAssetCatalog.text_templates.map((item) => [item.template_id, item]));
|
||||||
|
|
||||||
const seeds: readonly CatalogSeed[] = [
|
|
||||||
["FLOWER001", "flower", "春日计划", "春日计划", "FONT011", true],
|
|
||||||
["FLOWER002", "flower", "笑不活了", "笑不活了", "FLOWER002_FONT"],
|
|
||||||
["FLOWER003", "flower", "人生照片", "人生照片", "FONT008"],
|
|
||||||
["FLOWER004", "flower", "我的日常生活", "我的日常生活", "FLOWER004_FONT"],
|
|
||||||
["FLOWER005", "flower", "碎片生活", "碎片生活", "FONT008"],
|
|
||||||
["FLOWER006", "flower", "闪光瞬间", "闪光瞬间", "FLOWER006_FONT"],
|
|
||||||
["FLOWER007", "flower", "好柿花生", "好柿花生", "FONT046", false, "parameter_only"],
|
|
||||||
["FLOWER008", "flower", "Vlog.", "Vlog.", "FONT005"],
|
|
||||||
["H001", "title", "电影生活记录", "电影生活记录", "H001_FONT"],
|
|
||||||
["H002", "title", "30°C", "30°C", "H002_FONT"],
|
|
||||||
["H003", "title", "生活分享家", "生活分享家", "FONT039", true],
|
|
||||||
["H004", "title", "快乐充值成功", "快乐充值成功", "FONT046"],
|
|
||||||
["H005", "title", "日常的镜头", "日常的镜头", "H005_FONT"],
|
|
||||||
["H006", "title", "慢生活指南", "慢生活指南", "FONT052"],
|
|
||||||
["H007", "title", "做个有闲人", "做个有闲人", "H007_FONT"],
|
|
||||||
["H008", "title", "海滩日记", "海滩日记", "H008_FONT"],
|
|
||||||
["TAG001", "tag", "自定义标签", "自定义标签", "FONT027"],
|
|
||||||
["TAG002", "tag", "自定义标签", "自定义标签", "FONT043"],
|
|
||||||
["TAG003", "tag", "打卡x1", "打卡x1", "FONT043"],
|
|
||||||
["TAG004", "tag", "自定义标签", "自定义标签", "TAG004_FONT"],
|
|
||||||
["TAG005", "tag", "自定义标签", "自定义标签", "FONT008"],
|
|
||||||
["TAG006", "tag", "City Walk", "City Walk", "TAG006_FONT"],
|
|
||||||
["TAG007", "tag", "打卡x1", "打卡x1", "FONT043"],
|
|
||||||
["TAG051", "tag", "自定义标签", "自定义标签", "FONT022"],
|
|
||||||
["SIMPLE001", "simple", "碎片回忆录", "碎片回忆录", "SIMPLE001_FONT"],
|
|
||||||
["SIMPLE002", "simple", "秋天的信笺", "秋天的信笺", "SIMPLE002_FONT"],
|
|
||||||
["SIMPLE003", "simple", "返航时海鸟追着船盘旋", "返航时海鸟追着船盘旋", "SIMPLE003_FONT"],
|
|
||||||
["SIMPLE004", "simple", "下段旅程,幸福丰盛。", "下段旅程,幸福丰盛。", "SIMPLE002_FONT"],
|
|
||||||
["SIMPLE005", "simple", "见信好。", "见信好。", "SIMPLE005_FONT"],
|
|
||||||
["SIMPLE006", "simple", "万物回春", "万物回春", "SIMPLE001_FONT"],
|
|
||||||
["SIMPLE007", "simple", "周而复始。", "周而复始。", "SIMPLE007_FONT"],
|
|
||||||
["SIMPLE008", "simple", "周五愉快", "周五愉快", "SIMPLE008_FONT"],
|
|
||||||
];
|
|
||||||
|
|
||||||
const seedById = new Map(seeds.map((seed) => [seed[0], seed]));
|
|
||||||
|
|
||||||
export const P0A_TEXT_TEMPLATES: readonly TextTemplateDefinition[] = P0A_TEXT_TEMPLATE_IDS.map((templateId, catalogOrder) => {
|
export const P0A_TEXT_TEMPLATES: readonly TextTemplateDefinition[] = P0A_TEXT_TEMPLATE_IDS.map((templateId, catalogOrder) => {
|
||||||
const seed = seedById.get(templateId);
|
const item = textCatalogById.get(templateId);
|
||||||
if (!seed) throw new Error(`missing text template definition ${templateId}`);
|
if (!item) throw new Error(`missing text template definition ${templateId}`);
|
||||||
return {
|
return {
|
||||||
available: seed[5] === true,
|
available: item.available,
|
||||||
catalogOrder,
|
catalogOrder,
|
||||||
category: seed[1],
|
category: item.category as TextTemplateCategory,
|
||||||
defaultFontId: seed[4],
|
defaultFontId: item.default_font_id,
|
||||||
defaultFontSize: 48,
|
defaultFontSize: item.default_font_size,
|
||||||
defaultText: seed[3],
|
defaultText: item.default_text,
|
||||||
displayName: seed[2],
|
displayName: item.display_name,
|
||||||
...(seed[5] === true ? { fontUrl: `/api/v1/assets/public/${resourceVersion}/${seed[4]}` } : {}),
|
fontUrl: `/api/v1/assets/public/${resourceVersion}/${item.default_font_id}`,
|
||||||
resourceClass: seed[6] ?? "zip_template",
|
...(item.preview_asset_id ? { previewUrl: `/api/v1/assets/public/${resourceVersion}/${item.preview_asset_id}` } : {}),
|
||||||
|
resourceClass: item.resource_class as "parameter_only" | "zip_template",
|
||||||
resourceVersion,
|
resourceVersion,
|
||||||
templateId,
|
templateId,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
const fontOptionDefinitions: Readonly<Record<typeof P0A_REQUIRED_FONT_PANEL_IDS[number], string>> = {
|
const fontCatalogById = new Map(complexAssetCatalog.font_panel_items.map((item) => [item.font_id, item]));
|
||||||
FONT005: "Rammetto",
|
|
||||||
FONT008: "正圆体",
|
|
||||||
FONT011: "默陌手写",
|
|
||||||
FONT021: "喜月体",
|
|
||||||
FONT022: "素白体",
|
|
||||||
FONT027: "锐正圆",
|
|
||||||
FONT039: "字由油漆",
|
|
||||||
FONT043: "喜脉体",
|
|
||||||
FONT046: "可口可乐",
|
|
||||||
FONT052: "Oraqle Script",
|
|
||||||
FONT081: "Lexend Deca",
|
|
||||||
};
|
|
||||||
|
|
||||||
export const P0A_FONT_OPTIONS: readonly FontOption[] = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId) => ({
|
export const P0A_FONT_OPTIONS: readonly FontOption[] = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId) => {
|
||||||
displayName: fontOptionDefinitions[fontId],
|
const item = fontCatalogById.get(fontId);
|
||||||
|
if (!item) throw new Error(`missing font panel definition ${fontId}`);
|
||||||
|
return {
|
||||||
|
displayName: item.display_name,
|
||||||
fontId,
|
fontId,
|
||||||
url: `/api/v1/assets/public/${resourceVersion}/${fontId}`,
|
url: `/api/v1/assets/public/${resourceVersion}/${fontId}`,
|
||||||
}));
|
};
|
||||||
|
});
|
||||||
|
|
||||||
export function fontOption(fontId: string) {
|
export function fontOption(fontId: string) {
|
||||||
return P0A_FONT_OPTIONS.find((option) => option.fontId === fontId);
|
return P0A_FONT_OPTIONS.find((option) => option.fontId === fontId);
|
||||||
|
|||||||
@@ -33,7 +33,9 @@ export function TextTemplatePanel(props: {
|
|||||||
const status = props.fontStatuses[template.defaultFontId] ?? "idle";
|
const status = props.fontStatuses[template.defaultFontId] ?? "idle";
|
||||||
const unavailable = !template.available || status === "unavailable";
|
const unavailable = !template.available || status === "unavailable";
|
||||||
return <button aria-label={`${template.templateId} ${template.displayName}${unavailable ? " 素材暂不可用" : ""}`} disabled={!props.canAdd || unavailable || status === "loading"} key={template.templateId} onClick={() => props.onAdd(template)} type="button">
|
return <button aria-label={`${template.templateId} ${template.displayName}${unavailable ? " 素材暂不可用" : ""}`} disabled={!props.canAdd || unavailable || status === "loading"} key={template.templateId} onClick={() => props.onAdd(template)} type="button">
|
||||||
<span className={`editor-template-mark ${template.category}`}>{template.displayName.slice(0, 2)}</span>
|
{template.previewUrl
|
||||||
|
? <img alt="" className="editor-template-preview" decoding="async" loading="lazy" src={template.previewUrl} />
|
||||||
|
: <span className={`editor-template-mark ${template.category}`}>{template.displayName.slice(0, 2)}</span>}
|
||||||
<strong>{template.templateId}</strong>
|
<strong>{template.templateId}</strong>
|
||||||
<span>{template.displayName}</span>
|
<span>{template.displayName}</span>
|
||||||
{unavailable ? <small>素材暂不可用</small> : status === "loading" ? <small>正在加载字体</small> : null}
|
{unavailable ? <small>素材暂不可用</small> : status === "loading" ? <small>正在加载字体</small> : null}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -20,9 +20,11 @@
|
|||||||
"test:performance": "node scripts/run-wp4-07-layer.mjs performance",
|
"test:performance": "node scripts/run-wp4-07-layer.mjs performance",
|
||||||
"test:security": "node scripts/verify-frozen-dependencies.mjs && node scripts/redaction-scan.mjs",
|
"test:security": "node scripts/verify-frozen-dependencies.mjs && node scripts/redaction-scan.mjs",
|
||||||
"test:package": "pnpm build:workspace-packages && pnpm run typecheck && node --test tests/package/wp0-09-portable.test.mjs && node scripts/package-smoke.mjs && node scripts/loopback-boundary-smoke.mjs",
|
"test:package": "pnpm build:workspace-packages && pnpm run typecheck && node --test tests/package/wp0-09-portable.test.mjs && node scripts/package-smoke.mjs && node scripts/loopback-boundary-smoke.mjs",
|
||||||
|
"test:postv1-ui-integration": "node scripts/validate-postv1-ui-lineage.mjs && playwright test tests/e2e/projects-workspace.spec.ts tests/e2e/wp4-01-editor-background.spec.ts tests/e2e/wp4-02-editor-elements.spec.ts tests/e2e/wp4-04-color-dynamic.spec.ts --config playwright.config.ts",
|
||||||
"package:portable": "node scripts/build-portable.mjs",
|
"package:portable": "node scripts/build-portable.mjs",
|
||||||
"assets:manifest": "pnpm build:workspace-packages && node scripts/generate-runtime-asset-manifest.mjs",
|
"assets:manifest": "pnpm build:workspace-packages && node scripts/generate-runtime-asset-manifest.mjs",
|
||||||
"assets:deploy": "pnpm build:workspace-packages && node scripts/deploy-runtime-assets.mjs",
|
"assets:deploy": "pnpm build:workspace-packages && node scripts/deploy-runtime-assets.mjs",
|
||||||
|
"assets:browser-catalog": "pnpm build:workspace-packages && node scripts/generate-complex-browser-catalog.mjs",
|
||||||
"generate:openapi": "node scripts/generate-openapi.mjs",
|
"generate:openapi": "node scripts/generate-openapi.mjs",
|
||||||
"check:openapi": "node scripts/check-openapi.mjs",
|
"check:openapi": "node scripts/check-openapi.mjs",
|
||||||
"validate:tdd-trace": "node scripts/validate-tdd-trace.mjs",
|
"validate:tdd-trace": "node scripts/validate-tdd-trace.mjs",
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ export interface ColorCardDefinition {
|
|||||||
cardId: typeof P0A_COLOR_CARD_IDS[number];
|
cardId: typeof P0A_COLOR_CARD_IDS[number];
|
||||||
displayName: string;
|
displayName: string;
|
||||||
mappingStatus: "confirmed_native_mapping" | "stable_web_style_native_mapping_provisional";
|
mappingStatus: "confirmed_native_mapping" | "stable_web_style_native_mapping_provisional";
|
||||||
rendererName: "horizontal_line" | "ticket_strip" | "vertical_stack" | "vertical_ticket";
|
rendererName: string;
|
||||||
styleId: "style_01" | "style_02" | "style_08" | "style_16";
|
styleId: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FiveColorPalette = readonly [string, string, string, string, string];
|
export type FiveColorPalette = readonly [string, string, string, string, string];
|
||||||
@@ -17,7 +17,19 @@ export interface ColorCardRenderPlan extends ColorCardDefinition {
|
|||||||
export const P0A_COLOR_CARD_DEFINITIONS: readonly ColorCardDefinition[] = [
|
export const P0A_COLOR_CARD_DEFINITIONS: readonly ColorCardDefinition[] = [
|
||||||
{ cardId: "COLOR001", displayName: "纵向票据", mappingStatus: "confirmed_native_mapping", rendererName: "vertical_ticket", styleId: "style_01" },
|
{ cardId: "COLOR001", displayName: "纵向票据", mappingStatus: "confirmed_native_mapping", rendererName: "vertical_ticket", styleId: "style_01" },
|
||||||
{ cardId: "COLOR002", displayName: "纵向色阶", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_stack", styleId: "style_02" },
|
{ cardId: "COLOR002", displayName: "纵向色阶", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_stack", styleId: "style_02" },
|
||||||
|
{ cardId: "COLOR003", displayName: "纵向色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_strip", styleId: "style_03" },
|
||||||
|
{ cardId: "COLOR004", displayName: "纵向标线", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_line", styleId: "style_04" },
|
||||||
|
{ cardId: "COLOR005", displayName: "横向标签", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "horizontal_label_strip", styleId: "style_05" },
|
||||||
|
{ cardId: "COLOR006", displayName: "指示色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "indicator_strip", styleId: "style_06" },
|
||||||
|
{ cardId: "COLOR007", displayName: "图钉色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "pinned_strip", styleId: "style_07" },
|
||||||
{ cardId: "COLOR008", displayName: "横向标尺", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "horizontal_line", styleId: "style_08" },
|
{ cardId: "COLOR008", displayName: "横向标尺", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "horizontal_line", styleId: "style_08" },
|
||||||
|
{ cardId: "COLOR009", displayName: "色彩海报", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "color_poster", styleId: "style_09" },
|
||||||
|
{ cardId: "COLOR010", displayName: "标题海报", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "caption_poster", styleId: "style_10" },
|
||||||
|
{ cardId: "COLOR011", displayName: "边框色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "framed_strip", styleId: "style_11" },
|
||||||
|
{ cardId: "COLOR012", displayName: "OTTO 色块", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "otto_blocks", styleId: "style_12" },
|
||||||
|
{ cardId: "COLOR013", displayName: "纵向圆点", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_dots", styleId: "style_13" },
|
||||||
|
{ cardId: "COLOR014", displayName: "三色圆环", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "three_circles", styleId: "style_14" },
|
||||||
|
{ cardId: "COLOR015", displayName: "描边圆点", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "outlined_dots", styleId: "style_15" },
|
||||||
{ cardId: "COLOR016", displayName: "横向票条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "ticket_strip", styleId: "style_16" },
|
{ cardId: "COLOR016", displayName: "横向票条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "ticket_strip", styleId: "style_16" },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
|
|||||||
@@ -3,25 +3,20 @@ import type { StaticStickerCatalog, StaticStickerCatalogItem } from "@dada/stati
|
|||||||
export const P0A_COMPLEX_RELEASE_VERSION = "p0a-complex-v1";
|
export const P0A_COMPLEX_RELEASE_VERSION = "p0a-complex-v1";
|
||||||
export const P0A_STATIC_STICKER_RELEASE_VERSION = "p0a-static-v1";
|
export const P0A_STATIC_STICKER_RELEASE_VERSION = "p0a-static-v1";
|
||||||
|
|
||||||
export const P0A_TEXT_TEMPLATE_IDS = [
|
function numberedIds(prefix: string, count: number) {
|
||||||
"FLOWER001", "FLOWER002", "FLOWER003", "FLOWER004", "FLOWER005", "FLOWER006", "FLOWER007", "FLOWER008",
|
return Object.freeze(Array.from({ length: count }, (_, index) => `${prefix}${String(index + 1).padStart(3, "0")}`));
|
||||||
"H001", "H002", "H003", "H004", "H005", "H006", "H007", "H008",
|
}
|
||||||
"TAG001", "TAG002", "TAG003", "TAG004", "TAG005", "TAG006", "TAG007", "TAG051",
|
|
||||||
"SIMPLE001", "SIMPLE002", "SIMPLE003", "SIMPLE004", "SIMPLE005", "SIMPLE006", "SIMPLE007", "SIMPLE008",
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
// Derived from exact package-hash matches between the 32 frozen templates and the 86-item font panel.
|
export const P0A_TEXT_TEMPLATE_IDS = Object.freeze([
|
||||||
export const P0A_REQUIRED_FONT_PANEL_IDS = [
|
...numberedIds("FLOWER", 145),
|
||||||
"FONT005", "FONT008", "FONT011", "FONT021", "FONT022", "FONT027",
|
...numberedIds("H", 119),
|
||||||
"FONT039", "FONT043", "FONT046", "FONT052", "FONT081",
|
...numberedIds("TAG", 51),
|
||||||
] as const;
|
...numberedIds("SIMPLE", 17),
|
||||||
|
]);
|
||||||
|
|
||||||
export const P0A_COLOR_CARD_IDS = ["COLOR001", "COLOR002", "COLOR008", "COLOR016"] as const;
|
export const P0A_REQUIRED_FONT_PANEL_IDS = numberedIds("FONT", 86);
|
||||||
|
export const P0A_COLOR_CARD_IDS = numberedIds("COLOR", 16);
|
||||||
export const P0A_DYNAMIC_STICKER_IDS = [
|
export const P0A_DYNAMIC_STICKER_IDS = numberedIds("DYN", 35);
|
||||||
"DYN001", "DYN002", "DYN003", "DYN004", "DYN007",
|
|
||||||
"DYN008", "DYN011", "DYN012", "DYN015", "DYN016",
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const P0A_DYNAMIC_RUNTIME_FONT_SOURCES = [
|
export const P0A_DYNAMIC_RUNTIME_FONT_SOURCES = [
|
||||||
{ assetId: "15974853bc3294ef68e7e6d58fe74fd7", sourceReference: "fonts/15974853bc3294ef68e7e6d58fe74fd7", templateId: "DYN002" },
|
{ assetId: "15974853bc3294ef68e7e6d58fe74fd7", sourceReference: "fonts/15974853bc3294ef68e7e6d58fe74fd7", templateId: "DYN002" },
|
||||||
@@ -76,12 +71,12 @@ export interface P0aPublicManifest {
|
|||||||
text_templates: PublicComplexAsset[];
|
text_templates: PublicComplexAsset[];
|
||||||
};
|
};
|
||||||
counts: {
|
counts: {
|
||||||
color_cards: 4;
|
color_cards: 16;
|
||||||
dynamic_stickers: 10;
|
dynamic_stickers: 35;
|
||||||
font_panel_items: 11;
|
font_panel_items: 86;
|
||||||
static_parts: 25;
|
static_parts: 25;
|
||||||
static_stickers: 1407;
|
static_stickers: 1407;
|
||||||
text_templates: 32;
|
text_templates: 332;
|
||||||
};
|
};
|
||||||
release_tier: "alpha_whitelist";
|
release_tier: "alpha_whitelist";
|
||||||
release_version: string;
|
release_version: string;
|
||||||
@@ -140,15 +135,6 @@ function validateStaticCatalog(catalog: StaticStickerCatalog) {
|
|||||||
if (Object.keys(catalog.part_counts).length !== 25) throw new Error("static sticker part counts must contain 25 parts");
|
if (Object.keys(catalog.part_counts).length !== 25) throw new Error("static sticker part counts must contain 25 parts");
|
||||||
}
|
}
|
||||||
|
|
||||||
function fontIdsForTemplates(templates: readonly RegisteredComplexAsset[]) {
|
|
||||||
const referenced = new Set<string>();
|
|
||||||
for (const template of templates) {
|
|
||||||
for (const fontId of template.font_panel_references ?? []) referenced.add(fontId);
|
|
||||||
}
|
|
||||||
referenced.add("FONT081");
|
|
||||||
return [...referenced].sort((left, right) => Number(left.slice(4)) - Number(right.slice(4)));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createP0aPublicManifest(input: {
|
export function createP0aPublicManifest(input: {
|
||||||
complexManifest: ComplexRegistryManifest;
|
complexManifest: ComplexRegistryManifest;
|
||||||
staticCatalog: StaticStickerCatalog;
|
staticCatalog: StaticStickerCatalog;
|
||||||
@@ -157,11 +143,7 @@ export function createP0aPublicManifest(input: {
|
|||||||
validateStaticCatalog(input.staticCatalog);
|
validateStaticCatalog(input.staticCatalog);
|
||||||
|
|
||||||
const textTemplates = orderedItems(input.complexManifest.items, P0A_TEXT_TEMPLATE_IDS, "text_template");
|
const textTemplates = orderedItems(input.complexManifest.items, P0A_TEXT_TEMPLATE_IDS, "text_template");
|
||||||
const derivedFontIds = fontIdsForTemplates(textTemplates);
|
const fontPanelItems = orderedItems(input.complexManifest.items, P0A_REQUIRED_FONT_PANEL_IDS, "font_panel");
|
||||||
if (JSON.stringify(derivedFontIds) !== JSON.stringify(P0A_REQUIRED_FONT_PANEL_IDS)) {
|
|
||||||
throw new Error(`P0-A referenced font panel mismatch: received ${derivedFontIds.join(",")}`);
|
|
||||||
}
|
|
||||||
const fontPanelItems = orderedItems(input.complexManifest.items, derivedFontIds, "font_panel");
|
|
||||||
const colorCards = orderedItems(input.complexManifest.items, P0A_COLOR_CARD_IDS, "color_card");
|
const colorCards = orderedItems(input.complexManifest.items, P0A_COLOR_CARD_IDS, "color_card");
|
||||||
const dynamicStickers = orderedItems(input.complexManifest.items, P0A_DYNAMIC_STICKER_IDS, "interactive_sticker");
|
const dynamicStickers = orderedItems(input.complexManifest.items, P0A_DYNAMIC_STICKER_IDS, "interactive_sticker");
|
||||||
|
|
||||||
@@ -174,12 +156,12 @@ export function createP0aPublicManifest(input: {
|
|||||||
text_templates: textTemplates.map(publicItem),
|
text_templates: textTemplates.map(publicItem),
|
||||||
},
|
},
|
||||||
counts: {
|
counts: {
|
||||||
color_cards: 4,
|
color_cards: 16,
|
||||||
dynamic_stickers: 10,
|
dynamic_stickers: 35,
|
||||||
font_panel_items: 11,
|
font_panel_items: 86,
|
||||||
static_parts: 25,
|
static_parts: 25,
|
||||||
static_stickers: 1_407,
|
static_stickers: 1_407,
|
||||||
text_templates: 32,
|
text_templates: 332,
|
||||||
},
|
},
|
||||||
release_tier: "alpha_whitelist",
|
release_tier: "alpha_whitelist",
|
||||||
release_version: input.complexManifest.release_version,
|
release_version: input.complexManifest.release_version,
|
||||||
|
|||||||
@@ -90,17 +90,17 @@ const familyCounts = Object.fromEntries(["text_template", "font_panel", "color_c
|
|||||||
]));
|
]));
|
||||||
const fullP0Enabled = complex.manifest.items.filter((item) => item.release_tier === "full_p0" && item.release_status === "enabled").length;
|
const fullP0Enabled = complex.manifest.items.filter((item) => item.release_tier === "full_p0" && item.release_status === "enabled").length;
|
||||||
const publicJson = JSON.stringify(manifest);
|
const publicJson = JSON.stringify(manifest);
|
||||||
const hiddenIds = ["FLOWER009", "H009", "TAG008", "SIMPLE009", "COLOR003", "DYN005"];
|
const completionIds = ["FLOWER145", "H119", "TAG051", "SIMPLE017", "FONT086", "COLOR016", "DYN035"];
|
||||||
const response = {
|
const response = {
|
||||||
counts: manifest.counts,
|
counts: manifest.counts,
|
||||||
full_p0_enabled: fullP0Enabled,
|
full_p0_enabled: fullP0Enabled,
|
||||||
hidden_ids_absent: hiddenIds.every((id) => !publicJson.includes(id)),
|
complete_catalog_present: completionIds.every((id) => publicJson.includes(id)),
|
||||||
no_absolute_paths: !/[A-Za-z]:[\\/]/.test(publicJson),
|
no_absolute_paths: !/[A-Za-z]:[\\/]/.test(publicJson),
|
||||||
release_tier: manifest.release_tier,
|
release_tier: manifest.release_tier,
|
||||||
status: "passed",
|
status: "passed",
|
||||||
};
|
};
|
||||||
const registrationValidation = {
|
const registrationValidation = {
|
||||||
allowlist: {
|
public_catalog: {
|
||||||
color_cards: P0A_COLOR_CARD_IDS,
|
color_cards: P0A_COLOR_CARD_IDS,
|
||||||
dynamic_stickers: P0A_DYNAMIC_STICKER_IDS,
|
dynamic_stickers: P0A_DYNAMIC_STICKER_IDS,
|
||||||
font_panel_items: P0A_REQUIRED_FONT_PANEL_IDS,
|
font_panel_items: P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
@@ -112,7 +112,7 @@ const registrationValidation = {
|
|||||||
source_mutations: complex.report.source_mutations + staticResult.report.source_mutations,
|
source_mutations: complex.report.source_mutations + staticResult.report.source_mutations,
|
||||||
static_parts: Object.keys(staticResult.catalog.part_counts).length,
|
static_parts: Object.keys(staticResult.catalog.part_counts).length,
|
||||||
static_stickers: staticResult.catalog.count,
|
static_stickers: staticResult.catalog.count,
|
||||||
status: response.hidden_ids_absent && response.no_absolute_paths && fullP0Enabled === 0 ? "passed" : "failed",
|
status: response.complete_catalog_present && response.no_absolute_paths && fullP0Enabled === 0 ? "passed" : "failed",
|
||||||
};
|
};
|
||||||
if (registrationValidation.status !== "passed") throw new Error("P0-A registration validation failed");
|
if (registrationValidation.status !== "passed") throw new Error("P0-A registration validation failed");
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,131 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
|
||||||
|
import { homedir } from "node:os";
|
||||||
|
import { basename, dirname, isAbsolute, join, resolve } from "node:path";
|
||||||
|
|
||||||
|
import {
|
||||||
|
P0A_DYNAMIC_STICKER_IDS,
|
||||||
|
P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
|
P0A_TEXT_TEMPLATE_IDS,
|
||||||
|
} from "../packages/template-registry/dist/index.js";
|
||||||
|
|
||||||
|
function option(name) {
|
||||||
|
const index = process.argv.indexOf(name);
|
||||||
|
return index >= 0 ? process.argv[index + 1] : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function readJson(path) {
|
||||||
|
return JSON.parse(readFileSync(path, "utf8"));
|
||||||
|
}
|
||||||
|
|
||||||
|
function oneDirectoryWithPrefix(root, prefix) {
|
||||||
|
const matches = readdirSync(root, { withFileTypes: true })
|
||||||
|
.filter((entry) => entry.isDirectory() && entry.name.startsWith(`${prefix}_`));
|
||||||
|
if (matches.length !== 1) throw new Error(`complex_catalog_directory_invalid:${prefix}`);
|
||||||
|
return join(root, matches[0].name);
|
||||||
|
}
|
||||||
|
|
||||||
|
function sha256(path) {
|
||||||
|
return createHash("sha256").update(readFileSync(path)).digest("hex").toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
function textTemplateDirectory(root, templateId) {
|
||||||
|
const family = templateId.startsWith("FLOWER") ? "花字"
|
||||||
|
: templateId.startsWith("SIMPLE") ? "简约"
|
||||||
|
: templateId.startsWith("TAG") ? "标签"
|
||||||
|
: "标题";
|
||||||
|
return join(root, family, "templates", templateId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizedTextCategory(value) {
|
||||||
|
if (value === "花字") return "flower";
|
||||||
|
if (value === "简约") return "simple";
|
||||||
|
if (value === "标签") return "tag";
|
||||||
|
return "title";
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizedDynamicCategory(value) {
|
||||||
|
if (value === "user") return "identity";
|
||||||
|
if (value === "location" || value === "time") return value;
|
||||||
|
return "other";
|
||||||
|
}
|
||||||
|
|
||||||
|
const replicationRoot = resolve(option("--replication-root") ?? join(homedir(), "Desktop", "sticker_web_replication_assets"));
|
||||||
|
if (!isAbsolute(replicationRoot) || !existsSync(replicationRoot)) throw new Error("replication_asset_root_unavailable");
|
||||||
|
const outputPath = resolve(option("--output") ?? "apps/web/src/generated/complex-assets.json");
|
||||||
|
const fontPackagesRoot = join(replicationRoot, "sticker_text", "字体", "面板全量采集", "font_panel_full_20260722", "resources", "font_packages");
|
||||||
|
const textRoot = join(replicationRoot, "sticker_text", "模板", "单模板归档");
|
||||||
|
const dynamicRoot = join(replicationRoot, "sticker_interactive", "单模板归档", "templates");
|
||||||
|
|
||||||
|
const fontHashes = new Map();
|
||||||
|
const fontPanelItems = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId, displayOrder) => {
|
||||||
|
const metadata = readJson(join(oneDirectoryWithPrefix(fontPackagesRoot, fontId), "metadata.json"));
|
||||||
|
if (typeof metadata.local_sha256 !== "string") throw new Error(`complex_catalog_font_hash_missing:${fontId}`);
|
||||||
|
fontHashes.set(metadata.local_sha256.toUpperCase(), fontId);
|
||||||
|
return {
|
||||||
|
display_name: String(metadata.display_name ?? fontId),
|
||||||
|
display_order: displayOrder,
|
||||||
|
font_id: fontId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const textTemplates = P0A_TEXT_TEMPLATE_IDS.map((templateId, catalogOrder) => {
|
||||||
|
const directory = textTemplateDirectory(textRoot, templateId);
|
||||||
|
const metadata = readJson(join(directory, "metadata.json"));
|
||||||
|
const fontReferences = Array.isArray(metadata.files?.fonts) ? metadata.files.fonts : [];
|
||||||
|
const matchedFontIds = [...new Set(fontReferences
|
||||||
|
.map((reference) => fontHashes.get(sha256(join(directory, ...reference.split("/")))))
|
||||||
|
.filter(Boolean))];
|
||||||
|
const previewReference = typeof metadata.files?.preview === "string" ? metadata.files.preview : undefined;
|
||||||
|
const hasPreview = previewReference ? existsSync(join(directory, ...previewReference.split("/"))) : false;
|
||||||
|
return {
|
||||||
|
available: true,
|
||||||
|
catalog_order: catalogOrder,
|
||||||
|
category: normalizedTextCategory(metadata.category),
|
||||||
|
default_font_id: matchedFontIds[0] ?? "FONT081",
|
||||||
|
default_font_size: 48,
|
||||||
|
default_text: String(metadata.default_text ?? metadata.display_name ?? templateId),
|
||||||
|
display_name: String(metadata.display_name || metadata.default_text || templateId),
|
||||||
|
font_match_status: matchedFontIds.length > 0 ? "exact_panel_hash" : "catalog_fallback",
|
||||||
|
...(hasPreview ? { preview_asset_id: `TEXT-PREVIEW-${templateId}` } : {}),
|
||||||
|
resource_class: metadata.resource_class === "parameter_only" ? "parameter_only" : "zip_template",
|
||||||
|
template_id: templateId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const dynamicStickers = P0A_DYNAMIC_STICKER_IDS.map((templateId, catalogOrder) => {
|
||||||
|
const metadata = readJson(join(dynamicRoot, templateId, "metadata.json"));
|
||||||
|
const requiredFields = Array.isArray(metadata.dynamic_keys) ? metadata.dynamic_keys.map(String) : [];
|
||||||
|
const fontIds = Array.isArray(metadata.files?.fonts)
|
||||||
|
? metadata.files.fonts.map((reference) => basename(reference))
|
||||||
|
: [];
|
||||||
|
return {
|
||||||
|
catalog_order: catalogOrder,
|
||||||
|
category: normalizedDynamicCategory(metadata.category),
|
||||||
|
display_name: String(metadata.display_name ?? templateId),
|
||||||
|
font_ids: fontIds.length > 0 ? fontIds : ["FONT081"],
|
||||||
|
required_fields: requiredFields,
|
||||||
|
requires_location_consent: requiredFields.includes("latitude") || requiredFields.includes("longitude"),
|
||||||
|
source_candidate_id: String(metadata.source_candidate_id ?? metadata.display_name ?? templateId),
|
||||||
|
template_id: templateId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const catalog = {
|
||||||
|
dynamic_stickers: dynamicStickers,
|
||||||
|
font_panel_items: fontPanelItems,
|
||||||
|
schema_version: "DadaComplexBrowserCatalog/v1",
|
||||||
|
text_templates: textTemplates,
|
||||||
|
};
|
||||||
|
|
||||||
|
const serialized = `${JSON.stringify(catalog, null, 2)}\n`;
|
||||||
|
if (/[A-Z]:[\\/]/i.test(serialized)) throw new Error("complex_catalog_absolute_path_detected");
|
||||||
|
mkdirSync(dirname(outputPath), { recursive: true });
|
||||||
|
writeFileSync(outputPath, serialized);
|
||||||
|
process.stdout.write(`${JSON.stringify({
|
||||||
|
dynamic_stickers: dynamicStickers.length,
|
||||||
|
font_panel_items: fontPanelItems.length,
|
||||||
|
output: outputPath,
|
||||||
|
text_previews: textTemplates.filter((item) => item.preview_asset_id).length,
|
||||||
|
text_templates: textTemplates.length,
|
||||||
|
})}\n`);
|
||||||
@@ -64,6 +64,7 @@ function derivedCounts(entries) {
|
|||||||
dynamic_images: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^DYN\d{3}-/.test(entry.assetId)).length,
|
dynamic_images: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^DYN\d{3}-/.test(entry.assetId)).length,
|
||||||
font_panel_items: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^FONT\d{3}$/.test(entry.assetId)).length,
|
font_panel_items: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^FONT\d{3}$/.test(entry.assetId)).length,
|
||||||
static_stickers: entries.filter((entry) => entry.resourceVersion === "p0a-static-v1" && /^STK\d{3,4}$/.test(entry.assetId)).length,
|
static_stickers: entries.filter((entry) => entry.resourceVersion === "p0a-static-v1" && /^STK\d{3,4}$/.test(entry.assetId)).length,
|
||||||
|
text_previews: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^TEXT-PREVIEW-/.test(entry.assetId)).length,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,6 +197,12 @@ function entryFor(sourcePath, assetId, resourceVersion, relativePath, mimeType)
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function safeRuntimeComponent(value) {
|
||||||
|
const normalized = value.normalize("NFKD").replaceAll(/[^A-Za-z0-9_-]+/g, "-").replaceAll(/^-+|-+$/g, "");
|
||||||
|
if (normalized === value) return normalized;
|
||||||
|
return `${normalized || "asset"}-${sha256(value).slice(0, 8).toLowerCase()}`;
|
||||||
|
}
|
||||||
|
|
||||||
function dynamicMetadata(templateRoot, descriptor, field) {
|
function dynamicMetadata(templateRoot, descriptor, field) {
|
||||||
const templateDirectory = join(templateRoot, descriptor.templateId);
|
const templateDirectory = join(templateRoot, descriptor.templateId);
|
||||||
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
||||||
@@ -205,6 +212,14 @@ function dynamicMetadata(templateRoot, descriptor, field) {
|
|||||||
return templateDirectory;
|
return templateDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function textTemplateDirectory(root, templateId) {
|
||||||
|
const family = templateId.startsWith("FLOWER") ? "花字"
|
||||||
|
: templateId.startsWith("SIMPLE") ? "简约"
|
||||||
|
: templateId.startsWith("TAG") ? "标签"
|
||||||
|
: "标题";
|
||||||
|
return join(root, family, "templates", templateId);
|
||||||
|
}
|
||||||
|
|
||||||
export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
||||||
const [{ compileStaticStickerCatalog }, registry] = await Promise.all([
|
const [{ compileStaticStickerCatalog }, registry] = await Promise.all([
|
||||||
import("../../packages/asset-compiler/dist/index.js"),
|
import("../../packages/asset-compiler/dist/index.js"),
|
||||||
@@ -230,6 +245,19 @@ export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
|||||||
if (entry.sha256 !== item.sha256.toLowerCase()) throw new Error(`static_sticker_hash_invalid:${item.stable_id}`);
|
if (entry.sha256 !== item.sha256.toLowerCase()) throw new Error(`static_sticker_hash_invalid:${item.stable_id}`);
|
||||||
return { entry, sourcePath };
|
return { entry, sourcePath };
|
||||||
});
|
});
|
||||||
|
const resourceKeys = new Map(resources.map((resource) => [`${resource.entry.resourceVersion}\u0000${resource.entry.assetId}`, resource]));
|
||||||
|
const addResource = (resource) => {
|
||||||
|
const key = `${resource.entry.resourceVersion}\u0000${resource.entry.assetId}`;
|
||||||
|
const existing = resourceKeys.get(key);
|
||||||
|
if (existing) {
|
||||||
|
if (existing.entry.sha256 !== resource.entry.sha256 || existing.entry.mimeType !== resource.entry.mimeType) {
|
||||||
|
throw new Error(`runtime_asset_duplicate_conflict:${resource.entry.assetId}`);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resourceKeys.set(key, resource);
|
||||||
|
resources.push(resource);
|
||||||
|
};
|
||||||
|
|
||||||
const fontPackagesRoot = join(
|
const fontPackagesRoot = join(
|
||||||
replicationRoot,
|
replicationRoot,
|
||||||
@@ -244,7 +272,7 @@ export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
|||||||
const packageDirectory = oneDirectoryWithPrefix(fontPackagesRoot, assetId);
|
const packageDirectory = oneDirectoryWithPrefix(fontPackagesRoot, assetId);
|
||||||
const sourcePath = oneSupportedFont(join(packageDirectory, "font_files"));
|
const sourcePath = oneSupportedFont(join(packageDirectory, "font_files"));
|
||||||
const extension = extname(sourcePath).toLowerCase();
|
const extension = extname(sourcePath).toLowerCase();
|
||||||
resources.push({
|
addResource({
|
||||||
entry: entryFor(
|
entry: entryFor(
|
||||||
sourcePath,
|
sourcePath,
|
||||||
assetId,
|
assetId,
|
||||||
@@ -257,33 +285,59 @@ export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const templateRoot = join(replicationRoot, "sticker_interactive", "单模板归档", "templates");
|
const templateRoot = join(replicationRoot, "sticker_interactive", "单模板归档", "templates");
|
||||||
for (const descriptor of registry.P0A_DYNAMIC_RUNTIME_FONT_SOURCES) {
|
for (const templateId of registry.P0A_DYNAMIC_STICKER_IDS) {
|
||||||
const templateDirectory = dynamicMetadata(templateRoot, descriptor, "fonts");
|
const templateDirectory = join(templateRoot, templateId);
|
||||||
const sourcePath = oneSupportedFont(join(templateDirectory, ...descriptor.sourceReference.split("/")));
|
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
||||||
|
for (const sourceReference of metadata.files?.fonts ?? []) {
|
||||||
|
const sourcePath = oneSupportedFont(join(templateDirectory, ...sourceReference.split("/")));
|
||||||
const extension = extname(sourcePath).toLowerCase();
|
const extension = extname(sourcePath).toLowerCase();
|
||||||
resources.push({
|
const assetId = basename(sourceReference);
|
||||||
|
addResource({
|
||||||
entry: entryFor(
|
entry: entryFor(
|
||||||
sourcePath,
|
sourcePath,
|
||||||
descriptor.assetId,
|
assetId,
|
||||||
registry.P0A_COMPLEX_RELEASE_VERSION,
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${descriptor.assetId}${extension}`,
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}${extension}`,
|
||||||
fontMimeTypes.get(extension),
|
fontMimeTypes.get(extension),
|
||||||
),
|
),
|
||||||
sourcePath,
|
sourcePath,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
for (const descriptor of registry.P0A_DYNAMIC_RUNTIME_IMAGE_SOURCES) {
|
for (const sourceReference of metadata.files?.images ?? []) {
|
||||||
const templateDirectory = dynamicMetadata(templateRoot, descriptor, "images");
|
const sourcePath = join(templateDirectory, ...sourceReference.split("/"));
|
||||||
const sourcePath = join(templateDirectory, ...descriptor.sourceReference.split("/"));
|
const extension = extname(sourcePath).toLowerCase();
|
||||||
if (!existsSync(sourcePath) || extname(sourcePath).toLowerCase() !== ".png") {
|
const assetId = `${templateId}-${safeRuntimeComponent(basename(sourceReference, extension))}`;
|
||||||
throw new Error(`runtime_dynamic_image_invalid:${descriptor.assetId}`);
|
if (!existsSync(sourcePath) || extension !== ".png") throw new Error(`runtime_dynamic_image_invalid:${assetId}`);
|
||||||
}
|
addResource({
|
||||||
resources.push({
|
|
||||||
entry: entryFor(
|
entry: entryFor(
|
||||||
sourcePath,
|
sourcePath,
|
||||||
descriptor.assetId,
|
assetId,
|
||||||
registry.P0A_COMPLEX_RELEASE_VERSION,
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${descriptor.assetId}.png`,
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}.png`,
|
||||||
|
"image/png",
|
||||||
|
),
|
||||||
|
sourcePath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const textRoot = join(replicationRoot, "sticker_text", "模板", "单模板归档");
|
||||||
|
for (const templateId of registry.P0A_TEXT_TEMPLATE_IDS) {
|
||||||
|
const templateDirectory = textTemplateDirectory(textRoot, templateId);
|
||||||
|
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
||||||
|
const previewReference = metadata.files?.preview;
|
||||||
|
if (typeof previewReference !== "string" || previewReference.length === 0) continue;
|
||||||
|
const sourcePath = join(templateDirectory, ...previewReference.split("/"));
|
||||||
|
if (!existsSync(sourcePath) || extname(sourcePath).toLowerCase() !== ".png") {
|
||||||
|
throw new Error(`runtime_text_preview_invalid:${templateId}`);
|
||||||
|
}
|
||||||
|
const assetId = `TEXT-PREVIEW-${templateId}`;
|
||||||
|
addResource({
|
||||||
|
entry: entryFor(
|
||||||
|
sourcePath,
|
||||||
|
assetId,
|
||||||
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}.png`,
|
||||||
"image/png",
|
"image/png",
|
||||||
),
|
),
|
||||||
sourcePath,
|
sourcePath,
|
||||||
@@ -292,12 +346,7 @@ export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
|||||||
|
|
||||||
const manifestPath = join(replicationRoot, "sticker_web_handoff", "sticker_web_catalog_manifest.json");
|
const manifestPath = join(replicationRoot, "sticker_web_handoff", "sticker_web_catalog_manifest.json");
|
||||||
const manifest = createRuntimeAssetManifest({
|
const manifest = createRuntimeAssetManifest({
|
||||||
counts: {
|
counts: derivedCounts(resources.map((resource) => resource.entry)),
|
||||||
dynamic_fonts: registry.P0A_DYNAMIC_RUNTIME_FONT_SOURCES.length,
|
|
||||||
dynamic_images: registry.P0A_DYNAMIC_RUNTIME_IMAGE_SOURCES.length,
|
|
||||||
font_panel_items: registry.P0A_REQUIRED_FONT_PANEL_IDS.length,
|
|
||||||
static_stickers: staticResult.catalog.count,
|
|
||||||
},
|
|
||||||
entries: resources.map((resource) => resource.entry),
|
entries: resources.map((resource) => resource.entry),
|
||||||
sourceManifestSha256: fileSha256(manifestPath),
|
sourceManifestSha256: fileSha256(manifestPath),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ export function validateWp5FinalManifest(path) {
|
|||||||
const raw = readFileSync(path, "utf8");
|
const raw = readFileSync(path, "utf8");
|
||||||
if (raw.includes(WP4_07_RED_RESOURCE_VERSION) || raw.includes("fixture-v1")) throw new Error("WP4_07_PLACEHOLDER_ASSET_REJECTED");
|
if (raw.includes(WP4_07_RED_RESOURCE_VERSION) || raw.includes("fixture-v1")) throw new Error("WP4_07_PLACEHOLDER_ASSET_REJECTED");
|
||||||
const manifest = JSON.parse(raw);
|
const manifest = JSON.parse(raw);
|
||||||
const expectedCounts = { color_cards: 4, dynamic_stickers: 10, font_panel_items: 11, static_parts: 25, static_stickers: 1_407, text_templates: 32 };
|
const expectedCounts = { color_cards: 16, dynamic_stickers: 35, font_panel_items: 86, static_parts: 25, static_stickers: 1_407, text_templates: 332 };
|
||||||
for (const [key, expected] of Object.entries(expectedCounts)) {
|
for (const [key, expected] of Object.entries(expectedCounts)) {
|
||||||
if (manifest.counts?.[key] !== expected) throw new Error(`WP4_07_FINAL_MANIFEST_COUNT_MISMATCH:${key}`);
|
if (manifest.counts?.[key] !== expected) throw new Error(`WP4_07_FINAL_MANIFEST_COUNT_MISMATCH:${key}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ function findFiles(directory, name) {
|
|||||||
|
|
||||||
if (phase === "green") {
|
if (phase === "green") {
|
||||||
const traces = findFiles(outputDirectory, "trace.zip");
|
const traces = findFiles(outputDirectory, "trace.zip");
|
||||||
const whiteTrace = traces.find((path) => path.toLowerCase().includes("wp5-white-001") || path.toLowerCase().includes("p0-a-public-allowlist"));
|
const whiteTrace = traces.find((path) => path.toLowerCase().includes("wp5-white-001") || path.toLowerCase().includes("complete-complex-asset-catalog"));
|
||||||
const colorTrace = traces.find((path) => path.toLowerCase().includes("wp5-col-001") || path.toLowerCase().includes("shared-five-color"));
|
const colorTrace = traces.find((path) => path.toLowerCase().includes("wp5-col-001") || path.toLowerCase().includes("shared-five-color"));
|
||||||
if (whiteTrace) copyFileSync(whiteTrace, resolve(whiteDirectory, "trace.zip"));
|
if (whiteTrace) copyFileSync(whiteTrace, resolve(whiteDirectory, "trace.zip"));
|
||||||
if (colorTrace) copyFileSync(colorTrace, resolve(colorDirectory, "trace.zip"));
|
if (colorTrace) copyFileSync(colorTrace, resolve(colorDirectory, "trace.zip"));
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { execFileSync } from "node:child_process";
|
||||||
|
|
||||||
|
const requiredSubjects = [
|
||||||
|
"fix(POSTV1-07): 固定画布布局与文字贴纸选择",
|
||||||
|
"fix(POSTV1-07): 自动关闭编辑器操作提示",
|
||||||
|
"fix(POSTV1-08): 修复文字拖动闪烁与自动保存",
|
||||||
|
"fix(POSTV1-09): 展示项目生成图片",
|
||||||
|
"feat(POSTV1-10): 增加统一交互反馈",
|
||||||
|
"fix(POSTV1-11): 修复生成提交的会话令牌轮换",
|
||||||
|
"fix(POSTV1-runtime): 改善后台启动与状态窗口可见性",
|
||||||
|
"fix(POSTV1-browser): 同时支持 Chrome 150 与 151",
|
||||||
|
"fix(POSTV1-editor): 修复多选拖动与底图调整",
|
||||||
|
];
|
||||||
|
|
||||||
|
const subjects = new Set(execFileSync("git", ["log", "--format=%s", "HEAD"], { encoding: "utf8" })
|
||||||
|
.split(/\r?\n/u)
|
||||||
|
.filter(Boolean));
|
||||||
|
const missing = requiredSubjects.filter((subject) => !subjects.has(subject));
|
||||||
|
|
||||||
|
if (missing.length > 0) {
|
||||||
|
throw new Error(`postv1_ui_lineage_incomplete:${missing.join("|")}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(JSON.stringify({ required_commit_count: requiredSubjects.length, status: "passed" }));
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
|
||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
describe("POSTV1-11 workspace generation CSRF refresh", () => {
|
||||||
|
it("keeps the rotated account-settings token for generation submission", () => {
|
||||||
|
const source = readFileSync("apps/web/src/project-pages.tsx", "utf8");
|
||||||
|
|
||||||
|
expect(source).toContain("csrf_token: string;");
|
||||||
|
expect(source).toContain("csrf_token: settings.csrf_token");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -32,7 +32,7 @@ function fixture() {
|
|||||||
sha256: createHash("sha256").update(bytes).digest("hex"),
|
sha256: createHash("sha256").update(bytes).digest("hex"),
|
||||||
};
|
};
|
||||||
const manifest = {
|
const manifest = {
|
||||||
counts: { dynamic_fonts: 0, dynamic_images: 0, font_panel_items: 0, static_stickers: 1 },
|
counts: { dynamic_fonts: 0, dynamic_images: 0, font_panel_items: 0, static_stickers: 1, text_previews: 0 },
|
||||||
entries: [entry],
|
entries: [entry],
|
||||||
root_ref: "p0a_runtime_assets",
|
root_ref: "p0a_runtime_assets",
|
||||||
schema_version: "DadaRuntimeAssets/v1",
|
schema_version: "DadaRuntimeAssets/v1",
|
||||||
|
|||||||
@@ -33,6 +33,10 @@ function routeSession(page: Page) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function generatedImageSvg(label: string) {
|
||||||
|
return `<svg xmlns="http://www.w3.org/2000/svg" width="300" height="400"><rect width="300" height="400" fill="#d9f24f"/><text x="150" y="210" text-anchor="middle">${label}</text></svg>`;
|
||||||
|
}
|
||||||
|
|
||||||
async function captureEvidence(page: Page, caseId: string, name: string) {
|
async function captureEvidence(page: Page, caseId: string, name: string) {
|
||||||
const root = process.env.DADA_EVIDENCE_DIR_PROJECTS;
|
const root = process.env.DADA_EVIDENCE_DIR_PROJECTS;
|
||||||
if (!root) return;
|
if (!root) return;
|
||||||
@@ -75,6 +79,12 @@ test("TDD-WP2-PROJ-005 limits failed-empty selection on the project list", async
|
|||||||
],
|
],
|
||||||
}), contentType: "application/json", status: 200,
|
}), contentType: "application/json", status: 200,
|
||||||
}));
|
}));
|
||||||
|
await page.route(`**/api/v1/private-assets/projects/${successId}/images/*`, (route) => route.fulfill({
|
||||||
|
body: generatedImageSvg("城市工作室"),
|
||||||
|
contentType: "image/svg+xml",
|
||||||
|
headers: { "Content-Disposition": "attachment; filename=\"dada-original.png\"" },
|
||||||
|
status: 200,
|
||||||
|
}));
|
||||||
let batchPayload: unknown;
|
let batchPayload: unknown;
|
||||||
await page.route("**/api/v1/projects/failed-empty/trash", async (route) => {
|
await page.route("**/api/v1/projects/failed-empty/trash", async (route) => {
|
||||||
batchPayload = route.request().postDataJSON();
|
batchPayload = route.request().postDataJSON();
|
||||||
@@ -86,12 +96,30 @@ test("TDD-WP2-PROJ-005 limits failed-empty selection on the project list", async
|
|||||||
|
|
||||||
await expect(page.getByRole("heading", { name: "项目" })).toBeVisible();
|
await expect(page.getByRole("heading", { name: "项目" })).toBeVisible();
|
||||||
await expect(page.getByText("2 / 20 active")).toBeVisible();
|
await expect(page.getByText("2 / 20 active")).toBeVisible();
|
||||||
|
const projectPreview = page.getByRole("img", { name: "城市工作室预览图" });
|
||||||
|
await expect(projectPreview).toHaveAttribute(
|
||||||
|
"src",
|
||||||
|
`/api/v1/private-assets/projects/${successId}/images/00000000-0000-4000-8000-000000000213`,
|
||||||
|
);
|
||||||
|
await expect(projectPreview).toHaveCSS("object-fit", "cover");
|
||||||
await expect(page.getByLabel("选择失败草稿:失败草稿")).toBeVisible();
|
await expect(page.getByLabel("选择失败草稿:失败草稿")).toBeVisible();
|
||||||
await expect(page.getByLabel("选择失败草稿:城市工作室")).toHaveCount(0);
|
await expect(page.getByLabel("选择失败草稿:城市工作室")).toHaveCount(0);
|
||||||
await page.getByLabel("选择失败草稿:失败草稿").check();
|
await page.getByLabel("选择失败草稿:失败草稿").check();
|
||||||
await page.getByRole("button", { name: "批量移入回收站" }).click();
|
const batchTrashButton = page.getByRole("button", { name: "批量移入回收站" });
|
||||||
|
await batchTrashButton.hover();
|
||||||
|
await expect(batchTrashButton).toHaveCSS("transform", "matrix(1, 0, 0, 1, 0, -1)");
|
||||||
|
const buttonBounds = await batchTrashButton.boundingBox();
|
||||||
|
if (!buttonBounds) throw new Error("Batch trash button geometry is unavailable.");
|
||||||
|
await page.mouse.move(buttonBounds.x + buttonBounds.width / 2, buttonBounds.y + buttonBounds.height / 2);
|
||||||
|
await page.mouse.down();
|
||||||
|
await expect(batchTrashButton).toHaveCSS("transform", "matrix(1, 0, 0, 1, 0, 1)");
|
||||||
|
await page.mouse.move(0, 0);
|
||||||
|
await page.mouse.up();
|
||||||
|
await batchTrashButton.click();
|
||||||
expect(batchPayload).toEqual({ project_ids: [failedId] });
|
expect(batchPayload).toEqual({ project_ids: [failedId] });
|
||||||
await expect(page.getByText("失败草稿已移入回收站")).toBeVisible();
|
await expect(page.getByText("失败草稿已移入回收站")).toBeVisible();
|
||||||
|
await page.emulateMedia({ reducedMotion: "reduce" });
|
||||||
|
await expect(page.getByRole("link", { name: "打开项目:城市工作室" })).toHaveCSS("transition-duration", "0s");
|
||||||
expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBe(375);
|
expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBe(375);
|
||||||
await captureEvidence(page, "TDD-WP2-PROJ-005-failed-draft-retry", "projects-mobile.png");
|
await captureEvidence(page, "TDD-WP2-PROJ-005-failed-draft-retry", "projects-mobile.png");
|
||||||
});
|
});
|
||||||
@@ -99,9 +127,10 @@ test("TDD-WP2-PROJ-005 limits failed-empty selection on the project list", async
|
|||||||
test("TDD-WP2-PROJ-001 keeps ratio fixed and blocks an eleventh image in project detail", async ({ page }) => {
|
test("TDD-WP2-PROJ-001 keeps ratio fixed and blocks an eleventh image in project detail", async ({ page }) => {
|
||||||
await routeSession(page);
|
await routeSession(page);
|
||||||
const projectId = "00000000-0000-4000-8000-000000000221";
|
const projectId = "00000000-0000-4000-8000-000000000221";
|
||||||
|
const currentImageId = "00000000-0000-4000-8000-000000000222";
|
||||||
await page.route(`**/api/v1/projects/${projectId}`, (route) => route.fulfill({
|
await page.route(`**/api/v1/projects/${projectId}`, (route) => route.fulfill({
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
created_at: "2026-07-28T08:00:00.000Z", current_image_id: "00000000-0000-4000-8000-000000000222",
|
created_at: "2026-07-28T08:00:00.000Z", current_image_id: currentImageId,
|
||||||
draft_prompt: "城市工作室", generations: [], images: Array.from({ length: 10 }, (_, index) => ({
|
draft_prompt: "城市工作室", generations: [], images: Array.from({ length: 10 }, (_, index) => ({
|
||||||
created_at: `2026-07-28T08:${String(index).padStart(2, "0")}:00.000Z`,
|
created_at: `2026-07-28T08:${String(index).padStart(2, "0")}:00.000Z`,
|
||||||
generation_id: `00000000-0000-4000-8000-${String(223 + index).padStart(12, "0")}`,
|
generation_id: `00000000-0000-4000-8000-${String(223 + index).padStart(12, "0")}`,
|
||||||
@@ -111,11 +140,25 @@ test("TDD-WP2-PROJ-001 keeps ratio fixed and blocks an eleventh image in project
|
|||||||
status: "active", successful_image_count: 10, updated_at: "2026-07-28T08:10:00.000Z",
|
status: "active", successful_image_count: 10, updated_at: "2026-07-28T08:10:00.000Z",
|
||||||
}), contentType: "application/json", status: 200,
|
}), contentType: "application/json", status: 200,
|
||||||
}));
|
}));
|
||||||
|
await page.route(`**/api/v1/private-assets/projects/${projectId}/images/*`, (route) => route.fulfill({
|
||||||
|
body: generatedImageSvg("生成结果"),
|
||||||
|
contentType: "image/svg+xml",
|
||||||
|
headers: { "Content-Disposition": "attachment; filename=\"dada-original.png\"" },
|
||||||
|
status: 200,
|
||||||
|
}));
|
||||||
await page.goto(`${webUrl}/app/projects/${projectId}`);
|
await page.goto(`${webUrl}/app/projects/${projectId}`);
|
||||||
|
|
||||||
await expect(page.getByRole("heading", { name: "城市工作室" })).toBeVisible();
|
await expect(page.getByRole("heading", { name: "城市工作室" })).toBeVisible();
|
||||||
await expect(page.getByText("固定比例 3:4")).toBeVisible();
|
await expect(page.getByText("固定比例 3:4")).toBeVisible();
|
||||||
await expect(page.getByText("10 / 10 张成功图")).toBeVisible();
|
await expect(page.getByText("10 / 10 张成功图")).toBeVisible();
|
||||||
|
const currentImage = page.getByRole("img", { name: "城市工作室当前底图" });
|
||||||
|
await expect(currentImage).toHaveAttribute(
|
||||||
|
"src",
|
||||||
|
`/api/v1/private-assets/projects/${projectId}/images/${currentImageId}`,
|
||||||
|
);
|
||||||
|
await expect(currentImage).toHaveAttribute("loading", "eager");
|
||||||
|
await expect(currentImage).toHaveCSS("object-fit", "contain");
|
||||||
|
await expect(page.getByRole("img", { name: "生成结果 10" })).toBeVisible();
|
||||||
await expect(page.getByRole("button", { name: "继续生成" })).toBeDisabled();
|
await expect(page.getByRole("button", { name: "继续生成" })).toBeDisabled();
|
||||||
await expect(page.getByText("请先删除一张非当前底图的历史图")).toBeVisible();
|
await expect(page.getByText("请先删除一张非当前底图的历史图")).toBeVisible();
|
||||||
await expect(page.getByRole("radio")).toHaveCount(0);
|
await expect(page.getByRole("radio")).toHaveCount(0);
|
||||||
|
|||||||
@@ -67,6 +67,20 @@ async function routeEditor(page: Page) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function canvasFingerprint(page: Page) {
|
||||||
|
return page.getByLabel("编辑画布").evaluate((canvas: HTMLCanvasElement) => {
|
||||||
|
const context = canvas.getContext("2d");
|
||||||
|
if (!context) throw new Error("Canvas context unavailable.");
|
||||||
|
return [
|
||||||
|
...context.getImageData(108, 720, 1, 1).data,
|
||||||
|
...context.getImageData(324, 720, 1, 1).data,
|
||||||
|
...context.getImageData(540, 720, 1, 1).data,
|
||||||
|
...context.getImageData(756, 720, 1, 1).data,
|
||||||
|
...context.getImageData(972, 720, 1, 1).data,
|
||||||
|
];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
test("TDD-WP4-BG-001 preserves overlays while switching the background", async ({ page }) => {
|
test("TDD-WP4-BG-001 preserves overlays while switching the background", async ({ page }) => {
|
||||||
await routeEditor(page);
|
await routeEditor(page);
|
||||||
const saves: Array<Record<string, unknown>> = [];
|
const saves: Array<Record<string, unknown>> = [];
|
||||||
@@ -144,3 +158,35 @@ test("TDD-WP4-BG-002 commits, reopens, undoes, and resets background processing"
|
|||||||
writeEvidence("TDD-WP4-BG-002-processing-controls", "pixel-diff.json", { preview_commit_undo_reset: true, export_source_canvas_state_stable: true });
|
writeEvidence("TDD-WP4-BG-002-processing-controls", "pixel-diff.json", { preview_commit_undo_reset: true, export_source_canvas_state_stable: true });
|
||||||
await page.screenshot({ fullPage: true, path: process.env.DADA_EVIDENCE_DIR_EDITOR ? resolve(process.env.DADA_EVIDENCE_DIR_EDITOR, "TDD-WP4-BG-002-processing-controls", "processing-controls.png") : undefined });
|
await page.screenshot({ fullPage: true, path: process.env.DADA_EVIDENCE_DIR_EDITOR ? resolve(process.env.DADA_EVIDENCE_DIR_EDITOR, "TDD-WP4-BG-002-processing-controls", "processing-controls.png") : undefined });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("TDD-WP4-BG-002 previews background pixels before committing", async ({ page }) => {
|
||||||
|
await routeEditor(page);
|
||||||
|
const saves: Array<Record<string, unknown>> = [];
|
||||||
|
let version = 7;
|
||||||
|
await page.route(`**/api/v1/projects/${projectId}/state`, async (route) => {
|
||||||
|
saves.push(route.request().postDataJSON() as Record<string, unknown>);
|
||||||
|
version += 1;
|
||||||
|
await route.fulfill({ body: JSON.stringify({ save_status: "saved", state_version: version }), contentType: "application/json", status: 200 });
|
||||||
|
});
|
||||||
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
|
await page.getByRole("button", { name: "恢复原图" }).click();
|
||||||
|
await page.getByRole("button", { name: "应用调整" }).click();
|
||||||
|
await expect.poll(() => saves.length, { timeout: 4_000 }).toBeGreaterThan(0);
|
||||||
|
await expect.poll(async () => (await canvasFingerprint(page)).some((channel) => channel < 240)).toBe(true);
|
||||||
|
const baseline = (await canvasFingerprint(page)).join(",");
|
||||||
|
|
||||||
|
const ranges = page.locator(".editor-inspector input[type=range]");
|
||||||
|
await ranges.nth(0).fill("40");
|
||||||
|
await ranges.nth(1).fill("25");
|
||||||
|
await ranges.nth(2).fill("-35");
|
||||||
|
await ranges.nth(3).fill("70");
|
||||||
|
await ranges.nth(4).fill("100");
|
||||||
|
await expect.poll(async () => (await canvasFingerprint(page)).join(",")).not.toBe(baseline);
|
||||||
|
|
||||||
|
await page.getByRole("button", { name: "应用调整" }).click();
|
||||||
|
await expect.poll(() => saves.length, { timeout: 4_000 }).toBeGreaterThan(1);
|
||||||
|
const committed = saves.at(-1) as { canvas_state: typeof initialCanvasState };
|
||||||
|
expect(committed.canvas_state.background.adjustments).toMatchObject({
|
||||||
|
brightness: 40, contrast: 25, saturation: -35, sharpness: 100, temperature: 70,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import { homedir } from "node:os";
|
|||||||
import { join, resolve } from "node:path";
|
import { join, resolve } from "node:path";
|
||||||
import type { CanvasState } from "@dada/shared-contracts";
|
import type { CanvasState } from "@dada/shared-contracts";
|
||||||
|
|
||||||
|
import { P0A_TEXT_TEMPLATES, createTextTemplateElement } from "../../apps/web/src/text-assets.js";
|
||||||
|
|
||||||
let vite: ViteDevServer;
|
let vite: ViteDevServer;
|
||||||
let webUrl: string;
|
let webUrl: string;
|
||||||
|
|
||||||
@@ -26,7 +28,8 @@ const session = {
|
|||||||
user: { creator_name: "Canvas User", role: "user", social_id: "@canvas_user", status: "active", user_id: "00000000-0000-4000-8000-000000000501" },
|
user: { creator_name: "Canvas User", role: "user", social_id: "@canvas_user", status: "active", user_id: "00000000-0000-4000-8000-000000000501" },
|
||||||
};
|
};
|
||||||
|
|
||||||
const stickerRoot = process.env.DADA_STATIC_STICKER_ROOT ?? join(homedir(), "Desktop", "贴纸素材");
|
const stickerRoot = process.env.DADA_STATIC_STICKER_ROOT
|
||||||
|
?? join(homedir(), "Desktop", "sticker_web_replication_assets", "sticker_normal");
|
||||||
const originalStickerFixtures: Readonly<Record<string, string>> = {
|
const originalStickerFixtures: Readonly<Record<string, string>> = {
|
||||||
STK001: join(stickerRoot, "sticker_part1", "01af6384c2a962d17f55736f9895b505.png"),
|
STK001: join(stickerRoot, "sticker_part1", "01af6384c2a962d17f55736f9895b505.png"),
|
||||||
STK002: join(stickerRoot, "sticker_part2", "011db0fb6ac4184e4a708374003bce66.png"),
|
STK002: join(stickerRoot, "sticker_part2", "011db0fb6ac4184e4a708374003bce66.png"),
|
||||||
@@ -131,6 +134,41 @@ test("TDD-WP4-CAN-001 keeps fifty elements editable and blocks the fifty-first",
|
|||||||
if (process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS, "TDD-WP4-CAN-001-fifty-elements", "fifty-elements.png") });
|
if (process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS, "TDD-WP4-CAN-001-fifty-elements", "fifty-elements.png") });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("TDD-WP4-CAN-001 drags distant multi-selected objects as one group", async ({ page }) => {
|
||||||
|
const projectId = uuid(519);
|
||||||
|
const backend = {
|
||||||
|
canvas: canvas([sticker(1, { x: 0.2, y: 0.2 }, 0), sticker(2, { x: 0.8, y: 0.8 }, 1)]),
|
||||||
|
saves: 0,
|
||||||
|
version: 5,
|
||||||
|
};
|
||||||
|
await routeEditor(page, projectId, backend);
|
||||||
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
|
const stage = page.getByLabel("编辑画布");
|
||||||
|
const bounds = await stage.boundingBox();
|
||||||
|
if (!bounds) throw new Error("Canvas bounds unavailable.");
|
||||||
|
const point = (x: number, y: number) => ({ x: bounds.x + bounds.width * x, y: bounds.y + bounds.height * y });
|
||||||
|
|
||||||
|
await page.getByRole("button", { name: "多选模式" }).click();
|
||||||
|
await page.mouse.click(point(0.2, 0.2).x, point(0.2, 0.2).y);
|
||||||
|
await page.mouse.click(point(0.8, 0.8).x, point(0.8, 0.8).y);
|
||||||
|
await expect(page.getByRole("heading", { name: "已选 2 个对象" })).toBeVisible();
|
||||||
|
|
||||||
|
await page.mouse.move(point(0.2, 0.2).x, point(0.2, 0.2).y);
|
||||||
|
await page.mouse.down();
|
||||||
|
await page.mouse.move(point(0.3, 0.3).x, point(0.3, 0.3).y, { steps: 4 });
|
||||||
|
await page.mouse.up();
|
||||||
|
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 4_000 }).toBeGreaterThan(0);
|
||||||
|
const [first, second] = backend.canvas.elements.map(({ position }) => position);
|
||||||
|
expect(first?.x).toBeCloseTo(0.3, 6);
|
||||||
|
expect(first?.y).toBeCloseTo(0.3, 6);
|
||||||
|
expect(second?.x).toBeCloseTo(0.9, 6);
|
||||||
|
expect(second?.y).toBeCloseTo(0.9, 6);
|
||||||
|
expect((first?.x ?? 0) - 0.2).toBeCloseTo((second?.x ?? 0) - 0.8, 10);
|
||||||
|
expect((first?.y ?? 0) - 0.2).toBeCloseTo((second?.y ?? 0) - 0.8, 10);
|
||||||
|
await expect(page.getByRole("heading", { name: "已选 2 个对象" })).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
test("TDD-WP4-STK-001 transforms, cycles, selects and reopens ordinary stickers", async ({ page }) => {
|
test("TDD-WP4-STK-001 transforms, cycles, selects and reopens ordinary stickers", async ({ page }) => {
|
||||||
const projectId = uuid(520);
|
const projectId = uuid(520);
|
||||||
const backend = { canvas: canvas([sticker(1, { x: 0.5, y: 0.5 }, 0), sticker(2, { x: 0.5, y: 0.5 }, 1)]), saves: 0, version: 5 };
|
const backend = { canvas: canvas([sticker(1, { x: 0.5, y: 0.5 }, 0), sticker(2, { x: 0.5, y: 0.5 }, 1)]), saves: 0, version: 5 };
|
||||||
@@ -196,3 +234,89 @@ test("TDD-WP4-STK-001 transforms, cycles, selects and reopens ordinary stickers"
|
|||||||
writeEvidence("TDD-WP4-STK-001-transform-sticker", "pixel-diff.json", { canvas_and_saved_state_match: true, export_source_canvas_state_stable: true });
|
writeEvidence("TDD-WP4-STK-001-transform-sticker", "pixel-diff.json", { canvas_and_saved_state_match: true, export_source_canvas_state_stable: true });
|
||||||
if (process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS, "TDD-WP4-STK-001-transform-sticker", "transformed-sticker.png") });
|
if (process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS, "TDD-WP4-STK-001-transform-sticker", "transformed-sticker.png") });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("POSTV1-08 keeps the canvas frame stable and previews drag before pointer release", async ({ page }) => {
|
||||||
|
await page.addInitScript(() => {
|
||||||
|
const counters = { height: 0, width: 0 };
|
||||||
|
Object.defineProperty(window, "__dadaCanvasDimensionWrites", { value: counters });
|
||||||
|
for (const key of ["height", "width"] as const) {
|
||||||
|
const descriptor = Object.getOwnPropertyDescriptor(HTMLCanvasElement.prototype, key);
|
||||||
|
if (!descriptor?.get || !descriptor.set) throw new Error(`Canvas ${key} descriptor unavailable.`);
|
||||||
|
Object.defineProperty(HTMLCanvasElement.prototype, key, {
|
||||||
|
configurable: descriptor.configurable,
|
||||||
|
enumerable: descriptor.enumerable,
|
||||||
|
get: descriptor.get,
|
||||||
|
set(value: number) {
|
||||||
|
if (this.classList.contains("editor-canvas")) counters[key] += 1;
|
||||||
|
descriptor.set!.call(this, value);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const projectId = uuid(530);
|
||||||
|
const text = createTextTemplateElement(P0A_TEXT_TEMPLATES[0]!, {
|
||||||
|
createdAt: "2026-08-03T08:00:00.000Z",
|
||||||
|
elementId: uuid(630),
|
||||||
|
}, 0, { position: { x: 0.5, y: 0.5 } });
|
||||||
|
const backend = { canvas: canvas([text]), saves: 0, version: 6 };
|
||||||
|
await routeEditor(page, projectId, backend);
|
||||||
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
|
const stage = page.getByLabel("编辑画布");
|
||||||
|
const bounds = await stage.boundingBox();
|
||||||
|
if (!bounds) throw new Error("Canvas bounds unavailable.");
|
||||||
|
const center = { x: bounds.x + bounds.width * 0.5, y: bounds.y + bounds.height * 0.5 };
|
||||||
|
await page.mouse.click(center.x, center.y);
|
||||||
|
await expect(page.getByLabel("文字内容")).toBeVisible();
|
||||||
|
await page.getByLabel("文字内容").fill("拖动中的文字");
|
||||||
|
await page.getByRole("spinbutton", { name: "有效字号", exact: true }).fill("64");
|
||||||
|
await page.getByLabel("文字填充色").fill("#FA5751");
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 4_000 }).toBe(1);
|
||||||
|
expect(backend.canvas.elements[0]).toMatchObject({
|
||||||
|
content: "拖动中的文字",
|
||||||
|
scale: { x: 64 / 48, y: 64 / 48 },
|
||||||
|
style_parameters: { fill_color: "#FA5751" },
|
||||||
|
});
|
||||||
|
const savesBeforeDrag = backend.saves;
|
||||||
|
|
||||||
|
const before = await page.evaluate(() => {
|
||||||
|
return structuredClone((window as typeof window & { __dadaCanvasDimensionWrites: { height: number; width: number } }).__dadaCanvasDimensionWrites);
|
||||||
|
});
|
||||||
|
await page.mouse.move(center.x, center.y);
|
||||||
|
await page.mouse.down();
|
||||||
|
await page.waitForTimeout(650);
|
||||||
|
await expect(page.getByRole("menu")).toBeVisible();
|
||||||
|
await page.mouse.move(bounds.x + bounds.width * 0.68, center.y);
|
||||||
|
await expect(page.getByRole("menu")).toBeHidden();
|
||||||
|
await expect(page.getByLabel("文字内容")).toBeVisible();
|
||||||
|
|
||||||
|
const preview = await stage.evaluate((canvas: HTMLCanvasElement) => {
|
||||||
|
const context = canvas.getContext("2d");
|
||||||
|
if (!context) throw new Error("Canvas context unavailable.");
|
||||||
|
const pixels = context.getImageData(0, 0, canvas.width, canvas.height).data;
|
||||||
|
let count = 0;
|
||||||
|
let totalX = 0;
|
||||||
|
for (let y = 0; y < canvas.height; y += 1) {
|
||||||
|
for (let x = 0; x < canvas.width; x += 1) {
|
||||||
|
const offset = (y * canvas.width + x) * 4;
|
||||||
|
if ((pixels[offset] ?? 255) < 20 && (pixels[offset + 1] ?? 0) >= 75 && (pixels[offset + 1] ?? 255) <= 120 && (pixels[offset + 2] ?? 0) >= 180) {
|
||||||
|
count += 1;
|
||||||
|
totalX += x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { blue_pixel_count: count, blue_x: count > 0 ? totalX / count / canvas.width : 0 };
|
||||||
|
});
|
||||||
|
const during = await page.evaluate(() => {
|
||||||
|
return structuredClone((window as typeof window & { __dadaCanvasDimensionWrites: { height: number; width: number } }).__dadaCanvasDimensionWrites);
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(during).toEqual(before);
|
||||||
|
expect(preview.blue_pixel_count).toBeGreaterThan(100);
|
||||||
|
expect(preview.blue_x).toBeGreaterThan(0.60);
|
||||||
|
await page.mouse.up();
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 4_000 }).toBeGreaterThan(savesBeforeDrag);
|
||||||
|
expect(backend.canvas.elements[0]?.position.x).toBeCloseTo(0.68, 2);
|
||||||
|
expect(backend.canvas.elements[0]?.content).toBe("拖动中的文字");
|
||||||
|
await expect(page.getByLabel("文字内容")).toBeVisible();
|
||||||
|
});
|
||||||
|
|||||||
@@ -76,29 +76,37 @@ async function routeEditor(page: Page, projectId: string, backend: Backend) {
|
|||||||
backend.recent = [item, ...backend.recent.filter((entry) => entry.asset_id !== item.asset_id)];
|
backend.recent = [item, ...backend.recent.filter((entry) => entry.asset_id !== item.asset_id)];
|
||||||
await route.fulfill({ body: JSON.stringify({ status: "recorded" }), contentType: "application/json", status: 200 });
|
await route.fulfill({ body: JSON.stringify({ status: "recorded" }), contentType: "application/json", status: 200 });
|
||||||
});
|
});
|
||||||
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => route.fulfill({ body: fontBytes, contentType: "font/ttf", status: 200 }));
|
const previewPng = Buffer.from("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=", "base64");
|
||||||
|
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => {
|
||||||
|
const preview = new URL(route.request().url()).pathname.includes("TEXT-PREVIEW-");
|
||||||
|
return route.fulfill(preview ? { body: previewPng, contentType: "image/png", status: 200 } : { body: fontBytes, contentType: "font/ttf", status: 200 });
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
test("TDD-WP4-TXT-003 exposes the frozen catalog, display-name search and account recent use", async ({ page }) => {
|
test("TDD-WP4-TXT-003 exposes the complete catalog, display-name search and account recent use", async ({ page }) => {
|
||||||
const projectId = uuid(730);
|
const projectId = uuid(730);
|
||||||
const backend: Backend = { canvas: emptyCanvas(), recent: [], saves: 0, version: 2 };
|
const backend: Backend = { canvas: emptyCanvas(), recent: [], saves: 0, version: 2 };
|
||||||
await routeEditor(page, projectId, backend);
|
await routeEditor(page, projectId, backend);
|
||||||
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
||||||
await expect(page.locator(".editor-template-grid button")).toHaveCount(32);
|
await expect(page.locator(".editor-template-grid button")).toHaveCount(332);
|
||||||
for (const [label, count] of [["花字", 8], ["标题", 8], ["标签", 8], ["简约", 8]] as const) {
|
for (const [label, count] of [["花字", 145], ["标题", 119], ["标签", 51], ["简约", 17]] as const) {
|
||||||
await page.getByRole("button", { name: label, exact: true }).click();
|
await page.getByRole("button", { name: label, exact: true }).click();
|
||||||
await expect(page.locator(".editor-template-grid button")).toHaveCount(count);
|
await expect(page.locator(".editor-template-grid button")).toHaveCount(count);
|
||||||
}
|
}
|
||||||
await page.getByRole("button", { name: "全部", exact: true }).click();
|
await page.getByRole("button", { name: "全部", exact: true }).click();
|
||||||
const search = page.getByPlaceholder("搜索文字模板显示名称");
|
const search = page.getByPlaceholder("搜索文字模板显示名称");
|
||||||
await search.fill("生活");
|
await search.fill("生活");
|
||||||
await expect(page.locator(".editor-template-grid button")).toHaveCount(5);
|
await expect(page.locator(".editor-template-grid button")).toHaveCount(9);
|
||||||
await search.fill("FLOWER001");
|
await search.fill("FLOWER001");
|
||||||
await expect(page.locator(".editor-template-grid button")).toHaveCount(0);
|
await expect(page.locator(".editor-template-grid button")).toHaveCount(0);
|
||||||
await search.fill("");
|
await search.fill("");
|
||||||
expect(page.getByText("添加普通文字", { exact: true })).toHaveCount(0);
|
expect(page.getByText("添加普通文字", { exact: true })).toHaveCount(0);
|
||||||
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
const flowerTemplate = page.getByRole("button", { name: /FLOWER001 春日计划/ });
|
||||||
|
await flowerTemplate.hover();
|
||||||
|
await expect(flowerTemplate).toHaveCSS("background-color", "rgb(255, 255, 214)");
|
||||||
|
await expect(flowerTemplate.locator(".editor-template-preview")).toHaveCSS("transform", "matrix(1.03, 0, 0, 1.03, 0, 0)");
|
||||||
|
await flowerTemplate.click();
|
||||||
await expect(page.getByText("对象 1 / 50")).toBeVisible();
|
await expect(page.getByText("对象 1 / 50")).toBeVisible();
|
||||||
await expect.poll(() => backend.recent).toEqual([{ asset_id: "FLOWER001", asset_kind: "text_template", resource_version: "p0a-complex-v1" }]);
|
await expect.poll(() => backend.recent).toEqual([{ asset_id: "FLOWER001", asset_kind: "text_template", resource_version: "p0a-complex-v1" }]);
|
||||||
await page.reload();
|
await page.reload();
|
||||||
@@ -106,8 +114,8 @@ test("TDD-WP4-TXT-003 exposes the frozen catalog, display-name search and accoun
|
|||||||
await expect(page.getByLabel("最近使用文字模板").getByText("FLOWER001", { exact: true })).toBeVisible();
|
await expect(page.getByLabel("最近使用文字模板").getByText("FLOWER001", { exact: true })).toBeVisible();
|
||||||
await page.getByRole("button", { name: "普通贴纸", exact: true }).click();
|
await page.getByRole("button", { name: "普通贴纸", exact: true }).click();
|
||||||
expect(page.getByPlaceholder("搜索普通贴纸")).toHaveCount(0);
|
expect(page.getByPlaceholder("搜索普通贴纸")).toHaveCount(0);
|
||||||
writeEvidence("TDD-WP4-TXT-003-catalog-search-recent", "catalog.json", { categories: { flower: 8, simple: 8, tag: 8, title: 8 }, count: 32, first: "FLOWER001", last: "SIMPLE008" });
|
writeEvidence("TDD-WP4-TXT-003-catalog-search-recent", "catalog.json", { categories: { flower: 145, simple: 17, tag: 51, title: 119 }, count: 332, first: "FLOWER001", last: "SIMPLE017" });
|
||||||
writeEvidence("TDD-WP4-TXT-003-catalog-search-recent", "response.json", { public_count: 32, recent: backend.recent, unavailable_is_disabled: true });
|
writeEvidence("TDD-WP4-TXT-003-catalog-search-recent", "response.json", { public_count: 332, recent: backend.recent, unavailable_count: 0 });
|
||||||
writeEvidence("TDD-WP4-TXT-003-catalog-search-recent", "db-diff.json", { account_user_id: userId, recent: backend.recent, search_did_not_write: true });
|
writeEvidence("TDD-WP4-TXT-003-catalog-search-recent", "db-diff.json", { account_user_id: userId, recent: backend.recent, search_did_not_write: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -212,3 +220,81 @@ test("TDD-WP4-TXT-002 waits for the archived font and commits exact style ranges
|
|||||||
writeEvidence("TDD-WP4-TXT-002-font-metrics-ranges", "pixel-diff.json", { background_alpha_separate: true, clipped_visible_text: false, effective_font_size: 96 });
|
writeEvidence("TDD-WP4-TXT-002-font-metrics-ranges", "pixel-diff.json", { background_alpha_separate: true, clipped_visible_text: false, effective_font_size: 96 });
|
||||||
if (process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR, "TDD-WP4-TXT-002-font-metrics-ranges", "font-styles.png") });
|
if (process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR, "TDD-WP4-TXT-002-font-metrics-ranges", "font-styles.png") });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("POSTV1-07 keeps the canvas anchored when the text template panel opens", async ({ page }) => {
|
||||||
|
const projectId = uuid(760);
|
||||||
|
const backend: Backend = { canvas: emptyCanvas(), recent: [], saves: 0, version: 5 };
|
||||||
|
await routeEditor(page, projectId, backend);
|
||||||
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
|
|
||||||
|
const stage = page.getByLabel("编辑画布");
|
||||||
|
const before = await stage.boundingBox();
|
||||||
|
if (!before) throw new Error("Canvas geometry is unavailable before opening text templates.");
|
||||||
|
|
||||||
|
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
||||||
|
await expect(page.locator(".editor-template-grid button")).toHaveCount(332);
|
||||||
|
const after = await stage.boundingBox();
|
||||||
|
if (!after) throw new Error("Canvas geometry is unavailable after opening text templates.");
|
||||||
|
const assetsPanelScroll = await page.getByLabel("素材与底图来源").evaluate((panel) => ({
|
||||||
|
clientHeight: panel.clientHeight,
|
||||||
|
overflowY: getComputedStyle(panel).overflowY,
|
||||||
|
scrollHeight: panel.scrollHeight,
|
||||||
|
}));
|
||||||
|
|
||||||
|
expect(Math.abs(after.x - before.x)).toBeLessThanOrEqual(1);
|
||||||
|
expect(Math.abs(after.y - before.y)).toBeLessThanOrEqual(1);
|
||||||
|
expect(Math.abs(after.width - before.width)).toBeLessThanOrEqual(1);
|
||||||
|
expect(Math.abs(after.height - before.height)).toBeLessThanOrEqual(1);
|
||||||
|
expect(assetsPanelScroll.overflowY).toBe("auto");
|
||||||
|
expect(assetsPanelScroll.scrollHeight).toBeGreaterThan(assetsPanelScroll.clientHeight);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("POSTV1-07 keeps text selection stable and dismisses move feedback", async ({ page }) => {
|
||||||
|
const projectId = uuid(770);
|
||||||
|
const backend: Backend = { canvas: emptyCanvas(), recent: [], saves: 0, version: 6 };
|
||||||
|
await routeEditor(page, projectId, backend);
|
||||||
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
|
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
||||||
|
await page.getByRole("button", { name: /H003 生活分享家/ }).click();
|
||||||
|
await expect.poll(() => backend.canvas.elements.length).toBe(1);
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
await page.reload();
|
||||||
|
const stage = page.getByLabel("编辑画布");
|
||||||
|
const bounds = await stage.boundingBox();
|
||||||
|
const element = backend.canvas.elements[0];
|
||||||
|
if (!bounds || !element) throw new Error("Text selection geometry is unavailable.");
|
||||||
|
const positionBefore = structuredClone(element.position);
|
||||||
|
const savesBefore = backend.saves;
|
||||||
|
const clientX = bounds.x + bounds.width * element.position.x;
|
||||||
|
const clientY = bounds.y + bounds.height * element.position.y;
|
||||||
|
|
||||||
|
await page.mouse.move(clientX, clientY);
|
||||||
|
await page.mouse.down();
|
||||||
|
await expect(page.getByLabel("字体覆盖")).toBeVisible();
|
||||||
|
const selectedBounds = await stage.boundingBox();
|
||||||
|
const inspectorScroll = await page.getByLabel("对象参数").evaluate((panel) => ({
|
||||||
|
clientHeight: panel.clientHeight,
|
||||||
|
overflowY: getComputedStyle(panel).overflowY,
|
||||||
|
scrollHeight: panel.scrollHeight,
|
||||||
|
}));
|
||||||
|
if (!selectedBounds) throw new Error("Canvas geometry is unavailable after selecting text.");
|
||||||
|
expect(Math.abs(selectedBounds.y - bounds.y)).toBeLessThanOrEqual(1);
|
||||||
|
expect(inspectorScroll.overflowY).toBe("auto");
|
||||||
|
expect(inspectorScroll.scrollHeight).toBeGreaterThan(inspectorScroll.clientHeight);
|
||||||
|
await page.mouse.move(clientX + 1, clientY);
|
||||||
|
await page.mouse.up();
|
||||||
|
|
||||||
|
await expect(page.getByLabel("字体覆盖")).toBeVisible();
|
||||||
|
await page.waitForTimeout(800);
|
||||||
|
expect(backend.canvas.elements[0]?.position).toEqual(positionBefore);
|
||||||
|
expect(backend.saves).toBe(savesBefore);
|
||||||
|
|
||||||
|
await page.mouse.move(clientX, clientY);
|
||||||
|
await page.mouse.down();
|
||||||
|
await page.mouse.move(clientX + 12, clientY);
|
||||||
|
await page.mouse.up();
|
||||||
|
await expect(page.getByText("对象位置已提交", { exact: true })).toBeVisible();
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBeGreaterThan(savesBefore);
|
||||||
|
await expect(page.getByText("对象位置已提交", { exact: true })).toBeHidden({ timeout: 5_000 });
|
||||||
|
});
|
||||||
|
|||||||
@@ -29,8 +29,9 @@ const rawImages: Record<string, string[]> = {
|
|||||||
"00000000-0000-4000-8000-000000000812": ["#102030", "#405060", "#708090", "#A0B0C0", "#D0E0F0"],
|
"00000000-0000-4000-8000-000000000812": ["#102030", "#405060", "#708090", "#A0B0C0", "#D0E0F0"],
|
||||||
};
|
};
|
||||||
|
|
||||||
const dynamicRoot = process.env.DADA_DYNAMIC_ASSET_ROOT ?? join(homedir(), "Desktop", "sticker_interactive", "单模板归档", "templates");
|
const assetRoot = join(homedir(), "Desktop", "sticker_web_replication_assets");
|
||||||
const textRoot = process.env.DADA_TEXT_ASSET_ROOT ?? join(homedir(), "Desktop", "sticker_text");
|
const dynamicRoot = process.env.DADA_DYNAMIC_ASSET_ROOT ?? join(assetRoot, "sticker_interactive", "单模板归档", "templates");
|
||||||
|
const textRoot = process.env.DADA_TEXT_ASSET_ROOT ?? join(assetRoot, "sticker_text");
|
||||||
const dynamicSourceAssets: Readonly<Record<string, { contentType: string; path: string }>> = {
|
const dynamicSourceAssets: Readonly<Record<string, { contentType: string; path: string }>> = {
|
||||||
"15974853bc3294ef68e7e6d58fe74fd7": { contentType: "font/ttf", path: join(dynamicRoot, "DYN002", "fonts", "15974853bc3294ef68e7e6d58fe74fd7", "0202b90o6r57rxed4027b5689e0dxe7e142r0yho9d0lljuqj.ttf") },
|
"15974853bc3294ef68e7e6d58fe74fd7": { contentType: "font/ttf", path: join(dynamicRoot, "DYN002", "fonts", "15974853bc3294ef68e7e6d58fe74fd7", "0202b90o6r57rxed4027b5689e0dxe7e142r0yho9d0lljuqj.ttf") },
|
||||||
"46f8336813e4c48d06a1aef294fdccf6": { contentType: "font/ttf", path: join(dynamicRoot, "DYN016", "fonts", "46f8336813e4c48d06a1aef294fdccf6", "9fbfbb420cea1df916d7c7c7ac90b1c88b61e117-PingFang-SC-Semibold-2.ttf") },
|
"46f8336813e4c48d06a1aef294fdccf6": { contentType: "font/ttf", path: join(dynamicRoot, "DYN016", "fonts", "46f8336813e4c48d06a1aef294fdccf6", "9fbfbb420cea1df916d7c7c7ac90b1c88b61e117-PingFang-SC-Semibold-2.ttf") },
|
||||||
@@ -136,7 +137,7 @@ test("TDD-WP4-COL-001 extracts once from raw pixels and refreshes only for a new
|
|||||||
await routeEditor(page, projectId, backend);
|
await routeEditor(page, projectId, backend);
|
||||||
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
await page.getByRole("button", { name: "色卡", exact: true }).click();
|
await page.getByRole("button", { name: "色卡", exact: true }).click();
|
||||||
await expect(page.getByRole("button", { name: /^添加色卡/ })).toHaveCount(4);
|
await expect(page.getByRole("button", { name: /^添加色卡/ })).toHaveCount(16);
|
||||||
await expect(page.getByRole("button", { name: "色卡说明" })).toHaveAttribute("title", "色卡基于原始底图,更换底图时更新,不随裁剪、调色和滤镜变化");
|
await expect(page.getByRole("button", { name: "色卡说明" })).toHaveAttribute("title", "色卡基于原始底图,更换底图时更新,不随裁剪、调色和滤镜变化");
|
||||||
const placements = [
|
const placements = [
|
||||||
[{ key: "ArrowLeft", times: 15 }, { key: "ArrowUp", times: 14 }],
|
[{ key: "ArrowLeft", times: 15 }, { key: "ArrowUp", times: 14 }],
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ async function routeEditor(page: Page, projectId: string, backend: Backend, opti
|
|||||||
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => route.fulfill({ body: readFileSync(windowsFont), contentType: "font/ttf" }));
|
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => route.fulfill({ body: readFileSync(windowsFont), contentType: "font/ttf" }));
|
||||||
}
|
}
|
||||||
|
|
||||||
test("TDD-WP4-EXP-001 cancel keeps a pending text edit outside history and export", async ({ page }) => {
|
test("TDD-WP4-EXP-001 cancel keeps automatically saved text outside the export", async ({ page }) => {
|
||||||
const projectId = "00000000-0000-4000-8000-000000000920";
|
const projectId = "00000000-0000-4000-8000-000000000920";
|
||||||
const assetId = "00000000-0000-4000-8000-000000000921";
|
const assetId = "00000000-0000-4000-8000-000000000921";
|
||||||
const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 2 };
|
const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 2 };
|
||||||
@@ -87,27 +87,29 @@ test("TDD-WP4-EXP-001 cancel keeps a pending text edit outside history and expor
|
|||||||
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
||||||
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
||||||
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1);
|
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1);
|
||||||
await page.getByLabel("文字内容").fill("尚未提交的导出文字");
|
await page.getByLabel("文字内容").fill("自动保存的导出文字");
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(2);
|
||||||
const downloads: string[] = [];
|
const downloads: string[] = [];
|
||||||
page.on("download", (download) => downloads.push(download.suggestedFilename()));
|
page.on("download", (download) => downloads.push(download.suggestedFilename()));
|
||||||
await page.getByRole("button", { name: "导出", exact: true }).click();
|
await page.getByRole("button", { name: "导出", exact: true }).click();
|
||||||
const dialog = page.getByRole("dialog", { name: "导出成品" });
|
const dialog = page.getByRole("dialog", { name: "导出成品" });
|
||||||
await expect(dialog).toContainText("导出前需要提交当前修改");
|
await expect(dialog).not.toContainText("导出前需要提交当前修改");
|
||||||
await expect(dialog.getByText("将应用当前修改并导出", { exact: true })).toBeVisible();
|
await expect(dialog.getByRole("checkbox", { name: "将应用当前修改并导出" })).toHaveCount(0);
|
||||||
await dialog.getByRole("button", { name: "取消" }).click();
|
await dialog.getByRole("button", { name: "取消" }).click();
|
||||||
await expect(dialog).toHaveCount(0);
|
await expect(dialog).toHaveCount(0);
|
||||||
await expect(page.getByLabel("文字内容")).toHaveValue("尚未提交的导出文字");
|
await expect(page.getByLabel("文字内容")).toHaveValue("自动保存的导出文字");
|
||||||
expect(backend.saves).toBe(1);
|
expect(backend.saves).toBe(2);
|
||||||
|
expect(backend.canvas.elements[0]?.content).toBe("自动保存的导出文字");
|
||||||
expect(backend.latestBodies).toHaveLength(0);
|
expect(backend.latestBodies).toHaveLength(0);
|
||||||
expect(downloads).toHaveLength(0);
|
expect(downloads).toHaveLength(0);
|
||||||
const beforeUndo = { download_count: 0, latest_count: 0, save_count_after_cancel: backend.saves, state_version: backend.version };
|
const beforeUndo = { download_count: 0, latest_count: 0, save_count_after_cancel: backend.saves, state_version: backend.version };
|
||||||
await page.getByRole("button", { name: "撤销" }).click();
|
await page.getByRole("button", { name: "撤销" }).click();
|
||||||
await expect(page.getByLabel("文字内容")).toHaveCount(0);
|
await expect(page.getByLabel("文字内容")).toHaveValue("春日计划");
|
||||||
evidence("TDD-WP4-EXP-001-cancel-pending-edit", "network-timeline.json", { ...beforeUndo, compose_calls: 0, export_save_calls: 0 });
|
evidence("TDD-WP4-EXP-001-cancel-pending-edit", "network-timeline.json", { ...beforeUndo, compose_calls: 0, export_save_calls: 0 });
|
||||||
evidence("TDD-WP4-EXP-001-cancel-pending-edit", "db-diff.json", { committed_text_after_cancel: "春日计划", first_undo_removed_initial_element: true, latest_exports_changed: false });
|
evidence("TDD-WP4-EXP-001-cancel-pending-edit", "db-diff.json", { committed_text_after_cancel: "自动保存的导出文字", first_undo_restored_initial_text: true, latest_exports_changed: false });
|
||||||
});
|
});
|
||||||
|
|
||||||
test("TDD-WP4-EXP-001 confirm commits once, downloads, and saves the same bytes", async ({ page }) => {
|
test("TDD-WP4-EXP-001 exports automatically saved text and saves the same bytes", async ({ page }) => {
|
||||||
const projectId = "00000000-0000-4000-8000-000000000930";
|
const projectId = "00000000-0000-4000-8000-000000000930";
|
||||||
const assetId = "00000000-0000-4000-8000-000000000931";
|
const assetId = "00000000-0000-4000-8000-000000000931";
|
||||||
const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 4 };
|
const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 4 };
|
||||||
@@ -117,6 +119,7 @@ test("TDD-WP4-EXP-001 confirm commits once, downloads, and saves the same bytes"
|
|||||||
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
||||||
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1);
|
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1);
|
||||||
await page.getByLabel("文字内容").fill("确认后进入导出");
|
await page.getByLabel("文字内容").fill("确认后进入导出");
|
||||||
|
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(2);
|
||||||
await page.getByRole("button", { name: "导出", exact: true }).click();
|
await page.getByRole("button", { name: "导出", exact: true }).click();
|
||||||
const dialog = page.getByRole("dialog", { name: "导出成品" });
|
const dialog = page.getByRole("dialog", { name: "导出成品" });
|
||||||
if (process.env.DADA_EVIDENCE_DIR_EXPORT) {
|
if (process.env.DADA_EVIDENCE_DIR_EXPORT) {
|
||||||
@@ -124,14 +127,14 @@ test("TDD-WP4-EXP-001 confirm commits once, downloads, and saves the same bytes"
|
|||||||
mkdirSync(dirname(screenshot), { recursive: true });
|
mkdirSync(dirname(screenshot), { recursive: true });
|
||||||
await page.screenshot({ fullPage: true, path: screenshot });
|
await page.screenshot({ fullPage: true, path: screenshot });
|
||||||
}
|
}
|
||||||
await dialog.getByRole("checkbox", { name: "将应用当前修改并导出" }).check();
|
await expect(dialog.getByRole("checkbox", { name: "将应用当前修改并导出" })).toHaveCount(0);
|
||||||
const downloadPromise = page.waitForEvent("download");
|
const downloadPromise = page.waitForEvent("download");
|
||||||
await dialog.getByRole("button", { name: "导出并下载" }).click();
|
await dialog.getByRole("button", { name: "导出并下载" }).click();
|
||||||
const download = await downloadPromise;
|
const download = await downloadPromise;
|
||||||
const downloadPath = await download.path();
|
const downloadPath = await download.path();
|
||||||
if (!downloadPath) throw new Error("Browser download did not expose a local path.");
|
if (!downloadPath) throw new Error("Browser download did not expose a local path.");
|
||||||
await expect(dialog.getByRole("status")).toHaveText("已下载并保存为最新成品");
|
await expect(dialog.getByRole("status")).toHaveText("已下载并保存为最新成品");
|
||||||
await expect.poll(() => backend.saves).toBe(2);
|
expect(backend.saves).toBe(2);
|
||||||
expect(backend.canvas.elements[0]?.content).toBe("确认后进入导出");
|
expect(backend.canvas.elements[0]?.content).toBe("确认后进入导出");
|
||||||
expect(backend.latestBodies).toHaveLength(1);
|
expect(backend.latestBodies).toHaveLength(1);
|
||||||
const downloaded = readFileSync(downloadPath);
|
const downloaded = readFileSync(downloadPath);
|
||||||
|
|||||||
@@ -64,7 +64,10 @@ async function routeEditor(page: Page, backend: Backend) {
|
|||||||
});
|
});
|
||||||
await page.route("**/api/v1/assets/recent?asset_kind=text_template", (route) => route.fulfill({ body: JSON.stringify({ items: [] }), contentType: "application/json" }));
|
await page.route("**/api/v1/assets/recent?asset_kind=text_template", (route) => route.fulfill({ body: JSON.stringify({ items: [] }), contentType: "application/json" }));
|
||||||
await page.route("**/api/v1/assets/recent", (route) => route.fulfill({ body: JSON.stringify({ status: "recorded" }), contentType: "application/json" }));
|
await page.route("**/api/v1/assets/recent", (route) => route.fulfill({ body: JSON.stringify({ status: "recorded" }), contentType: "application/json" }));
|
||||||
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => route.fulfill({ body: fontBytes, contentType: "font/ttf" }));
|
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => {
|
||||||
|
const preview = new URL(route.request().url()).pathname.includes("TEXT-PREVIEW-");
|
||||||
|
return route.fulfill(preview ? { body: png, contentType: "image/png" } : { body: fontBytes, contentType: "font/ttf" });
|
||||||
|
});
|
||||||
await page.route("**/api/v1/assets/public/p0a-static-v1/*", (route) => route.fulfill({ body: png, contentType: "image/png" }));
|
await page.route("**/api/v1/assets/public/p0a-static-v1/*", (route) => route.fulfill({ body: png, contentType: "image/png" }));
|
||||||
await page.route(`**/api/v1/private-assets/projects/${projectId}/images/${backgroundId}`, (route) => route.fulfill({ body: rawSvg(), contentType: "image/svg+xml" }));
|
await page.route(`**/api/v1/private-assets/projects/${projectId}/images/${backgroundId}`, (route) => route.fulfill({ body: rawSvg(), contentType: "image/svg+xml" }));
|
||||||
}
|
}
|
||||||
@@ -91,7 +94,7 @@ test.beforeAll(async () => {
|
|||||||
|
|
||||||
test.afterAll(async () => vite.close());
|
test.afterAll(async () => vite.close());
|
||||||
|
|
||||||
test("TDD-WP5-WHITE-001 exposes only the P0-A public allowlist", async ({ page }) => {
|
test("POSTV1-ASSET-ALL-16 exposes the complete complex asset catalog", async ({ page }) => {
|
||||||
const backend: Backend = { canvas: canvas(), saves: 0, version: 1 };
|
const backend: Backend = { canvas: canvas(), saves: 0, version: 1 };
|
||||||
await routeEditor(page, backend);
|
await routeEditor(page, backend);
|
||||||
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
@@ -99,7 +102,6 @@ test("TDD-WP5-WHITE-001 exposes only the P0-A public allowlist", async ({ page }
|
|||||||
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
await page.getByRole("button", { name: "文字模板", exact: true }).click();
|
||||||
const textIds = await page.locator(".editor-template-grid button strong").allTextContents();
|
const textIds = await page.locator(".editor-template-grid button strong").allTextContents();
|
||||||
expect(textIds).toEqual(P0A_TEXT_TEMPLATE_IDS);
|
expect(textIds).toEqual(P0A_TEXT_TEMPLATE_IDS);
|
||||||
expect(textIds).not.toContain("FLOWER009");
|
|
||||||
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
|
||||||
await expect(page.getByText("对象 1 / 50")).toBeVisible();
|
await expect(page.getByText("对象 1 / 50")).toBeVisible();
|
||||||
await expect(page.getByLabel("字体覆盖")).toBeVisible();
|
await expect(page.getByLabel("字体覆盖")).toBeVisible();
|
||||||
@@ -109,12 +111,12 @@ test("TDD-WP5-WHITE-001 exposes only the P0-A public allowlist", async ({ page }
|
|||||||
await page.getByRole("button", { name: "色卡", exact: true }).click();
|
await page.getByRole("button", { name: "色卡", exact: true }).click();
|
||||||
const colorIds = await page.locator(".editor-provider-grid button strong").allTextContents();
|
const colorIds = await page.locator(".editor-provider-grid button strong").allTextContents();
|
||||||
expect(colorIds).toEqual(P0A_COLOR_CARD_IDS);
|
expect(colorIds).toEqual(P0A_COLOR_CARD_IDS);
|
||||||
expect(colorIds).not.toContain("COLOR003");
|
|
||||||
|
|
||||||
await page.getByRole("button", { name: "动态贴纸", exact: true }).click();
|
await page.getByRole("button", { name: "动态贴纸", exact: true }).click();
|
||||||
const dynamicIds = await page.locator(".editor-provider-grid button strong").allTextContents();
|
const dynamicIds = await page.locator(".editor-provider-grid button strong").allTextContents();
|
||||||
expect([...dynamicIds].sort()).toEqual([...P0A_DYNAMIC_STICKER_IDS].sort());
|
expect([...dynamicIds].sort()).toEqual([...P0A_DYNAMIC_STICKER_IDS].sort());
|
||||||
expect(dynamicIds).not.toContain("DYN005");
|
await page.getByRole("button", { name: /添加动态贴纸 DYN035/ }).click();
|
||||||
|
await expect.poll(() => backend.canvas.elements.some((element) => element.template_or_asset_id === "DYN035")).toBe(true);
|
||||||
|
|
||||||
await page.getByRole("button", { name: "普通贴纸", exact: true }).click();
|
await page.getByRole("button", { name: "普通贴纸", exact: true }).click();
|
||||||
await expect(page.getByText("共 1,407 张", { exact: true })).toBeVisible();
|
await expect(page.getByText("共 1,407 张", { exact: true })).toBeVisible();
|
||||||
@@ -130,27 +132,22 @@ test("TDD-WP5-WHITE-001 exposes only the P0-A public allowlist", async ({ page }
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test("TDD-WP5-COL-001 renders four layouts from one shared five-color snapshot", async ({ page }) => {
|
test("POSTV1-ASSET-ALL-16 renders sixteen layouts from one shared five-color snapshot", async ({ page }) => {
|
||||||
|
test.setTimeout(60_000);
|
||||||
const backend: Backend = { canvas: canvas(), saves: 0, version: 1 };
|
const backend: Backend = { canvas: canvas(), saves: 0, version: 1 };
|
||||||
await routeEditor(page, backend);
|
await routeEditor(page, backend);
|
||||||
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
|
||||||
await page.getByRole("button", { name: "色卡", exact: true }).click();
|
await page.getByRole("button", { name: "色卡", exact: true }).click();
|
||||||
const placements = [
|
|
||||||
[["ArrowLeft", 10], ["ArrowUp", 8]],
|
|
||||||
[["ArrowRight", 10], ["ArrowUp", 8]],
|
|
||||||
[["ArrowLeft", 10], ["ArrowDown", 8]],
|
|
||||||
[["ArrowRight", 10], ["ArrowDown", 8]],
|
|
||||||
] as const;
|
|
||||||
for (const [index, id] of P0A_COLOR_CARD_IDS.entries()) {
|
for (const [index, id] of P0A_COLOR_CARD_IDS.entries()) {
|
||||||
await page.getByRole("button", { name: new RegExp(`添加色卡 ${id}`) }).click();
|
await page.getByRole("button", { name: new RegExp(`添加色卡 ${id}`) }).click();
|
||||||
await expect.poll(() => backend.canvas.elements.length).toBe(index + 1);
|
await expect(page.getByText(`对象 ${index + 1} / 50`)).toBeVisible();
|
||||||
for (const [key, times] of placements[index]!) {
|
|
||||||
for (let press = 0; press < times; press += 1) await page.getByLabel("编辑画布").press(`Shift+${key}`);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
await expect.poll(() => backend.canvas.elements.length, { timeout: 10_000 }).toBe(16);
|
||||||
const palettes = backend.canvas.elements.map((element) => element.colors);
|
const palettes = backend.canvas.elements.map((element) => element.colors);
|
||||||
expect(palettes.every((palette) => JSON.stringify(palette) === JSON.stringify(palettes[0]))).toBe(true);
|
expect(palettes.every((palette) => JSON.stringify(palette) === JSON.stringify(palettes[0]))).toBe(true);
|
||||||
expect(backend.canvas.elements.map((element) => element.style_id)).toEqual(["style_01", "style_02", "style_08", "style_16"]);
|
expect(backend.canvas.elements.map((element) => element.style_id)).toEqual(
|
||||||
|
Array.from({ length: 16 }, (_, index) => `style_${String(index + 1).padStart(2, "0")}`),
|
||||||
|
);
|
||||||
const pixels = await page.getByLabel("编辑画布").evaluate((stage: HTMLCanvasElement) => {
|
const pixels = await page.getByLabel("编辑画布").evaluate((stage: HTMLCanvasElement) => {
|
||||||
const context = stage.getContext("2d");
|
const context = stage.getContext("2d");
|
||||||
if (!context) throw new Error("canvas context unavailable");
|
if (!context) throw new Error("canvas context unavailable");
|
||||||
@@ -161,7 +158,7 @@ test("TDD-WP5-COL-001 renders four layouts from one shared five-color snapshot",
|
|||||||
});
|
});
|
||||||
mergeEvidence(evidencePath("color", "palette.json"), { browser_palettes: palettes, same_palette_snapshot: true });
|
mergeEvidence(evidencePath("color", "palette.json"), { browser_palettes: palettes, same_palette_snapshot: true });
|
||||||
mergeEvidence(evidencePath("color", "pixel-diff.json"), {
|
mergeEvidence(evidencePath("color", "pixel-diff.json"), {
|
||||||
...pixels, four_renderers_visible: true, significant_pixel_ratio: 0, status: pixels.opaque_pixels > 0 ? "passed" : "failed",
|
...pixels, sixteen_renderers_available: true, significant_pixel_ratio: 0, status: pixels.opaque_pixels > 0 ? "passed" : "failed",
|
||||||
});
|
});
|
||||||
const screenshot = evidencePath("color", "screenshots/color-cards.png");
|
const screenshot = evidencePath("color", "screenshots/color-cards.png");
|
||||||
if (screenshot) {
|
if (screenshot) {
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import test from "node:test";
|
||||||
|
import assert from "node:assert/strict";
|
||||||
|
import fs from "node:fs";
|
||||||
|
import path from "node:path";
|
||||||
|
|
||||||
|
test("POSTV1-11 release accepts the Codex embedded Chrome major", () => {
|
||||||
|
const release = JSON.parse(
|
||||||
|
fs.readFileSync(path.resolve("RELEASE.json"), "utf8"),
|
||||||
|
);
|
||||||
|
const chrome = release.browsers.find(({ brand }) => brand === "Google Chrome");
|
||||||
|
|
||||||
|
assert.ok(chrome, "release must include Google Chrome");
|
||||||
|
assert.equal(Number.parseInt(chrome.fullVersion.split(".")[0], 10), 151);
|
||||||
|
});
|
||||||
@@ -15,12 +15,13 @@ import {
|
|||||||
test("committed P0-A runtime manifest covers the frozen first-version binary assets", () => {
|
test("committed P0-A runtime manifest covers the frozen first-version binary assets", () => {
|
||||||
const manifest = readRuntimeAssetManifest("config/runtime-assets-manifest.json");
|
const manifest = readRuntimeAssetManifest("config/runtime-assets-manifest.json");
|
||||||
assert.deepEqual(manifest.counts, {
|
assert.deepEqual(manifest.counts, {
|
||||||
dynamic_fonts: 7,
|
dynamic_fonts: 18,
|
||||||
dynamic_images: 8,
|
dynamic_images: 43,
|
||||||
font_panel_items: 11,
|
font_panel_items: 86,
|
||||||
static_stickers: 1407,
|
static_stickers: 1407,
|
||||||
|
text_previews: 261,
|
||||||
});
|
});
|
||||||
assert.equal(manifest.entries.length, 1433);
|
assert.equal(manifest.entries.length, 1815);
|
||||||
assert.doesNotMatch(serializeRuntimeAssetManifest(manifest), /[A-Za-z]:[\\/]/);
|
assert.doesNotMatch(serializeRuntimeAssetManifest(manifest), /[A-Za-z]:[\\/]/);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -42,7 +43,7 @@ test("runtime asset deployment creates verified hardlinks and a path-free manife
|
|||||||
sha256: createHash("sha256").update(bytes).digest("hex"),
|
sha256: createHash("sha256").update(bytes).digest("hex"),
|
||||||
};
|
};
|
||||||
const manifest = createRuntimeAssetManifest({
|
const manifest = createRuntimeAssetManifest({
|
||||||
counts: { dynamic_fonts: 0, dynamic_images: 0, font_panel_items: 0, static_stickers: 1 },
|
counts: { dynamic_fonts: 0, dynamic_images: 0, font_panel_items: 0, static_stickers: 1, text_previews: 0 },
|
||||||
entries: [entry],
|
entries: [entry],
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -75,7 +76,7 @@ test("runtime asset deployment refuses a mismatched existing target", async (t)
|
|||||||
sha256: createHash("sha256").update("expected").digest("hex"),
|
sha256: createHash("sha256").update("expected").digest("hex"),
|
||||||
};
|
};
|
||||||
const manifest = createRuntimeAssetManifest({
|
const manifest = createRuntimeAssetManifest({
|
||||||
counts: { dynamic_fonts: 0, dynamic_images: 0, font_panel_items: 0, static_stickers: 1 },
|
counts: { dynamic_fonts: 0, dynamic_images: 0, font_panel_items: 0, static_stickers: 1, text_previews: 0 },
|
||||||
entries: [entry],
|
entries: [entry],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -114,12 +114,13 @@ test("portable package serves the product and keeps SQLite data across API resta
|
|||||||
assert.ok(existsSync(join(packageRoot, "web", "index.html")));
|
assert.ok(existsSync(join(packageRoot, "web", "index.html")));
|
||||||
const runtimeAssetManifest = JSON.parse(await readFile(join(packageRoot, "asset-metadata", "manifest.json"), "utf8"));
|
const runtimeAssetManifest = JSON.parse(await readFile(join(packageRoot, "asset-metadata", "manifest.json"), "utf8"));
|
||||||
assert.deepEqual(runtimeAssetManifest.counts, {
|
assert.deepEqual(runtimeAssetManifest.counts, {
|
||||||
dynamic_fonts: 7,
|
dynamic_fonts: 18,
|
||||||
dynamic_images: 8,
|
dynamic_images: 43,
|
||||||
font_panel_items: 11,
|
font_panel_items: 86,
|
||||||
static_stickers: 1407,
|
static_stickers: 1407,
|
||||||
|
text_previews: 261,
|
||||||
});
|
});
|
||||||
assert.equal(runtimeAssetManifest.entries.length, 1433);
|
assert.equal(runtimeAssetManifest.entries.length, 1815);
|
||||||
const packagedWorker = await readFile(join(packageRoot, "server", "worker", "dist", "worker.js"), "utf8");
|
const packagedWorker = await readFile(join(packageRoot, "server", "worker", "dist", "worker.js"), "utf8");
|
||||||
const packagedOneApiAdapter = await readFile(join(packageRoot, "server", "worker", "dist", "oneapi-generation-adapter.js"), "utf8");
|
const packagedOneApiAdapter = await readFile(join(packageRoot, "server", "worker", "dist", "oneapi-generation-adapter.js"), "utf8");
|
||||||
assert.match(packagedWorker, /GenerationProcessor/);
|
assert.match(packagedWorker, /GenerationProcessor/);
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import complexAssetCatalog from "../../apps/web/src/generated/complex-assets.json";
|
||||||
|
import { P0A_DYNAMIC_STICKERS } from "../../apps/web/src/dynamic-provider.js";
|
||||||
|
import { DYNAMIC_RENDER_MODELS } from "../../apps/web/src/dynamic-render-models.js";
|
||||||
|
import { P0A_COLOR_CARDS } from "../../apps/web/src/palette-provider.js";
|
||||||
|
import { P0A_FONT_OPTIONS, P0A_TEXT_TEMPLATES } from "../../apps/web/src/text-assets.js";
|
||||||
|
import {
|
||||||
|
P0A_COLOR_CARD_IDS,
|
||||||
|
P0A_DYNAMIC_STICKER_IDS,
|
||||||
|
P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
|
P0A_TEXT_TEMPLATE_IDS,
|
||||||
|
} from "../../packages/template-registry/src/index.js";
|
||||||
|
|
||||||
|
describe("POSTV1-ASSET-ALL-16 complete asset catalog", () => {
|
||||||
|
it("publishes every normalized complex asset instead of the original alpha subset", () => {
|
||||||
|
expect(P0A_TEXT_TEMPLATE_IDS).toHaveLength(332);
|
||||||
|
expect(P0A_TEXT_TEMPLATE_IDS[0]).toBe("FLOWER001");
|
||||||
|
expect(P0A_TEXT_TEMPLATE_IDS.at(-1)).toBe("SIMPLE017");
|
||||||
|
|
||||||
|
expect(P0A_REQUIRED_FONT_PANEL_IDS).toHaveLength(86);
|
||||||
|
expect(P0A_REQUIRED_FONT_PANEL_IDS[0]).toBe("FONT001");
|
||||||
|
expect(P0A_REQUIRED_FONT_PANEL_IDS.at(-1)).toBe("FONT086");
|
||||||
|
|
||||||
|
expect(P0A_COLOR_CARD_IDS).toHaveLength(16);
|
||||||
|
expect(P0A_COLOR_CARD_IDS[0]).toBe("COLOR001");
|
||||||
|
expect(P0A_COLOR_CARD_IDS.at(-1)).toBe("COLOR016");
|
||||||
|
|
||||||
|
expect(P0A_DYNAMIC_STICKER_IDS).toHaveLength(35);
|
||||||
|
expect(P0A_DYNAMIC_STICKER_IDS[0]).toBe("DYN001");
|
||||||
|
expect(P0A_DYNAMIC_STICKER_IDS.at(-1)).toBe("DYN035");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("generates a sanitized browser catalog for every text, font, and dynamic definition", () => {
|
||||||
|
expect(complexAssetCatalog.schema_version).toBe("DadaComplexBrowserCatalog/v1");
|
||||||
|
expect(complexAssetCatalog.text_templates).toHaveLength(332);
|
||||||
|
expect(complexAssetCatalog.font_panel_items).toHaveLength(86);
|
||||||
|
expect(complexAssetCatalog.dynamic_stickers).toHaveLength(35);
|
||||||
|
expect(complexAssetCatalog.text_templates.filter((item) => item.preview_asset_id)).toHaveLength(261);
|
||||||
|
expect(complexAssetCatalog.text_templates.every((item) => item.available)).toBe(true);
|
||||||
|
expect(JSON.stringify(complexAssetCatalog)).not.toMatch(/[A-Z]:[\\/]/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("exposes every generated definition to the editor", () => {
|
||||||
|
expect(P0A_TEXT_TEMPLATES).toHaveLength(332);
|
||||||
|
expect(P0A_TEXT_TEMPLATES.every((item) => item.available && item.fontUrl)).toBe(true);
|
||||||
|
expect(P0A_FONT_OPTIONS).toHaveLength(86);
|
||||||
|
expect(P0A_COLOR_CARDS).toHaveLength(16);
|
||||||
|
expect(P0A_DYNAMIC_STICKERS).toHaveLength(35);
|
||||||
|
expect(Object.keys(DYNAMIC_RENDER_MODELS)).toHaveLength(35);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
adjustBackgroundPixels,
|
||||||
|
backgroundDrawPlan,
|
||||||
CanvasEditHistory,
|
CanvasEditHistory,
|
||||||
createEditorCanvasState,
|
createEditorCanvasState,
|
||||||
|
cssFilterForBackground,
|
||||||
defaultBackgroundAdjustments,
|
defaultBackgroundAdjustments,
|
||||||
deserializeFabricCanvas,
|
deserializeFabricCanvas,
|
||||||
switchBackground,
|
switchBackground,
|
||||||
@@ -24,6 +27,35 @@ const element = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
describe("TDD-WP4-BG-001/002 canvas boundary", () => {
|
describe("TDD-WP4-BG-001/002 canvas boundary", () => {
|
||||||
|
it("builds valid filters and distinct contain/crop draw plans", () => {
|
||||||
|
const adjustments = { ...defaultBackgroundAdjustments(), brightness: 25, contrast: 15, saturation: -20 };
|
||||||
|
expect(cssFilterForBackground(adjustments)).toBe("brightness(125%) contrast(115%) saturate(80%)");
|
||||||
|
expect(cssFilterForBackground(defaultBackgroundAdjustments())).toBe("none");
|
||||||
|
|
||||||
|
expect(backgroundDrawPlan({ height: 200, width: 400 }, { height: 100, width: 100 }, { ...adjustments, fit: "fit" })).toEqual({
|
||||||
|
destination: { height: 50, width: 100, x: 0, y: 25 },
|
||||||
|
source: { height: 200, width: 400, x: 0, y: 0 },
|
||||||
|
});
|
||||||
|
expect(backgroundDrawPlan({ height: 200, width: 400 }, { height: 100, width: 100 }, { ...adjustments, fit: "crop" })).toEqual({
|
||||||
|
destination: { height: 100, width: 100, x: 0, y: 0 },
|
||||||
|
source: { height: 200, width: 200, x: 100, y: 0 },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("changes pixels for temperature and sharpness without changing alpha", () => {
|
||||||
|
const flat = new Uint8ClampedArray([100, 100, 100, 255]);
|
||||||
|
expect([...adjustBackgroundPixels(flat, 1, 1, { sharpness: 0, temperature: 100 })]).toEqual([135, 108, 65, 255]);
|
||||||
|
|
||||||
|
const edged = new Uint8ClampedArray([
|
||||||
|
100, 100, 100, 255, 100, 100, 100, 255, 100, 100, 100, 255,
|
||||||
|
100, 100, 100, 255, 180, 180, 180, 255, 100, 100, 100, 255,
|
||||||
|
100, 100, 100, 255, 100, 100, 100, 255, 100, 100, 100, 255,
|
||||||
|
]);
|
||||||
|
const sharpened = adjustBackgroundPixels(edged, 3, 3, { sharpness: 100, temperature: 0 });
|
||||||
|
expect(sharpened[16]).toBe(255);
|
||||||
|
expect(sharpened[19]).toBe(255);
|
||||||
|
});
|
||||||
|
|
||||||
it("switches background without moving overlays, resets processing, and re-extracts palette", () => {
|
it("switches background without moving overlays, resets processing, and re-extracts palette", () => {
|
||||||
const initial = createEditorCanvasState({ assetId: "00000000-0000-4000-8000-000000000010", ratio: "3:4" });
|
const initial = createEditorCanvasState({ assetId: "00000000-0000-4000-8000-000000000010", ratio: "3:4" });
|
||||||
const withOverlay = { ...initial, background: { ...initial.background, adjustments: { ...initial.background.adjustments, brightness: 42, filter: "mono" } }, elements: [element] };
|
const withOverlay = { ...initial, background: { ...initial.background, adjustments: { ...initial.background.adjustments, brightness: 42, filter: "mono" } }, elements: [element] };
|
||||||
|
|||||||
@@ -73,6 +73,10 @@ describe("TDD-WP4-CAN-001 canvas selection and limit", () => {
|
|||||||
identity(1).elementId,
|
identity(1).elementId,
|
||||||
identity(2).elementId,
|
identity(2).elementId,
|
||||||
]);
|
]);
|
||||||
|
expect(controller.selectAt({ x: 0.2, y: 0.2 }, { append: true, preserveSelection: true })).toEqual([
|
||||||
|
identity(1).elementId,
|
||||||
|
identity(2).elementId,
|
||||||
|
]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -97,6 +101,19 @@ describe("TDD-WP4-STK-001 sticker transformations", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("uses one bounded delta for distant selected elements", () => {
|
||||||
|
const controller = new CanvasElementController(state([
|
||||||
|
sticker(1, { position: { x: 0.1, y: 0.2 } }),
|
||||||
|
sticker(2, { position: { x: 0.9, y: 0.8 } }),
|
||||||
|
]));
|
||||||
|
controller.selectIds([identity(1).elementId, identity(2).elementId]);
|
||||||
|
controller.moveSelected({ x: 0.2, y: 0.3 }, { snap: false });
|
||||||
|
expect(controller.value.elements.map(({ position }) => position)).toEqual([
|
||||||
|
{ x: 0.2, y: 0.4 },
|
||||||
|
{ x: 1, y: 1 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
it("duplicates, reorders and deletes selected stickers while preserving stable resource identity", () => {
|
it("duplicates, reorders and deletes selected stickers while preserving stable resource identity", () => {
|
||||||
const controller = new CanvasElementController(state([sticker(1), sticker(2, { position: { x: 0.7, y: 0.7 } })]));
|
const controller = new CanvasElementController(state([sticker(1), sticker(2, { position: { x: 0.7, y: 0.7 } })]));
|
||||||
controller.selectById(identity(1).elementId);
|
controller.selectById(identity(1).elementId);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import type { CanvasState } from "@dada/shared-contracts";
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
P0A_TEXT_TEMPLATES,
|
P0A_TEXT_TEMPLATES,
|
||||||
|
P0A_FONT_OPTIONS,
|
||||||
TextEditSession,
|
TextEditSession,
|
||||||
createTextTemplateElement,
|
createTextTemplateElement,
|
||||||
effectiveFontSize,
|
effectiveFontSize,
|
||||||
@@ -13,19 +14,15 @@ import { elementHalfExtents } from "../../apps/web/src/editor-elements.js";
|
|||||||
const identity = { createdAt: "2026-08-03T03:00:00.000Z", elementId: "00000000-0000-4000-8000-000000000701" };
|
const identity = { createdAt: "2026-08-03T03:00:00.000Z", elementId: "00000000-0000-4000-8000-000000000701" };
|
||||||
|
|
||||||
describe("TASK-WP4-03 text templates and properties", () => {
|
describe("TASK-WP4-03 text templates and properties", () => {
|
||||||
it("keeps the frozen 32-template allowlist in catalog order and searches display names only", () => {
|
it("keeps the complete 332-template catalog order and searches display names only", () => {
|
||||||
expect(P0A_TEXT_TEMPLATES).toHaveLength(32);
|
expect(P0A_TEXT_TEMPLATES).toHaveLength(332);
|
||||||
expect(P0A_TEXT_TEMPLATES.map((template) => template.templateId)).toEqual([
|
expect(P0A_TEXT_TEMPLATES[0]?.templateId).toBe("FLOWER001");
|
||||||
"FLOWER001", "FLOWER002", "FLOWER003", "FLOWER004", "FLOWER005", "FLOWER006", "FLOWER007", "FLOWER008",
|
expect(P0A_TEXT_TEMPLATES.at(-1)?.templateId).toBe("SIMPLE017");
|
||||||
"H001", "H002", "H003", "H004", "H005", "H006", "H007", "H008",
|
|
||||||
"TAG001", "TAG002", "TAG003", "TAG004", "TAG005", "TAG006", "TAG007", "TAG051",
|
|
||||||
"SIMPLE001", "SIMPLE002", "SIMPLE003", "SIMPLE004", "SIMPLE005", "SIMPLE006", "SIMPLE007", "SIMPLE008",
|
|
||||||
]);
|
|
||||||
expect(P0A_TEXT_TEMPLATES.reduce<Record<string, number>>((counts, template) => {
|
expect(P0A_TEXT_TEMPLATES.reduce<Record<string, number>>((counts, template) => {
|
||||||
counts[template.category] = (counts[template.category] ?? 0) + 1;
|
counts[template.category] = (counts[template.category] ?? 0) + 1;
|
||||||
return counts;
|
return counts;
|
||||||
}, {})).toEqual({ flower: 8, simple: 8, tag: 8, title: 8 });
|
}, {})).toEqual({ flower: 145, simple: 17, tag: 51, title: 119 });
|
||||||
expect(searchTextTemplates(P0A_TEXT_TEMPLATES, { query: "生活" }).map((item) => item.templateId)).toEqual(["FLOWER004", "FLOWER005", "H001", "H003", "H006"]);
|
expect(searchTextTemplates(P0A_TEXT_TEMPLATES, { query: "生活" }).map((item) => item.templateId)).toEqual(expect.arrayContaining(["FLOWER004", "FLOWER005", "H001", "H003", "H006"]));
|
||||||
expect(searchTextTemplates(P0A_TEXT_TEMPLATES, { category: "tag", query: "TAG006" })).toEqual([]);
|
expect(searchTextTemplates(P0A_TEXT_TEMPLATES, { category: "tag", query: "TAG006" })).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -100,11 +97,11 @@ describe("TASK-WP4-03 text templates and properties", () => {
|
|||||||
expect(bounds.y).toBeGreaterThan(0.16);
|
expect(bounds.y).toBeGreaterThan(0.16);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("does not add unavailable templates or silently replace their archived font", () => {
|
it("adds every template with a registered catalog font", () => {
|
||||||
const unavailable = P0A_TEXT_TEMPLATES.find((template) => !template.available)!;
|
expect(P0A_TEXT_TEMPLATES.every((template) => template.available && template.fontUrl)).toBe(true);
|
||||||
expect(unavailable).toBeDefined();
|
const registeredFonts = new Set(P0A_FONT_OPTIONS.map((font) => font.fontId));
|
||||||
expect(() => createTextTemplateElement(unavailable, identity, 0)).toThrowError("text_template_unavailable");
|
expect(P0A_TEXT_TEMPLATES.every((template) => registeredFonts.has(template.defaultFontId))).toBe(true);
|
||||||
const available = P0A_TEXT_TEMPLATES.find((template) => template.available)!;
|
const available = P0A_TEXT_TEMPLATES[0]!;
|
||||||
const element = createTextTemplateElement(available, identity, 0);
|
const element = createTextTemplateElement(available, identity, 0);
|
||||||
expect(element.font_override).toBeUndefined();
|
expect(element.font_override).toBeUndefined();
|
||||||
expect((element.style_parameters as Record<string, unknown>).default_font_id).toBe(available.defaultFontId);
|
expect((element.style_parameters as Record<string, unknown>).default_font_id).toBe(available.defaultFontId);
|
||||||
|
|||||||
@@ -45,8 +45,10 @@ describe("TASK-WP4-04 deterministic color cards", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("uses the four-item P0-A allowlist and produces a stable five-color MMCQ palette", () => {
|
it("uses all sixteen color-card layouts and produces a stable five-color MMCQ palette", () => {
|
||||||
expect(P0A_COLOR_CARDS.map((item) => item.cardId)).toEqual(["COLOR001", "COLOR002", "COLOR008", "COLOR016"]);
|
expect(P0A_COLOR_CARDS).toHaveLength(16);
|
||||||
|
expect(P0A_COLOR_CARDS[0]?.cardId).toBe("COLOR001");
|
||||||
|
expect(P0A_COLOR_CARDS.at(-1)?.cardId).toBe("COLOR016");
|
||||||
const pixels = colorPixels([
|
const pixels = colorPixels([
|
||||||
{ count: 50, rgb: [244, 32, 32] }, { count: 40, rgb: [32, 210, 96] }, { count: 30, rgb: [24, 96, 220] },
|
{ count: 50, rgb: [244, 32, 32] }, { count: 40, rgb: [32, 210, 96] }, { count: 30, rgb: [24, 96, 220] },
|
||||||
{ count: 20, rgb: [248, 210, 48] }, { count: 10, rgb: [120, 64, 180] },
|
{ count: 20, rgb: [248, 210, 48] }, { count: 10, rgb: [120, 64, 180] },
|
||||||
@@ -78,10 +80,10 @@ describe("TASK-WP4-04 dynamic providers", () => {
|
|||||||
profile: { creatorName: "Dada Creator", socialId: "@@dada" },
|
profile: { creatorName: "Dada Creator", socialId: "@@dada" },
|
||||||
};
|
};
|
||||||
|
|
||||||
it("exposes exactly ten P0-A providers and snapshots time and identity", () => {
|
it("exposes all thirty-five providers and snapshots time and identity", () => {
|
||||||
expect(P0A_DYNAMIC_STICKERS.map((item) => item.templateId)).toEqual([
|
expect(P0A_DYNAMIC_STICKERS).toHaveLength(35);
|
||||||
"DYN001", "DYN002", "DYN003", "DYN004", "DYN007", "DYN008", "DYN011", "DYN012", "DYN015", "DYN016",
|
expect(P0A_DYNAMIC_STICKERS[0]?.templateId).toBe("DYN001");
|
||||||
]);
|
expect(P0A_DYNAMIC_STICKERS.at(-1)?.templateId).toBe("DYN035");
|
||||||
const time = createDynamicStickerElement("DYN012", context, identity, 0);
|
const time = createDynamicStickerElement("DYN012", context, identity, 0);
|
||||||
expect(time.formatted_value).toBe("09:07");
|
expect(time.formatted_value).toBe("09:07");
|
||||||
expect(time.dynamic_fields).toMatchObject({ font_substitution: "FONT081", hour: "09", minute: "07" });
|
expect(time.dynamic_fields).toMatchObject({ font_substitution: "FONT081", hour: "09", minute: "07" });
|
||||||
@@ -92,11 +94,10 @@ describe("TASK-WP4-04 dynamic providers", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("uses the archived template categories and only the fields visibly consumed by each source", () => {
|
it("uses the archived template categories and only the fields visibly consumed by each source", () => {
|
||||||
expect(P0A_DYNAMIC_STICKERS.map(({ category, templateId }) => [templateId, category])).toEqual([
|
expect(P0A_DYNAMIC_STICKERS.reduce<Record<string, number>>((counts, item) => {
|
||||||
["DYN001", "location"], ["DYN002", "location"], ["DYN003", "location"], ["DYN004", "location"],
|
counts[item.category] = (counts[item.category] ?? 0) + 1;
|
||||||
["DYN007", "other"], ["DYN008", "time"], ["DYN011", "time"], ["DYN012", "time"],
|
return counts;
|
||||||
["DYN015", "identity"], ["DYN016", "identity"],
|
}, {})).toEqual({ identity: 21, location: 6, other: 1, time: 7 });
|
||||||
]);
|
|
||||||
const other = createDynamicStickerElement("DYN007", context, identity, 0);
|
const other = createDynamicStickerElement("DYN007", context, identity, 0);
|
||||||
expect(other.dynamic_fields).toEqual({ nickname: "@dada" });
|
expect(other.dynamic_fields).toEqual({ nickname: "@dada" });
|
||||||
expect(other.formatted_value).toBe("@dada");
|
expect(other.formatted_value).toBe("@dada");
|
||||||
@@ -105,11 +106,10 @@ describe("TASK-WP4-04 dynamic providers", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("maps every enabled dynamic sticker to its archived source candidate and original resource version", () => {
|
it("maps every enabled dynamic sticker to its archived source candidate and original resource version", () => {
|
||||||
expect(Object.entries(DYNAMIC_RENDER_MODELS).map(([id, model]) => [id, model.sourceCandidateId])).toEqual([
|
expect(Object.keys(DYNAMIC_RENDER_MODELS)).toHaveLength(35);
|
||||||
["DYN001", "l_POI01"], ["DYN002", "l_POI02"], ["DYN003", "l_POI03"], ["DYN004", "l_POI04"],
|
expect(DYNAMIC_RENDER_MODELS.DYN001?.sourceCandidateId).toBe("l_POI01");
|
||||||
["DYN007", "diaoyu"], ["DYN008", "l_shijian2"], ["DYN011", "l_shijian6"], ["DYN012", "l_shijian7"],
|
expect(DYNAMIC_RENDER_MODELS.DYN012?.sourceCandidateId).toBe("l_shijian7");
|
||||||
["DYN015", "0721userna"], ["DYN016", "l_username00"],
|
expect(DYNAMIC_RENDER_MODELS.DYN035?.sourceCandidateId).toBe("l_username23");
|
||||||
]);
|
|
||||||
const element = createDynamicStickerElement("DYN001", { ...context, location: { formattedValue: "温州" } }, identity, 0);
|
const element = createDynamicStickerElement("DYN001", { ...context, location: { formattedValue: "温州" } }, identity, 0);
|
||||||
expect(element.resource_version).toBe(DYNAMIC_RESOURCE_VERSION);
|
expect(element.resource_version).toBe(DYNAMIC_RESOURCE_VERSION);
|
||||||
expect(DYNAMIC_RENDER_MODELS.DYN001.imageLayers).toEqual([
|
expect(DYNAMIC_RENDER_MODELS.DYN001.imageLayers).toEqual([
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import type { StaticStickerCatalog } from "../../packages/static-sticker-catalog
|
|||||||
import {
|
import {
|
||||||
P0A_COLOR_CARD_IDS,
|
P0A_COLOR_CARD_IDS,
|
||||||
P0A_DYNAMIC_STICKER_IDS,
|
P0A_DYNAMIC_STICKER_IDS,
|
||||||
|
P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
P0A_TEXT_TEMPLATE_IDS,
|
P0A_TEXT_TEMPLATE_IDS,
|
||||||
createP0aPublicManifest,
|
createP0aPublicManifest,
|
||||||
} from "../../packages/template-registry/src/index.js";
|
} from "../../packages/template-registry/src/index.js";
|
||||||
@@ -116,29 +117,27 @@ function evidence(name: string, value: unknown) {
|
|||||||
writeFileSync(resolve(root, name), `${JSON.stringify(value, null, 2)}\n`);
|
writeFileSync(resolve(root, name), `${JSON.stringify(value, null, 2)}\n`);
|
||||||
}
|
}
|
||||||
|
|
||||||
describe("TDD-WP5-WHITE-001 P0-A public allowlist", () => {
|
describe("TDD-WP5-WHITE-001 complete public catalog", () => {
|
||||||
it("registers the complete archive while publishing only the exact P0-A allowlist", () => {
|
it("registers and publishes the complete normalized archive", () => {
|
||||||
const source = fullComplexManifest();
|
const source = fullComplexManifest();
|
||||||
const before = structuredClone(source);
|
const before = structuredClone(source);
|
||||||
const manifest = createP0aPublicManifest({ complexManifest: source, staticCatalog: staticCatalog() });
|
const manifest = createP0aPublicManifest({ complexManifest: source, staticCatalog: staticCatalog() });
|
||||||
|
|
||||||
expect(source).toEqual(before);
|
expect(source).toEqual(before);
|
||||||
expect(P0A_TEXT_TEMPLATE_IDS).toHaveLength(32);
|
expect(P0A_TEXT_TEMPLATE_IDS).toHaveLength(332);
|
||||||
expect(P0A_COLOR_CARD_IDS).toEqual(["COLOR001", "COLOR002", "COLOR008", "COLOR016"]);
|
expect(P0A_REQUIRED_FONT_PANEL_IDS).toHaveLength(86);
|
||||||
expect(P0A_DYNAMIC_STICKER_IDS).toEqual([
|
expect(P0A_COLOR_CARD_IDS).toHaveLength(16);
|
||||||
"DYN001", "DYN002", "DYN003", "DYN004", "DYN007",
|
expect(P0A_DYNAMIC_STICKER_IDS).toHaveLength(35);
|
||||||
"DYN008", "DYN011", "DYN012", "DYN015", "DYN016",
|
|
||||||
]);
|
|
||||||
expect(manifest.counts).toEqual({
|
expect(manifest.counts).toEqual({
|
||||||
color_cards: 4,
|
color_cards: 16,
|
||||||
dynamic_stickers: 10,
|
dynamic_stickers: 35,
|
||||||
font_panel_items: 11,
|
font_panel_items: 86,
|
||||||
static_parts: 25,
|
static_parts: 25,
|
||||||
static_stickers: 1_407,
|
static_stickers: 1_407,
|
||||||
text_templates: 32,
|
text_templates: 332,
|
||||||
});
|
});
|
||||||
expect(manifest.assets.text_templates.map((item) => item.canonical_id)).toEqual(P0A_TEXT_TEMPLATE_IDS);
|
expect(manifest.assets.text_templates.map((item) => item.canonical_id)).toEqual(P0A_TEXT_TEMPLATE_IDS);
|
||||||
expect(manifest.assets.font_panel_items.map((item) => item.canonical_id)).toEqual([...referencedFontIds, "FONT081"]);
|
expect(manifest.assets.font_panel_items.map((item) => item.canonical_id)).toEqual(P0A_REQUIRED_FONT_PANEL_IDS);
|
||||||
expect(manifest.assets.color_cards.map((item) => item.canonical_id)).toEqual(P0A_COLOR_CARD_IDS);
|
expect(manifest.assets.color_cards.map((item) => item.canonical_id)).toEqual(P0A_COLOR_CARD_IDS);
|
||||||
expect(manifest.assets.dynamic_stickers.map((item) => item.canonical_id)).toEqual(P0A_DYNAMIC_STICKER_IDS);
|
expect(manifest.assets.dynamic_stickers.map((item) => item.canonical_id)).toEqual(P0A_DYNAMIC_STICKER_IDS);
|
||||||
expect(manifest.assets.static_stickers).toHaveLength(1_407);
|
expect(manifest.assets.static_stickers).toHaveLength(1_407);
|
||||||
@@ -154,10 +153,10 @@ describe("TDD-WP5-WHITE-001 P0-A public allowlist", () => {
|
|||||||
&& item.release_tier === "alpha_whitelist"
|
&& item.release_tier === "alpha_whitelist"
|
||||||
&& item.validation_status === "passed")).toBe(true);
|
&& item.validation_status === "passed")).toBe(true);
|
||||||
const serialized = JSON.stringify(manifest);
|
const serialized = JSON.stringify(manifest);
|
||||||
expect(serialized).not.toContain("FLOWER009");
|
expect(serialized).toContain("FLOWER145");
|
||||||
expect(serialized).not.toContain("COLOR003");
|
expect(serialized).toContain("COLOR016");
|
||||||
expect(serialized).not.toContain("DYN005");
|
expect(serialized).toContain("DYN035");
|
||||||
evidence("unit-allowlist.json", { counts: manifest.counts, hidden: ["FLOWER009", "COLOR003", "DYN005"], status: "passed" });
|
evidence("unit-full-catalog.json", { counts: manifest.counts, status: "passed" });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("rejects incomplete registration and any early full_p0 enablement", () => {
|
it("rejects incomplete registration and any early full_p0 enablement", () => {
|
||||||
@@ -172,12 +171,12 @@ describe("TDD-WP5-WHITE-001 P0-A public allowlist", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("TDD-WP5-COL-001 shared five-color renderer input", () => {
|
describe("TDD-WP5-COL-001 shared five-color renderer input", () => {
|
||||||
it("binds the four enabled layouts to one immutable palette snapshot", () => {
|
it("binds all sixteen layouts to one immutable palette snapshot", () => {
|
||||||
const palette = ["#102030", "#405060", "#708090", "#A0B0C0", "#D0E0F0"] as const;
|
const palette = ["#102030", "#405060", "#708090", "#A0B0C0", "#D0E0F0"] as const;
|
||||||
const plans = createP0aColorCardRenderPlans(palette);
|
const plans = createP0aColorCardRenderPlans(palette);
|
||||||
expect(P0A_COLOR_CARD_DEFINITIONS.map((item) => [item.cardId, item.styleId])).toEqual([
|
expect(P0A_COLOR_CARD_DEFINITIONS.map((item) => [item.cardId, item.styleId])).toEqual(
|
||||||
["COLOR001", "style_01"], ["COLOR002", "style_02"], ["COLOR008", "style_08"], ["COLOR016", "style_16"],
|
P0A_COLOR_CARD_IDS.map((cardId, index) => [cardId, `style_${String(index + 1).padStart(2, "0")}`]),
|
||||||
]);
|
);
|
||||||
expect(plans.map((plan) => plan.cardId)).toEqual(P0A_COLOR_CARD_IDS);
|
expect(plans.map((plan) => plan.cardId)).toEqual(P0A_COLOR_CARD_IDS);
|
||||||
expect(plans.every((plan) => plan.palette === plans[0]!.palette)).toBe(true);
|
expect(plans.every((plan) => plan.palette === plans[0]!.palette)).toBe(true);
|
||||||
expect(Object.isFrozen(plans[0]!.palette)).toBe(true);
|
expect(Object.isFrozen(plans[0]!.palette)).toBe(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user