fix(containers): only flex-convert Container/Section when vertical-align set (avoid blockifying inline-block children)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

craft/src/components/basic/Footer.toHtml.test.ts

@@ -20,14 +20,3 @@ describe('Footer.toHtml text escaping (attacker-controlled `text` prop)', () =>
     expect(html).toContain('© 2026 MySite. All rights reserved.');
   });
 });
-
-describe('Footer (F4: box-model + animation + visibility props on craft.props)', () => {
-  test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
-    const craftProps = (Footer as any).craft.props;
-    expect(craftProps).toHaveProperty('animation', 'none');
-    expect(craftProps).toHaveProperty('animationDelay', '0');
-    expect(craftProps).toHaveProperty('hideOnDesktop', false);
-    expect(craftProps).toHaveProperty('hideOnTablet', false);
-    expect(craftProps).toHaveProperty('hideOnMobile', false);
-  });
-});

craft/src/components/basic/Footer.tsx

@@ -6,11 +6,6 @@ import { escapeHtml } from '../../utils/escape';
 interface FooterProps {
   text?: string;
   style?: CSSProperties;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
-  animation?: string;
-  animationDelay?: string;
 }
 
 export const Footer: UserComponent<FooterProps> = ({
@@ -97,11 +92,6 @@ Footer.craft = {
       fontSize: '14px',
       padding: '24px 20px',
     },
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
-    animation: 'none',
-    animationDelay: '0',
   },
   rules: {
     canDrag: () => true,

craft/src/components/basic/Logo.toHtml.test.ts

@@ -43,29 +43,6 @@ describe('Logo.toHtml image src/alt sanitization (type="image")', () => {
   });
 });
 
-describe('Logo.toHtml download attribute (F3: link-to-file toggle)', () => {
-  test('download:true emits the download attribute', () => {
-    const { html } = toHtml({ href: '/resume.pdf', download: true, text: 'Resume' }, '');
-    expect(html).toMatch(/<a href="\/resume\.pdf" download/);
-  });
-
-  test('no download prop -> no download attribute emitted', () => {
-    const { html } = toHtml({ href: '/', text: 'MySite' }, '');
-    expect(html).not.toContain('download');
-  });
-});
-
-describe('Logo (F4: box-model + animation + visibility props on craft.props)', () => {
-  test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
-    const craftProps = (Logo as any).craft.props;
-    expect(craftProps).toHaveProperty('animation', 'none');
-    expect(craftProps).toHaveProperty('animationDelay', '0');
-    expect(craftProps).toHaveProperty('hideOnDesktop', false);
-    expect(craftProps).toHaveProperty('hideOnTablet', false);
-    expect(craftProps).toHaveProperty('hideOnMobile', false);
-  });
-});
-
 describe('Logo.toHtml text-logo styling sanitization', () => {
   test('a quote-breakout color does not escape the span style attribute', () => {
     const malicious = 'red" onmouseover="alert(1)';

craft/src/components/basic/Logo.tsx

@@ -12,18 +12,11 @@ interface LogoProps {
   imageSrc?: string;
   imageWidth?: string;
   href?: string;
-  /** Adds the `download` attribute to the exported anchor (F3: link to a file). */
-  download?: boolean;
   fontFamily?: string;
   fontSize?: string;
   fontWeight?: string;
   color?: string;
   style?: CSSProperties;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
-  animation?: string;
-  animationDelay?: string;
 }
 
 /* ---------- Component ---------- */
@@ -34,7 +27,6 @@ export const Logo: UserComponent<LogoProps> = ({
   imageSrc = '',
   imageWidth = '120px',
   href = '/',
-  download = false,
   fontFamily = 'Inter, sans-serif',
   fontSize = '20px',
   fontWeight = '700',
@@ -52,7 +44,6 @@ export const Logo: UserComponent<LogoProps> = ({
     <a
       ref={(ref: HTMLElement | null): void => { if (ref) connect(drag(ref)); }}
       href={href}
-      download={download || undefined}
       onClick={(e) => e.preventDefault()}
       style={{
         textDecoration: 'none',
@@ -96,13 +87,7 @@ Logo.craft = {
     fontSize: '20px',
     fontWeight: '700',
     color: undefined,
-    download: false,
     style: {},
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
-    animation: 'none',
-    animationDelay: '0',
   } as LogoProps,
   rules: {
     canDrag: () => true,
@@ -137,9 +122,8 @@ Logo.craft = {
     flexShrink: '0',
     ...props.style,
   });
-  const downloadAttr = props.download ? ' download' : '';
 
   return {
-    html: `<a href="${escapeAttr(safeUrl(href))}"${downloadAttr}${aStyle ? ` style="${aStyle}"` : ''}>${innerHtml}</a>`,
+    html: `<a href="${escapeAttr(safeUrl(href))}"${aStyle ? ` style="${aStyle}"` : ''}>${innerHtml}</a>`,
   };
 };

craft/src/components/basic/Menu.toHtml.test.ts

@@ -31,29 +31,6 @@ describe('Menu.toHtml deterministic + unique scope ids (thread node id, no Math.
   });
 });
 
-describe('Menu.toHtml download attribute (F3: link-to-file toggle)', () => {
-  test('a link with download:true emits the download attribute', () => {
-    const { html } = toHtml({ links: [{ text: 'Brochure', href: '/brochure.pdf', download: true }] }, '', 'node-dl1');
-    expect(html).toMatch(/<a href="\/brochure\.pdf"[^>]* download[^>]*>Brochure<\/a>/);
-  });
-
-  test('a link without download does not emit the attribute', () => {
-    const { html } = toHtml({ links: [{ text: 'Home', href: '/' }] }, '', 'node-dl2');
-    expect(html).not.toContain(' download');
-  });
-});
-
-describe('Menu (F4: box-model + animation + visibility props on craft.props)', () => {
-  test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
-    const craftProps = (Menu as any).craft.props;
-    expect(craftProps).toHaveProperty('animation', 'none');
-    expect(craftProps).toHaveProperty('animationDelay', '0');
-    expect(craftProps).toHaveProperty('hideOnDesktop', false);
-    expect(craftProps).toHaveProperty('hideOnTablet', false);
-    expect(craftProps).toHaveProperty('hideOnMobile', false);
-  });
-});
-
 describe('Menu.toHtml XSS hardening (linkHoverColor into <style>)', () => {
   test('a linkHoverColor value containing </style><script> is neutralized', () => {
     const malicious = '#fff}</style><script>alert(1)</script><style>{';

craft/src/components/basic/Menu.tsx

@@ -10,8 +10,6 @@ interface MenuLink {
   href: string;
   isExternal?: boolean;
   isCta?: boolean;
-  /** Adds the `download` attribute to the exported anchor (F3: links to files). */
-  download?: boolean;
 }
 
 interface MenuProps {
@@ -25,11 +23,6 @@ interface MenuProps {
   orientation?: 'horizontal' | 'vertical';
   fontSize?: string;
   style?: CSSProperties;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
-  animation?: string;
-  animationDelay?: string;
 }
 
 /* ---------- Defaults ---------- */
@@ -82,7 +75,6 @@ export const Menu: UserComponent<MenuProps> = ({
           href={link.href}
           target={link.isExternal ? '_blank' : undefined}
           rel={link.isExternal ? 'noopener noreferrer' : undefined}
-          download={link.download || undefined}
           onClick={(e) => e.preventDefault()}
           onMouseEnter={() => setHoveredLink(i)}
           onMouseLeave={() => setHoveredLink(null)}
@@ -122,11 +114,6 @@ Menu.craft = {
     orientation: 'horizontal',
     fontSize: '14px',
     style: {},
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
-    animation: 'none',
-    animationDelay: '0',
   } as MenuProps,
   rules: {
     canDrag: () => true,
@@ -175,7 +162,6 @@ Menu.craft = {
 
   const linksHtml = links.map((link) => {
     const target = link.isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
-    const downloadAttr = link.download ? ' download' : '';
     const cls = link.isCta ? `${scope}-cta` : `${scope}-link`;
     const linkStyle = cssPropsToString({
       textDecoration: 'none',
@@ -187,7 +173,7 @@ Menu.craft = {
       borderRadius: link.isCta ? '6px' : '0',
       transition: 'color 0.15s, background-color 0.15s',
     });
-    return `<a href="${escapeAttr(safeUrl(link.href || '#'))}" class="${cls}"${target}${downloadAttr}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
+    return `<a href="${escapeAttr(safeUrl(link.href || '#'))}" class="${cls}"${target}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
   }).join('\n    ');
 
   const hoverCss = `<style>

craft/src/components/basic/Navbar.toHtml.test.ts

@@ -83,29 +83,6 @@ describe('Navbar.toHtml node-scoped ids/hover styles (M-1: two navbars must not
   });
 });
 
-describe('Navbar.toHtml download attribute (F3: link-to-file toggle)', () => {
-  test('a link with download:true emits the download attribute', () => {
-    const { html } = toHtml({ links: [{ text: 'Brochure', href: '/brochure.pdf', download: true }] }, '', 'node-dl1');
-    expect(html).toMatch(/<a href="\/brochure\.pdf"[^>]* download[^>]*>Brochure<\/a>/);
-  });
-
-  test('a link without download does not emit the attribute', () => {
-    const { html } = toHtml({ links: [{ text: 'Home', href: '/' }] }, '', 'node-dl2');
-    expect(html).not.toContain(' download');
-  });
-});
-
-describe('Navbar (F4: box-model + animation + visibility props on craft.props)', () => {
-  test('craft.props includes animation/visibility defaults so the panel controls always render', () => {
-    const craftProps = (Navbar as any).craft.props;
-    expect(craftProps).toHaveProperty('animation', 'none');
-    expect(craftProps).toHaveProperty('animationDelay', '0');
-    expect(craftProps).toHaveProperty('hideOnDesktop', false);
-    expect(craftProps).toHaveProperty('hideOnTablet', false);
-    expect(craftProps).toHaveProperty('hideOnMobile', false);
-  });
-});
-
 describe('Navbar.toHtml XSS hardening (hoverColor/backgroundColor/ctaColor into <style>)', () => {
   test('a hoverColor value containing </style><script> is neutralized in the hover <style> block', () => {
     const malicious = '#fff}</style><script>alert(1)</script><style>{';

craft/src/components/basic/Navbar.tsx

@@ -11,8 +11,6 @@ interface NavLink {
   href: string;
   isExternal?: boolean;
   isCta?: boolean;
-  /** Adds the `download` attribute to the exported anchor (F3: links to files). */
-  download?: boolean;
 }
 
 interface NavbarProps {
@@ -35,11 +33,6 @@ interface NavbarProps {
   isSticky?: boolean;
   showMobileMenu?: boolean;
   style?: CSSProperties;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
-  animation?: string;
-  animationDelay?: string;
 }
 
 /* ---------- Defaults ---------- */
@@ -156,7 +149,6 @@ export const Navbar: UserComponent<NavbarProps> = ({
             href={link.href}
             target={link.isExternal ? '_blank' : undefined}
             rel={link.isExternal ? 'noopener noreferrer' : undefined}
-            download={link.download || undefined}
             onClick={(e) => e.preventDefault()}
             onMouseEnter={() => setHoveredLink(i)}
             onMouseLeave={() => setHoveredLink(null)}
@@ -208,11 +200,6 @@ Navbar.craft = {
     style: {
       borderBottom: '1px solid #e4e4e7',
     },
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
-    animation: 'none',
-    animationDelay: '0',
   } as NavbarProps,
   rules: {
     canDrag: () => true,
@@ -321,7 +308,6 @@ Navbar.craft = {
   // Add CSS class to each link for hover
   const linksHtmlWithClass = links.map((link) => {
     const target = link.isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
-    const downloadAttr = link.download ? ' download' : '';
     const cls = link.isCta ? 'navbar-cta' : 'navbar-link';
     const linkStyle = cssPropsToString({
       textDecoration: 'none',
@@ -333,7 +319,7 @@ Navbar.craft = {
       borderRadius: link.isCta ? '6px' : '0',
       transition: 'color 0.15s, background-color 0.15s',
     });
-    return `<a href="${escapeAttr(safeUrl(link.href || "#"))}" class="${cls}"${target}${downloadAttr}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
+    return `<a href="${escapeAttr(safeUrl(link.href || "#"))}" class="${cls}"${target}${linkStyle ? ` style="${linkStyle}"` : ''}>${escapeHtml(link.text)}</a>`;
   }).join('\n      ');
 
   return {

craft/src/components/layout/ColumnLayout.toHtml.test.ts

@@ -80,3 +80,56 @@ describe('ColumnLayout.toHtml XSS hardening (gap into <style>)', () => {
     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');
+  });
+});

craft/src/components/layout/ColumnLayout.tsx

@@ -20,6 +20,11 @@ interface ColumnLayoutProps {
   style?: CSSProperties;
   children?: React.ReactNode;
   anchorId?: string;
+  hideOnDesktop?: boolean;
+  hideOnTablet?: boolean;
+  hideOnMobile?: boolean;
+  animation?: string;
+  animationDelay?: string;
 }
 
 const splitToWidths: Record<string, string[]> = {
@@ -102,8 +107,20 @@ ColumnLayout.craft = {
     columns: 2,
     split: '50-50',
     gap: '16px',
-    style: {},
+    style: {
+      alignItems: '',
+      marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
+      paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
+      border: 'none',
+      boxShadow: 'none',
+      opacity: '1',
+    },
     anchorId: '',
+    animation: '',
+    animationDelay: '0',
+    hideOnDesktop: false,
+    hideOnTablet: false,
+    hideOnMobile: false,
   },
   rules: {
     canDrag: () => true,

craft/src/components/layout/Container.toHtml.test.ts

@@ -63,3 +63,88 @@ 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');
+  });
+});

craft/src/components/layout/Container.tsx

@@ -43,6 +43,20 @@ const flexAlignFromTextAlign = (textAlign: CSSProperties['textAlign']): CSSPrope
   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> = ({
   style = {},
   tag = 'div',
@@ -58,10 +72,12 @@ export const Container: UserComponent<ContainerProps> = ({
   const safeTag = sanitizeContainerTag(tag);
   const needsBoxedWrapper = contentWidth === 'boxed';
   const flexStyles = flexAlignFromTextAlign(style.textAlign);
+  const hasVerticalAlign = !!style.justifyContent;
 
   const outerStyle: CSSProperties = {
     minHeight: '40px',
     ...style,
+    ...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
     ...(fullWidth ? { width: '100vw', marginLeft: 'calc(-50vw + 50%)' } : {}),
     ...(needsBoxedWrapper ? {} : flexStyles),
   };
@@ -93,13 +109,27 @@ export const Container: UserComponent<ContainerProps> = ({
 Container.craft = {
   displayName: 'Container',
   props: {
-    style: { padding: '20px', minHeight: '100px' },
+    style: {
+      padding: '20px',
+      minHeight: '100px',
+      justifyContent: '',
+      marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
+      paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
+      border: 'none',
+      boxShadow: 'none',
+      opacity: '1',
+    },
     tag: 'div',
     fullWidth: false,
     contentWidth: 'full',
     anchorId: '',
     cssId: '',
     cssClass: '',
+    animation: '',
+    animationDelay: '0',
+    hideOnDesktop: false,
+    hideOnTablet: false,
+    hideOnMobile: false,
   },
   rules: {
     canDrag: () => true,
@@ -114,9 +144,11 @@ Container.craft = {
   const tag = sanitizeContainerTag(props.tag);
   const isBoxed = props.contentWidth === 'boxed';
   const flexStyles = flexAlignFromTextAlign(props.style?.textAlign);
+  const hasVerticalAlign = !!props.style?.justifyContent;
 
   const outerCss: CSSProperties = {
     ...props.style,
+    ...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
     ...(isBoxed ? {} : flexStyles),
   };
 

craft/src/components/layout/Section.toHtml.test.ts

@@ -73,3 +73,78 @@ describe('Section.toHtml shape divider color/height XSS hardening', () => {
     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');
+  });
+});

craft/src/components/layout/Section.tsx

@@ -27,6 +27,11 @@ interface SectionProps {
   bottomDividerColor?: string;
   bottomDividerHeight?: string;
   anchorId?: string;
+  hideOnDesktop?: boolean;
+  hideOnTablet?: boolean;
+  hideOnMobile?: boolean;
+  animation?: string;
+  animationDelay?: string;
 }
 
 /* ---------- Divider renderer ---------- */
@@ -98,6 +103,13 @@ export const Section: UserComponent<SectionProps> = ({
 
   const hasTopDivider = topDivider && topDivider !== '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 (
     <section
@@ -107,6 +119,7 @@ export const Section: UserComponent<SectionProps> = ({
         width: '100%',
         position: (hasTopDivider || hasBottomDivider) ? 'relative' : undefined,
         ...style,
+        ...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
       }}
     >
       {hasTopDivider && (
@@ -143,7 +156,17 @@ export const Section: UserComponent<SectionProps> = ({
 Section.craft = {
   displayName: 'Section',
   props: {
-    style: { padding: '40px 0', backgroundColor: '#ffffff' },
+    style: {
+      padding: '40px 0',
+      backgroundColor: '#ffffff',
+      minHeight: '',
+      justifyContent: '',
+      marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
+      paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
+      border: 'none',
+      boxShadow: 'none',
+      opacity: '1',
+    },
     innerMaxWidth: '1200px',
     topDivider: 'none',
     topDividerColor: '#ffffff',
@@ -152,6 +175,11 @@ Section.craft = {
     bottomDividerColor: '#ffffff',
     bottomDividerHeight: '50px',
     anchorId: '',
+    animation: '',
+    animationDelay: '0',
+    hideOnDesktop: false,
+    hideOnTablet: false,
+    hideOnMobile: false,
   },
   rules: {
     canDrag: () => true,
@@ -199,11 +227,13 @@ function buildDividerHtml(
 (Section as any).toHtml = (props: SectionProps, childrenHtml: string) => {
   const hasTopDivider = props.topDivider && props.topDivider !== 'none';
   const hasBottomDivider = props.bottomDivider && props.bottomDivider !== 'none';
+  const hasVerticalAlign = !!props.style?.justifyContent;
 
   const outerStyle = cssPropsToString({
     width: '100%',
     position: (hasTopDivider || hasBottomDivider) ? 'relative' : undefined,
     ...props.style,
+    ...(hasVerticalAlign ? { display: 'flex', flexDirection: 'column' } : {}),
   });
   const innerStyle = cssPropsToString({
     maxWidth: props.innerMaxWidth || '1200px',

craft/src/panels/right/styles/ContainerStylePanel.tsx

@@ -10,18 +10,40 @@ import {
   ColorSwatchGrid,
   GradientSwatchGrid,
   PresetButtonGrid,
+  NumericUnitInput,
   labelStyle,
   inputStyle,
   sectionGap,
   useNodeProp,
 } from './shared';
+import { BoxModelSection, BorderEffectsSection, AnimVisSection } from './containerBoxModel';
 
-/* ---------- CONTAINER / SECTION ---------- */
+// Vertical Alignment options shown to the user identically regardless of
+// 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 }) => {
   const style: CSSProperties = nodeProps.style || {};
 
   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 (
     <>
       {nodeProps.cssId !== undefined && (
@@ -94,6 +116,30 @@ export const ContainerStylePanel: React.FC<StylePanelProps> = ({ selectedId, nod
           ))}
         </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} />
     </>
   );
 };

craft/src/panels/right/styles/NavStylePanel.test.tsx

@@ -1,282 +0,0 @@
-import { describe, test, expect, vi, beforeEach, afterEach } from 'vitest';
-import React from 'react';
-import { createRoot, Root } from 'react-dom/client';
-import { act } from 'react-dom/test-utils';
-
-/* NavStylePanel (via useNodeProp/LinkPicker in this file) needs useEditor
-   from @craftjs/core and usePages from PageContext. Mock both following the
-   DOM-harness pattern used across this repo's other *StylePanel tests (no
-   @testing-library/react here) -- PageContext itself is Wave-2's territory,
-   this package only READS pages via usePages(), so mocking it is the
-   correct boundary for these tests. */
-const setPropSpy = vi.fn((_id: string, updater: (p: any) => void) => {
-  updater(lastProps);
-});
-let lastProps: any;
-
-vi.mock('@craftjs/core', () => ({
-  useEditor: () => ({ actions: { setProp: setPropSpy } }),
-}));
-
-let mockPages: { id: string; name: string; slug: string; craftState: string | null }[] = [];
-vi.mock('../../../state/PageContext', () => ({
-  usePages: () => ({ pages: mockPages }),
-}));
-
-vi.mock('../../../ui/AssetPicker', () => ({
-  AssetPicker: () => null,
-}));
-
-import { NavStylePanel, LinkPicker, pageHref } from './NavStylePanel';
-
-let container: HTMLDivElement;
-let root: Root;
-
-function render(ui: React.ReactElement) {
-  container = document.createElement('div');
-  document.body.appendChild(container);
-  act(() => {
-    root = createRoot(container);
-    root.render(ui);
-  });
-}
-
-function rerender(ui: React.ReactElement) {
-  act(() => { root.render(ui); });
-}
-
-function unmount() {
-  act(() => { root.unmount(); });
-  container.remove();
-}
-
-function setValue(el: HTMLInputElement | HTMLSelectElement, value: string) {
-  const proto = el instanceof HTMLSelectElement ? window.HTMLSelectElement.prototype : window.HTMLInputElement.prototype;
-  const setter = Object.getOwnPropertyDescriptor(proto, 'value')!.set!;
-  act(() => {
-    setter.call(el, value);
-    el.dispatchEvent(new Event('input', { bubbles: true }));
-    el.dispatchEvent(new Event('change', { bubbles: true }));
-  });
-}
-
-function click(el: Element | null) {
-  act(() => { (el as HTMLElement).dispatchEvent(new MouseEvent('click', { bubbles: true })); });
-}
-
-beforeEach(() => {
-  setPropSpy.mockClear();
-  mockPages = [
-    { id: 'home', name: 'Home', slug: 'index', craftState: null },
-    { id: 'about', name: 'About', slug: 'about', craftState: null },
-  ];
-});
-
-afterEach(() => {
-  if (container) unmount();
-});
-
-describe('pageHref (landing page is always "/")', () => {
-  test('index 0 (landing page) -> "/"', () => {
-    expect(pageHref(mockPages[0], 0)).toBe('/');
-  });
-
-  test('any other page -> "/{slug}"', () => {
-    expect(pageHref(mockPages[1], 1)).toBe('/about');
-  });
-});
-
-describe('LinkPicker (F1: link-to-page picker + manual URL/anchor/tel/mailto)', () => {
-  test('a value matching a page href starts in "Page" mode and lists every page', () => {
-    render(<LinkPicker value="/about" onChange={vi.fn()} />);
-    const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
-    expect(modeSelect.value).toBe('page');
-    const optionText = Array.from(container.querySelectorAll('option')).map((o) => o.textContent);
-    expect(optionText).toContain('Home');
-    expect(optionText).toContain('About');
-  });
-
-  test('picking a different page from the page dropdown emits that page\'s href', () => {
-    const onChange = vi.fn();
-    render(<LinkPicker value="/about" onChange={onChange} />);
-    const [, pageSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
-    setValue(pageSelect, '/');
-    expect(onChange).toHaveBeenCalledWith('/');
-  });
-
-  test('a "#section" value starts in Anchor mode', () => {
-    render(<LinkPicker value="#pricing" onChange={vi.fn()} />);
-    const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
-    expect(modeSelect.value).toBe('anchor');
-    const input = container.querySelector('input[type="text"]') as HTMLInputElement;
-    expect(input.value).toBe('#pricing');
-  });
-
-  test('switching mode to Anchor seeds a bare "#"', () => {
-    const onChange = vi.fn();
-    render(<LinkPicker value="/about" onChange={onChange} />);
-    const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
-    setValue(modeSelect, 'anchor');
-    expect(onChange).toHaveBeenCalledWith('#');
-  });
-
-  test('mailto: helper strips the scheme for editing and re-adds it on change', () => {
-    const onChange = vi.fn();
-    render(<LinkPicker value="mailto:foo@example.com" onChange={onChange} />);
-    const input = container.querySelector('input[type="text"]') as HTMLInputElement;
-    expect(input.value).toBe('foo@example.com');
-    setValue(input, 'bar@example.com');
-    expect(onChange).toHaveBeenCalledWith('mailto:bar@example.com');
-  });
-
-  test('tel: helper strips the scheme for editing and re-adds it on change', () => {
-    const onChange = vi.fn();
-    render(<LinkPicker value="tel:5551234567" onChange={onChange} />);
-    const input = container.querySelector('input[type="text"]') as HTMLInputElement;
-    expect(input.value).toBe('5551234567');
-    setValue(input, '5559876543');
-    expect(onChange).toHaveBeenCalledWith('tel:5559876543');
-  });
-
-  test('a plain https:// URL falls back to Custom URL mode', () => {
-    render(<LinkPicker value="https://example.com" onChange={vi.fn()} />);
-    const [modeSelect] = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
-    expect(modeSelect.value).toBe('url');
-  });
-});
-
-describe('NavStylePanel Links section: href set via LinkPicker (F1 wired into the panel)', () => {
-  test('choosing a page for a Navbar link writes that page\'s href onto the link', () => {
-    lastProps = {
-      links: [{ text: 'Home', href: '/old-home' }],
-    };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-
-    const selects = Array.from(container.querySelectorAll('select')) as HTMLSelectElement[];
-    // First select for the one link item is its LinkPicker mode select (the
-    // href starts as a Custom URL, so it opens on "url" mode); switch it to
-    // "page" then pick the About page from the resulting page dropdown.
-    const modeSelect = selects[0];
-    setValue(modeSelect, 'page');
-    expect(setPropSpy).toHaveBeenCalled();
-    expect(lastProps.links[0].href).toBe('/'); // defaults to the first page
-
-    // The mock setProp mutates `lastProps` in place rather than triggering a
-    // real Craft.js state update, so force a re-render (passing the same,
-    // now-mutated, object) to get the LinkPicker to reflect its new "page"
-    // mode and render the page <select>.
-    rerender(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-
-    const pageSelect = Array.from(container.querySelectorAll('select'))[1] as HTMLSelectElement;
-    setValue(pageSelect, '/about');
-    expect(lastProps.links[0].href).toBe('/about');
-  });
-
-  test('toggling the Download checkbox for a link sets download:true', () => {
-    lastProps = { links: [{ text: 'Brochure', href: '/brochure.pdf' }] };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-    const checkbox = container.querySelector('input[type="checkbox"]') as HTMLInputElement;
-    act(() => { checkbox.click(); });
-    expect(lastProps.links[0].download).toBe(true);
-  });
-});
-
-describe('NavStylePanel: "Sync links with Pages" (F2, regression vs legacy builder)', () => {
-  test('populates links from the mocked pages list and preserves the CTA link', () => {
-    lastProps = {
-      links: [
-        { text: 'Old Home', href: '/old' },
-        { text: 'Old About', href: '/old-about' },
-        { text: 'Get Started', href: '#signup', isCta: true },
-      ],
-    };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-
-    const syncBtn = Array.from(container.querySelectorAll('button'))
-      .find((b) => b.textContent?.includes('Sync links with Pages'))!;
-    expect(syncBtn).toBeTruthy();
-    click(syncBtn);
-
-    expect(lastProps.links).toEqual([
-      { text: 'Home', href: '/' },
-      { text: 'About', href: '/about' },
-      { text: 'Get Started', href: '#signup', isCta: true },
-    ]);
-  });
-
-  test('with no CTA link, sync just replaces links 1:1 with the pages list', () => {
-    lastProps = { links: [{ text: 'Stale', href: '/stale' }] };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-
-    const syncBtn = Array.from(container.querySelectorAll('button'))
-      .find((b) => b.textContent?.includes('Sync links with Pages'))!;
-    click(syncBtn);
-
-    expect(lastProps.links).toEqual([
-      { text: 'Home', href: '/' },
-      { text: 'About', href: '/about' },
-    ]);
-  });
-
-  test('the Links section (and its Sync button) is not shown for Footer (no `links` prop)', () => {
-    lastProps = { text: '© 2026' };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-    const syncBtn = Array.from(container.querySelectorAll('button'))
-      .find((b) => b.textContent?.includes('Sync links with Pages'));
-    expect(syncBtn).toBeUndefined();
-  });
-});
-
-/** The Spacing/Border & Effects/Animation/Visibility CollapsibleSections all
- *  default closed (defaultOpen={false}, matching the pre-existing "Spacing"
- *  section's convention) -- open one by clicking its header button before
- *  asserting on / interacting with its contents. */
-function openSection(title: string) {
-  const header = Array.from(container.querySelectorAll('button'))
-    .find((b) => b.textContent?.includes(title))!;
-  click(header);
-}
-
-describe('NavStylePanel: box-model + animation + visibility controls always present', () => {
-  test('Spacing (Margin/Padding), Border & Effects, Animation, and Visibility sections render for a Navbar', () => {
-    lastProps = {
-      backgroundColor: '#ffffff',
-      style: {},
-      animation: 'none',
-      animationDelay: '0',
-      hideOnDesktop: false,
-      hideOnTablet: false,
-      hideOnMobile: false,
-    };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-    openSection('Spacing');
-    openSection('Border & Effects');
-    openSection('Animation');
-    openSection('Visibility');
-    expect(container.querySelector('[data-testid="spacing-control"]')).toBeTruthy();
-    expect(container.querySelector('[data-testid="border-control"]')).toBeTruthy();
-    expect(container.querySelector('[data-testid="animation-control"]')).toBeTruthy();
-    expect(container.querySelector('[data-testid="visibility-control"]')).toBeTruthy();
-  });
-
-  test('checking "Hide on Mobile" writes hideOnMobile:true via setProp', () => {
-    lastProps = { hideOnDesktop: false, hideOnTablet: false, hideOnMobile: false };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-    openSection('Visibility');
-    const checkbox = container.querySelector('[data-testid="visibility-hideOnMobile"]') as HTMLInputElement;
-    act(() => {
-      checkbox.click();
-    });
-    expect(lastProps.hideOnMobile).toBe(true);
-  });
-
-  test('picking an entrance animation writes animation via setProp', () => {
-    lastProps = { animation: 'none', animationDelay: '0' };
-    render(<NavStylePanel selectedId="node1" nodeProps={lastProps} />);
-    openSection('Animation');
-    const fadeInBtn = Array.from(container.querySelectorAll('[data-testid="animation-control"] button'))
-      .find((b) => b.textContent === 'Fade In')!;
-    click(fadeInBtn);
-    expect(lastProps.animation).toBe('fade-in');
-  });
-});

craft/src/panels/right/styles/NavStylePanel.tsx

@@ -2,7 +2,6 @@ import React, { useCallback } from 'react';
 import { useEditor } from '@craftjs/core';
 import {
   SPACING_PRESETS,
-  SHADOW_PRESETS,
 } from '../../../constants/presets';
 import {
   StylePanelProps,
@@ -17,145 +16,13 @@ import {
   smallInputStyle,
   sectionGap,
   useNodeProp,
-  SpacingControl,
-  BorderControl,
-  BorderValue,
-  buildBorderShorthand,
-  AnimationControl,
-  VisibilityControl,
 } from './shared';
 import { AssetPicker } from '../../../ui/AssetPicker';
-import { usePages } from '../../../state/PageContext';
-import { PageData } from '../../../types';
 
-/* ---------- Link-to-page helpers (F1/F2: link picker + Sync with Pages) ----------
+/* ---------- NAV / MENU / LOGO ---------- */
-   Mirrors the export convention used elsewhere: the first page is always the
-   landing page and publishes to '/', every other page publishes to '/{slug}'.
-   See PageContext.tsx's uniqueSlug/slugify and the landing-page-lock comment
-   in renamePage() for why index 0 is special-cased this way. */
-export function pageHref(page: PageData, index: number): string {
-  return index === 0 ? '/' : `/${page.slug}`;
-}
-
-type LinkMode = 'page' | 'url' | 'anchor' | 'tel' | 'mailto';
-
-function detectLinkMode(value: string, pageHrefs: string[]): LinkMode {
-  const v = value || '';
-  if (pageHrefs.includes(v)) return 'page';
-  if (v.startsWith('#')) return 'anchor';
-  if (v.startsWith('tel:')) return 'tel';
-  if (v.startsWith('mailto:')) return 'mailto';
-  return 'url';
-}
-
-/* ---------- LinkPicker ----------
-   Reused for every link-href field in this panel (standalone Logo's href,
-   Navbar's logoUrl, and each Navbar/Menu link item's href): a dropdown of
-   the site's PAGES (read-only via usePages() -- PageContext itself is
-   Wave-2's territory) plus manual URL / #anchor / tel: / mailto: entry.
-   safeUrl (in toHtml) already allows tel:/mailto: schemes, so no export-side
-   change is needed for those. */
-interface LinkPickerProps {
-  value: string;
-  onChange: (value: string) => void;
-}
-export const LinkPicker: React.FC<LinkPickerProps> = ({ value, onChange }) => {
-  const { pages } = usePages();
-  const pageOptions = pages.map((p, i) => ({ id: p.id, name: p.name, href: pageHref(p, i) }));
-  const mode = detectLinkMode(value || '', pageOptions.map((p) => p.href));
-
-  const switchMode = (next: LinkMode) => {
-    if (next === mode) return;
-    if (next === 'page') onChange(pageOptions[0]?.href || '/');
-    else if (next === 'anchor') onChange('#');
-    else if (next === 'tel') onChange('tel:');
-    else if (next === 'mailto') onChange('mailto:');
-    else onChange('');
-  };
-
-  return (
-    <div style={sectionGap} data-testid="link-picker">
-      <label style={labelStyle}>Link</label>
-      <select
-        value={mode}
-        onChange={(e) => switchMode(e.target.value as LinkMode)}
-        style={{ ...inputStyle, marginBottom: 4, cursor: 'pointer' }}
-      >
-        <option value="page">Page</option>
-        <option value="url">Custom URL</option>
-        <option value="anchor">Anchor (#section)</option>
-        <option value="tel">Phone (tel:)</option>
-        <option value="mailto">Email (mailto:)</option>
-      </select>
-      {mode === 'page' && (
-        pageOptions.length > 0 ? (
-          <select value={value} onChange={(e) => onChange(e.target.value)} style={inputStyle}>
-            {pageOptions.map((p) => (
-              <option key={p.id} value={p.href}>{p.name}</option>
-            ))}
-          </select>
-        ) : (
-          <div style={{ fontSize: 11, color: '#71717a' }}>No pages yet</div>
-        )
-      )}
-      {mode === 'anchor' && (
-        <input
-          type="text"
-          value={value || ''}
-          onChange={(e) => onChange(e.target.value.startsWith('#') ? e.target.value : `#${e.target.value}`)}
-          placeholder="#section-id"
-          style={inputStyle}
-        />
-      )}
-      {mode === 'tel' && (
-        <input
-          type="text"
-          value={(value || '').replace(/^tel:/, '')}
-          onChange={(e) => onChange(`tel:${e.target.value}`)}
-          placeholder="+15551234567"
-          style={inputStyle}
-        />
-      )}
-      {mode === 'mailto' && (
-        <input
-          type="text"
-          value={(value || '').replace(/^mailto:/, '')}
-          onChange={(e) => onChange(`mailto:${e.target.value}`)}
-          placeholder="name@example.com"
-          style={inputStyle}
-        />
-      )}
-      {mode === 'url' && (
-        <input
-          type="text"
-          value={value || ''}
-          onChange={(e) => onChange(e.target.value)}
-          placeholder="https://example.com or /page"
-          style={inputStyle}
-        />
-      )}
-    </div>
-  );
-};
-
-/* Parses a `border` shorthand ("2px solid #hex" / "none") back into the
-   { width, style, color } shape BorderControl edits. */
-function parseBorderShorthand(v: string | undefined): BorderValue {
-  if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
-  const m = v.trim().match(/^(\S+)\s+(\S+)\s+(.+)$/);
-  if (!m) return { width: '', style: 'none', color: '#000000' };
-  return { width: m[1], style: m[2], color: m[3] };
-}
-
-function capitalize(s: string): string {
-  return s.charAt(0).toUpperCase() + s.slice(1);
-}
-
-/* ---------- NAV / MENU / LOGO / FOOTER ---------- */
 export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
   const { actions } = useEditor();
   const { setProp, setPropStyle } = useNodeProp(selectedId);
-  const { pages } = usePages();
 
   const links: any[] = nodeProps.links || [];
 
@@ -181,20 +48,6 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
     });
   }, [actions, selectedId]);
 
-  /* F2: (re)populate the links array from the current pages list --
-     label = page name, href = '/' for the landing page else '/{slug}'.
-     Any existing CTA link (isCta: true) is preserved (appended after the
-     freshly-generated page links) rather than being wiped, matching the
-     legacy GrapesJS builder's "Sync with Pages" behavior. */
-  const syncWithPages = useCallback(() => {
-    actions.setProp(selectedId, (props: any) => {
-      const existing: any[] = props.links || [];
-      const ctaLinks = existing.filter((l) => l.isCta);
-      const pageLinks = pages.map((p, i) => ({ text: p.name, href: pageHref(p, i) }));
-      props.links = [...pageLinks, ...ctaLinks];
-    });
-  }, [actions, selectedId, pages]);
-
   /* Detect standalone Logo vs Navbar/Menu */
   const isStandaloneLogo = nodeProps.type !== undefined && (nodeProps.type === 'text' || nodeProps.type === 'image') && nodeProps.logoText === undefined;
 
@@ -213,15 +66,6 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
   );
   const GAP_PRESETS = ['8px', '16px', '24px', '32px', '40px'].map((g) => ({ label: g, value: g }));
 
-  /* Box-model / animation / visibility values, read off `style` (margin,
-     padding, border, boxShadow, opacity) or top-level props (animation,
-     hideOn*). This panel is only ever mounted for the 4 owned components
-     (Navbar/Menu/Logo/Footer), which all now carry these props (see each
-     component's .craft.props), so -- unlike the Links/Colors sections above,
-     which are shared across a genuinely disparate prop schema -- these
-     sections render unconditionally rather than gating on presence. */
-  const style = nodeProps.style || {};
-
   return (
     <>
       {/* Standalone Logo component settings */}
@@ -280,11 +124,10 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
               </div>
             </>
           )}
-          <LinkPicker value={nodeProps.href || '/'} onChange={(v) => setProp('href', v)} />
+          <div style={sectionGap}>
-          <label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 11, color: '#e4e4e7', cursor: 'pointer', marginTop: -8, marginBottom: 12 }}>
+            <label style={labelStyle}>Link URL</label>
-            <input type="checkbox" checked={!!nodeProps.download} onChange={(e) => setProp('download', e.target.checked)} />
+            <input type="text" value={nodeProps.href || '/'} onChange={(e) => setProp('href', e.target.value)} placeholder="/" style={inputStyle} />
-            Download (link points at a file)
+          </div>
-          </label>
         </CollapsibleSection>
       )}
 
@@ -302,22 +145,17 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
             </div>
           )}
           {nodeProps.logoUrl !== undefined && (
-            <LinkPicker value={nodeProps.logoUrl || '/'} onChange={(v) => setProp('logoUrl', v)} />
+            <div style={sectionGap}>
+              <label style={labelStyle}>Logo Link URL</label>
+              <input type="text" value={nodeProps.logoUrl || ''} onChange={(e) => setProp('logoUrl', e.target.value)} placeholder="/" style={inputStyle} />
+            </div>
           )}
         </CollapsibleSection>
       )}
 
-      {/* Links (not shown for standalone Logo, or for components -- like
+      {/* Links (not shown for standalone Logo) */}
-          Footer -- that don't carry a `links` array at all). */}
+      {!isStandaloneLogo && (
-      {!isStandaloneLogo && nodeProps.links !== undefined && (
         <CollapsibleSection title="Links">
-          <button
-            onClick={syncWithPages}
-            title="Replace these links with one per page (preserves any CTA link)"
-            style={{ marginBottom: 8, width: '100%', padding: '6px', fontSize: 11, background: 'rgba(59,130,246,0.12)', color: '#93c5fd', border: '1px solid rgba(59,130,246,0.4)', borderRadius: 4, cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 6 }}
-          >
-            <i className="fa fa-refresh" /> Sync links with Pages
-          </button>
           <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
             {links.map((link, i) => (
               <div key={i} style={{ background: '#1e1e22', borderRadius: 6, padding: 6, display: 'flex', flexDirection: 'column', gap: 3 }}>
@@ -327,11 +165,7 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
                     <i className="fa fa-times" />
                   </button>
                 </div>
-                <LinkPicker value={link.href || ''} onChange={(v) => updateLink(i, 'href', v)} />
+                <input type="text" value={link.href || ''} onChange={(e) => updateLink(i, 'href', e.target.value)} placeholder="URL" style={{ ...smallInputStyle, color: '#71717a' }} />
-                <label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 10, color: '#a1a1aa', cursor: 'pointer', marginTop: -6 }}>
-                  <input type="checkbox" checked={!!link.download} onChange={(e) => updateLink(i, 'download', e.target.checked)} />
-                  Download (points at a file)
-                </label>
               </div>
             ))}
           </div>
@@ -400,61 +234,12 @@ export const NavStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps
         </CollapsibleSection>
       )}
 
-      {/* Box model: margin + padding (per-side, via style.*). The old
+      {/* Style overrides */}
-          single "Padding" preset row is folded into the Padding SpacingControl
-          below (still writes to style.padding when linked, matching the
-          previous behavior exactly). */}
       <CollapsibleSection title="Spacing" defaultOpen={false}>
-        <SpacingControl
-          label="Margin"
-          value={{ top: style.marginTop, right: style.marginRight, bottom: style.marginBottom, left: style.marginLeft }}
-          onChange={(side, v) => setPropStyle(`margin${capitalize(side)}`, v)}
-        />
-        <SpacingControl
-          label="Padding"
-          value={{ top: style.paddingTop, right: style.paddingRight, bottom: style.paddingBottom, left: style.paddingLeft }}
-          onChange={(side, v) => setPropStyle(`padding${capitalize(side)}`, v)}
-          presets={SPACING_PRESETS}
-        />
-      </CollapsibleSection>
-
-      {/* Border & Effects: border, box-shadow, opacity */}
-      <CollapsibleSection title="Border & Effects" defaultOpen={false}>
-        <BorderControl
-          value={parseBorderShorthand(style.border)}
-          onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
-        />
         <div className="guided-section">
-          <SectionLabel>Box Shadow</SectionLabel>
+          <SectionLabel>Padding</SectionLabel>
-          <PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow || 'none'} onSelect={(v) => setPropStyle('boxShadow', v)} />
+          <PresetButtonGrid presets={SPACING_PRESETS} activeValue={(nodeProps.style || {}).padding as string} onSelect={(v) => setPropStyle('padding', v)} />
         </div>
-        <div style={sectionGap}>
-          <label style={labelStyle}>Opacity</label>
-          <input
-            type="range"
-            min={0}
-            max={100}
-            value={style.opacity !== undefined ? Math.round(parseFloat(style.opacity) * 100) : 100}
-            onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
-            style={{ width: '100%' }}
-          />
-        </div>
-      </CollapsibleSection>
-
-      {/* Entrance animation */}
-      <CollapsibleSection title="Animation" defaultOpen={false}>
-        <AnimationControl
-          value={{ animation: nodeProps.animation, animationDelay: nodeProps.animationDelay }}
-          onChange={(v) => actions.setProp(selectedId, (p: any) => { p.animation = v.animation; p.animationDelay = v.animationDelay; })}
-        />
-      </CollapsibleSection>
-
-      {/* Responsive visibility */}
-      <CollapsibleSection title="Visibility" defaultOpen={false}>
-        <VisibilityControl
-          value={{ hideOnDesktop: nodeProps.hideOnDesktop, hideOnTablet: nodeProps.hideOnTablet, hideOnMobile: nodeProps.hideOnMobile }}
-          onChange={(v) => actions.setProp(selectedId, (p: any) => { p.hideOnDesktop = v.hideOnDesktop; p.hideOnTablet = v.hideOnTablet; p.hideOnMobile = v.hideOnMobile; })}
-        />
       </CollapsibleSection>
     </>
   );

craft/src/panels/right/styles/containerBoxModel.tsx

@@ -0,0 +1,135 @@
+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>
+);