Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8bf525c600 |
@@ -20,14 +20,3 @@ describe('Footer.toHtml text escaping (attacker-controlled `text` prop)', () =>
|
|||||||
expect(html).toContain('© 2026 MySite. All rights reserved.');
|
expect(html).toContain('© 2026 MySite. All rights reserved.');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Footer (F4: box-model + animation + visibility props on craft.props)', () => {
|
|
||||||
test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
|
|
||||||
const craftProps = (Footer as any).craft.props;
|
|
||||||
expect(craftProps).toHaveProperty('animation', 'none');
|
|
||||||
expect(craftProps).toHaveProperty('animationDelay', '0');
|
|
||||||
expect(craftProps).toHaveProperty('hideOnDesktop', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnTablet', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnMobile', false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -6,11 +6,6 @@ import { escapeHtml } from '../../utils/escape';
|
|||||||
interface FooterProps {
|
interface FooterProps {
|
||||||
text?: string;
|
text?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
hideOnDesktop?: boolean;
|
|
||||||
hideOnTablet?: boolean;
|
|
||||||
hideOnMobile?: boolean;
|
|
||||||
animation?: string;
|
|
||||||
animationDelay?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Footer: UserComponent<FooterProps> = ({
|
export const Footer: UserComponent<FooterProps> = ({
|
||||||
@@ -97,11 +92,6 @@ Footer.craft = {
|
|||||||
fontSize: '14px',
|
fontSize: '14px',
|
||||||
padding: '24px 20px',
|
padding: '24px 20px',
|
||||||
},
|
},
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
animation: 'none',
|
|
||||||
animationDelay: '0',
|
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -44,3 +44,29 @@ describe('Icon.toHtml XSS hardening', () => {
|
|||||||
expect(html).not.toMatch(/"\s+onclick="/);
|
expect(html).not.toMatch(/"\s+onclick="/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Icon.toHtml bgShape/bgColor/bgSize rendering (built but, until this panel update, unexposed)', () => {
|
||||||
|
test('bgShape="circle" + bgColor render a colored 50%-radius background box', () => {
|
||||||
|
const { html } = toHtml({ icon: 'fa-star', bgShape: 'circle', bgColor: '#3b82f6', bgSize: '64px' }, '');
|
||||||
|
expect(html).toContain('background-color:#3b82f6');
|
||||||
|
expect(html).toContain('border-radius:50%');
|
||||||
|
expect(html).toContain('width:64px');
|
||||||
|
expect(html).toContain('height:64px');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('bgShape="none" (default) renders the bare icon with no background wrapper', () => {
|
||||||
|
const { html } = toHtml({ icon: 'fa-star' }, '');
|
||||||
|
expect(html).not.toContain('background-color');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Icon.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (Icon as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ interface IconProps {
|
|||||||
bgSize?: string;
|
bgSize?: string;
|
||||||
link?: string;
|
link?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getBgBorderRadius(shape: string): string {
|
function getBgBorderRadius(shape: string): string {
|
||||||
@@ -96,6 +101,11 @@ Icon.craft = {
|
|||||||
bgSize: '56px',
|
bgSize: '56px',
|
||||||
link: '',
|
link: '',
|
||||||
style: {},
|
style: {},
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -43,29 +43,6 @@ describe('Logo.toHtml image src/alt sanitization (type="image")', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Logo.toHtml download attribute (F3: link-to-file toggle)', () => {
|
|
||||||
test('download:true emits the download attribute', () => {
|
|
||||||
const { html } = toHtml({ href: '/resume.pdf', download: true, text: 'Resume' }, '');
|
|
||||||
expect(html).toMatch(/<a href="\/resume\.pdf" download/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('no download prop -> no download attribute emitted', () => {
|
|
||||||
const { html } = toHtml({ href: '/', text: 'MySite' }, '');
|
|
||||||
expect(html).not.toContain('download');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Logo (F4: box-model + animation + visibility props on craft.props)', () => {
|
|
||||||
test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
|
|
||||||
const craftProps = (Logo as any).craft.props;
|
|
||||||
expect(craftProps).toHaveProperty('animation', 'none');
|
|
||||||
expect(craftProps).toHaveProperty('animationDelay', '0');
|
|
||||||
expect(craftProps).toHaveProperty('hideOnDesktop', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnTablet', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnMobile', false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Logo.toHtml text-logo styling sanitization', () => {
|
describe('Logo.toHtml text-logo styling sanitization', () => {
|
||||||
test('a quote-breakout color does not escape the span style attribute', () => {
|
test('a quote-breakout color does not escape the span style attribute', () => {
|
||||||
const malicious = 'red" onmouseover="alert(1)';
|
const malicious = 'red" onmouseover="alert(1)';
|
||||||
|
|||||||
@@ -12,18 +12,11 @@ interface LogoProps {
|
|||||||
imageSrc?: string;
|
imageSrc?: string;
|
||||||
imageWidth?: string;
|
imageWidth?: string;
|
||||||
href?: string;
|
href?: string;
|
||||||
/** Adds the `download` attribute to the exported anchor (F3: link to a file). */
|
|
||||||
download?: boolean;
|
|
||||||
fontFamily?: string;
|
fontFamily?: string;
|
||||||
fontSize?: string;
|
fontSize?: string;
|
||||||
fontWeight?: string;
|
fontWeight?: string;
|
||||||
color?: string;
|
color?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
hideOnDesktop?: boolean;
|
|
||||||
hideOnTablet?: boolean;
|
|
||||||
hideOnMobile?: boolean;
|
|
||||||
animation?: string;
|
|
||||||
animationDelay?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Component ---------- */
|
/* ---------- Component ---------- */
|
||||||
@@ -34,7 +27,6 @@ export const Logo: UserComponent<LogoProps> = ({
|
|||||||
imageSrc = '',
|
imageSrc = '',
|
||||||
imageWidth = '120px',
|
imageWidth = '120px',
|
||||||
href = '/',
|
href = '/',
|
||||||
download = false,
|
|
||||||
fontFamily = 'Inter, sans-serif',
|
fontFamily = 'Inter, sans-serif',
|
||||||
fontSize = '20px',
|
fontSize = '20px',
|
||||||
fontWeight = '700',
|
fontWeight = '700',
|
||||||
@@ -52,7 +44,6 @@ export const Logo: UserComponent<LogoProps> = ({
|
|||||||
<a
|
<a
|
||||||
ref={(ref: HTMLElement | null): void => { if (ref) connect(drag(ref)); }}
|
ref={(ref: HTMLElement | null): void => { if (ref) connect(drag(ref)); }}
|
||||||
href={href}
|
href={href}
|
||||||
download={download || undefined}
|
|
||||||
onClick={(e) => e.preventDefault()}
|
onClick={(e) => e.preventDefault()}
|
||||||
style={{
|
style={{
|
||||||
textDecoration: 'none',
|
textDecoration: 'none',
|
||||||
@@ -96,13 +87,7 @@ Logo.craft = {
|
|||||||
fontSize: '20px',
|
fontSize: '20px',
|
||||||
fontWeight: '700',
|
fontWeight: '700',
|
||||||
color: undefined,
|
color: undefined,
|
||||||
download: false,
|
|
||||||
style: {},
|
style: {},
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
animation: 'none',
|
|
||||||
animationDelay: '0',
|
|
||||||
} as LogoProps,
|
} as LogoProps,
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
@@ -137,9 +122,8 @@ Logo.craft = {
|
|||||||
flexShrink: '0',
|
flexShrink: '0',
|
||||||
...props.style,
|
...props.style,
|
||||||
});
|
});
|
||||||
const downloadAttr = props.download ? ' download' : '';
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
html: `<a href="${escapeAttr(safeUrl(href))}"${downloadAttr}${aStyle ? ` style="${aStyle}"` : ''}>${innerHtml}</a>`,
|
html: `<a href="${escapeAttr(safeUrl(href))}"${aStyle ? ` style="${aStyle}"` : ''}>${innerHtml}</a>`,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,29 +31,6 @@ describe('Menu.toHtml deterministic + unique scope ids (thread node id, no Math.
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Menu.toHtml download attribute (F3: link-to-file toggle)', () => {
|
|
||||||
test('a link with download:true emits the download attribute', () => {
|
|
||||||
const { html } = toHtml({ links: [{ text: 'Brochure', href: '/brochure.pdf', download: true }] }, '', 'node-dl1');
|
|
||||||
expect(html).toMatch(/<a href="\/brochure\.pdf"[^>]* download[^>]*>Brochure<\/a>/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('a link without download does not emit the attribute', () => {
|
|
||||||
const { html } = toHtml({ links: [{ text: 'Home', href: '/' }] }, '', 'node-dl2');
|
|
||||||
expect(html).not.toContain(' download');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Menu (F4: box-model + animation + visibility props on craft.props)', () => {
|
|
||||||
test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
|
|
||||||
const craftProps = (Menu as any).craft.props;
|
|
||||||
expect(craftProps).toHaveProperty('animation', 'none');
|
|
||||||
expect(craftProps).toHaveProperty('animationDelay', '0');
|
|
||||||
expect(craftProps).toHaveProperty('hideOnDesktop', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnTablet', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnMobile', false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Menu.toHtml XSS hardening (linkHoverColor into <style>)', () => {
|
describe('Menu.toHtml XSS hardening (linkHoverColor into <style>)', () => {
|
||||||
test('a linkHoverColor value containing </style><script> is neutralized', () => {
|
test('a linkHoverColor value containing </style><script> is neutralized', () => {
|
||||||
const malicious = '#fff}</style><script>alert(1)</script><style>{';
|
const malicious = '#fff}</style><script>alert(1)</script><style>{';
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ interface MenuLink {
|
|||||||
href: string;
|
href: string;
|
||||||
isExternal?: boolean;
|
isExternal?: boolean;
|
||||||
isCta?: boolean;
|
isCta?: boolean;
|
||||||
/** Adds the `download` attribute to the exported anchor (F3: links to files). */
|
|
||||||
download?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface MenuProps {
|
interface MenuProps {
|
||||||
@@ -25,11 +23,6 @@ interface MenuProps {
|
|||||||
orientation?: 'horizontal' | 'vertical';
|
orientation?: 'horizontal' | 'vertical';
|
||||||
fontSize?: string;
|
fontSize?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
hideOnDesktop?: boolean;
|
|
||||||
hideOnTablet?: boolean;
|
|
||||||
hideOnMobile?: boolean;
|
|
||||||
animation?: string;
|
|
||||||
animationDelay?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Defaults ---------- */
|
/* ---------- Defaults ---------- */
|
||||||
@@ -82,7 +75,6 @@ export const Menu: UserComponent<MenuProps> = ({
|
|||||||
href={link.href}
|
href={link.href}
|
||||||
target={link.isExternal ? '_blank' : undefined}
|
target={link.isExternal ? '_blank' : undefined}
|
||||||
rel={link.isExternal ? 'noopener noreferrer' : undefined}
|
rel={link.isExternal ? 'noopener noreferrer' : undefined}
|
||||||
download={link.download || undefined}
|
|
||||||
onClick={(e) => e.preventDefault()}
|
onClick={(e) => e.preventDefault()}
|
||||||
onMouseEnter={() => setHoveredLink(i)}
|
onMouseEnter={() => setHoveredLink(i)}
|
||||||
onMouseLeave={() => setHoveredLink(null)}
|
onMouseLeave={() => setHoveredLink(null)}
|
||||||
@@ -122,11 +114,6 @@ Menu.craft = {
|
|||||||
orientation: 'horizontal',
|
orientation: 'horizontal',
|
||||||
fontSize: '14px',
|
fontSize: '14px',
|
||||||
style: {},
|
style: {},
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
animation: 'none',
|
|
||||||
animationDelay: '0',
|
|
||||||
} as MenuProps,
|
} as MenuProps,
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
@@ -175,7 +162,6 @@ Menu.craft = {
|
|||||||
|
|
||||||
const linksHtml = links.map((link) => {
|
const linksHtml = links.map((link) => {
|
||||||
const target = link.isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
|
const target = link.isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
|
||||||
const downloadAttr = link.download ? ' download' : '';
|
|
||||||
const cls = link.isCta ? `${scope}-cta` : `${scope}-link`;
|
const cls = link.isCta ? `${scope}-cta` : `${scope}-link`;
|
||||||
const linkStyle = cssPropsToString({
|
const linkStyle = cssPropsToString({
|
||||||
textDecoration: 'none',
|
textDecoration: 'none',
|
||||||
@@ -187,7 +173,7 @@ Menu.craft = {
|
|||||||
borderRadius: link.isCta ? '6px' : '0',
|
borderRadius: link.isCta ? '6px' : '0',
|
||||||
transition: 'color 0.15s, background-color 0.15s',
|
transition: 'color 0.15s, background-color 0.15s',
|
||||||
});
|
});
|
||||||
return `<a href="${escapeAttr(safeUrl(link.href || '#'))}" class="${cls}"${target}${downloadAttr}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
|
return `<a href="${escapeAttr(safeUrl(link.href || '#'))}" class="${cls}"${target}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
|
||||||
}).join('\n ');
|
}).join('\n ');
|
||||||
|
|
||||||
const hoverCss = `<style>
|
const hoverCss = `<style>
|
||||||
|
|||||||
@@ -83,29 +83,6 @@ describe('Navbar.toHtml node-scoped ids/hover styles (M-1: two navbars must not
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Navbar.toHtml download attribute (F3: link-to-file toggle)', () => {
|
|
||||||
test('a link with download:true emits the download attribute', () => {
|
|
||||||
const { html } = toHtml({ links: [{ text: 'Brochure', href: '/brochure.pdf', download: true }] }, '', 'node-dl1');
|
|
||||||
expect(html).toMatch(/<a href="\/brochure\.pdf"[^>]* download[^>]*>Brochure<\/a>/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('a link without download does not emit the attribute', () => {
|
|
||||||
const { html } = toHtml({ links: [{ text: 'Home', href: '/' }] }, '', 'node-dl2');
|
|
||||||
expect(html).not.toContain(' download');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Navbar (F4: box-model + animation + visibility props on craft.props)', () => {
|
|
||||||
test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
|
|
||||||
const craftProps = (Navbar as any).craft.props;
|
|
||||||
expect(craftProps).toHaveProperty('animation', 'none');
|
|
||||||
expect(craftProps).toHaveProperty('animationDelay', '0');
|
|
||||||
expect(craftProps).toHaveProperty('hideOnDesktop', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnTablet', false);
|
|
||||||
expect(craftProps).toHaveProperty('hideOnMobile', false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Navbar.toHtml XSS hardening (hoverColor/backgroundColor/ctaColor into <style>)', () => {
|
describe('Navbar.toHtml XSS hardening (hoverColor/backgroundColor/ctaColor into <style>)', () => {
|
||||||
test('a hoverColor value containing </style><script> is neutralized in the hover <style> block', () => {
|
test('a hoverColor value containing </style><script> is neutralized in the hover <style> block', () => {
|
||||||
const malicious = '#fff}</style><script>alert(1)</script><style>{';
|
const malicious = '#fff}</style><script>alert(1)</script><style>{';
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ interface NavLink {
|
|||||||
href: string;
|
href: string;
|
||||||
isExternal?: boolean;
|
isExternal?: boolean;
|
||||||
isCta?: boolean;
|
isCta?: boolean;
|
||||||
/** Adds the `download` attribute to the exported anchor (F3: links to files). */
|
|
||||||
download?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface NavbarProps {
|
interface NavbarProps {
|
||||||
@@ -35,11 +33,6 @@ interface NavbarProps {
|
|||||||
isSticky?: boolean;
|
isSticky?: boolean;
|
||||||
showMobileMenu?: boolean;
|
showMobileMenu?: boolean;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
hideOnDesktop?: boolean;
|
|
||||||
hideOnTablet?: boolean;
|
|
||||||
hideOnMobile?: boolean;
|
|
||||||
animation?: string;
|
|
||||||
animationDelay?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Defaults ---------- */
|
/* ---------- Defaults ---------- */
|
||||||
@@ -156,7 +149,6 @@ export const Navbar: UserComponent<NavbarProps> = ({
|
|||||||
href={link.href}
|
href={link.href}
|
||||||
target={link.isExternal ? '_blank' : undefined}
|
target={link.isExternal ? '_blank' : undefined}
|
||||||
rel={link.isExternal ? 'noopener noreferrer' : undefined}
|
rel={link.isExternal ? 'noopener noreferrer' : undefined}
|
||||||
download={link.download || undefined}
|
|
||||||
onClick={(e) => e.preventDefault()}
|
onClick={(e) => e.preventDefault()}
|
||||||
onMouseEnter={() => setHoveredLink(i)}
|
onMouseEnter={() => setHoveredLink(i)}
|
||||||
onMouseLeave={() => setHoveredLink(null)}
|
onMouseLeave={() => setHoveredLink(null)}
|
||||||
@@ -208,11 +200,6 @@ Navbar.craft = {
|
|||||||
style: {
|
style: {
|
||||||
borderBottom: '1px solid #e4e4e7',
|
borderBottom: '1px solid #e4e4e7',
|
||||||
},
|
},
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
animation: 'none',
|
|
||||||
animationDelay: '0',
|
|
||||||
} as NavbarProps,
|
} as NavbarProps,
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
@@ -321,7 +308,6 @@ Navbar.craft = {
|
|||||||
// Add CSS class to each link for hover
|
// Add CSS class to each link for hover
|
||||||
const linksHtmlWithClass = links.map((link) => {
|
const linksHtmlWithClass = links.map((link) => {
|
||||||
const target = link.isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
|
const target = link.isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
|
||||||
const downloadAttr = link.download ? ' download' : '';
|
|
||||||
const cls = link.isCta ? 'navbar-cta' : 'navbar-link';
|
const cls = link.isCta ? 'navbar-cta' : 'navbar-link';
|
||||||
const linkStyle = cssPropsToString({
|
const linkStyle = cssPropsToString({
|
||||||
textDecoration: 'none',
|
textDecoration: 'none',
|
||||||
@@ -333,7 +319,7 @@ Navbar.craft = {
|
|||||||
borderRadius: link.isCta ? '6px' : '0',
|
borderRadius: link.isCta ? '6px' : '0',
|
||||||
transition: 'color 0.15s, background-color 0.15s',
|
transition: 'color 0.15s, background-color 0.15s',
|
||||||
});
|
});
|
||||||
return `<a href="${escapeAttr(safeUrl(link.href || "#"))}" class="${cls}"${target}${downloadAttr}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
|
return `<a href="${escapeAttr(safeUrl(link.href || "#"))}" class="${cls}"${target}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
|
||||||
}).join('\n ');
|
}).join('\n ');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -51,3 +51,43 @@ describe('SocialLinks.toHtml XSS hardening (iconSize/iconColor/iconBgColor/gap i
|
|||||||
expect(html).not.toContain('javascript:alert(1)');
|
expect(html).not.toContain('javascript:alert(1)');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('SocialLinks.toHtml iconShape/gap emission (previously built but unexposed in SocialStylePanel)', () => {
|
||||||
|
test('iconShape="circle" emits a 50% border-radius on the wrapping <a>', () => {
|
||||||
|
const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'circle' }, '');
|
||||||
|
expect(html).toMatch(/<a[^>]*style="[^"]*border-radius:50%[^"]*"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('iconShape="square" emits border-radius:0', () => {
|
||||||
|
const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'square' }, '');
|
||||||
|
expect(html).toMatch(/<a[^>]*style="[^"]*border-radius:0[^"]*"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('iconShape="rounded" emits a 6px border-radius', () => {
|
||||||
|
const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'rounded' }, '');
|
||||||
|
expect(html).toMatch(/<a[^>]*style="[^"]*border-radius:6px[^"]*"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('iconShape="none" omits the background box entirely (transparent bg, no fixed box size)', () => {
|
||||||
|
const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'none' }, '');
|
||||||
|
const aTag = html.match(/<a[^>]*>/)![0];
|
||||||
|
expect(aTag).toContain('background-color:transparent');
|
||||||
|
expect(aTag).not.toContain('border-radius');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gap emits on the wrapper <div> style', () => {
|
||||||
|
const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], gap: '24px' }, '');
|
||||||
|
expect(html).toMatch(/<div[^>]*style="[^"]*gap:24px[^"]*"/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('SocialLinks.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (SocialLinks as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ interface SocialLinksProps {
|
|||||||
gap?: string;
|
gap?: string;
|
||||||
alignment?: 'left' | 'center' | 'right';
|
alignment?: 'left' | 'center' | 'right';
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const platformIcons: Record<string, string> = {
|
const platformIcons: Record<string, string> = {
|
||||||
@@ -151,6 +156,11 @@ SocialLinks.craft = {
|
|||||||
gap: '10px',
|
gap: '10px',
|
||||||
alignment: 'center',
|
alignment: 'center',
|
||||||
style: {},
|
style: {},
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -75,3 +75,14 @@ describe('StarRating.toHtml XSS hardening (rating/maxStars into aria-label, F2.2
|
|||||||
expect(html).toMatch(/<span role="img" aria-label="Rating: 4\.5 out of 5"/);
|
expect(html).toMatch(/<span role="img" aria-label="Rating: 4\.5 out of 5"/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('StarRating.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (StarRating as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -10,6 +10,11 @@ interface StarRatingProps {
|
|||||||
filledColor?: string;
|
filledColor?: string;
|
||||||
emptyColor?: string;
|
emptyColor?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const StarRating: UserComponent<StarRatingProps> = ({
|
export const StarRating: UserComponent<StarRatingProps> = ({
|
||||||
@@ -87,6 +92,11 @@ StarRating.craft = {
|
|||||||
filledColor: '#f59e0b',
|
filledColor: '#f59e0b',
|
||||||
emptyColor: '#d1d5db',
|
emptyColor: '#d1d5db',
|
||||||
style: {},
|
style: {},
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { describe, test, expect } from 'vitest';
|
||||||
|
import { Accordion } from './Accordion';
|
||||||
|
|
||||||
|
const toHtml = (Accordion as any).toHtml;
|
||||||
|
|
||||||
|
const items = [
|
||||||
|
{ title: 'Q1', content: 'A1', isOpen: true },
|
||||||
|
{ title: 'Q2', content: 'A2', isOpen: false },
|
||||||
|
];
|
||||||
|
|
||||||
|
describe('Accordion.toHtml basic export', () => {
|
||||||
|
test('renders a <details> per item with the open attribute honored', () => {
|
||||||
|
const { html } = toHtml({ items }, '');
|
||||||
|
const detailsBlocks = html.match(/<details[^>]*>/g) || [];
|
||||||
|
expect(detailsBlocks.length).toBe(2);
|
||||||
|
expect(detailsBlocks[0]).toContain(' open');
|
||||||
|
expect(detailsBlocks[1]).not.toContain(' open');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('headerBg/headerColor/contentBg/borderColor emit into the panel styles', () => {
|
||||||
|
const { html } = toHtml({ items, headerBg: '#111111', headerColor: '#222222', contentBg: '#333333', borderColor: '#444444' }, '');
|
||||||
|
expect(html).toContain('#111111');
|
||||||
|
expect(html).toContain('#222222');
|
||||||
|
expect(html).toContain('#333333');
|
||||||
|
expect(html).toContain('#444444');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Accordion.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (Accordion as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -17,6 +17,11 @@ interface AccordionProps {
|
|||||||
contentBg?: string;
|
contentBg?: string;
|
||||||
borderColor?: string;
|
borderColor?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultItems: AccordionItem[] = [
|
const defaultItems: AccordionItem[] = [
|
||||||
@@ -135,6 +140,11 @@ Accordion.craft = {
|
|||||||
contentBg: '#ffffff',
|
contentBg: '#ffffff',
|
||||||
borderColor: '#e2e8f0',
|
borderColor: '#e2e8f0',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { describe, test, expect } from 'vitest';
|
||||||
|
import { CTASection } from './CTASection';
|
||||||
|
|
||||||
|
const toHtml = (CTASection as any).toHtml;
|
||||||
|
|
||||||
|
describe('CTASection.toHtml basic export', () => {
|
||||||
|
test('renders heading, description, and CTA buttons', () => {
|
||||||
|
const { html } = toHtml({ heading: 'Hi', description: 'Sub', ctas: [{ text: 'Go', href: '#', variant: 'primary' }] }, '');
|
||||||
|
expect(html).toContain('Hi');
|
||||||
|
expect(html).toContain('Sub');
|
||||||
|
expect(html).toContain('Go');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('box-model style props (margin/padding/border/boxShadow/opacity) flow through to the section style=""', () => {
|
||||||
|
const { html } = toHtml({
|
||||||
|
heading: 'Hi',
|
||||||
|
description: 'Sub',
|
||||||
|
style: { marginTop: '10px', paddingLeft: '5px', border: '1px solid #000', boxShadow: '0 1px 2px rgba(0,0,0,0.1)', opacity: '0.5' },
|
||||||
|
}, '');
|
||||||
|
expect(html).toContain('margin-top:10px');
|
||||||
|
expect(html).toContain('padding-left:5px');
|
||||||
|
expect(html).toContain('border:1px solid #000');
|
||||||
|
expect(html).toContain('box-shadow:0 1px 2px rgba(0,0,0,0.1)');
|
||||||
|
expect(html).toContain('opacity:0.5');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('CTASection.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (CTASection as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -14,6 +14,11 @@ interface CTASectionProps {
|
|||||||
gradient?: string;
|
gradient?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultGradient = 'linear-gradient(135deg, #2563eb 0%, #7c3aed 100%)';
|
const defaultGradient = 'linear-gradient(135deg, #2563eb 0%, #7c3aed 100%)';
|
||||||
@@ -83,6 +88,11 @@ CTASection.craft = {
|
|||||||
gradient: defaultGradient,
|
gradient: defaultGradient,
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
style: {},
|
style: {},
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { describe, test, expect } from 'vitest';
|
||||||
|
import { CallToAction } from './CallToAction';
|
||||||
|
|
||||||
|
const toHtml = (CallToAction as any).toHtml;
|
||||||
|
|
||||||
|
describe('CallToAction.toHtml basic export', () => {
|
||||||
|
test('renders heading, description, and CTA buttons', () => {
|
||||||
|
const { html } = toHtml({ heading: 'Hi', description: 'Sub', ctas: [{ text: 'Go', href: '#', variant: 'primary' }] }, '');
|
||||||
|
expect(html).toContain('Hi');
|
||||||
|
expect(html).toContain('Sub');
|
||||||
|
expect(html).toContain('Go');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('box-model style props (margin/padding/border/boxShadow/opacity) flow through to the section style=""', () => {
|
||||||
|
const { html } = toHtml({
|
||||||
|
heading: 'Hi',
|
||||||
|
description: 'Sub',
|
||||||
|
style: { marginBottom: '12px', paddingRight: '6px', border: '2px dashed #333', boxShadow: '0 4px 8px rgba(0,0,0,0.12)', opacity: '0.75' },
|
||||||
|
}, '');
|
||||||
|
expect(html).toContain('margin-bottom:12px');
|
||||||
|
expect(html).toContain('padding-right:6px');
|
||||||
|
expect(html).toContain('border:2px dashed #333');
|
||||||
|
expect(html).toContain('box-shadow:0 4px 8px rgba(0,0,0,0.12)');
|
||||||
|
expect(html).toContain('opacity:0.75');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('CallToAction.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (CallToAction as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -21,6 +21,11 @@ interface CallToActionProps {
|
|||||||
buttonColor?: string;
|
buttonColor?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultGradient = 'linear-gradient(135deg, #2563eb 0%, #7c3aed 100%)';
|
const defaultGradient = 'linear-gradient(135deg, #2563eb 0%, #7c3aed 100%)';
|
||||||
@@ -131,6 +136,11 @@ CallToAction.craft = {
|
|||||||
textColor: '#ffffff',
|
textColor: '#ffffff',
|
||||||
buttonColor: '#ffffff',
|
buttonColor: '#ffffff',
|
||||||
style: {},
|
style: {},
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -62,3 +62,14 @@ describe('Countdown.toHtml script nit: ticking interval stops at zero', () => {
|
|||||||
expect(html).toMatch(/if\s*\(\s*target\s*-\s*Date\.now\(\)\s*>\s*0\s*\)\s*\{/);
|
expect(html).toMatch(/if\s*\(\s*target\s*-\s*Date\.now\(\)\s*>\s*0\s*\)\s*\{/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Countdown.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (Countdown as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ interface CountdownProps {
|
|||||||
labelColor?: string;
|
labelColor?: string;
|
||||||
bgColor?: string;
|
bgColor?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface TimeLeft {
|
interface TimeLeft {
|
||||||
@@ -139,6 +144,11 @@ Countdown.craft = {
|
|||||||
labelColor: 'rgba(255,255,255,0.7)',
|
labelColor: 'rgba(255,255,255,0.7)',
|
||||||
bgColor: '#18181b',
|
bgColor: '#18181b',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -21,3 +21,14 @@ describe('FeaturesGrid.toHtml image sink uses safeImageUrl (data:image/svg+xml a
|
|||||||
expect(html).toMatch(/<a href=""/);
|
expect(html).toMatch(/<a href=""/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('FeaturesGrid.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (FeaturesGrid as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ interface FeaturesGridProps {
|
|||||||
features?: FeatureItem[];
|
features?: FeatureItem[];
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keys image/imageAlt/buttonText/buttonUrl are present (blank) on the defaults so
|
// Keys image/imageAlt/buttonText/buttonUrl are present (blank) on the defaults so
|
||||||
@@ -98,6 +103,11 @@ FeaturesGrid.craft = {
|
|||||||
features: defaultFeatures,
|
features: defaultFeatures,
|
||||||
style: { backgroundColor: '#ffffff' },
|
style: { backgroundColor: '#ffffff' },
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -73,3 +73,14 @@ describe('NumberCounter.toHtml counter.number is NOT runtime-type-checked -- mus
|
|||||||
expect(html).toContain('data-target="150"');
|
expect(html).toContain('data-target="150"');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('NumberCounter.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (NumberCounter as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -16,6 +16,11 @@ interface NumberCounterProps {
|
|||||||
labelColor?: string;
|
labelColor?: string;
|
||||||
numberSize?: string;
|
numberSize?: string;
|
||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultCounters: Counter[] = [
|
const defaultCounters: Counter[] = [
|
||||||
@@ -99,6 +104,11 @@ NumberCounter.craft = {
|
|||||||
labelColor: '#6b7280',
|
labelColor: '#6b7280',
|
||||||
numberSize: '48px',
|
numberSize: '48px',
|
||||||
style: { backgroundColor: '#ffffff' },
|
style: { backgroundColor: '#ffffff' },
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
import { describe, test, expect } from 'vitest';
|
||||||
|
import { PricingTable } from './PricingTable';
|
||||||
|
|
||||||
|
const toHtml = (PricingTable as any).toHtml;
|
||||||
|
|
||||||
|
const plans = [
|
||||||
|
{ name: 'Basic', price: '$9', period: '/month', features: ['Feature A'], buttonText: 'Buy', buttonHref: '#', isFeatured: false },
|
||||||
|
{ name: 'Pro', price: '$29', period: '/month', features: ['Feature B'], buttonText: 'Buy', buttonHref: '#', isFeatured: true },
|
||||||
|
];
|
||||||
|
|
||||||
|
describe('PricingTable.toHtml regular-card color overrides (previously hard-coded, now real props)', () => {
|
||||||
|
test('cardBg emits as the non-featured card background', () => {
|
||||||
|
const { html } = toHtml({ plans, cardBg: '#f0f0f0' }, '');
|
||||||
|
expect(html).toContain('background-color:#f0f0f0');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('textColor emits as the non-featured heading/price color', () => {
|
||||||
|
const { html } = toHtml({ plans, textColor: '#123456' }, '');
|
||||||
|
expect(html).toContain('color:#123456');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('subColor emits as the non-featured period text color', () => {
|
||||||
|
const { html } = toHtml({ plans, subColor: '#abcdef' }, '');
|
||||||
|
expect(html).toContain('color:#abcdef');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('featColor emits as the non-featured feature list text color', () => {
|
||||||
|
const { html } = toHtml({ plans, featColor: '#334455' }, '');
|
||||||
|
expect(html).toContain('color:#334455');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('checkColor emits as the non-featured bullet color', () => {
|
||||||
|
const { html } = toHtml({ plans, checkColor: '#00ff00' }, '');
|
||||||
|
expect(html).toContain('color:#00ff00');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('btnBg/btnColor emit as the non-featured button colors', () => {
|
||||||
|
const { html } = toHtml({ plans, btnBg: '#111111', btnColor: '#eeeeee' }, '');
|
||||||
|
expect(html).toContain('background-color:#111111');
|
||||||
|
expect(html).toContain('color:#eeeeee');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('unset overrides fall back to the exact prior literals (backward compatible)', () => {
|
||||||
|
const { html } = toHtml({ plans }, '');
|
||||||
|
// Regular (non-featured) card literals unchanged from before these props existed.
|
||||||
|
expect(html).toContain('background-color:#ffffff');
|
||||||
|
expect(html).toContain('color:#18181b');
|
||||||
|
expect(html).toContain('color:#64748b');
|
||||||
|
expect(html).toContain('color:#4b5563');
|
||||||
|
expect(html).toContain('color:#10b981');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('unset btnBg falls back to featuredBg (original derivation)', () => {
|
||||||
|
const { html } = toHtml({ plans, featuredBg: '#654321' }, '');
|
||||||
|
expect(html).toContain('background-color:#654321');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('PricingTable.toHtml XSS hardening (new card color props into style=)', () => {
|
||||||
|
test('a cardBg breakout string cannot escape style=""', () => {
|
||||||
|
const malicious = '#fff" onmouseover="alert(1)';
|
||||||
|
const { html } = toHtml({ plans, cardBg: malicious }, '');
|
||||||
|
expect(html).not.toMatch(/"\s+onmouseover="/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a textColor breakout string cannot escape style=""', () => {
|
||||||
|
const malicious = '#000" onmouseover="alert(1)';
|
||||||
|
const { html } = toHtml({ plans, textColor: malicious }, '');
|
||||||
|
expect(html).not.toMatch(/"\s+onmouseover="/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a btnBg breakout string cannot escape style=""', () => {
|
||||||
|
const malicious = '#000" onmouseover="alert(1)';
|
||||||
|
const { html } = toHtml({ plans, btnBg: malicious }, '');
|
||||||
|
expect(html).not.toMatch(/"\s+onmouseover="/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a btnColor breakout string cannot escape style=""', () => {
|
||||||
|
const malicious = '#000" onmouseover="alert(1)';
|
||||||
|
const { html } = toHtml({ plans, btnColor: malicious }, '');
|
||||||
|
expect(html).not.toMatch(/"\s+onmouseover="/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('PricingTable.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('the new regular-card color props are declared blank by default', () => {
|
||||||
|
const props = (PricingTable as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('cardBg', '');
|
||||||
|
expect(props).toHaveProperty('textColor', '');
|
||||||
|
expect(props).toHaveProperty('subColor', '');
|
||||||
|
expect(props).toHaveProperty('featColor', '');
|
||||||
|
expect(props).toHaveProperty('checkColor', '');
|
||||||
|
expect(props).toHaveProperty('btnBg', '');
|
||||||
|
expect(props).toHaveProperty('btnColor', '');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (PricingTable as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -19,6 +19,23 @@ interface PricingTableProps {
|
|||||||
featuredBg?: string;
|
featuredBg?: string;
|
||||||
bulletType?: string;
|
bulletType?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
|
/* ---- Regular (non-featured) card colors ----
|
||||||
|
All optional; each falls back to the exact literal the card was
|
||||||
|
previously hard-coded to (or, for the button, to featuredBg -- the
|
||||||
|
button's original derivation) when left unset, so existing saved
|
||||||
|
projects render pixel-identical until a color is explicitly picked. */
|
||||||
|
cardBg?: string;
|
||||||
|
textColor?: string;
|
||||||
|
subColor?: string;
|
||||||
|
featColor?: string;
|
||||||
|
checkColor?: string;
|
||||||
|
btnBg?: string;
|
||||||
|
btnColor?: string;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const bulletChars: Record<string, string> = {
|
const bulletChars: Record<string, string> = {
|
||||||
@@ -61,6 +78,13 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
featuredBg = '#3b82f6',
|
featuredBg = '#3b82f6',
|
||||||
bulletType = 'check',
|
bulletType = 'check',
|
||||||
anchorId,
|
anchorId,
|
||||||
|
cardBg,
|
||||||
|
textColor,
|
||||||
|
subColor,
|
||||||
|
featColor,
|
||||||
|
checkColor,
|
||||||
|
btnBg,
|
||||||
|
btnColor,
|
||||||
}) => {
|
}) => {
|
||||||
const {
|
const {
|
||||||
connectors: { connect, drag },
|
connectors: { connect, drag },
|
||||||
@@ -69,6 +93,14 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
selected: node.events.selected,
|
selected: node.events.selected,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const regCardBg = cardBg || '#ffffff';
|
||||||
|
const regTextColor = textColor || '#18181b';
|
||||||
|
const regSubColor = subColor || '#64748b';
|
||||||
|
const regFeatColor = featColor || '#4b5563';
|
||||||
|
const regCheckColor = checkColor || '#10b981';
|
||||||
|
const regBtnBg = btnBg || featuredBg;
|
||||||
|
const regBtnColor = btnColor || '#ffffff';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section
|
<section
|
||||||
ref={(ref: HTMLElement | null): void => { if (ref) connect(drag(ref)); }}
|
ref={(ref: HTMLElement | null): void => { if (ref) connect(drag(ref)); }}
|
||||||
@@ -95,7 +127,7 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
style={{
|
style={{
|
||||||
flex: '1 1 280px',
|
flex: '1 1 280px',
|
||||||
maxWidth: '360px',
|
maxWidth: '360px',
|
||||||
backgroundColor: plan.isFeatured ? featuredBg : '#ffffff',
|
backgroundColor: plan.isFeatured ? featuredBg : regCardBg,
|
||||||
border: plan.isFeatured ? 'none' : '1px solid #e2e8f0',
|
border: plan.isFeatured ? 'none' : '1px solid #e2e8f0',
|
||||||
borderRadius: '16px',
|
borderRadius: '16px',
|
||||||
padding: '40px 32px',
|
padding: '40px 32px',
|
||||||
@@ -127,7 +159,7 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
<h3 style={{
|
<h3 style={{
|
||||||
fontSize: '20px',
|
fontSize: '20px',
|
||||||
fontWeight: '600',
|
fontWeight: '600',
|
||||||
color: plan.isFeatured ? '#ffffff' : '#18181b',
|
color: plan.isFeatured ? '#ffffff' : regTextColor,
|
||||||
marginBottom: '8px',
|
marginBottom: '8px',
|
||||||
marginTop: plan.isFeatured ? '8px' : '0',
|
marginTop: plan.isFeatured ? '8px' : '0',
|
||||||
}}>
|
}}>
|
||||||
@@ -137,14 +169,14 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
<span style={{
|
<span style={{
|
||||||
fontSize: '48px',
|
fontSize: '48px',
|
||||||
fontWeight: '700',
|
fontWeight: '700',
|
||||||
color: plan.isFeatured ? '#ffffff' : '#18181b',
|
color: plan.isFeatured ? '#ffffff' : regTextColor,
|
||||||
lineHeight: '1',
|
lineHeight: '1',
|
||||||
}}>
|
}}>
|
||||||
{plan.price}
|
{plan.price}
|
||||||
</span>
|
</span>
|
||||||
<span style={{
|
<span style={{
|
||||||
fontSize: '16px',
|
fontSize: '16px',
|
||||||
color: plan.isFeatured ? 'rgba(255,255,255,0.8)' : '#64748b',
|
color: plan.isFeatured ? 'rgba(255,255,255,0.8)' : regSubColor,
|
||||||
}}>
|
}}>
|
||||||
{plan.period}
|
{plan.period}
|
||||||
</span>
|
</span>
|
||||||
@@ -161,12 +193,12 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
{(Array.isArray(plan.features) ? plan.features : []).map((feature, fi) => (
|
{(Array.isArray(plan.features) ? plan.features : []).map((feature, fi) => (
|
||||||
<li key={fi} style={{
|
<li key={fi} style={{
|
||||||
fontSize: '14px',
|
fontSize: '14px',
|
||||||
color: plan.isFeatured ? 'rgba(255,255,255,0.9)' : '#4b5563',
|
color: plan.isFeatured ? 'rgba(255,255,255,0.9)' : regFeatColor,
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: '8px',
|
gap: '8px',
|
||||||
}}>
|
}}>
|
||||||
<span style={{ color: plan.isFeatured ? '#bbf7d0' : '#10b981', fontWeight: '700' }}>{bulletChars[bulletType] || '✓'}</span>
|
<span style={{ color: plan.isFeatured ? '#bbf7d0' : regCheckColor, fontWeight: '700' }}>{bulletChars[bulletType] || '✓'}</span>
|
||||||
{feature}
|
{feature}
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
@@ -178,8 +210,8 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
|
|||||||
marginTop: 'auto',
|
marginTop: 'auto',
|
||||||
display: 'inline-block',
|
display: 'inline-block',
|
||||||
padding: '14px 32px',
|
padding: '14px 32px',
|
||||||
backgroundColor: plan.isFeatured ? '#ffffff' : featuredBg,
|
backgroundColor: plan.isFeatured ? '#ffffff' : regBtnBg,
|
||||||
color: plan.isFeatured ? featuredBg : '#ffffff',
|
color: plan.isFeatured ? featuredBg : regBtnColor,
|
||||||
textDecoration: 'none',
|
textDecoration: 'none',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
fontWeight: '600',
|
fontWeight: '600',
|
||||||
@@ -207,6 +239,18 @@ PricingTable.craft = {
|
|||||||
featuredBg: '#3b82f6',
|
featuredBg: '#3b82f6',
|
||||||
bulletType: 'check',
|
bulletType: 'check',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
|
cardBg: '',
|
||||||
|
textColor: '',
|
||||||
|
subColor: '',
|
||||||
|
featColor: '',
|
||||||
|
checkColor: '',
|
||||||
|
btnBg: '',
|
||||||
|
btnColor: '',
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
@@ -228,16 +272,28 @@ PricingTable.craft = {
|
|||||||
// Sanitized -- featuredBg is a raw string-interpolation sink below (drives
|
// Sanitized -- featuredBg is a raw string-interpolation sink below (drives
|
||||||
// cardBg/btnBg/btnColor, all raw-interpolated into style="...").
|
// cardBg/btnBg/btnColor, all raw-interpolated into style="...").
|
||||||
const featuredBg = cssValue(props.featuredBg) || '#3b82f6';
|
const featuredBg = cssValue(props.featuredBg) || '#3b82f6';
|
||||||
|
// Sanitized -- regular (non-featured) card color overrides, all raw
|
||||||
|
// string-interpolation sinks into style="..." below. Each falls back to
|
||||||
|
// the exact literal the card was previously hard-coded to (or, for the
|
||||||
|
// button, to featuredBg) when unset, so unmodified pricing tables render
|
||||||
|
// identically to before these props existed.
|
||||||
|
const regCardBg = cssValue(props.cardBg) || '#ffffff';
|
||||||
|
const regTextColor = cssValue(props.textColor) || '#18181b';
|
||||||
|
const regSubColor = cssValue(props.subColor) || '#64748b';
|
||||||
|
const regFeatColor = cssValue(props.featColor) || '#4b5563';
|
||||||
|
const regCheckColor = cssValue(props.checkColor) || '#10b981';
|
||||||
|
const regBtnBg = cssValue(props.btnBg) || featuredBg;
|
||||||
|
const regBtnColor = cssValue(props.btnColor) || '#ffffff';
|
||||||
|
|
||||||
const cards = plans.map((plan) => {
|
const cards = plans.map((plan) => {
|
||||||
const cardBg = plan.isFeatured ? featuredBg : '#ffffff';
|
const cardBg = plan.isFeatured ? featuredBg : regCardBg;
|
||||||
const cardBorder = plan.isFeatured ? 'border:none;' : 'border:1px solid #e2e8f0;';
|
const cardBorder = plan.isFeatured ? 'border:none;' : 'border:1px solid #e2e8f0;';
|
||||||
const textColor = plan.isFeatured ? '#ffffff' : '#18181b';
|
const textColor = plan.isFeatured ? '#ffffff' : regTextColor;
|
||||||
const subColor = plan.isFeatured ? 'rgba(255,255,255,0.8)' : '#64748b';
|
const subColor = plan.isFeatured ? 'rgba(255,255,255,0.8)' : regSubColor;
|
||||||
const featColor = plan.isFeatured ? 'rgba(255,255,255,0.9)' : '#4b5563';
|
const featColor = plan.isFeatured ? 'rgba(255,255,255,0.9)' : regFeatColor;
|
||||||
const checkColor = plan.isFeatured ? '#bbf7d0' : '#10b981';
|
const checkColor = plan.isFeatured ? '#bbf7d0' : regCheckColor;
|
||||||
const btnBg = plan.isFeatured ? '#ffffff' : featuredBg;
|
const btnBg = plan.isFeatured ? '#ffffff' : regBtnBg;
|
||||||
const btnColor = plan.isFeatured ? featuredBg : '#ffffff';
|
const btnColor = plan.isFeatured ? featuredBg : regBtnColor;
|
||||||
const scale = plan.isFeatured ? 'transform:scale(1.05);' : '';
|
const scale = plan.isFeatured ? 'transform:scale(1.05);' : '';
|
||||||
const shadow = plan.isFeatured ? 'box-shadow:0 20px 60px rgba(59,130,246,0.3);' : 'box-shadow:0 1px 3px rgba(0,0,0,0.06);';
|
const shadow = plan.isFeatured ? 'box-shadow:0 20px 60px rgba(59,130,246,0.3);' : 'box-shadow:0 1px 3px rgba(0,0,0,0.06);';
|
||||||
|
|
||||||
|
|||||||
@@ -80,3 +80,14 @@ describe('Tabs.toHtml deterministic + unique ids (thread node id, resolves id-co
|
|||||||
expect(html1).toBe(html2);
|
expect(html1).toBe(html2);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Tabs.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (Tabs as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ interface TabsProps {
|
|||||||
inactiveTabColor?: string;
|
inactiveTabColor?: string;
|
||||||
contentBg?: string;
|
contentBg?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultTabs: TabItem[] = [
|
const defaultTabs: TabItem[] = [
|
||||||
@@ -114,6 +119,11 @@ Tabs.craft = {
|
|||||||
inactiveTabColor: '#64748b',
|
inactiveTabColor: '#64748b',
|
||||||
contentBg: '#ffffff',
|
contentBg: '#ffffff',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -71,3 +71,14 @@ describe('Testimonials.toHtml rating aria-label sink (attacker-controlled `ratin
|
|||||||
expect(html).toContain('aria-label="Rating: 4 out of 5"');
|
expect(html).toContain('aria-label="Rating: 4 out of 5"');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Testimonials.craft.props includes the box-model/animation/visibility rollout props', () => {
|
||||||
|
test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
|
||||||
|
const props = (Testimonials as any).craft.props;
|
||||||
|
expect(props).toHaveProperty('animation', '');
|
||||||
|
expect(props).toHaveProperty('animationDelay', '');
|
||||||
|
expect(props).toHaveProperty('hideOnDesktop', false);
|
||||||
|
expect(props).toHaveProperty('hideOnTablet', false);
|
||||||
|
expect(props).toHaveProperty('hideOnMobile', false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -18,6 +18,11 @@ interface TestimonialsProps {
|
|||||||
cardBg?: string;
|
cardBg?: string;
|
||||||
starColor?: string;
|
starColor?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
|
animation?: string;
|
||||||
|
animationDelay?: string;
|
||||||
|
hideOnDesktop?: boolean;
|
||||||
|
hideOnTablet?: boolean;
|
||||||
|
hideOnMobile?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultTestimonials: Testimonial[] = [
|
const defaultTestimonials: Testimonial[] = [
|
||||||
@@ -131,6 +136,11 @@ Testimonials.craft = {
|
|||||||
cardBg: '#f8fafc',
|
cardBg: '#f8fafc',
|
||||||
starColor: '#f59e0b',
|
starColor: '#f59e0b',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
|
animation: '',
|
||||||
|
animationDelay: '',
|
||||||
|
hideOnDesktop: false,
|
||||||
|
hideOnTablet: false,
|
||||||
|
hideOnMobile: false,
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -1,282 +0,0 @@
|
|||||||
import { describe, test, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
||||||
import React from 'react';
|
|
||||||
import { createRoot, Root } from 'react-dom/client';
|
|
||||||
import { act } from 'react-dom/test-utils';
|
|
||||||
|
|
||||||
/* NavStylePanel (via useNodeProp/LinkPicker in this file) needs useEditor
|
|
||||||
from @craftjs/core and usePages from PageContext. Mock both following the
|
|
||||||
DOM-harness pattern used across this repo's other *StylePanel tests (no
|
|
||||||
@testing-library/react here) -- PageContext itself is Wave-2's territory,
|
|
||||||
this package only READS pages via usePages(), so mocking it is the
|
|
||||||
correct boundary for these tests. */
|
|
||||||
const setPropSpy = vi.fn((_id: string, updater: (p: any) => void) => {
|
|
||||||
updater(lastProps);
|
|
||||||
});
|
|
||||||
let lastProps: any;
|
|
||||||
|
|
||||||
vi.mock('@craftjs/core', () => ({
|
|
||||||
useEditor: () => ({ actions: { setProp: setPropSpy } }),
|
|
||||||
}));
|
|
||||||
|
|
||||||
let mockPages: { id: string; name: string; slug: string; craftState: string | null }[] = [];
|
|
||||||
vi.mock('../../../state/PageContext', () => ({
|
|
||||||
usePages: () => ({ pages: mockPages }),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock('../../../ui/AssetPicker', () => ({
|
|
||||||
AssetPicker: () => null,
|
|
||||||
}));
|
|
||||||
|
|
||||||
import { NavStylePanel, LinkPicker, pageHref } from './NavStylePanel';
|
|
||||||
|
|
||||||
let container: HTMLDivElement;
|
|
||||||
let root: Root;
|
|
||||||
|
|
||||||
function render(ui: React.ReactElement) {
|
|
||||||
container = document.createElement('div');
|
|
||||||
document.body.appendChild(container);
|
|
||||||
act(() => {
|
|
||||||
root = createRoot(container);
|
|
||||||
root.render(ui);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function rerender(ui: React.ReactElement) {
|
|
||||||
act(() => { root.render(ui); });
|
|
||||||
}
|
|
||||||
|
|
||||||
function unmount() {
|
|
||||||
act(() => { root.unmount(); });
|
|
||||||
container.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function setValue(el: HTMLInputElement | HTMLSelectElement, value: string) {
|
|
||||||
const proto = el instanceof HTMLSelectElement ? window.HTMLSelectElement.prototype : window.HTMLInputElement.prototype;
|
|
||||||
const setter = Object.getOwnPropertyDescriptor(proto, 'value')!.set!;
|
|
||||||
act(() => {
|
|
||||||
setter.call(el, value);
|
|
||||||
el.dispatchEvent(new Event('input', { bubbles: true }));
|
|
||||||
el.dispatchEvent(new Event('change', { bubbles: true }));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function click(el: Element | null) {
|
|
||||||
act(() => { (el as HTMLElement).dispatchEvent(new MouseEvent('click', { bubbles: true })); });
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
setPropSpy.mockClear();
|
|
||||||
mockPages = [
|
|
||||||
{ id: 'home', name: 'Home', slug: 'index', craftState: null },
|
|
||||||
{ id: 'about', name: 'About', slug: 'about', craftState: null },
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
if (container) unmount();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('pageHref (landing page is always "/")', () => {
|
|
||||||
test('index 0 (landing page) -> "/"', () => {
|
|
||||||
expect(pageHref(mockPages[0], 0)).toBe('/');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('any other page -> "/{slug}"', () => {
|
|
||||||
expect(pageHref(mockPages[1], 1)).toBe('/about');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('LinkPicker (F1: link-to-page picker + manual URL/anchor/tel/mailto)', () => {
|
|
||||||
test('a value matching a page href starts in "Page" mode and lists every page', () => {
|
|
||||||
render(<LinkPicker value="/about" onChange={vi.fn()} />);
|
|
||||||
const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
|
|
||||||
expect(modeSelect.value).toBe('page');
|
|
||||||
const optionText = Array.from(container.querySelectorAll('option')).map((o) => o.textContent);
|
|
||||||
expect(optionText).toContain('Home');
|
|
||||||
expect(optionText).toContain('About');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('picking a different page from the page dropdown emits that page\'s href', () => {
|
|
||||||
const onChange = vi.fn();
|
|
||||||
render(<LinkPicker value="/about" onChange={onChange} />);
|
|
||||||
const [, pageSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
|
|
||||||
setValue(pageSelect, '/');
|
|
||||||
expect(onChange).toHaveBeenCalledWith('/');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('a "#section" value starts in Anchor mode', () => {
|
|
||||||
render(<LinkPicker value="#pricing" onChange={vi.fn()} />);
|
|
||||||
const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
|
|
||||||
expect(modeSelect.value).toBe('anchor');
|
|
||||||
const input = container.querySelector('input[type="text"]') as HTMLInputElement;
|
|
||||||
expect(input.value).toBe('#pricing');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('switching mode to Anchor seeds a bare "#"', () => {
|
|
||||||
const onChange = vi.fn();
|
|
||||||
render(<LinkPicker value="/about" onChange={onChange} />);
|
|
||||||
const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
|
|
||||||
setValue(modeSelect, 'anchor');
|
|
||||||
expect(onChange).toHaveBeenCalledWith('#');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('mailto: helper strips the scheme for editing and re-adds it on change', () => {
|
|
||||||
const onChange = vi.fn();
|
|
||||||
render(<LinkPicker value="mailto:foo@example.com" onChange={onChange} />);
|
|
||||||
const input = container.querySelector('input[type="text"]') as HTMLInputElement;
|
|
||||||
expect(input.value).toBe('foo@example.com');
|
|
||||||
setValue(input, 'bar@example.com');
|
|
||||||
expect(onChange).toHaveBeenCalledWith('mailto:bar@example.com');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('tel: helper strips the scheme for editing and re-adds it on change', () => {
|
|
||||||
const onChange = vi.fn();
|
|
||||||
render(<LinkPicker value="tel:5551234567" onChange={onChange} />);
|
|
||||||
const input = container.querySelector('input[type="text"]') as HTMLInputElement;
|
|
||||||
expect(input.value).toBe('5551234567');
|
|
||||||
setValue(input, '5559876543');
|
|
||||||
expect(onChange).toHaveBeenCalledWith('tel:5559876543');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('a plain https:// URL falls back to Custom URL mode', () => {
|
|
||||||
render(<LinkPicker value="https://example.com" onChange={vi.fn()} />);
|
|
||||||
const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
|
|
||||||
expect(modeSelect.value).toBe('url');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('NavStylePanel Links section: href set via LinkPicker (F1 wired into the panel)', () => {
|
|
||||||
test('choosing a page for a Navbar link writes that page\'s href onto the link', () => {
|
|
||||||
lastProps = {
|
|
||||||
links: [{ text: 'Home', href: '/old-home' }],
|
|
||||||
};
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
|
|
||||||
const selects = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
|
|
||||||
// First select for the one link item is its LinkPicker mode select (the
|
|
||||||
// href starts as a Custom URL, so it opens on "url" mode); switch it to
|
|
||||||
// "page" then pick the About page from the resulting page dropdown.
|
|
||||||
const modeSelect = selects[0];
|
|
||||||
setValue(modeSelect, 'page');
|
|
||||||
expect(setPropSpy).toHaveBeenCalled();
|
|
||||||
expect(lastProps.links[0].href).toBe('/'); // defaults to the first page
|
|
||||||
|
|
||||||
// The mock setProp mutates `lastProps` in place rather than triggering a
|
|
||||||
// real Craft.js state update, so force a re-render (passing the same,
|
|
||||||
// now-mutated, object) to get the LinkPicker to reflect its new "page"
|
|
||||||
// mode and render the page <select>.
|
|
||||||
rerender(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
|
|
||||||
const pageSelect = Array.from(container.querySelectorAll('select'))[1] as HTMLSelectElement;
|
|
||||||
setValue(pageSelect, '/about');
|
|
||||||
expect(lastProps.links[0].href).toBe('/about');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('toggling the Download checkbox for a link sets download:true', () => {
|
|
||||||
lastProps = { links: [{ text: 'Brochure', href: '/brochure.pdf' }] };
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
const checkbox = container.querySelector('input[type="checkbox"]') as HTMLInputElement;
|
|
||||||
act(() => { checkbox.click(); });
|
|
||||||
expect(lastProps.links[0].download).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('NavStylePanel: "Sync links with Pages" (F2, regression vs legacy builder)', () => {
|
|
||||||
test('populates links from the mocked pages list and preserves the CTA link', () => {
|
|
||||||
lastProps = {
|
|
||||||
links: [
|
|
||||||
{ text: 'Old Home', href: '/old' },
|
|
||||||
{ text: 'Old About', href: '/old-about' },
|
|
||||||
{ text: 'Get Started', href: '#signup', isCta: true },
|
|
||||||
],
|
|
||||||
};
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
|
|
||||||
const syncBtn = Array.from(container.querySelectorAll('button'))
|
|
||||||
.find((b) => b.textContent?.includes('Sync links with Pages'))!;
|
|
||||||
expect(syncBtn).toBeTruthy();
|
|
||||||
click(syncBtn);
|
|
||||||
|
|
||||||
expect(lastProps.links).toEqual([
|
|
||||||
{ text: 'Home', href: '/' },
|
|
||||||
{ text: 'About', href: '/about' },
|
|
||||||
{ text: 'Get Started', href: '#signup', isCta: true },
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('with no CTA link, sync just replaces links 1:1 with the pages list', () => {
|
|
||||||
lastProps = { links: [{ text: 'Stale', href: '/stale' }] };
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
|
|
||||||
const syncBtn = Array.from(container.querySelectorAll('button'))
|
|
||||||
.find((b) => b.textContent?.includes('Sync links with Pages'))!;
|
|
||||||
click(syncBtn);
|
|
||||||
|
|
||||||
expect(lastProps.links).toEqual([
|
|
||||||
{ text: 'Home', href: '/' },
|
|
||||||
{ text: 'About', href: '/about' },
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('the Links section (and its Sync button) is not shown for Footer (no `links` prop)', () => {
|
|
||||||
lastProps = { text: '© 2026' };
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
const syncBtn = Array.from(container.querySelectorAll('button'))
|
|
||||||
.find((b) => b.textContent?.includes('Sync links with Pages'));
|
|
||||||
expect(syncBtn).toBeUndefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
/** The Spacing/Border & Effects/Animation/Visibility CollapsibleSections all
|
|
||||||
* default closed (defaultOpen={false}, matching the pre-existing "Spacing"
|
|
||||||
* section's convention) -- open one by clicking its header button before
|
|
||||||
* asserting on / interacting with its contents. */
|
|
||||||
function openSection(title: string) {
|
|
||||||
const header = Array.from(container.querySelectorAll('button'))
|
|
||||||
.find((b) => b.textContent?.includes(title))!;
|
|
||||||
click(header);
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('NavStylePanel: box-model + animation + visibility controls always present', () => {
|
|
||||||
test('Spacing (Margin/Padding), Border & Effects, Animation, and Visibility sections render for a Navbar', () => {
|
|
||||||
lastProps = {
|
|
||||||
backgroundColor: '#ffffff',
|
|
||||||
style: {},
|
|
||||||
animation: 'none',
|
|
||||||
animationDelay: '0',
|
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
};
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
openSection('Spacing');
|
|
||||||
openSection('Border & Effects');
|
|
||||||
openSection('Animation');
|
|
||||||
openSection('Visibility');
|
|
||||||
expect(container.querySelector('[data-testid="spacing-control"]')).toBeTruthy();
|
|
||||||
expect(container.querySelector('[data-testid="border-control"]')).toBeTruthy();
|
|
||||||
expect(container.querySelector('[data-testid="animation-control"]')).toBeTruthy();
|
|
||||||
expect(container.querySelector('[data-testid="visibility-control"]')).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('checking "Hide on Mobile" writes hideOnMobile:true via setProp', () => {
|
|
||||||
lastProps = { hideOnDesktop: false, hideOnTablet: false, hideOnMobile: false };
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
openSection('Visibility');
|
|
||||||
const checkbox = container.querySelector('[data-testid="visibility-hideOnMobile"]') as HTMLInputElement;
|
|
||||||
act(() => {
|
|
||||||
checkbox.click();
|
|
||||||
});
|
|
||||||
expect(lastProps.hideOnMobile).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('picking an entrance animation writes animation via setProp', () => {
|
|
||||||
lastProps = { animation: 'none', animationDelay: '0' };
|
|
||||||
render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
|
|
||||||
openSection('Animation');
|
|
||||||
const fadeInBtn = Array.from(container.querySelectorAll('[data-testid="animation-control"] button'))
|
|
||||||
.find((b) => b.textContent === 'Fade In')!;
|
|
||||||
click(fadeInBtn);
|
|
||||||
expect(lastProps.animation).toBe('fade-in');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -2,7 +2,6 @@ import React, { useCallback } from 'react';
|
|||||||
import { useEditor } from '@craftjs/core';
|
import { useEditor } from '@craftjs/core';
|
||||||
import {
|
import {
|
||||||
SPACING_PRESETS,
|
SPACING_PRESETS,
|
||||||
SHADOW_PRESETS,
|
|
||||||
} from '../../../constants/presets';
|
} from '../../../constants/presets';
|
||||||
import {
|
import {
|
||||||
StylePanelProps,
|
StylePanelProps,
|
||||||
@@ -17,145 +16,13 @@ import {
|
|||||||
smallInputStyle,
|
smallInputStyle,
|
||||||
sectionGap,
|
sectionGap,
|
||||||
useNodeProp,
|
useNodeProp,
|
||||||
SpacingControl,
|
|
||||||
BorderControl,
|
|
||||||
BorderValue,
|
|
||||||
buildBorderShorthand,
|
|
||||||
AnimationControl,
|
|
||||||
VisibilityControl,
|
|
||||||
} from './shared';
|
} from './shared';
|
||||||
import { AssetPicker } from '../../../ui/AssetPicker';
|
import { AssetPicker } from '../../../ui/AssetPicker';
|
||||||
import { usePages } from '../../../state/PageContext';
|
|
||||||
import { PageData } from '../../../types';
|
|
||||||
|
|
||||||
/* ---------- Link-to-page helpers (F1/F2: link picker + Sync with Pages) ----------
|
/* ---------- NAV / MENU / LOGO ---------- */
|
||||||
Mirrors the export convention used elsewhere: the first page is always the
|
|
||||||
landing page and publishes to '/', every other page publishes to '/{slug}'.
|
|
||||||
See PageContext.tsx's uniqueSlug/slugify and the landing-page-lock comment
|
|
||||||
in renamePage() for why index 0 is special-cased this way. */
|
|
||||||
export function pageHref(page: PageData, index: number): string {
|
|
||||||
return index === 0 ? '/' : `/${page.slug}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
type LinkMode = 'page' | 'url' | 'anchor' | 'tel' | 'mailto';
|
|
||||||
|
|
||||||
function detectLinkMode(value: string, pageHrefs: string[]): LinkMode {
|
|
||||||
const v = value || '';
|
|
||||||
if (pageHrefs.includes(v)) return 'page';
|
|
||||||
if (v.startsWith('#')) return 'anchor';
|
|
||||||
if (v.startsWith('tel:')) return 'tel';
|
|
||||||
if (v.startsWith('mailto:')) return 'mailto';
|
|
||||||
return 'url';
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- LinkPicker ----------
|
|
||||||
Reused for every link-href field in this panel (standalone Logo's href,
|
|
||||||
Navbar's logoUrl, and each Navbar/Menu link item's href): a dropdown of
|
|
||||||
the site's PAGES (read-only via usePages() -- PageContext itself is
|
|
||||||
Wave-2's territory) plus manual URL / #anchor / tel: / mailto: entry.
|
|
||||||
safeUrl (in toHtml) already allows tel:/mailto: schemes, so no export-side
|
|
||||||
change is needed for those. */
|
|
||||||
interface LinkPickerProps {
|
|
||||||
value: string;
|
|
||||||
onChange: (value: string) => void;
|
|
||||||
}
|
|
||||||
export const LinkPicker: React.FC<LinkPickerProps> = ({ value, onChange }) => {
|
|
||||||
const { pages } = usePages();
|
|
||||||
const pageOptions = pages.map((p, i) => ({ id: p.id, name: p.name, href: pageHref(p, i) }));
|
|
||||||
const mode = detectLinkMode(value || '', pageOptions.map((p) => p.href));
|
|
||||||
|
|
||||||
const switchMode = (next: LinkMode) => {
|
|
||||||
if (next === mode) return;
|
|
||||||
if (next === 'page') onChange(pageOptions[0]?.href || '/');
|
|
||||||
else if (next === 'anchor') onChange('#');
|
|
||||||
else if (next === 'tel') onChange('tel:');
|
|
||||||
else if (next === 'mailto') onChange('mailto:');
|
|
||||||
else onChange('');
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div style={sectionGap} data-testid="link-picker">
|
|
||||||
<label style={labelStyle}>Link</label>
|
|
||||||
<select
|
|
||||||
value={mode}
|
|
||||||
onChange={(e) => switchMode(e.target.value as LinkMode)}
|
|
||||||
style={{ ...inputStyle, marginBottom: 4, cursor: 'pointer' }}
|
|
||||||
>
|
|
||||||
<option value="page">Page</option>
|
|
||||||
<option value="url">Custom URL</option>
|
|
||||||
<option value="anchor">Anchor (#section)</option>
|
|
||||||
<option value="tel">Phone (tel:)</option>
|
|
||||||
<option value="mailto">Email (mailto:)</option>
|
|
||||||
</select>
|
|
||||||
{mode === 'page' && (
|
|
||||||
pageOptions.length > 0 ? (
|
|
||||||
<select value={value} onChange={(e) => onChange(e.target.value)} style={inputStyle}>
|
|
||||||
{pageOptions.map((p) => (
|
|
||||||
<option key={p.id} value={p.href}>{p.name}</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
) : (
|
|
||||||
<div style={{ fontSize: 11, color: '#71717a' }}>No pages yet</div>
|
|
||||||
)
|
|
||||||
)}
|
|
||||||
{mode === 'anchor' && (
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={value || ''}
|
|
||||||
onChange={(e) => onChange(e.target.value.startsWith('#') ? e.target.value : `#${e.target.value}`)}
|
|
||||||
placeholder="#section-id"
|
|
||||||
style={inputStyle}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{mode === 'tel' && (
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={(value || '').replace(/^tel:/, '')}
|
|
||||||
onChange={(e) => onChange(`tel:${e.target.value}`)}
|
|
||||||
placeholder="+15551234567"
|
|
||||||
style={inputStyle}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{mode === 'mailto' && (
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={(value || '').replace(/^mailto:/, '')}
|
|
||||||
onChange={(e) => onChange(`mailto:${e.target.value}`)}
|
|
||||||
placeholder="name@example.com"
|
|
||||||
style={inputStyle}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{mode === 'url' && (
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={value || ''}
|
|
||||||
onChange={(e) => onChange(e.target.value)}
|
|
||||||
placeholder="https://example.com or /page"
|
|
||||||
style={inputStyle}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Parses a `border` shorthand ("2px solid #hex" / "none") back into the
|
|
||||||
{ width, style, color } shape BorderControl edits. */
|
|
||||||
function parseBorderShorthand(v: string | undefined): BorderValue {
|
|
||||||
if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
|
|
||||||
const m = v.trim().match(/^(\S+)\s+(\S+)\s+(.+)$/);
|
|
||||||
if (!m) return { width: '', style: 'none', color: '#000000' };
|
|
||||||
return { width: m[1], style: m[2], color: m[3] };
|
|
||||||
}
|
|
||||||
|
|
||||||
function capitalize(s: string): string {
|
|
||||||
return s.charAt(0).toUpperCase() + s.slice(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- NAV / MENU / LOGO / FOOTER ---------- */
|
|
||||||
export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
||||||
const { actions } = useEditor();
|
const { actions } = useEditor();
|
||||||
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
||||||
const { pages } = usePages();
|
|
||||||
|
|
||||||
const links: any[] = nodeProps.links || [];
|
const links: any[] = nodeProps.links || [];
|
||||||
|
|
||||||
@@ -181,20 +48,6 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
|
|||||||
});
|
});
|
||||||
}, [actions, selectedId]);
|
}, [actions, selectedId]);
|
||||||
|
|
||||||
/* F2: (re)populate the links array from the current pages list --
|
|
||||||
label = page name, href = '/' for the landing page else '/{slug}'.
|
|
||||||
Any existing CTA link (isCta: true) is preserved (appended after the
|
|
||||||
freshly-generated page links) rather than being wiped, matching the
|
|
||||||
legacy GrapesJS builder's "Sync with Pages" behavior. */
|
|
||||||
const syncWithPages = useCallback(() => {
|
|
||||||
actions.setProp(selectedId, (props: any) => {
|
|
||||||
const existing: any[] = props.links || [];
|
|
||||||
const ctaLinks = existing.filter((l) => l.isCta);
|
|
||||||
const pageLinks = pages.map((p, i) => ({ text: p.name, href: pageHref(p, i) }));
|
|
||||||
props.links = [...pageLinks, ...ctaLinks];
|
|
||||||
});
|
|
||||||
}, [actions, selectedId, pages]);
|
|
||||||
|
|
||||||
/* Detect standalone Logo vs Navbar/Menu */
|
/* Detect standalone Logo vs Navbar/Menu */
|
||||||
const isStandaloneLogo = nodeProps.type !== undefined && (nodeProps.type === 'text' || nodeProps.type === 'image') && nodeProps.logoText === undefined;
|
const isStandaloneLogo = nodeProps.type !== undefined && (nodeProps.type === 'text' || nodeProps.type === 'image') && nodeProps.logoText === undefined;
|
||||||
|
|
||||||
@@ -213,15 +66,6 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
|
|||||||
);
|
);
|
||||||
const GAP_PRESETS = ['8px', '16px', '24px', '32px', '40px'].map((g) => ({ label: g, value: g }));
|
const GAP_PRESETS = ['8px', '16px', '24px', '32px', '40px'].map((g) => ({ label: g, value: g }));
|
||||||
|
|
||||||
/* Box-model / animation / visibility values, read off `style` (margin,
|
|
||||||
padding, border, boxShadow, opacity) or top-level props (animation,
|
|
||||||
hideOn*). This panel is only ever mounted for the 4 owned components
|
|
||||||
(Navbar/Menu/Logo/Footer), which all now carry these props (see each
|
|
||||||
component's .craft.props), so -- unlike the Links/Colors sections above,
|
|
||||||
which are shared across a genuinely disparate prop schema -- these
|
|
||||||
sections render unconditionally rather than gating on presence. */
|
|
||||||
const style = nodeProps.style || {};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* Standalone Logo component settings */}
|
{/* Standalone Logo component settings */}
|
||||||
@@ -280,11 +124,10 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
<LinkPicker value={nodeProps.href || '/'} onChange={(v) => setProp('href', v)} />
|
<div style={sectionGap}>
|
||||||
<label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 11, color: '#e4e4e7', cursor: 'pointer', marginTop: -8, marginBottom: 12 }}>
|
<label style={labelStyle}>Link URL</label>
|
||||||
<input type="checkbox" checked={!!nodeProps.download} onChange={(e) => setProp('download', e.target.checked)} />
|
<input type="text" value={nodeProps.href || '/'} onChange={(e) => setProp('href', e.target.value)} placeholder="/" style={inputStyle} />
|
||||||
Download (link points at a file)
|
</div>
|
||||||
</label>
|
|
||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -302,22 +145,17 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{nodeProps.logoUrl !== undefined && (
|
{nodeProps.logoUrl !== undefined && (
|
||||||
<LinkPicker value={nodeProps.logoUrl || '/'} onChange={(v) => setProp('logoUrl', v)} />
|
<div style={sectionGap}>
|
||||||
|
<label style={labelStyle}>Logo Link URL</label>
|
||||||
|
<input type="text" value={nodeProps.logoUrl || ''} onChange={(e) => setProp('logoUrl', e.target.value)} placeholder="/" style={inputStyle} />
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Links (not shown for standalone Logo, or for components -- like
|
{/* Links (not shown for standalone Logo) */}
|
||||||
Footer -- that don't carry a `links` array at all). */}
|
{!isStandaloneLogo && (
|
||||||
{!isStandaloneLogo && nodeProps.links !== undefined && (
|
|
||||||
<CollapsibleSection title="Links">
|
<CollapsibleSection title="Links">
|
||||||
<button
|
|
||||||
onClick={syncWithPages}
|
|
||||||
title="Replace these links with one per page (preserves any CTA link)"
|
|
||||||
style={{ marginBottom: 8, width: '100%', padding: '6px', fontSize: 11, background: 'rgba(59,130,246,0.12)', color: '#93c5fd', border: '1px solid rgba(59,130,246,0.4)', borderRadius: 4, cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 6 }}
|
|
||||||
>
|
|
||||||
<i className="fa fa-refresh" /> Sync links with Pages
|
|
||||||
</button>
|
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
|
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
|
||||||
{links.map((link, i) => (
|
{links.map((link, i) => (
|
||||||
<div key={i} style={{ background: '#1e1e22', borderRadius: 6, padding: 6, display: 'flex', flexDirection: 'column', gap: 3 }}>
|
<div key={i} style={{ background: '#1e1e22', borderRadius: 6, padding: 6, display: 'flex', flexDirection: 'column', gap: 3 }}>
|
||||||
@@ -327,11 +165,7 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
|
|||||||
<i className="fa fa-times" />
|
<i className="fa fa-times" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<LinkPicker value={link.href || ''} onChange={(v) => updateLink(i, 'href', v)} />
|
<input type="text" value={link.href || ''} onChange={(e) => updateLink(i, 'href', e.target.value)} placeholder="URL" style={{ ...smallInputStyle, color: '#71717a' }} />
|
||||||
<label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 10, color: '#a1a1aa', cursor: 'pointer', marginTop: -6 }}>
|
|
||||||
<input type="checkbox" checked={!!link.download} onChange={(e) => updateLink(i, 'download', e.target.checked)} />
|
|
||||||
Download (points at a file)
|
|
||||||
</label>
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
@@ -400,61 +234,12 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
|
|||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Box model: margin + padding (per-side, via style.*). The old
|
{/* Style overrides */}
|
||||||
single "Padding" preset row is folded into the Padding SpacingControl
|
|
||||||
below (still writes to style.padding when linked, matching the
|
|
||||||
previous behavior exactly). */}
|
|
||||||
<CollapsibleSection title="Spacing" defaultOpen={false}>
|
<CollapsibleSection title="Spacing" defaultOpen={false}>
|
||||||
<SpacingControl
|
|
||||||
label="Margin"
|
|
||||||
value={{ top: style.marginTop, right: style.marginRight, bottom: style.marginBottom, left: style.marginLeft }}
|
|
||||||
onChange={(side, v) => setPropStyle(`margin${capitalize(side)}`, v)}
|
|
||||||
/>
|
|
||||||
<SpacingControl
|
|
||||||
label="Padding"
|
|
||||||
value={{ top: style.paddingTop, right: style.paddingRight, bottom: style.paddingBottom, left: style.paddingLeft }}
|
|
||||||
onChange={(side, v) => setPropStyle(`padding${capitalize(side)}`, v)}
|
|
||||||
presets={SPACING_PRESETS}
|
|
||||||
/>
|
|
||||||
</CollapsibleSection>
|
|
||||||
|
|
||||||
{/* Border & Effects: border, box-shadow, opacity */}
|
|
||||||
<CollapsibleSection title="Border & Effects" defaultOpen={false}>
|
|
||||||
<BorderControl
|
|
||||||
value={parseBorderShorthand(style.border)}
|
|
||||||
onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
|
|
||||||
/>
|
|
||||||
<div className="guided-section">
|
<div className="guided-section">
|
||||||
<SectionLabel>Box Shadow</SectionLabel>
|
<SectionLabel>Padding</SectionLabel>
|
||||||
<PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow || 'none'} onSelect={(v) => setPropStyle('boxShadow', v)} />
|
<PresetButtonGrid presets={SPACING_PRESETS} activeValue={(nodeProps.style || {}).padding as string} onSelect={(v) => setPropStyle('padding', v)} />
|
||||||
</div>
|
</div>
|
||||||
<div style={sectionGap}>
|
|
||||||
<label style={labelStyle}>Opacity</label>
|
|
||||||
<input
|
|
||||||
type="range"
|
|
||||||
min={0}
|
|
||||||
max={100}
|
|
||||||
value={style.opacity !== undefined ? Math.round(parseFloat(style.opacity) * 100) : 100}
|
|
||||||
onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
|
|
||||||
style={{ width: '100%' }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</CollapsibleSection>
|
|
||||||
|
|
||||||
{/* Entrance animation */}
|
|
||||||
<CollapsibleSection title="Animation" defaultOpen={false}>
|
|
||||||
<AnimationControl
|
|
||||||
value={{ animation: nodeProps.animation, animationDelay: nodeProps.animationDelay }}
|
|
||||||
onChange={(v) => actions.setProp(selectedId, (p: any) => { p.animation = v.animation; p.animationDelay = v.animationDelay; })}
|
|
||||||
/>
|
|
||||||
</CollapsibleSection>
|
|
||||||
|
|
||||||
{/* Responsive visibility */}
|
|
||||||
<CollapsibleSection title="Visibility" defaultOpen={false}>
|
|
||||||
<VisibilityControl
|
|
||||||
value={{ hideOnDesktop: nodeProps.hideOnDesktop, hideOnTablet: nodeProps.hideOnTablet, hideOnMobile: nodeProps.hideOnMobile }}
|
|
||||||
onChange={(v) => actions.setProp(selectedId, (p: any) => { p.hideOnDesktop = v.hideOnDesktop; p.hideOnTablet = v.hideOnTablet; p.hideOnMobile = v.hideOnMobile; })}
|
|
||||||
/>
|
|
||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,16 +1,38 @@
|
|||||||
import React, { useCallback, useState } from 'react';
|
import React, { useCallback, useState } from 'react';
|
||||||
import { useEditor } from '@craftjs/core';
|
import { useEditor } from '@craftjs/core';
|
||||||
|
import { SHADOW_PRESETS } from '../../../constants/presets';
|
||||||
import {
|
import {
|
||||||
StylePanelProps,
|
StylePanelProps,
|
||||||
CollapsibleSection,
|
CollapsibleSection,
|
||||||
ColorPickerField,
|
ColorPickerField,
|
||||||
|
SectionLabel,
|
||||||
|
PresetButtonGrid,
|
||||||
labelStyle,
|
labelStyle,
|
||||||
inputStyle,
|
inputStyle,
|
||||||
smallInputStyle,
|
smallInputStyle,
|
||||||
btnActiveStyle,
|
btnActiveStyle,
|
||||||
sectionGap,
|
sectionGap,
|
||||||
|
useNodeProp,
|
||||||
|
SpacingControl,
|
||||||
|
BorderControl,
|
||||||
|
BorderValue,
|
||||||
|
buildBorderShorthand,
|
||||||
|
AnimationControl,
|
||||||
|
VisibilityControl,
|
||||||
} from './shared';
|
} from './shared';
|
||||||
|
|
||||||
|
/** Parses a border shorthand string ("2px solid #hex") produced by
|
||||||
|
* buildBorderShorthand() back into its parts for round-tripping through
|
||||||
|
* BorderControl. See SectionTypePanel.tsx for the identical helper. */
|
||||||
|
function parseBorderShorthand(v: string | undefined): BorderValue {
|
||||||
|
if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
|
||||||
|
const m = String(v).match(/^([\d.]+[a-z%]*)\s+(\w+)\s+(.+)$/);
|
||||||
|
if (!m) return { width: '', style: 'none', color: '#000000' };
|
||||||
|
return { width: m[1], style: m[2], color: m[3] };
|
||||||
|
}
|
||||||
|
|
||||||
|
const capSide = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1);
|
||||||
|
|
||||||
const bulletOptions = [
|
const bulletOptions = [
|
||||||
{ label: '✓', value: 'check' },
|
{ label: '✓', value: 'check' },
|
||||||
{ label: '●', value: 'dot' },
|
{ label: '●', value: 'dot' },
|
||||||
@@ -26,10 +48,12 @@ const bulletChar: Record<string, string> = {
|
|||||||
|
|
||||||
export const PricingStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
export const PricingStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
||||||
const { actions } = useEditor();
|
const { actions } = useEditor();
|
||||||
|
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
||||||
const [expandedPlan, setExpandedPlan] = useState<number>(0);
|
const [expandedPlan, setExpandedPlan] = useState<number>(0);
|
||||||
|
|
||||||
const plans: any[] = Array.isArray(nodeProps.plans) ? nodeProps.plans : [];
|
const plans: any[] = Array.isArray(nodeProps.plans) ? nodeProps.plans : [];
|
||||||
const currentBullet = nodeProps.bulletType || 'check';
|
const currentBullet = nodeProps.bulletType || 'check';
|
||||||
|
const style = nodeProps.style || {};
|
||||||
|
|
||||||
const updatePlan = useCallback((planIndex: number, field: string, value: any) => {
|
const updatePlan = useCallback((planIndex: number, field: string, value: any) => {
|
||||||
actions.setProp(selectedId, (props: any) => {
|
actions.setProp(selectedId, (props: any) => {
|
||||||
@@ -204,6 +228,79 @@ export const PricingStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeP
|
|||||||
{/* Colors */}
|
{/* Colors */}
|
||||||
<CollapsibleSection title="Colors" defaultOpen={false}>
|
<CollapsibleSection title="Colors" defaultOpen={false}>
|
||||||
<ColorPickerField label="Featured Plan Color" value={nodeProps.featuredBg || '#3b82f6'} onChange={(v) => actions.setProp(selectedId, (p: any) => { p.featuredBg = v; })} />
|
<ColorPickerField label="Featured Plan Color" value={nodeProps.featuredBg || '#3b82f6'} onChange={(v) => actions.setProp(selectedId, (p: any) => { p.featuredBg = v; })} />
|
||||||
|
{/* Regular (non-featured) card colors -- built into PricingTable's
|
||||||
|
render/toHtml but previously hard-coded literals with no control
|
||||||
|
surfacing them. Each falls back to the prior literal when blank. */}
|
||||||
|
<ColorPickerField label="Card Background" value={nodeProps.cardBg || '#ffffff'} onChange={(v) => setProp('cardBg', v)} />
|
||||||
|
<ColorPickerField label="Heading / Price Color" value={nodeProps.textColor || '#18181b'} onChange={(v) => setProp('textColor', v)} />
|
||||||
|
<ColorPickerField label="Period Text Color" value={nodeProps.subColor || '#64748b'} onChange={(v) => setProp('subColor', v)} />
|
||||||
|
<ColorPickerField label="Feature Text Color" value={nodeProps.featColor || '#4b5563'} onChange={(v) => setProp('featColor', v)} />
|
||||||
|
<ColorPickerField label="Checkmark Color" value={nodeProps.checkColor || '#10b981'} onChange={(v) => setProp('checkColor', v)} />
|
||||||
|
<ColorPickerField label="Button Background" value={nodeProps.btnBg || nodeProps.featuredBg || '#3b82f6'} onChange={(v) => setProp('btnBg', v)} />
|
||||||
|
<ColorPickerField label="Button Text Color" value={nodeProps.btnColor || '#ffffff'} onChange={(v) => setProp('btnColor', v)} />
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Box model: margin, padding, border, shadow, opacity */}
|
||||||
|
<CollapsibleSection title="Spacing & Border" defaultOpen={false}>
|
||||||
|
<SpacingControl
|
||||||
|
label="Margin"
|
||||||
|
value={{
|
||||||
|
top: style.marginTop as string, right: style.marginRight as string,
|
||||||
|
bottom: style.marginBottom as string, left: style.marginLeft as string,
|
||||||
|
}}
|
||||||
|
onChange={(side, v) => setPropStyle(`margin${capSide(side)}`, v)}
|
||||||
|
/>
|
||||||
|
<SpacingControl
|
||||||
|
label="Padding"
|
||||||
|
value={{
|
||||||
|
top: style.paddingTop as string, right: style.paddingRight as string,
|
||||||
|
bottom: style.paddingBottom as string, left: style.paddingLeft as string,
|
||||||
|
}}
|
||||||
|
onChange={(side, v) => setPropStyle(`padding${capSide(side)}`, v)}
|
||||||
|
/>
|
||||||
|
<BorderControl
|
||||||
|
value={parseBorderShorthand(style.border as string)}
|
||||||
|
onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
|
||||||
|
/>
|
||||||
|
<div className="guided-section">
|
||||||
|
<SectionLabel>Shadow</SectionLabel>
|
||||||
|
<PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow as string} onSelect={(v) => setPropStyle('boxShadow', v)} />
|
||||||
|
</div>
|
||||||
|
<div className="guided-section">
|
||||||
|
<SectionLabel>Opacity</SectionLabel>
|
||||||
|
<input
|
||||||
|
type="range"
|
||||||
|
min={0}
|
||||||
|
max={100}
|
||||||
|
value={style.opacity !== undefined ? Math.round(Number(style.opacity) * 100) : 100}
|
||||||
|
onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
|
||||||
|
style={{ width: '100%' }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Entrance animation */}
|
||||||
|
<CollapsibleSection title="Animation" defaultOpen={false}>
|
||||||
|
<AnimationControl
|
||||||
|
value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay || '0' }}
|
||||||
|
onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
|
||||||
|
/>
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Responsive visibility */}
|
||||||
|
<CollapsibleSection title="Visibility" defaultOpen={false}>
|
||||||
|
<VisibilityControl
|
||||||
|
value={{
|
||||||
|
hideOnDesktop: !!nodeProps.hideOnDesktop,
|
||||||
|
hideOnTablet: !!nodeProps.hideOnTablet,
|
||||||
|
hideOnMobile: !!nodeProps.hideOnMobile,
|
||||||
|
}}
|
||||||
|
onChange={(v) => {
|
||||||
|
setProp('hideOnDesktop', !!v.hideOnDesktop);
|
||||||
|
setProp('hideOnTablet', !!v.hideOnTablet);
|
||||||
|
setProp('hideOnMobile', !!v.hideOnMobile);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import {
|
|||||||
BG_COLORS,
|
BG_COLORS,
|
||||||
SPACING_PRESETS,
|
SPACING_PRESETS,
|
||||||
RADIUS_PRESETS,
|
RADIUS_PRESETS,
|
||||||
|
SHADOW_PRESETS,
|
||||||
} from '../../../constants/presets';
|
} from '../../../constants/presets';
|
||||||
import {
|
import {
|
||||||
StylePanelProps,
|
StylePanelProps,
|
||||||
@@ -15,10 +16,31 @@ import {
|
|||||||
inputStyle,
|
inputStyle,
|
||||||
sectionGap,
|
sectionGap,
|
||||||
useNodeProp,
|
useNodeProp,
|
||||||
|
SpacingControl,
|
||||||
|
BorderControl,
|
||||||
|
BorderValue,
|
||||||
|
buildBorderShorthand,
|
||||||
|
AnimationControl,
|
||||||
|
VisibilityControl,
|
||||||
} from './shared';
|
} from './shared';
|
||||||
import { FeaturesEditor } from './FeaturesEditor';
|
import { FeaturesEditor } from './FeaturesEditor';
|
||||||
import { ArrayItemFieldsEditor } from './ArrayItemFields';
|
import { ArrayItemFieldsEditor } from './ArrayItemFields';
|
||||||
|
|
||||||
|
/** Parses a border shorthand string ("2px solid #hex") produced by
|
||||||
|
* buildBorderShorthand() back into its parts for round-tripping through
|
||||||
|
* BorderControl. Anything that doesn't match (undefined/'none'/legacy
|
||||||
|
* hand-authored values) falls back to an empty/none border rather than
|
||||||
|
* throwing, since this is display-only -- the next edit always re-emits a
|
||||||
|
* clean shorthand via buildBorderShorthand(). */
|
||||||
|
function parseBorderShorthand(v: string | undefined): BorderValue {
|
||||||
|
if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
|
||||||
|
const m = String(v).match(/^([\d.]+[a-z%]*)\s+(\w+)\s+(.+)$/);
|
||||||
|
if (!m) return { width: '', style: 'none', color: '#000000' };
|
||||||
|
return { width: m[1], style: m[2], color: m[3] };
|
||||||
|
}
|
||||||
|
|
||||||
|
const capSide = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1);
|
||||||
|
|
||||||
/* ---------- SECTION-TYPE (Accordion, Tabs, Pricing, Testimonials, etc.) ---------- */
|
/* ---------- SECTION-TYPE (Accordion, Tabs, Pricing, Testimonials, etc.) ---------- */
|
||||||
export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }> = ({ selectedId, nodeProps, typeName }) => {
|
export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }> = ({ selectedId, nodeProps, typeName }) => {
|
||||||
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
||||||
@@ -26,7 +48,12 @@ export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }>
|
|||||||
const style = nodeProps.style || {};
|
const style = nodeProps.style || {};
|
||||||
|
|
||||||
// Find all string/number/boolean props
|
// Find all string/number/boolean props
|
||||||
const SKIP_PROPS = new Set(['style', 'children', 'cssId', 'cssClass']);
|
const SKIP_PROPS = new Set([
|
||||||
|
'style', 'children', 'cssId', 'cssClass',
|
||||||
|
// Rendered via dedicated controls below (Animation/Visibility), not the
|
||||||
|
// generic Content field dump -- otherwise they'd show up twice.
|
||||||
|
'animation', 'animationDelay', 'hideOnDesktop', 'hideOnTablet', 'hideOnMobile',
|
||||||
|
]);
|
||||||
const scalarProps = Object.entries(nodeProps).filter(
|
const scalarProps = Object.entries(nodeProps).filter(
|
||||||
([key, val]) => !SKIP_PROPS.has(key) && (typeof val === 'string' || typeof val === 'number' || typeof val === 'boolean')
|
([key, val]) => !SKIP_PROPS.has(key) && (typeof val === 'string' || typeof val === 'number' || typeof val === 'boolean')
|
||||||
);
|
);
|
||||||
@@ -126,6 +153,69 @@ export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }>
|
|||||||
<PresetButtonGrid presets={RADIUS_PRESETS} activeValue={style.borderRadius as string} onSelect={(v) => setPropStyle('borderRadius', v)} />
|
<PresetButtonGrid presets={RADIUS_PRESETS} activeValue={style.borderRadius as string} onSelect={(v) => setPropStyle('borderRadius', v)} />
|
||||||
</div>
|
</div>
|
||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Box model: margin, padding, border, shadow, opacity */}
|
||||||
|
<CollapsibleSection title="Spacing & Border" defaultOpen={false}>
|
||||||
|
<SpacingControl
|
||||||
|
label="Margin"
|
||||||
|
value={{
|
||||||
|
top: style.marginTop as string, right: style.marginRight as string,
|
||||||
|
bottom: style.marginBottom as string, left: style.marginLeft as string,
|
||||||
|
}}
|
||||||
|
onChange={(side, v) => setPropStyle(`margin${capSide(side)}`, v)}
|
||||||
|
/>
|
||||||
|
<SpacingControl
|
||||||
|
label="Padding"
|
||||||
|
value={{
|
||||||
|
top: style.paddingTop as string, right: style.paddingRight as string,
|
||||||
|
bottom: style.paddingBottom as string, left: style.paddingLeft as string,
|
||||||
|
}}
|
||||||
|
onChange={(side, v) => setPropStyle(`padding${capSide(side)}`, v)}
|
||||||
|
/>
|
||||||
|
<BorderControl
|
||||||
|
value={parseBorderShorthand(style.border as string)}
|
||||||
|
onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
|
||||||
|
/>
|
||||||
|
<div className="guided-section">
|
||||||
|
<SectionLabel>Shadow</SectionLabel>
|
||||||
|
<PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow as string} onSelect={(v) => setPropStyle('boxShadow', v)} />
|
||||||
|
</div>
|
||||||
|
<div className="guided-section">
|
||||||
|
<SectionLabel>Opacity</SectionLabel>
|
||||||
|
<input
|
||||||
|
type="range"
|
||||||
|
min={0}
|
||||||
|
max={100}
|
||||||
|
value={style.opacity !== undefined ? Math.round(Number(style.opacity) * 100) : 100}
|
||||||
|
onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
|
||||||
|
style={{ width: '100%' }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Entrance animation */}
|
||||||
|
<CollapsibleSection title="Animation" defaultOpen={false}>
|
||||||
|
<AnimationControl
|
||||||
|
value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay || '0' }}
|
||||||
|
onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
|
||||||
|
/>
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Responsive visibility */}
|
||||||
|
<CollapsibleSection title="Visibility" defaultOpen={false}>
|
||||||
|
<VisibilityControl
|
||||||
|
value={{
|
||||||
|
hideOnDesktop: !!nodeProps.hideOnDesktop,
|
||||||
|
hideOnTablet: !!nodeProps.hideOnTablet,
|
||||||
|
hideOnMobile: !!nodeProps.hideOnMobile,
|
||||||
|
}}
|
||||||
|
onChange={(v) => {
|
||||||
|
setProp('hideOnDesktop', !!v.hideOnDesktop);
|
||||||
|
setProp('hideOnTablet', !!v.hideOnTablet);
|
||||||
|
setProp('hideOnMobile', !!v.hideOnMobile);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</CollapsibleSection>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { useEditor } from '@craftjs/core';
|
|||||||
import {
|
import {
|
||||||
BG_COLORS,
|
BG_COLORS,
|
||||||
SPACING_PRESETS,
|
SPACING_PRESETS,
|
||||||
|
SHADOW_PRESETS,
|
||||||
} from '../../../constants/presets';
|
} from '../../../constants/presets';
|
||||||
import {
|
import {
|
||||||
StylePanelProps,
|
StylePanelProps,
|
||||||
@@ -17,8 +18,33 @@ import {
|
|||||||
btnActiveStyle,
|
btnActiveStyle,
|
||||||
sectionGap,
|
sectionGap,
|
||||||
useNodeProp,
|
useNodeProp,
|
||||||
|
SpacingControl,
|
||||||
|
BorderControl,
|
||||||
|
BorderValue,
|
||||||
|
buildBorderShorthand,
|
||||||
|
AnimationControl,
|
||||||
|
VisibilityControl,
|
||||||
} from './shared';
|
} from './shared';
|
||||||
|
|
||||||
|
/** Parses a border shorthand string ("2px solid #hex") produced by
|
||||||
|
* buildBorderShorthand() back into its parts for round-tripping through
|
||||||
|
* BorderControl. See SectionTypePanel.tsx for the identical helper. */
|
||||||
|
function parseBorderShorthand(v: string | undefined): BorderValue {
|
||||||
|
if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
|
||||||
|
const m = String(v).match(/^([\d.]+[a-z%]*)\s+(\w+)\s+(.+)$/);
|
||||||
|
if (!m) return { width: '', style: 'none', color: '#000000' };
|
||||||
|
return { width: m[1], style: m[2], color: m[3] };
|
||||||
|
}
|
||||||
|
|
||||||
|
const capSide = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1);
|
||||||
|
|
||||||
|
const ICON_SHAPES = [
|
||||||
|
{ label: 'None', value: 'none' },
|
||||||
|
{ label: 'Circle', value: 'circle' },
|
||||||
|
{ label: 'Square', value: 'square' },
|
||||||
|
{ label: 'Rounded', value: 'rounded' },
|
||||||
|
];
|
||||||
|
|
||||||
/* ---------- SOCIAL / ICON / STAR RATING ---------- */
|
/* ---------- SOCIAL / ICON / STAR RATING ---------- */
|
||||||
export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
||||||
const { actions } = useEditor();
|
const { actions } = useEditor();
|
||||||
@@ -111,6 +137,72 @@ export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodePr
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Icon shape (SocialLinks) -- exists on the component (iconShape prop
|
||||||
|
drives the circle/square/rounded background box) but previously had
|
||||||
|
no control. */}
|
||||||
|
{nodeProps.iconShape !== undefined && (
|
||||||
|
<div style={sectionGap}>
|
||||||
|
<label style={labelStyle}>Icon Shape</label>
|
||||||
|
<div style={{ display: 'flex', gap: 4 }}>
|
||||||
|
{ICON_SHAPES.map((s) => (
|
||||||
|
<button key={s.value} onClick={() => setProp('iconShape', s.value)} style={{ ...btnActiveStyle(nodeProps.iconShape === s.value), flex: 1 }}>
|
||||||
|
{s.label}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{/* Gap between links (SocialLinks) -- exists on the component but
|
||||||
|
previously had no control. */}
|
||||||
|
{nodeProps.gap !== undefined && (
|
||||||
|
<div style={sectionGap}>
|
||||||
|
<label style={labelStyle}>Gap</label>
|
||||||
|
<input type="text" value={nodeProps.gap || '10px'} onChange={(e) => setProp('gap', e.target.value)} placeholder="10px" style={inputStyle} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Background shape / size / link (Icon component) -- bgColor, bgShape,
|
||||||
|
bgSize, link all already exist on Icon.craft.props but had no
|
||||||
|
control; the generic `color`/`iconColor` checks above never matched
|
||||||
|
Icon's actual prop names. */}
|
||||||
|
{nodeProps.bgShape !== undefined && (
|
||||||
|
<div style={sectionGap}>
|
||||||
|
<label style={labelStyle}>Background Shape</label>
|
||||||
|
<div style={{ display: 'flex', gap: 4 }}>
|
||||||
|
{ICON_SHAPES.map((s) => (
|
||||||
|
<button key={s.value} onClick={() => setProp('bgShape', s.value)} style={{ ...btnActiveStyle(nodeProps.bgShape === s.value), flex: 1 }}>
|
||||||
|
{s.label}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{nodeProps.bgColor !== undefined && (
|
||||||
|
<ColorPickerField label="Background Color" value={nodeProps.bgColor === 'transparent' ? '' : nodeProps.bgColor} onChange={(v) => setProp('bgColor', v)} />
|
||||||
|
)}
|
||||||
|
{nodeProps.bgSize !== undefined && (
|
||||||
|
<div style={sectionGap}>
|
||||||
|
<label style={labelStyle}>Background Size</label>
|
||||||
|
<input type="text" value={nodeProps.bgSize || '56px'} onChange={(e) => setProp('bgSize', e.target.value)} placeholder="56px" style={inputStyle} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{nodeProps.link !== undefined && (
|
||||||
|
<div style={sectionGap}>
|
||||||
|
<label style={labelStyle}>Link URL</label>
|
||||||
|
<input type="text" value={nodeProps.link || ''} onChange={(e) => setProp('link', e.target.value)} placeholder="https://..." style={inputStyle} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Star colors (StarRating) -- exist on the component as filledColor /
|
||||||
|
emptyColor but had no control (the generic `starColor` check above
|
||||||
|
never matched StarRating's actual prop names). */}
|
||||||
|
{nodeProps.filledColor !== undefined && (
|
||||||
|
<ColorPickerField label="Filled Star Color" value={nodeProps.filledColor || '#f59e0b'} onChange={(v) => setProp('filledColor', v)} />
|
||||||
|
)}
|
||||||
|
{nodeProps.emptyColor !== undefined && (
|
||||||
|
<ColorPickerField label="Empty Star Color" value={nodeProps.emptyColor || '#d1d5db'} onChange={(v) => setProp('emptyColor', v)} />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Colors */}
|
{/* Colors */}
|
||||||
{nodeProps.iconColor !== undefined && (
|
{nodeProps.iconColor !== undefined && (
|
||||||
<ColorPickerField label="Icon Color" value={nodeProps.iconColor || '#3b82f6'} onChange={(v) => setProp('iconColor', v)} />
|
<ColorPickerField label="Icon Color" value={nodeProps.iconColor || '#3b82f6'} onChange={(v) => setProp('iconColor', v)} />
|
||||||
@@ -164,6 +256,69 @@ export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodePr
|
|||||||
<PresetButtonGrid presets={SPACING_PRESETS} activeValue={style.padding as string} onSelect={(v) => setPropStyle('padding', v)} />
|
<PresetButtonGrid presets={SPACING_PRESETS} activeValue={style.padding as string} onSelect={(v) => setPropStyle('padding', v)} />
|
||||||
</div>
|
</div>
|
||||||
</CollapsibleSection>
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Box model: margin, padding (per-side), border, shadow, opacity */}
|
||||||
|
<CollapsibleSection title="Spacing & Border" defaultOpen={false}>
|
||||||
|
<SpacingControl
|
||||||
|
label="Margin"
|
||||||
|
value={{
|
||||||
|
top: style.marginTop as string, right: style.marginRight as string,
|
||||||
|
bottom: style.marginBottom as string, left: style.marginLeft as string,
|
||||||
|
}}
|
||||||
|
onChange={(side, v) => setPropStyle(`margin${capSide(side)}`, v)}
|
||||||
|
/>
|
||||||
|
<SpacingControl
|
||||||
|
label="Padding"
|
||||||
|
value={{
|
||||||
|
top: style.paddingTop as string, right: style.paddingRight as string,
|
||||||
|
bottom: style.paddingBottom as string, left: style.paddingLeft as string,
|
||||||
|
}}
|
||||||
|
onChange={(side, v) => setPropStyle(`padding${capSide(side)}`, v)}
|
||||||
|
/>
|
||||||
|
<BorderControl
|
||||||
|
value={parseBorderShorthand(style.border as string)}
|
||||||
|
onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
|
||||||
|
/>
|
||||||
|
<div className="guided-section">
|
||||||
|
<SectionLabel>Shadow</SectionLabel>
|
||||||
|
<PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow as string} onSelect={(v) => setPropStyle('boxShadow', v)} />
|
||||||
|
</div>
|
||||||
|
<div className="guided-section">
|
||||||
|
<SectionLabel>Opacity</SectionLabel>
|
||||||
|
<input
|
||||||
|
type="range"
|
||||||
|
min={0}
|
||||||
|
max={100}
|
||||||
|
value={style.opacity !== undefined ? Math.round(Number(style.opacity) * 100) : 100}
|
||||||
|
onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
|
||||||
|
style={{ width: '100%' }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Entrance animation */}
|
||||||
|
<CollapsibleSection title="Animation" defaultOpen={false}>
|
||||||
|
<AnimationControl
|
||||||
|
value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay || '0' }}
|
||||||
|
onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
|
||||||
|
/>
|
||||||
|
</CollapsibleSection>
|
||||||
|
|
||||||
|
{/* Responsive visibility */}
|
||||||
|
<CollapsibleSection title="Visibility" defaultOpen={false}>
|
||||||
|
<VisibilityControl
|
||||||
|
value={{
|
||||||
|
hideOnDesktop: !!nodeProps.hideOnDesktop,
|
||||||
|
hideOnTablet: !!nodeProps.hideOnTablet,
|
||||||
|
hideOnMobile: !!nodeProps.hideOnMobile,
|
||||||
|
}}
|
||||||
|
onChange={(v) => {
|
||||||
|
setProp('hideOnDesktop', !!v.hideOnDesktop);
|
||||||
|
setProp('hideOnTablet', !!v.hideOnTablet);
|
||||||
|
setProp('hideOnMobile', !!v.hideOnMobile);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</CollapsibleSection>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user