feat(builder): text+button package -- typography depth, button target/hover, box-model+anim/vis rollout

- TextStylePanel (Heading/TextBlock): line-height/letter-spacing presets,
  text-transform (none/uppercase/lowercase/capitalize), italic + underline
  toggles (fontStyle/textDecoration), and a custom NumericUnitInput
  font-size alongside the existing preset row. All write to component
  `style`; no toHtml changes needed (style already flows through
  cssPropsToString for both components).
- ButtonStylePanel/ButtonLink: "Open in new tab" checkbox writes the
  existing `target` prop ('_self'/'_blank' -- toHtml already emitted
  rel="noopener noreferrer" for _blank). New Hover State section
  (hoverBg/hoverColor via ColorPickerField) renders a scoped
  `<style>.btn_<hash>:hover{...}</style>` block before the `<a>` in
  toHtml, scoped per-node via scopeId (same pattern as Navbar/Menu) so
  two buttons on one page don't collide; both values sanitized through
  cssValue against <style>-element breakout. Editor canvas gets a live
  hover preview via onMouseEnter/onMouseLeave local state (mirrors Menu's
  approach), since there's no way to preview a CSS :hover rule directly
  on an inline-styled React element.
- Heading/TextBlock/ButtonLink: added margin(per-side)/padding(per-side,
  Text only)/border/box-shadow/opacity style defaults + AnimationControl/
  VisibilityControl-backed animation/animationDelay/hideOnDesktop/
  hideOnTablet/hideOnMobile props, each panel gaining collapsible
  Spacing / Border & Effects / Animation & Visibility sections. Button
  keeps its existing padding-shorthand preset row rather than adding a
  redundant per-side padding control; only margin got the new
  per-side SpacingControl.
- Tests: extended all three *.toHtml.test.ts files -- typography style
  emission (line-height/letter-spacing/text-transform/font-style/
  text-decoration/custom font-size), button target+rel, scoped hover
  style emission + two adversarial style-breakout cases (</style><script>
  and rule-injection via `;}selector{`), and craft.props assertions for
  every new prop on all three components. 674 tests green, tsc + vite
  build clean.

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

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

@@ -52,3 +52,69 @@ describe('ButtonLink.toHtml text escaping (attacker-controlled `text` prop)', ()
     expect(html).toContain('>Click Me</a>');
   });
 });
+
+describe('ButtonLink.toHtml hover state (scoped <style> block)', () => {
+  test('no hover props -- no <style> block, no class added', () => {
+    const { html } = toHtml({ href: '#', text: 'x' }, '', 'node-1');
+    expect(html).not.toContain('<style>');
+    expect(html).not.toContain('class=');
+  });
+
+  test('hoverBg/hoverColor emit a scoped :hover rule scoped to the node id', () => {
+    const { html } = toHtml({ href: '#', text: 'x', hoverBg: '#111111', hoverColor: '#eeeeee' }, '', 'node-42');
+    expect(html).toMatch(/<style>\.btn_[a-z0-9]+:hover\{background-color:#111111;color:#eeeeee\}<\/style>/);
+    expect(html).toMatch(/class="btn_[a-z0-9]+"/);
+  });
+
+  test('two different node ids produce different scope classes (no collision)', () => {
+    const a = toHtml({ href: '#', text: 'x', hoverBg: '#111111' }, '', 'node-a').html;
+    const b = toHtml({ href: '#', text: 'x', hoverBg: '#111111' }, '', 'node-b').html;
+    const scopeOf = (html: string) => html.match(/btn_[a-z0-9]+/)?.[0];
+    expect(scopeOf(a)).toBeTruthy();
+    expect(scopeOf(a)).not.toBe(scopeOf(b));
+  });
+
+  test('an XSS breakout attempt in hoverBg cannot close the <style> element', () => {
+    const malicious = '</style><script>alert(1)</script>';
+    const { html } = toHtml({ href: '#', text: 'x', hoverBg: malicious }, '', 'node-1');
+    expect(html).not.toContain('</style><script>');
+    expect(html).not.toContain('<script>alert(1)</script>');
+  });
+
+  test('a rule-breakout attempt in hoverColor cannot inject a second selector/rule', () => {
+    const malicious = 'red;}body{background:red';
+    const { html } = toHtml({ href: '#', text: 'x', hoverColor: malicious }, '', 'node-1');
+    expect(html).not.toContain('}body{');
+    expect(html).not.toContain(';}');
+    // The whole export is still exactly one <style> element -- no new rule
+    // or element was opened by the malicious value.
+    expect((html.match(/<style>/g) || []).length).toBe(1);
+    expect((html.match(/<\/style>/g) || []).length).toBe(1);
+  });
+});
+
+describe('ButtonLink.craft.props exposes target + hover + box-model + animation/visibility', () => {
+  test('target defaults to _self, hoverBg/hoverColor blank', () => {
+    const props = (ButtonLink as any).craft.props;
+    expect(props.target).toBe('_self');
+    expect(props.hoverBg).toBe('');
+    expect(props.hoverColor).toBe('');
+  });
+
+  test('animation, animationDelay, hideOnDesktop/Tablet/Mobile are present with blank/false defaults', () => {
+    const props = (ButtonLink 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 box-model keys', () => {
+    const style = (ButtonLink as any).craft.props.style;
+    expect(style).toHaveProperty('marginTop');
+    expect(style.border).toBe('none');
+    expect(style.boxShadow).toBe('none');
+    expect(style.opacity).toBe('1');
+  });
+});

craft/src/components/basic/ButtonLink.tsx

@@ -1,13 +1,24 @@
 import React, { CSSProperties } from 'react';
 import { useNode, UserComponent } from '@craftjs/core';
 import { cssPropsToString } from '../../utils/style-helpers';
-import { escapeHtml, escapeAttr, safeUrl } from '../../utils/escape';
+import { escapeHtml, escapeAttr, safeUrl, cssValue, scopeId } from '../../utils/escape';
 
 interface ButtonLinkProps {
   text?: string;
   href?: string;
   target?: '_self' | '_blank';
   style?: CSSProperties;
+  /** Background color applied on `:hover` via a scoped `<style>` block
+   *  (editor preview does not show hover state -- only the published
+   *  export). Blank means "no hover background override". */
+  hoverBg?: string;
+  /** Text color applied on `:hover`, same scoped `<style>` block. */
+  hoverColor?: string;
+  animation?: string;
+  animationDelay?: string;
+  hideOnDesktop?: boolean;
+  hideOnTablet?: boolean;
+  hideOnMobile?: boolean;
 }
 
 export const ButtonLink: UserComponent<ButtonLinkProps> = ({
@@ -15,6 +26,8 @@ export const ButtonLink: UserComponent<ButtonLinkProps> = ({
   href = '#',
   target = '_self',
   style = {},
+  hoverBg = '',
+  hoverColor = '',
 }) => {
   const {
     connectors: { connect, drag },
@@ -23,6 +36,8 @@ export const ButtonLink: UserComponent<ButtonLinkProps> = ({
     selected: node.events.selected,
   }));
 
+  const [hovered, setHovered] = React.useState(false);
+
   return (
     <a
       ref={(ref: HTMLAnchorElement | null) => { if (ref) connect(drag(ref)); }}
@@ -32,12 +47,16 @@ export const ButtonLink: UserComponent<ButtonLinkProps> = ({
         // Prevent navigation inside editor
         e.preventDefault();
       }}
+      onMouseEnter={() => setHovered(true)}
+      onMouseLeave={() => setHovered(false)}
       style={{
         display: 'inline-block',
         textDecoration: 'none',
         cursor: 'pointer',
         outline: selected ? '2px solid #3b82f6' : 'none',
         ...style,
+        ...(hovered && hoverBg ? { backgroundColor: hoverBg } : {}),
+        ...(hovered && hoverColor ? { color: hoverColor } : {}),
       }}
     >
       {text}
@@ -53,6 +72,8 @@ ButtonLink.craft = {
     text: 'Click Me',
     href: '#',
     target: '_self',
+    hoverBg: '',
+    hoverColor: '',
     style: {
       backgroundColor: '#3b82f6',
       color: '#ffffff',
@@ -61,7 +82,15 @@ ButtonLink.craft = {
       fontWeight: '600',
       fontSize: '16px',
       border: 'none',
+      marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
+      boxShadow: 'none',
+      opacity: '1',
     },
+    animation: '',
+    animationDelay: '0',
+    hideOnDesktop: false,
+    hideOnTablet: false,
+    hideOnMobile: false,
   },
   rules: {
     canDrag: () => true,
@@ -72,7 +101,7 @@ ButtonLink.craft = {
 
 /* ---------- HTML export ---------- */
 
-(ButtonLink as any).toHtml = (props: ButtonLinkProps, _childrenHtml: string) => {
+(ButtonLink as any).toHtml = (props: ButtonLinkProps, _childrenHtml: string, nodeId?: string) => {
   const styleStr = cssPropsToString({
     display: 'inline-block',
     textDecoration: 'none',
@@ -80,7 +109,28 @@ ButtonLink.craft = {
   });
   const escapedText = escapeHtml(props.text || '');
   const targetAttr = props.target === '_blank' ? ' target="_blank" rel="noopener noreferrer"' : '';
+
+  // Scoped hover style -- same pattern as Navbar/Menu: a deterministic,
+  // per-node class (via scopeId) avoids two ButtonLink instances on the
+  // same page colliding on a shared `.btn-link:hover` rule. hoverBg/
+  // hoverColor are sanitized through cssValue -- they land inside a
+  // `<style>` element, the worst-case XSS sink (an unescaped `<`/`>` or
+  // `{`/`}` could close the rule/element and open a `<script>`).
+  const hoverBg = cssValue(props.hoverBg);
+  const hoverColor = cssValue(props.hoverColor);
+  let hoverCss = '';
+  let cls = '';
+  if (hoverBg || hoverColor) {
+    const scope = scopeId(nodeId, (props.href || '') + (props.text || ''), 'btn');
+    cls = ` class="${scope}"`;
+    const decls = [
+      hoverBg ? `background-color:${hoverBg}` : '',
+      hoverColor ? `color:${hoverColor}` : '',
+    ].filter(Boolean).join(';');
+    hoverCss = `<style>.${scope}:hover{${decls}}</style>`;
+  }
+
   return {
-    html: `<a href="${escapeAttr(safeUrl(props.href || '#'))}"${targetAttr}${styleStr ? ` style="${styleStr}"` : ''}>${escapedText}</a>`,
+    html: `${hoverCss}<a href="${escapeAttr(safeUrl(props.href || '#'))}"${targetAttr}${cls}${styleStr ? ` style="${styleStr}"` : ''}>${escapedText}</a>`,
   };
 };

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/Heading.toHtml.test.ts

@@ -56,3 +56,54 @@ describe('Heading.toHtml text escaping (attacker-controlled `text` prop)', () =>
     expect(html).toBe('<h2>Hello world</h2>');
   });
 });
+
+describe('Heading.toHtml typography depth (line-height/letter-spacing/transform/style/decoration)', () => {
+  test('line-height, letter-spacing, text-transform all flow into the style attribute', () => {
+    const { html } = toHtml({
+      text: 'x',
+      level: 'h2',
+      style: { lineHeight: '1.25', letterSpacing: '0.05em', textTransform: 'uppercase' },
+    }, '');
+    expect(html).toContain('line-height:1.25');
+    expect(html).toContain('letter-spacing:0.05em');
+    expect(html).toContain('text-transform:uppercase');
+  });
+
+  test('italic + underline toggles emit font-style and text-decoration', () => {
+    const { html } = toHtml({
+      text: 'x',
+      level: 'h2',
+      style: { fontStyle: 'italic', textDecoration: 'underline' },
+    }, '');
+    expect(html).toContain('font-style:italic');
+    expect(html).toContain('text-decoration:underline');
+  });
+
+  test('a custom font-size (not one of the presets) still flows through', () => {
+    const { html } = toHtml({ text: 'x', level: 'h2', style: { fontSize: '42px' } }, '');
+    expect(html).toContain('font-size:42px');
+  });
+});
+
+describe('Heading.craft.props exposes the box-model + animation/visibility rollout', () => {
+  test('animation, animationDelay, hideOnDesktop/Tablet/Mobile are present with blank/false defaults', () => {
+    const props = (Heading 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 box-model + typography-depth keys', () => {
+    const style = (Heading as any).craft.props.style;
+    expect(style).toHaveProperty('marginTop');
+    expect(style).toHaveProperty('paddingTop');
+    expect(style).toHaveProperty('lineHeight');
+    expect(style).toHaveProperty('letterSpacing');
+    expect(style).toHaveProperty('textTransform');
+    expect(style.border).toBe('none');
+    expect(style.boxShadow).toBe('none');
+    expect(style.opacity).toBe('1');
+  });
+});

craft/src/components/basic/Heading.tsx

@@ -100,7 +100,22 @@ Heading.craft = {
       fontFamily: 'Inter, sans-serif',
       color: '#1f2937',
       marginBottom: '16px',
+      lineHeight: '',
+      letterSpacing: '',
+      textTransform: '' as CSSProperties['textTransform'],
+      fontStyle: '' as CSSProperties['fontStyle'],
+      textDecoration: '',
+      marginTop: '', marginRight: '', marginLeft: '',
+      paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
+      border: 'none',
+      boxShadow: 'none',
+      opacity: '1',
     },
+    animation: '',
+    animationDelay: '0',
+    hideOnDesktop: false,
+    hideOnTablet: false,
+    hideOnMobile: false,
   },
   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/basic/TextBlock.toHtml.test.ts

@@ -20,3 +20,48 @@ describe('TextBlock.toHtml text escaping (attacker-controlled `text` prop)', ()
     expect(html).toBe('<p>Hello world</p>');
   });
 });
+
+describe('TextBlock.toHtml typography depth (line-height/letter-spacing/transform/style/decoration)', () => {
+  test('line-height, letter-spacing, text-transform all flow into the style attribute', () => {
+    const { html } = toHtml({
+      text: 'x',
+      style: { lineHeight: '1.75', letterSpacing: '-0.02em', textTransform: 'capitalize' },
+    }, '');
+    expect(html).toContain('line-height:1.75');
+    expect(html).toContain('letter-spacing:-0.02em');
+    expect(html).toContain('text-transform:capitalize');
+  });
+
+  test('italic + underline toggles emit font-style and text-decoration', () => {
+    const { html } = toHtml({ text: 'x', style: { fontStyle: 'italic', textDecoration: 'underline' } }, '');
+    expect(html).toContain('font-style:italic');
+    expect(html).toContain('text-decoration:underline');
+  });
+
+  test('a custom font-size (not one of the presets) still flows through', () => {
+    const { html } = toHtml({ text: 'x', style: { fontSize: '19px' } }, '');
+    expect(html).toContain('font-size:19px');
+  });
+});
+
+describe('TextBlock.craft.props exposes the box-model + animation/visibility rollout', () => {
+  test('animation, animationDelay, hideOnDesktop/Tablet/Mobile are present with blank/false defaults', () => {
+    const props = (TextBlock 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 box-model + typography-depth keys', () => {
+    const style = (TextBlock as any).craft.props.style;
+    expect(style).toHaveProperty('marginTop');
+    expect(style).toHaveProperty('paddingTop');
+    expect(style).toHaveProperty('letterSpacing');
+    expect(style).toHaveProperty('textTransform');
+    expect(style.border).toBe('none');
+    expect(style.boxShadow).toBe('none');
+    expect(style.opacity).toBe('1');
+  });
+});

craft/src/components/basic/TextBlock.tsx

@@ -83,7 +83,21 @@ TextBlock.craft = {
       fontSize: '16px',
       lineHeight: '1.6',
       color: '#3f3f46',
+      letterSpacing: '',
+      textTransform: '' as CSSProperties['textTransform'],
+      fontStyle: '' as CSSProperties['fontStyle'],
+      textDecoration: '',
+      marginTop: '', marginRight: '', marginBottom: '', marginLeft: '',
+      paddingTop: '', paddingRight: '', paddingBottom: '', paddingLeft: '',
+      border: 'none',
+      boxShadow: 'none',
+      opacity: '1',
     },
+    animation: '',
+    animationDelay: '0',
+    hideOnDesktop: false,
+    hideOnTablet: false,
+    hideOnMobile: false,
   },
   rules: {
     canDrag: () => true,

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

@@ -4,6 +4,7 @@ import {
   BG_COLORS,
   RADIUS_PRESETS,
   SPACING_PRESETS,
+  SHADOW_PRESETS,
 } from '../../../constants/presets';
 import {
   StylePanelProps,
@@ -11,16 +12,49 @@ import {
   ColorSwatchGrid,
   PresetButtonGrid,
   TextInputField,
+  ColorPickerField,
+  CollapsibleSection,
+  SpacingControl,
+  SpacingSide,
+  BorderControl,
+  BorderValue,
+  buildBorderShorthand,
+  AnimationControl,
+  VisibilityControl,
+  sectionGap,
+  labelStyle,
   autoTextColor,
   useNodeProp,
 } from './shared';
 
+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. */
+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] };
+}
+
+/** style.opacity is a CSS-length-free numeric string ("0.8") or blank
+ *  (treated as fully opaque). Converts to a 0-100 integer for the UI. */
+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;
+}
+
 /* ---------- BUTTON ---------- */
 export const ButtonStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
   const { actions } = useEditor();
   const style: CSSProperties = nodeProps.style || {};
 
-  const { setPropStyle } = useNodeProp(selectedId);
+  const { setProp, setPropStyle } = useNodeProp(selectedId);
 
   const setButtonColor = useCallback(
     (bgColor: string) => {
@@ -61,6 +95,16 @@ export const ButtonStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodePr
           actions.setProp(selectedId, (props: any) => { props.href = v; });
         }}
       />
+      <div className="guided-section">
+        <label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 11, color: '#e4e4e7', cursor: 'pointer' }}>
+          <input
+            type="checkbox"
+            checked={nodeProps.target === '_blank'}
+            onChange={(e) => setProp('target', e.target.checked ? '_blank' : '_self')}
+          />
+          Open in new tab
+        </label>
+      </div>
       <div className="guided-section">
         <SectionLabel>Border Radius</SectionLabel>
         <PresetButtonGrid
@@ -77,6 +121,70 @@ export const ButtonStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodePr
           onSelect={(v) => setPropStyle('padding', v)}
         />
       </div>
+
+      {/* Hover state -- rendered into a scoped <style>...:hover{} block by
+          ButtonLink.toHtml (published export only; not shown live in the
+          editor canvas beyond the hover preview ButtonLink itself does). */}
+      <CollapsibleSection title="Hover State" defaultOpen={false}>
+        <ColorPickerField
+          label="Hover Background"
+          value={nodeProps.hoverBg || ''}
+          onChange={(v) => setProp('hoverBg', v)}
+        />
+        <ColorPickerField
+          label="Hover Text Color"
+          value={nodeProps.hoverColor || ''}
+          onChange={(v) => setProp('hoverColor', v)}
+        />
+      </CollapsibleSection>
+
+      {/* Box model + border/effects + animation/visibility rollout */}
+      <CollapsibleSection title="Spacing" 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: SpacingSide, v: string) => setPropStyle(`margin${capitalize(side)}`, v)}
+        />
+      </CollapsibleSection>
+      <CollapsibleSection title="Border & Effects" defaultOpen={false}>
+        <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 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>
+      <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>
     </>
   );
 };

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) ----------
-   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 ---------- */
+/* ---------- NAV / MENU / LOGO ---------- */
 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)} />
-          <label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 11, color: '#e4e4e7', cursor: 'pointer', marginTop: -8, marginBottom: 12 }}>
-            <input type="checkbox" checked={!!nodeProps.download} onChange={(e) => setProp('download', e.target.checked)} />
-            Download (link points at a file)
-          </label>
+          <div style={sectionGap}>
+            <label style={labelStyle}>Link URL</label>
+            <input type="text" value={nodeProps.href || '/'} onChange={(e) => setProp('href', e.target.value)} placeholder="/" style={inputStyle} />
+          </div>
         </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
-          Footer -- that don't carry a `links` array at all). */}
-      {!isStandaloneLogo && nodeProps.links !== undefined && (
+      {/* Links (not shown for standalone Logo) */}
+      {!isStandaloneLogo && (
         <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)} />
-                <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>
+                <input type="text" value={link.href || ''} onChange={(e) => updateLink(i, 'href', e.target.value)} placeholder="URL" style={{ ...smallInputStyle, color: '#71717a' }} />
               </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
-          single "Padding" preset row is folded into the Padding SpacingControl
-          below (still writes to style.padding when linked, matching the
-          previous behavior exactly). */}
+      {/* Style overrides */}
       <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>
-          <PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow || 'none'} onSelect={(v) => setPropStyle('boxShadow', v)} />
+          <SectionLabel>Padding</SectionLabel>
+          <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/TextStylePanel.tsx

@@ -4,20 +4,69 @@ import {
   FONT_FAMILIES,
   TEXT_SIZES,
   FONT_WEIGHTS,
+  LINE_HEIGHTS,
+  LETTER_SPACINGS,
+  SHADOW_PRESETS,
 } from '../../../constants/presets';
 import {
   StylePanelProps,
   SectionLabel,
   ColorSwatchGrid,
   PresetButtonGrid,
+  NumericUnitInput,
+  CollapsibleSection,
+  SpacingControl,
+  SpacingSide,
+  BorderControl,
+  BorderValue,
+  buildBorderShorthand,
+  AnimationControl,
+  VisibilityControl,
+  sectionGap,
+  labelStyle,
   useNodeProp,
 } from './shared';
 
+/* Text-transform is a small fixed enum with no natural home in the shared
+   foundation presets (constants/presets.ts is import-only for this
+   package), so it lives here as a package-local preset list. */
+const TEXT_TRANSFORMS: { label: string; value: string }[] = [
+  { label: 'None', value: 'none' },
+  { label: 'UPPER', value: 'uppercase' },
+  { label: 'lower', value: 'lowercase' },
+  { label: 'Capitalize', value: 'capitalize' },
+];
+
+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. */
+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] };
+}
+
+/** style.opacity is a CSS-length-free numeric string ("0.8") or blank
+ *  (treated as fully opaque). Converts to a 0-100 integer for the UI. */
+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;
+}
+
 /* ---------- TEXT ---------- */
 export const TextStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
   const style: CSSProperties = nodeProps.style || {};
 
-  const { setPropStyle } = useNodeProp(selectedId);
+  const { setProp, setPropStyle } = useNodeProp(selectedId);
+
+  const isItalic = style.fontStyle === 'italic';
+  const isUnderline = style.textDecoration === 'underline';
 
   return (
     <>
@@ -44,6 +93,15 @@ export const TextStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProp
           activeValue={style.fontSize as string}
           onSelect={(v) => setPropStyle('fontSize', v)}
         />
+        <div style={{ marginTop: 6 }}>
+          <NumericUnitInput
+            value={TEXT_SIZES.some((p) => p.value === style.fontSize) ? '' : ((style.fontSize as string) || '')}
+            onChange={(v) => setPropStyle('fontSize', v)}
+            units={['px', 'em', 'rem', '%']}
+            placeholder="custom"
+            testId="text-fontsize-custom"
+          />
+        </div>
       </div>
       <div className="guided-section">
         <SectionLabel>Font Weight</SectionLabel>
@@ -53,6 +111,53 @@ export const TextStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProp
           onSelect={(v) => setPropStyle('fontWeight', v)}
         />
       </div>
+      <div className="guided-section">
+        <SectionLabel>Style</SectionLabel>
+        <div style={{ display: 'flex', gap: 6 }}>
+          <button
+            type="button"
+            className={`preset-btn ${isItalic ? 'active' : ''}`}
+            style={{ flex: 1, fontStyle: 'italic' }}
+            onClick={() => setPropStyle('fontStyle', isItalic ? 'normal' : 'italic')}
+            title="Italic"
+          >
+            <i className="fa fa-italic" /> Italic
+          </button>
+          <button
+            type="button"
+            className={`preset-btn ${isUnderline ? 'active' : ''}`}
+            style={{ flex: 1, textDecoration: 'underline' }}
+            onClick={() => setPropStyle('textDecoration', isUnderline ? 'none' : 'underline')}
+            title="Underline"
+          >
+            <i className="fa fa-underline" /> Underline
+          </button>
+        </div>
+      </div>
+      <div className="guided-section">
+        <SectionLabel>Text Transform</SectionLabel>
+        <PresetButtonGrid
+          presets={TEXT_TRANSFORMS}
+          activeValue={(style.textTransform as string) || 'none'}
+          onSelect={(v) => setPropStyle('textTransform', v === 'none' ? '' : v)}
+        />
+      </div>
+      <div className="guided-section">
+        <SectionLabel>Line Height</SectionLabel>
+        <PresetButtonGrid
+          presets={LINE_HEIGHTS}
+          activeValue={String(style.lineHeight || '')}
+          onSelect={(v) => setPropStyle('lineHeight', v)}
+        />
+      </div>
+      <div className="guided-section">
+        <SectionLabel>Letter Spacing</SectionLabel>
+        <PresetButtonGrid
+          presets={LETTER_SPACINGS}
+          activeValue={String(style.letterSpacing || '')}
+          onSelect={(v) => setPropStyle('letterSpacing', v)}
+        />
+      </div>
       <div className="guided-section">
         <SectionLabel>Alignment</SectionLabel>
         <div className="preset-grid align-grid">
@@ -68,6 +173,59 @@ export const TextStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProp
           ))}
         </div>
       </div>
+
+      {/* Box model + border/effects + animation/visibility rollout */}
+      <CollapsibleSection title="Spacing" 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: SpacingSide, v: string) => setPropStyle(`margin${capitalize(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: SpacingSide, v: string) => setPropStyle(`padding${capitalize(side)}`, v)}
+        />
+      </CollapsibleSection>
+      <CollapsibleSection title="Border & Effects" defaultOpen={false}>
+        <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 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>
+      <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>
     </>
   );
 };