Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8bf525c600 |
@@ -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,
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -80,56 +80,3 @@ describe('ColumnLayout.toHtml XSS hardening (gap into <style>)', () => {
|
|||||||
expect(html).toMatch(/calc\(50% - 24px\)/);
|
expect(html).toMatch(/calc\(50% - 24px\)/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('ColumnLayout.toHtml vertical alignment (align-items on the flex row)', () => {
|
|
||||||
test('style.alignItems flows into the emitted style attribute (aligns uneven columns)', () => {
|
|
||||||
const { html } = toHtml({ columns: 2, split: '50-50', gap: '16px', style: { alignItems: 'center' } }, '<div>A</div><div>B</div>');
|
|
||||||
expect(html).toContain('align-items:center');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('ColumnLayout.toHtml box-model styles (margin/padding/border/shadow/opacity)', () => {
|
|
||||||
test('margin/padding/border/box-shadow/opacity all flow into the emitted style attribute', () => {
|
|
||||||
const { html } = toHtml(
|
|
||||||
{
|
|
||||||
columns: 2,
|
|
||||||
split: '50-50',
|
|
||||||
gap: '16px',
|
|
||||||
style: {
|
|
||||||
marginTop: '10px', marginRight: '10px', marginBottom: '10px', marginLeft: '10px',
|
|
||||||
paddingTop: '5px',
|
|
||||||
border: '2px solid #ff0000',
|
|
||||||
boxShadow: '0 4px 8px rgba(0,0,0,0.12)',
|
|
||||||
opacity: '0.8',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'<div>A</div><div>B</div>',
|
|
||||||
);
|
|
||||||
expect(html).toContain('margin-top:10px');
|
|
||||||
expect(html).toContain('padding-top:5px');
|
|
||||||
expect(html).toContain('border:2px solid #ff0000');
|
|
||||||
expect(html).toContain('box-shadow:0 4px 8px rgba(0,0,0,0.12)');
|
|
||||||
expect(html).toContain('opacity:0.8');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('ColumnLayout.craft.props exposes the vertical-alignment/box-model/animation/visibility rollout', () => {
|
|
||||||
test('animation, animationDelay, hideOnDesktop/Tablet/Mobile are present with blank/false defaults', () => {
|
|
||||||
const props = (ColumnLayout as any).craft.props;
|
|
||||||
expect(props.animation).toBe('');
|
|
||||||
expect(props.animationDelay).toBe('0');
|
|
||||||
expect(props.hideOnDesktop).toBe(false);
|
|
||||||
expect(props.hideOnTablet).toBe(false);
|
|
||||||
expect(props.hideOnMobile).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('style carries blank/default alignItems and box-model keys', () => {
|
|
||||||
const style = (ColumnLayout as any).craft.props.style;
|
|
||||||
expect(style).toHaveProperty('alignItems');
|
|
||||||
expect(style).toHaveProperty('marginTop');
|
|
||||||
expect(style).toHaveProperty('paddingTop');
|
|
||||||
expect(style.border).toBe('none');
|
|
||||||
expect(style.boxShadow).toBe('none');
|
|
||||||
expect(style.opacity).toBe('1');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -20,11 +20,6 @@ interface ColumnLayoutProps {
|
|||||||
style?: CSSProperties;
|
style?: CSSProperties;
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
hideOnDesktop?: boolean;
|
|
||||||
hideOnTablet?: boolean;
|
|
||||||
hideOnMobile?: boolean;
|
|
||||||
animation?: string;
|
|
||||||
animationDelay?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const splitToWidths: Record<string, string[]> = {
|
const splitToWidths: Record<string, string[]> = {
|
||||||
@@ -107,20 +102,8 @@ ColumnLayout.craft = {
|
|||||||
columns: 2,
|
columns: 2,
|
||||||
split: '50-50',
|
split: '50-50',
|
||||||
gap: '16px',
|
gap: '16px',
|
||||||
style: {
|
style: {},
|
||||||
alignItems: '',
|
|
||||||
marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
|
|
||||||
paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
|
|
||||||
border: 'none',
|
|
||||||
boxShadow: 'none',
|
|
||||||
opacity: '1',
|
|
||||||
},
|
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
animation: '',
|
|
||||||
animationDelay: '0',
|
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
|
|||||||
@@ -63,88 +63,3 @@ describe('Container.toHtml tag allowlist (adversarial re-review, same class as C
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Container.toHtml vertical alignment (justify-content + min-height)', () => {
|
|
||||||
// Regression lock: Container/Section must NOT unconditionally become a
|
|
||||||
// flex container. Flex-blockifies in-flow children, forcing components
|
|
||||||
// that deliberately render display:inline-block (ButtonLink, Icon) to
|
|
||||||
// stack vertically instead of sitting side-by-side -- a real visual
|
|
||||||
// regression for existing published pages that never touch vertical
|
|
||||||
// alignment.
|
|
||||||
test('does NOT become a flex container when no vertical alignment is set (plain block flow preserved)', () => {
|
|
||||||
const { html } = toHtml({}, 'child');
|
|
||||||
expect(html).not.toContain('display:flex');
|
|
||||||
expect(html).not.toContain('flex-direction');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('does NOT become a flex container from min-height alone (min-height must not itself trigger flex)', () => {
|
|
||||||
const { html } = toHtml({ style: { minHeight: '400px' } }, 'child');
|
|
||||||
expect(html).not.toContain('display:flex');
|
|
||||||
expect(html).not.toContain('flex-direction');
|
|
||||||
expect(html).toContain('min-height:400px');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('becomes a column flex container when style.justifyContent is set (feature still works)', () => {
|
|
||||||
const { html } = toHtml({ style: { justifyContent: 'center' } }, 'child');
|
|
||||||
expect(html).toContain('display:flex');
|
|
||||||
expect(html).toContain('flex-direction:column');
|
|
||||||
expect(html).toContain('justify-content:center');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('style.minHeight flows into the emitted style attribute', () => {
|
|
||||||
const { html } = toHtml({ style: { minHeight: '400px' } }, 'child');
|
|
||||||
expect(html).toContain('min-height:400px');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('justify-content and min-height still flow through in boxed (contentWidth) mode', () => {
|
|
||||||
const { html } = toHtml({ contentWidth: 'boxed', style: { justifyContent: 'flex-end', minHeight: '500px' } }, 'child');
|
|
||||||
expect(html).toContain('display:flex');
|
|
||||||
expect(html).toContain('flex-direction:column');
|
|
||||||
expect(html).toContain('justify-content:flex-end');
|
|
||||||
expect(html).toContain('min-height:500px');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Container.toHtml box-model styles (margin/padding/border/shadow/opacity)', () => {
|
|
||||||
test('margin/padding/border/box-shadow/opacity all flow into the emitted style attribute', () => {
|
|
||||||
const { html } = toHtml(
|
|
||||||
{
|
|
||||||
style: {
|
|
||||||
marginTop: '10px', marginRight: '10px', marginBottom: '10px', marginLeft: '10px',
|
|
||||||
paddingTop: '5px',
|
|
||||||
border: '2px solid #ff0000',
|
|
||||||
boxShadow: '0 4px 8px rgba(0,0,0,0.12)',
|
|
||||||
opacity: '0.8',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'child',
|
|
||||||
);
|
|
||||||
expect(html).toContain('margin-top:10px');
|
|
||||||
expect(html).toContain('padding-top:5px');
|
|
||||||
expect(html).toContain('border:2px solid #ff0000');
|
|
||||||
expect(html).toContain('box-shadow:0 4px 8px rgba(0,0,0,0.12)');
|
|
||||||
expect(html).toContain('opacity:0.8');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Container.craft.props exposes the vertical-alignment/box-model/animation/visibility rollout', () => {
|
|
||||||
test('animation, animationDelay, hideOnDesktop/Tablet/Mobile are present with blank/false defaults', () => {
|
|
||||||
const props = (Container as any).craft.props;
|
|
||||||
expect(props.animation).toBe('');
|
|
||||||
expect(props.animationDelay).toBe('0');
|
|
||||||
expect(props.hideOnDesktop).toBe(false);
|
|
||||||
expect(props.hideOnTablet).toBe(false);
|
|
||||||
expect(props.hideOnMobile).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('style carries blank/default vertical-alignment and box-model keys', () => {
|
|
||||||
const style = (Container as any).craft.props.style;
|
|
||||||
expect(style).toHaveProperty('justifyContent');
|
|
||||||
expect(style).toHaveProperty('minHeight');
|
|
||||||
expect(style).toHaveProperty('marginTop');
|
|
||||||
expect(style).toHaveProperty('paddingTop');
|
|
||||||
expect(style.border).toBe('none');
|
|
||||||
expect(style.boxShadow).toBe('none');
|
|
||||||
expect(style.opacity).toBe('1');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -43,20 +43,6 @@ const flexAlignFromTextAlign = (textAlign: CSSProperties['textAlign']): CSSPrope
|
|||||||
return {};
|
return {};
|
||||||
};
|
};
|
||||||
|
|
||||||
// Container only becomes display:flex/flex-direction:column at its root
|
|
||||||
// (both in the editor render below and in toHtml) when the user has
|
|
||||||
// actually set `style.justifyContent` (the Vertical Alignment control,
|
|
||||||
// paired with `style.minHeight`) -- i.e. the flex conversion is gated on
|
|
||||||
// vertical-align actually being in use, not unconditional. In-flow children
|
|
||||||
// of a flex container get CSS-blockified, which would force components that
|
|
||||||
// deliberately render `display:inline-block` (ButtonLink, Icon) to stack
|
|
||||||
// vertically instead of sitting side-by-side -- a real visual regression for
|
|
||||||
// any container/section that never touches vertical alignment, not a no-op.
|
|
||||||
// So plain block flow (no `display`/`flex-direction` at all) is preserved
|
|
||||||
// unless vertical-align is set. `flexAlignFromTextAlign` above still
|
|
||||||
// supplies its own conditional flex conversion (cross-axis alignItems from
|
|
||||||
// `textAlign`) independently -- unrelated to this gate.
|
|
||||||
|
|
||||||
export const Container: UserComponent<ContainerProps> = ({
|
export const Container: UserComponent<ContainerProps> = ({
|
||||||
style = {},
|
style = {},
|
||||||
tag = 'div',
|
tag = 'div',
|
||||||
@@ -72,12 +58,10 @@ export const Container: UserComponent<ContainerProps> = ({
|
|||||||
const safeTag = sanitizeContainerTag(tag);
|
const safeTag = sanitizeContainerTag(tag);
|
||||||
const needsBoxedWrapper = contentWidth === 'boxed';
|
const needsBoxedWrapper = contentWidth === 'boxed';
|
||||||
const flexStyles = flexAlignFromTextAlign(style.textAlign);
|
const flexStyles = flexAlignFromTextAlign(style.textAlign);
|
||||||
const hasVerticalAlign = !!style.justifyContent;
|
|
||||||
|
|
||||||
const outerStyle: CSSProperties = {
|
const outerStyle: CSSProperties = {
|
||||||
minHeight: '40px',
|
minHeight: '40px',
|
||||||
...style,
|
...style,
|
||||||
...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
|
|
||||||
...(fullWidth ? { width: '100vw', marginLeft: 'calc(-50vw + 50%)' } : {}),
|
...(fullWidth ? { width: '100vw', marginLeft: 'calc(-50vw + 50%)' } : {}),
|
||||||
...(needsBoxedWrapper ? {} : flexStyles),
|
...(needsBoxedWrapper ? {} : flexStyles),
|
||||||
};
|
};
|
||||||
@@ -109,27 +93,13 @@ export const Container: UserComponent<ContainerProps> = ({
|
|||||||
Container.craft = {
|
Container.craft = {
|
||||||
displayName: 'Container',
|
displayName: 'Container',
|
||||||
props: {
|
props: {
|
||||||
style: {
|
style: { padding: '20px', minHeight: '100px' },
|
||||||
padding: '20px',
|
|
||||||
minHeight: '100px',
|
|
||||||
justifyContent: '',
|
|
||||||
marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
|
|
||||||
paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
|
|
||||||
border: 'none',
|
|
||||||
boxShadow: 'none',
|
|
||||||
opacity: '1',
|
|
||||||
},
|
|
||||||
tag: 'div',
|
tag: 'div',
|
||||||
fullWidth: false,
|
fullWidth: false,
|
||||||
contentWidth: 'full',
|
contentWidth: 'full',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
cssId: '',
|
cssId: '',
|
||||||
cssClass: '',
|
cssClass: '',
|
||||||
animation: '',
|
|
||||||
animationDelay: '0',
|
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
@@ -144,11 +114,9 @@ Container.craft = {
|
|||||||
const tag = sanitizeContainerTag(props.tag);
|
const tag = sanitizeContainerTag(props.tag);
|
||||||
const isBoxed = props.contentWidth === 'boxed';
|
const isBoxed = props.contentWidth === 'boxed';
|
||||||
const flexStyles = flexAlignFromTextAlign(props.style?.textAlign);
|
const flexStyles = flexAlignFromTextAlign(props.style?.textAlign);
|
||||||
const hasVerticalAlign = !!props.style?.justifyContent;
|
|
||||||
|
|
||||||
const outerCss: CSSProperties = {
|
const outerCss: CSSProperties = {
|
||||||
...props.style,
|
...props.style,
|
||||||
...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
|
|
||||||
...(isBoxed ? {} : flexStyles),
|
...(isBoxed ? {} : flexStyles),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -73,78 +73,3 @@ describe('Section.toHtml shape divider color/height XSS hardening', () => {
|
|||||||
expect(html).not.toContain('<svg');
|
expect(html).not.toContain('<svg');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Section.toHtml vertical alignment (justify-content + min-height)', () => {
|
|
||||||
// Regression lock: same rationale as Container -- see Container.toHtml.test.ts.
|
|
||||||
// Section must not unconditionally become a flex container, or it
|
|
||||||
// blockifies inline-block children (ButtonLink, Icon) that are meant to
|
|
||||||
// sit side-by-side in existing published sections.
|
|
||||||
test('does NOT become a flex container when no vertical alignment is set (plain block flow preserved)', () => {
|
|
||||||
const { html } = toHtml({}, 'child');
|
|
||||||
expect(html).not.toContain('display:flex');
|
|
||||||
expect(html).not.toContain('flex-direction');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('does NOT become a flex container from min-height alone (min-height must not itself trigger flex)', () => {
|
|
||||||
const { html } = toHtml({ style: { minHeight: '600px' } }, 'child');
|
|
||||||
expect(html).not.toContain('display:flex');
|
|
||||||
expect(html).not.toContain('flex-direction');
|
|
||||||
expect(html).toContain('min-height:600px');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('becomes a column flex container when style.justifyContent is set (feature still works)', () => {
|
|
||||||
const { html } = toHtml({ style: { justifyContent: 'center' } }, 'child');
|
|
||||||
expect(html).toContain('display:flex');
|
|
||||||
expect(html).toContain('flex-direction:column');
|
|
||||||
expect(html).toContain('justify-content:center');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('style.minHeight flows into the emitted style attribute', () => {
|
|
||||||
const { html } = toHtml({ style: { minHeight: '600px' } }, 'child');
|
|
||||||
expect(html).toContain('min-height:600px');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Section.toHtml box-model styles (margin/padding/border/shadow/opacity)', () => {
|
|
||||||
test('margin/padding/border/box-shadow/opacity all flow into the emitted style attribute', () => {
|
|
||||||
const { html } = toHtml(
|
|
||||||
{
|
|
||||||
style: {
|
|
||||||
marginTop: '10px', marginRight: '10px', marginBottom: '10px', marginLeft: '10px',
|
|
||||||
paddingTop: '5px',
|
|
||||||
border: '2px solid #ff0000',
|
|
||||||
boxShadow: '0 4px 8px rgba(0,0,0,0.12)',
|
|
||||||
opacity: '0.8',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'child',
|
|
||||||
);
|
|
||||||
expect(html).toContain('margin-top:10px');
|
|
||||||
expect(html).toContain('padding-top:5px');
|
|
||||||
expect(html).toContain('border:2px solid #ff0000');
|
|
||||||
expect(html).toContain('box-shadow:0 4px 8px rgba(0,0,0,0.12)');
|
|
||||||
expect(html).toContain('opacity:0.8');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Section.craft.props exposes the vertical-alignment/box-model/animation/visibility rollout', () => {
|
|
||||||
test('animation, animationDelay, hideOnDesktop/Tablet/Mobile are present with blank/false defaults', () => {
|
|
||||||
const props = (Section as any).craft.props;
|
|
||||||
expect(props.animation).toBe('');
|
|
||||||
expect(props.animationDelay).toBe('0');
|
|
||||||
expect(props.hideOnDesktop).toBe(false);
|
|
||||||
expect(props.hideOnTablet).toBe(false);
|
|
||||||
expect(props.hideOnMobile).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('style carries blank/default vertical-alignment and box-model keys', () => {
|
|
||||||
const style = (Section as any).craft.props.style;
|
|
||||||
expect(style).toHaveProperty('justifyContent');
|
|
||||||
expect(style).toHaveProperty('minHeight');
|
|
||||||
expect(style).toHaveProperty('marginTop');
|
|
||||||
expect(style).toHaveProperty('paddingTop');
|
|
||||||
expect(style.border).toBe('none');
|
|
||||||
expect(style.boxShadow).toBe('none');
|
|
||||||
expect(style.opacity).toBe('1');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -27,11 +27,6 @@ interface SectionProps {
|
|||||||
bottomDividerColor?: string;
|
bottomDividerColor?: string;
|
||||||
bottomDividerHeight?: string;
|
bottomDividerHeight?: string;
|
||||||
anchorId?: string;
|
anchorId?: string;
|
||||||
hideOnDesktop?: boolean;
|
|
||||||
hideOnTablet?: boolean;
|
|
||||||
hideOnMobile?: boolean;
|
|
||||||
animation?: string;
|
|
||||||
animationDelay?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Divider renderer ---------- */
|
/* ---------- Divider renderer ---------- */
|
||||||
@@ -103,13 +98,6 @@ export const Section: UserComponent<SectionProps> = ({
|
|||||||
|
|
||||||
const hasTopDivider = topDivider && topDivider !== 'none';
|
const hasTopDivider = topDivider && topDivider !== 'none';
|
||||||
const hasBottomDivider = bottomDivider && bottomDivider !== 'none';
|
const hasBottomDivider = bottomDivider && bottomDivider !== 'none';
|
||||||
// Section's root only becomes a column flex container when the user has
|
|
||||||
// actually set `style.justifyContent` (Vertical Alignment control, paired
|
|
||||||
// with `style.minHeight`) -- see the matching note in Container.tsx for
|
|
||||||
// why an unconditional conversion is a real regression (blockifies
|
|
||||||
// deliberately inline-block children like ButtonLink/Icon) rather than a
|
|
||||||
// no-op, so plain block flow is preserved unless vertical-align is set.
|
|
||||||
const hasVerticalAlign = !!style.justifyContent;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section
|
<section
|
||||||
@@ -119,7 +107,6 @@ export const Section: UserComponent<SectionProps> = ({
|
|||||||
width: '100%',
|
width: '100%',
|
||||||
position: (hasTopDivider || hasBottomDivider) ? 'relative' : undefined,
|
position: (hasTopDivider || hasBottomDivider) ? 'relative' : undefined,
|
||||||
...style,
|
...style,
|
||||||
...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{hasTopDivider && (
|
{hasTopDivider && (
|
||||||
@@ -156,17 +143,7 @@ export const Section: UserComponent<SectionProps> = ({
|
|||||||
Section.craft = {
|
Section.craft = {
|
||||||
displayName: 'Section',
|
displayName: 'Section',
|
||||||
props: {
|
props: {
|
||||||
style: {
|
style: { padding: '40px 0', backgroundColor: '#ffffff' },
|
||||||
padding: '40px 0',
|
|
||||||
backgroundColor: '#ffffff',
|
|
||||||
minHeight: '',
|
|
||||||
justifyContent: '',
|
|
||||||
marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
|
|
||||||
paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
|
|
||||||
border: 'none',
|
|
||||||
boxShadow: 'none',
|
|
||||||
opacity: '1',
|
|
||||||
},
|
|
||||||
innerMaxWidth: '1200px',
|
innerMaxWidth: '1200px',
|
||||||
topDivider: 'none',
|
topDivider: 'none',
|
||||||
topDividerColor: '#ffffff',
|
topDividerColor: '#ffffff',
|
||||||
@@ -175,11 +152,6 @@ Section.craft = {
|
|||||||
bottomDividerColor: '#ffffff',
|
bottomDividerColor: '#ffffff',
|
||||||
bottomDividerHeight: '50px',
|
bottomDividerHeight: '50px',
|
||||||
anchorId: '',
|
anchorId: '',
|
||||||
animation: '',
|
|
||||||
animationDelay: '0',
|
|
||||||
hideOnDesktop: false,
|
|
||||||
hideOnTablet: false,
|
|
||||||
hideOnMobile: false,
|
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
canDrag: () => true,
|
canDrag: () => true,
|
||||||
@@ -227,13 +199,11 @@ function buildDividerHtml(
|
|||||||
(Section as any).toHtml = (props: SectionProps, childrenHtml: string) => {
|
(Section as any).toHtml = (props: SectionProps, childrenHtml: string) => {
|
||||||
const hasTopDivider = props.topDivider && props.topDivider !== 'none';
|
const hasTopDivider = props.topDivider && props.topDivider !== 'none';
|
||||||
const hasBottomDivider = props.bottomDivider && props.bottomDivider !== 'none';
|
const hasBottomDivider = props.bottomDivider && props.bottomDivider !== 'none';
|
||||||
const hasVerticalAlign = !!props.style?.justifyContent;
|
|
||||||
|
|
||||||
const outerStyle = cssPropsToString({
|
const outerStyle = cssPropsToString({
|
||||||
width: '100%',
|
width: '100%',
|
||||||
position: (hasTopDivider || hasBottomDivider) ? 'relative' : undefined,
|
position: (hasTopDivider || hasBottomDivider) ? 'relative' : undefined,
|
||||||
...props.style,
|
...props.style,
|
||||||
...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
|
|
||||||
});
|
});
|
||||||
const innerStyle = cssPropsToString({
|
const innerStyle = cssPropsToString({
|
||||||
maxWidth: props.innerMaxWidth || '1200px',
|
maxWidth: props.innerMaxWidth || '1200px',
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -10,40 +10,18 @@ import {
|
|||||||
ColorSwatchGrid,
|
ColorSwatchGrid,
|
||||||
GradientSwatchGrid,
|
GradientSwatchGrid,
|
||||||
PresetButtonGrid,
|
PresetButtonGrid,
|
||||||
NumericUnitInput,
|
|
||||||
labelStyle,
|
labelStyle,
|
||||||
inputStyle,
|
inputStyle,
|
||||||
sectionGap,
|
sectionGap,
|
||||||
useNodeProp,
|
useNodeProp,
|
||||||
} from './shared';
|
} from './shared';
|
||||||
import { BoxModelSection, BorderEffectsSection, AnimVisSection } from './containerBoxModel';
|
|
||||||
|
|
||||||
// Vertical Alignment options shown to the user identically regardless of
|
/* ---------- CONTAINER / SECTION ---------- */
|
||||||
// which CSS property they end up mapped to (align-items for the Columns
|
|
||||||
// flex ROW vs. justify-content for Container/Section's flex COLUMN root --
|
|
||||||
// see the per-type branch below).
|
|
||||||
const VERTICAL_ALIGN_OPTIONS: { label: string; value: string }[] = [
|
|
||||||
{ label: 'Top', value: 'flex-start' },
|
|
||||||
{ label: 'Center', value: 'center' },
|
|
||||||
{ label: 'Bottom', value: 'flex-end' },
|
|
||||||
{ label: 'Stretch', value: 'stretch' },
|
|
||||||
];
|
|
||||||
|
|
||||||
/* ---------- CONTAINER / SECTION / COLUMNS ---------- */
|
|
||||||
export const ContainerStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
export const ContainerStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
|
||||||
const style: CSSProperties = nodeProps.style || {};
|
const style: CSSProperties = nodeProps.style || {};
|
||||||
|
|
||||||
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
const { setProp, setPropStyle } = useNodeProp(selectedId);
|
||||||
|
|
||||||
// ColumnLayout only ever carries `columns`/`split` props -- Container and
|
|
||||||
// Section never set them -- so checking either alone distinguishes the
|
|
||||||
// flex-ROW case (align its columns via align-items, aligning uneven
|
|
||||||
// column heights) from the flex-COLUMN case (Container/Section, which
|
|
||||||
// vertically center/position their OWN content via justify-content,
|
|
||||||
// paired with a Min Height control so centering is meaningful).
|
|
||||||
const isColumns = nodeProps.columns !== undefined || nodeProps.split !== undefined;
|
|
||||||
const vAlignKey = isColumns ? 'alignItems' : 'justifyContent';
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{nodeProps.cssId !== undefined && (
|
{nodeProps.cssId !== undefined && (
|
||||||
@@ -116,30 +94,6 @@ export const ContainerStylePanel: React.FC<StylePanelProps> = ({ selectedId, nod
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="guided-section">
|
|
||||||
<SectionLabel>Vertical Alignment</SectionLabel>
|
|
||||||
<PresetButtonGrid
|
|
||||||
presets={VERTICAL_ALIGN_OPTIONS}
|
|
||||||
activeValue={style[vAlignKey] as string}
|
|
||||||
onSelect={(v) => setPropStyle(vAlignKey, v)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
{!isColumns && (
|
|
||||||
<div className="guided-section">
|
|
||||||
<SectionLabel>Min Height</SectionLabel>
|
|
||||||
<NumericUnitInput
|
|
||||||
value={(style.minHeight as string) || ''}
|
|
||||||
onChange={(v) => setPropStyle('minHeight', v)}
|
|
||||||
units={['px', 'vh', '%']}
|
|
||||||
placeholder="auto"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Box model + border/effects + animation/visibility rollout */}
|
|
||||||
<BoxModelSection style={style} setPropStyle={setPropStyle} />
|
|
||||||
<BorderEffectsSection style={style} setPropStyle={setPropStyle} />
|
|
||||||
<AnimVisSection nodeProps={nodeProps} setProp={setProp} />
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,135 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { SHADOW_PRESETS } from '../../../constants/presets';
|
|
||||||
import {
|
|
||||||
SectionLabel,
|
|
||||||
PresetButtonGrid,
|
|
||||||
CollapsibleSection,
|
|
||||||
SpacingControl,
|
|
||||||
SpacingSide,
|
|
||||||
BorderControl,
|
|
||||||
BorderValue,
|
|
||||||
buildBorderShorthand,
|
|
||||||
AnimationControl,
|
|
||||||
VisibilityControl,
|
|
||||||
sectionGap,
|
|
||||||
labelStyle,
|
|
||||||
} from './shared';
|
|
||||||
|
|
||||||
/* ==========================================================================
|
|
||||||
Shared box-model / border+effects / animation+visibility sections for the
|
|
||||||
CONTAINERS package's single shared panel (ContainerStylePanel, used for
|
|
||||||
Container / Section / Columns). Kept local to this package (not in
|
|
||||||
shared.tsx, which is foundation/import-only) since it's just DRY-ing the
|
|
||||||
identical JSX block across those 3 components rather than a genuinely
|
|
||||||
cross-package reusable control. Mirrors the equivalent helper in the
|
|
||||||
media package (mediaBoxModel.tsx) -- same shape, independently duplicated
|
|
||||||
per-package by design (packages are developed and merged in parallel).
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
function capitalize(s: string): string {
|
|
||||||
return s.charAt(0).toUpperCase() + s.slice(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Parses a `border` shorthand string (e.g. "2px solid #ff0000") back into
|
|
||||||
* the {width,style,color} shape BorderControl edits. Only needs to
|
|
||||||
* round-trip values this same panel produced via buildBorderShorthand --
|
|
||||||
* not arbitrary author-supplied CSS. */
|
|
||||||
export function parseBorderShorthand(v: string | undefined): BorderValue {
|
|
||||||
if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
|
|
||||||
const m = String(v).trim().match(/^(\d+(?:\.\d+)?(?:px|em|rem)?)\s+(\w+)\s+(.+)$/);
|
|
||||||
if (!m) return { width: '', style: 'none', color: '#000000' };
|
|
||||||
return { width: m[1], style: m[2], color: m[3] };
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface BoxModelSectionProps {
|
|
||||||
style: Record<string, any>;
|
|
||||||
setPropStyle: (prop: string, value: string) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Margin + Padding, per-side, via the shared SpacingControl. */
|
|
||||||
export const BoxModelSection: React.FC<BoxModelSectionProps> = ({ style, setPropStyle }) => {
|
|
||||||
const sideSetter = (kind: 'margin' | 'padding') => (side: SpacingSide, value: string) =>
|
|
||||||
setPropStyle(`${kind}${capitalize(side)}`, value);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<CollapsibleSection title="Spacing" defaultOpen={false}>
|
|
||||||
<SpacingControl
|
|
||||||
label="Margin"
|
|
||||||
value={{ top: style.marginTop, right: style.marginRight, bottom: style.marginBottom, left: style.marginLeft }}
|
|
||||||
onChange={sideSetter('margin')}
|
|
||||||
/>
|
|
||||||
<SpacingControl
|
|
||||||
label="Padding"
|
|
||||||
value={{ top: style.paddingTop, right: style.paddingRight, bottom: style.paddingBottom, left: style.paddingLeft }}
|
|
||||||
onChange={sideSetter('padding')}
|
|
||||||
/>
|
|
||||||
</CollapsibleSection>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
/** style.opacity is stored as a CSS-length-free numeric string ("0.8") or
|
|
||||||
* may be blank/undefined (treated as fully opaque). Converts to a 0-100
|
|
||||||
* integer for the range input / label. */
|
|
||||||
function opacityPercent(v: unknown): number {
|
|
||||||
if (v === undefined || v === null || v === '') return 100;
|
|
||||||
const n = parseFloat(String(v));
|
|
||||||
return Number.isFinite(n) ? Math.round(n * 100) : 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface BorderEffectsSectionProps {
|
|
||||||
style: Record<string, any>;
|
|
||||||
setPropStyle: (prop: string, value: string) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Border (width/style/color) + box-shadow preset + opacity slider. */
|
|
||||||
export const BorderEffectsSection: React.FC<BorderEffectsSectionProps> = ({ style, setPropStyle }) => (
|
|
||||||
<CollapsibleSection title="Border & Effects" defaultOpen={false}>
|
|
||||||
<BorderControl
|
|
||||||
value={parseBorderShorthand(style.border)}
|
|
||||||
onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
|
|
||||||
/>
|
|
||||||
<div className="guided-section">
|
|
||||||
<SectionLabel>Shadow</SectionLabel>
|
|
||||||
<PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow} onSelect={(v) => setPropStyle('boxShadow', v)} />
|
|
||||||
</div>
|
|
||||||
<div style={sectionGap}>
|
|
||||||
<label style={labelStyle}>Opacity: {opacityPercent(style.opacity)}%</label>
|
|
||||||
<input
|
|
||||||
type="range"
|
|
||||||
min={0}
|
|
||||||
max={100}
|
|
||||||
value={opacityPercent(style.opacity)}
|
|
||||||
onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
|
|
||||||
style={{ width: '100%' }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</CollapsibleSection>
|
|
||||||
);
|
|
||||||
|
|
||||||
export interface AnimVisSectionProps {
|
|
||||||
nodeProps: Record<string, any>;
|
|
||||||
setProp: (key: string, value: any) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Entrance animation + responsive hide toggles -- top-level props consumed
|
|
||||||
* directly by html-export.ts's buildDataAttrs (no toHtml change needed). */
|
|
||||||
export const AnimVisSection: React.FC<AnimVisSectionProps> = ({ nodeProps, setProp }) => (
|
|
||||||
<CollapsibleSection title="Animation & Visibility" defaultOpen={false}>
|
|
||||||
<AnimationControl
|
|
||||||
value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay }}
|
|
||||||
onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
|
|
||||||
/>
|
|
||||||
<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