fix(site-builder): entrance-animation reveal script survives Preview + well-formed void-tag attrs + no-JS fallback
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
4e0fc78a30
commit
2dcc2b4d21
3 files changed
+195
-7
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { describe, test, expect } from 'vitest';
|
||||
import { exportBodyHtml, exportToHtml, ExportOptions } from './html-export';
|
||||
import { exportBodyHtml, exportToHtml, buildAnimationScript, ExportOptions } from './html-export';
|
||||
import { DEFAULT_SITE_DESIGN, SiteDesign } from '../state/SiteDesignContext';
|
||||
|
||||
/**
|
||||
@@ -335,3 +335,143 @@ describe('PKG-H: SEO/meta + favicon + design-token <head> emission', () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* FIX: entrance-animation broken in Preview. Root causes (see
|
||||
* .superpowers/sdd/fix-animation-contract.md):
|
||||
* 1. injectAttrs inserted data-attrs before the tag's first `>`, so a void
|
||||
* tag (`<img ... />`) became malformed (`<img ... / data-animation="...">`,
|
||||
* attrs landing AFTER the self-close slash, outside the tag).
|
||||
* 2. wrapInDocument's in-body reveal <script> was destroyed by TopBar's
|
||||
* handlePreview, which replaces the whole <body> inner with a
|
||||
* recomposed header+body+footer string that never carried the script.
|
||||
*/
|
||||
describe('injectAttrs well-formed void-tag attrs (animation fix)', () => {
|
||||
// ImageBlock.toHtml renders `<img src="..." ... />` -- a real void-tag
|
||||
// producer that goes through injectAttrs via renderNode.
|
||||
const imageState = (props: Record<string, unknown>) =>
|
||||
JSON.stringify({
|
||||
ROOT: {
|
||||
type: { resolvedName: 'ImageBlock' },
|
||||
isCanvas: false,
|
||||
props: { src: '/uploads/photo.jpg', style: {}, ...props },
|
||||
displayName: 'ImageBlock',
|
||||
custom: {},
|
||||
hidden: false,
|
||||
nodes: [],
|
||||
linkedNodes: {},
|
||||
},
|
||||
});
|
||||
|
||||
test('void <img/> gets attrs INSIDE the tag, no " / " sequence before the final >', () => {
|
||||
const { html } = exportBodyHtml(imageState({ animation: 'bounce' }));
|
||||
expect(html).toContain('data-animation="bounce"');
|
||||
// Well-formed: the attribute sits before the self-close slash.
|
||||
expect(html).toMatch(/data-animation="bounce"\s*\/>/);
|
||||
// Malformed shape from the bug: attrs landing after the slash.
|
||||
expect(html).not.toMatch(/\/\s*data-animation="bounce"/);
|
||||
expect(html).not.toContain('/ data-animation');
|
||||
});
|
||||
|
||||
test('non-void tag (Container div) is unaffected -- attrs still inserted before its only >', () => {
|
||||
const state = JSON.stringify({
|
||||
ROOT: {
|
||||
type: { resolvedName: 'Container' },
|
||||
isCanvas: true,
|
||||
props: { tag: 'div', style: {}, animation: 'fade-in' },
|
||||
displayName: 'Container',
|
||||
custom: {},
|
||||
hidden: false,
|
||||
nodes: [],
|
||||
linkedNodes: {},
|
||||
},
|
||||
});
|
||||
const { html } = exportBodyHtml(state);
|
||||
expect(html).toMatch(/^<div[^>]*data-animation="fade-in"[^>]*>/);
|
||||
expect(html).not.toContain('/>');
|
||||
});
|
||||
});
|
||||
|
||||
describe('buildAnimationScript (animation fix)', () => {
|
||||
test('returns the IntersectionObserver reveal script when body contains data-animation', () => {
|
||||
const body = '<div data-animation="fade-in">Hi</div>';
|
||||
const script = buildAnimationScript(body);
|
||||
expect(script).toContain('<script>');
|
||||
expect(script).toContain('IntersectionObserver');
|
||||
expect(script).toContain("querySelectorAll('[data-animation]')");
|
||||
});
|
||||
|
||||
test('returns empty string when body has no data-animation', () => {
|
||||
expect(buildAnimationScript('<div>Hi</div>')).toBe('');
|
||||
});
|
||||
});
|
||||
|
||||
describe('Preview body-replacement keeps exactly one reveal script (animation fix)', () => {
|
||||
const animatedState = JSON.stringify({
|
||||
ROOT: {
|
||||
type: { resolvedName: 'Container' },
|
||||
isCanvas: true,
|
||||
props: { tag: 'div', style: {}, animation: 'fade-in' },
|
||||
displayName: 'Container',
|
||||
custom: {},
|
||||
hidden: false,
|
||||
nodes: [],
|
||||
linkedNodes: {},
|
||||
},
|
||||
});
|
||||
|
||||
test('wrapped doc alone already contains exactly one script + the CSS + the noscript fallback', () => {
|
||||
const { html } = exportToHtml(animatedState, { title: 'Page' });
|
||||
const scriptCount = (html.match(/IntersectionObserver/g) || []).length;
|
||||
expect(scriptCount).toBe(1);
|
||||
expect(html).toContain('[data-animation]{opacity:0}');
|
||||
expect(html).toContain('<noscript><style>[data-animation]{opacity:1}</style></noscript>');
|
||||
});
|
||||
|
||||
test('simulated handlePreview body-replacement: composed body built WITH buildAnimationScript still yields exactly one reveal script and the head CSS survives', () => {
|
||||
// Mirror TopBar.tsx handlePreview: exportToHtml gives the wrapped doc
|
||||
// (head CSS/noscript + its own in-body script); a "composedBody" of
|
||||
// header+body+footer (no script of its own) is what actually replaces
|
||||
// the <body> inner. Without appending buildAnimationScript to
|
||||
// composedBody, the wrapped doc's script would be clobbered and the
|
||||
// element would never reveal.
|
||||
const { html: wrapped } = exportToHtml(animatedState, { title: 'Page' });
|
||||
const headerHtml = '';
|
||||
const { html: bodyHtml } = exportBodyHtml(animatedState);
|
||||
const footerHtml = '';
|
||||
const composedBody =
|
||||
headerHtml + bodyHtml + footerHtml +
|
||||
buildAnimationScript(headerHtml + bodyHtml + footerHtml);
|
||||
|
||||
const bodyMatch = wrapped.match(/<body[^>]*>([\s\S]*)<\/body>/i);
|
||||
expect(bodyMatch).toBeTruthy();
|
||||
const finalHtml = wrapped.replace(bodyMatch![1], () => composedBody);
|
||||
|
||||
const scriptCount = (finalHtml.match(/IntersectionObserver/g) || []).length;
|
||||
expect(scriptCount).toBe(1);
|
||||
expect(finalHtml).toContain('[data-animation]{opacity:0}');
|
||||
expect(finalHtml).toContain('data-animation="fade-in"');
|
||||
// No malformed void-tag artifact should leak into the final assembly.
|
||||
expect(finalHtml).not.toContain('/ data-animation');
|
||||
});
|
||||
|
||||
test('non-animated body: no animation CSS, no noscript, no reveal script anywhere', () => {
|
||||
const plainState = JSON.stringify({
|
||||
ROOT: {
|
||||
type: { resolvedName: 'Container' },
|
||||
isCanvas: true,
|
||||
props: { tag: 'div', style: {} },
|
||||
displayName: 'Container',
|
||||
custom: {},
|
||||
hidden: false,
|
||||
nodes: [],
|
||||
linkedNodes: {},
|
||||
},
|
||||
});
|
||||
const { html } = exportToHtml(plainState, { title: 'Page' });
|
||||
expect(html).not.toContain('[data-animation]');
|
||||
expect(html).not.toContain('<noscript>');
|
||||
expect(html).not.toContain('IntersectionObserver');
|
||||
expect(buildAnimationScript(exportBodyHtml(plainState).html)).toBe('');
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user