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>
2026-07-14 06:41:53 -07:00
35 changed files with 528 additions and 878 deletions
@@ -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');
+  });
+});
@@ -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>`,
  };
 };
@@ -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');
+  });
+});
@@ -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,
@@ -44,29 +44,3 @@ describe('Icon.toHtml XSS hardening', () => {
    expect(html).not.toMatch(/"\s+onclick="/);
  });
 });
-
-describe('Icon.toHtml bgShape/bgColor/bgSize rendering (built but, until this panel update, unexposed)', () => {
-  test('bgShape="circle" + bgColor render a colored 50%-radius background box', () => {
-    const { html } = toHtml({ icon: 'fa-star', bgShape: 'circle', bgColor: '#3b82f6', bgSize: '64px' }, '');
-    expect(html).toContain('background-color:#3b82f6');
-    expect(html).toContain('border-radius:50%');
-    expect(html).toContain('width:64px');
-    expect(html).toContain('height:64px');
-  });
-
-  test('bgShape="none" (default) renders the bare icon with no background wrapper', () => {
-    const { html } = toHtml({ icon: 'fa-star' }, '');
-    expect(html).not.toContain('background-color');
-  });
-});
-
-describe('Icon.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (Icon as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -12,11 +12,6 @@ interface IconProps {
  bgSize?: string;
  link?: string;
  style?: CSSProperties;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 function getBgBorderRadius(shape: string): string {
@@ -101,11 +96,6 @@ Icon.craft = {
    bgSize: '56px',
    link: '',
    style: {},
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -51,43 +51,3 @@ describe('SocialLinks.toHtml XSS hardening (iconSize/iconColor/iconBgColor/gap i
    expect(html).not.toContain('javascript:alert(1)');
  });
 });
-
-describe('SocialLinks.toHtml iconShape/gap emission (previously built but unexposed in SocialStylePanel)', () => {
-  test('iconShape="circle" emits a 50% border-radius on the wrapping <a>', () => {
-    const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'circle' }, '');
-    expect(html).toMatch(/<a[^>]*style="[^"]*border-radius:50%[^"]*"/);
-  });
-
-  test('iconShape="square" emits border-radius:0', () => {
-    const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'square' }, '');
-    expect(html).toMatch(/<a[^>]*style="[^"]*border-radius:0[^"]*"/);
-  });
-
-  test('iconShape="rounded" emits a 6px border-radius', () => {
-    const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'rounded' }, '');
-    expect(html).toMatch(/<a[^>]*style="[^"]*border-radius:6px[^"]*"/);
-  });
-
-  test('iconShape="none" omits the background box entirely (transparent bg, no fixed box size)', () => {
-    const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], iconShape: 'none' }, '');
-    const aTag = html.match(/<a[^>]*>/)![0];
-    expect(aTag).toContain('background-color:transparent');
-    expect(aTag).not.toContain('border-radius');
-  });
-
-  test('gap emits on the wrapper <div> style', () => {
-    const { html } = toHtml({ links: [{ platform: 'facebook', url: '#' }], gap: '24px' }, '');
-    expect(html).toMatch(/<div[^>]*style="[^"]*gap:24px[^"]*"/);
-  });
-});
-
-describe('SocialLinks.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (SocialLinks as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -17,11 +17,6 @@ interface SocialLinksProps {
  gap?: string;
  alignment?: 'left' | 'center' | 'right';
  style?: CSSProperties;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const platformIcons: Record<string, string> = {
@@ -156,11 +151,6 @@ SocialLinks.craft = {
    gap: '10px',
    alignment: 'center',
    style: {},
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -75,14 +75,3 @@ describe('StarRating.toHtml XSS hardening (rating/maxStars into aria-label, F2.2
    expect(html).toMatch(/<span role="img" aria-label="Rating: 4\.5 out of 5"/);
  });
 });
-
-describe('StarRating.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (StarRating as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -10,11 +10,6 @@ interface StarRatingProps {
  filledColor?: string;
  emptyColor?: string;
  style?: CSSProperties;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 export const StarRating: UserComponent<StarRatingProps> = ({
@@ -92,11 +87,6 @@ StarRating.craft = {
    filledColor: '#f59e0b',
    emptyColor: '#d1d5db',
    style: {},
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -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');
+  });
+});
@@ -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,
@@ -1,38 +0,0 @@
-import { describe, test, expect } from 'vitest';
-import { Accordion } from './Accordion';
-
-const toHtml = (Accordion as any).toHtml;
-
-const items = [
-  { title: 'Q1', content: 'A1', isOpen: true },
-  { title: 'Q2', content: 'A2', isOpen: false },
-];
-
-describe('Accordion.toHtml basic export', () => {
-  test('renders a <details> per item with the open attribute honored', () => {
-    const { html } = toHtml({ items }, '');
-    const detailsBlocks = html.match(/<details[^>]*>/g) || [];
-    expect(detailsBlocks.length).toBe(2);
-    expect(detailsBlocks[0]).toContain(' open');
-    expect(detailsBlocks[1]).not.toContain(' open');
-  });
-
-  test('headerBg/headerColor/contentBg/borderColor emit into the panel styles', () => {
-    const { html } = toHtml({ items, headerBg: '#111111', headerColor: '#222222', contentBg: '#333333', borderColor: '#444444' }, '');
-    expect(html).toContain('#111111');
-    expect(html).toContain('#222222');
-    expect(html).toContain('#333333');
-    expect(html).toContain('#444444');
-  });
-});
-
-describe('Accordion.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (Accordion as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -17,11 +17,6 @@ interface AccordionProps {
  contentBg?: string;
  borderColor?: string;
  anchorId?: string;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const defaultItems: AccordionItem[] = [
@@ -140,11 +135,6 @@ Accordion.craft = {
    contentBg: '#ffffff',
    borderColor: '#e2e8f0',
    anchorId: '',
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -1,37 +0,0 @@
-import { describe, test, expect } from 'vitest';
-import { CTASection } from './CTASection';
-
-const toHtml = (CTASection as any).toHtml;
-
-describe('CTASection.toHtml basic export', () => {
-  test('renders heading, description, and CTA buttons', () => {
-    const { html } = toHtml({ heading: 'Hi', description: 'Sub', ctas: [{ text: 'Go', href: '#', variant: 'primary' }] }, '');
-    expect(html).toContain('Hi');
-    expect(html).toContain('Sub');
-    expect(html).toContain('Go');
-  });
-
-  test('box-model style props (margin/padding/border/boxShadow/opacity) flow through to the section style=""', () => {
-    const { html } = toHtml({
-      heading: 'Hi',
-      description: 'Sub',
-      style: { marginTop: '10px', paddingLeft: '5px', border: '1px solid #000', boxShadow: '0 1px 2px rgba(0,0,0,0.1)', opacity: '0.5' },
-    }, '');
-    expect(html).toContain('margin-top:10px');
-    expect(html).toContain('padding-left:5px');
-    expect(html).toContain('border:1px solid #000');
-    expect(html).toContain('box-shadow:0 1px 2px rgba(0,0,0,0.1)');
-    expect(html).toContain('opacity:0.5');
-  });
-});
-
-describe('CTASection.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (CTASection as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -14,11 +14,6 @@ interface CTASectionProps {
  gradient?: string;
  anchorId?: string;
  style?: CSSProperties;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const defaultGradient = 'linear-gradient(135deg, #2563eb 0%, #7c3aed 100%)';
@@ -88,11 +83,6 @@ CTASection.craft = {
    gradient: defaultGradient,
    anchorId: '',
    style: {},
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -1,37 +0,0 @@
-import { describe, test, expect } from 'vitest';
-import { CallToAction } from './CallToAction';
-
-const toHtml = (CallToAction as any).toHtml;
-
-describe('CallToAction.toHtml basic export', () => {
-  test('renders heading, description, and CTA buttons', () => {
-    const { html } = toHtml({ heading: 'Hi', description: 'Sub', ctas: [{ text: 'Go', href: '#', variant: 'primary' }] }, '');
-    expect(html).toContain('Hi');
-    expect(html).toContain('Sub');
-    expect(html).toContain('Go');
-  });
-
-  test('box-model style props (margin/padding/border/boxShadow/opacity) flow through to the section style=""', () => {
-    const { html } = toHtml({
-      heading: 'Hi',
-      description: 'Sub',
-      style: { marginBottom: '12px', paddingRight: '6px', border: '2px dashed #333', boxShadow: '0 4px 8px rgba(0,0,0,0.12)', opacity: '0.75' },
-    }, '');
-    expect(html).toContain('margin-bottom:12px');
-    expect(html).toContain('padding-right:6px');
-    expect(html).toContain('border:2px dashed #333');
-    expect(html).toContain('box-shadow:0 4px 8px rgba(0,0,0,0.12)');
-    expect(html).toContain('opacity:0.75');
-  });
-});
-
-describe('CallToAction.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (CallToAction as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -21,11 +21,6 @@ interface CallToActionProps {
  buttonColor?: string;
  anchorId?: string;
  style?: CSSProperties;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const defaultGradient = 'linear-gradient(135deg, #2563eb 0%, #7c3aed 100%)';
@@ -136,11 +131,6 @@ CallToAction.craft = {
    textColor: '#ffffff',
    buttonColor: '#ffffff',
    style: {},
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -62,14 +62,3 @@ describe('Countdown.toHtml script nit: ticking interval stops at zero', () => {
    expect(html).toMatch(/if\s*\(\s*target\s*-\s*Date\.now\(\)\s*>\s*0\s*\)\s*\{/);
  });
 });
-
-describe('Countdown.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (Countdown as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -11,11 +11,6 @@ interface CountdownProps {
  labelColor?: string;
  bgColor?: string;
  anchorId?: string;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 interface TimeLeft {
@@ -144,11 +139,6 @@ Countdown.craft = {
    labelColor: 'rgba(255,255,255,0.7)',
    bgColor: '#18181b',
    anchorId: '',
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -21,14 +21,3 @@ describe('FeaturesGrid.toHtml image sink uses safeImageUrl (data:image/svg+xml a
    expect(html).toMatch(/<a href=""/);
  });
 });
-
-describe('FeaturesGrid.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (FeaturesGrid as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -17,11 +17,6 @@ interface FeaturesGridProps {
  features?: FeatureItem[];
  style?: CSSProperties;
  anchorId?: string;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 // Keys image/imageAlt/buttonText/buttonUrl are present (blank) on the defaults so
@@ -103,11 +98,6 @@ FeaturesGrid.craft = {
    features: defaultFeatures,
    style: { backgroundColor: '#ffffff' },
    anchorId: '',
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -73,14 +73,3 @@ describe('NumberCounter.toHtml counter.number is NOT runtime-type-checked -- mus
    expect(html).toContain('data-target="150"');
  });
 });
-
-describe('NumberCounter.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (NumberCounter as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -16,11 +16,6 @@ interface NumberCounterProps {
  labelColor?: string;
  numberSize?: string;
  style?: CSSProperties;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const defaultCounters: Counter[] = [
@@ -104,11 +99,6 @@ NumberCounter.craft = {
    labelColor: '#6b7280',
    numberSize: '48px',
    style: { backgroundColor: '#ffffff' },
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -1,105 +0,0 @@
-import { describe, test, expect } from 'vitest';
-import { PricingTable } from './PricingTable';
-
-const toHtml = (PricingTable as any).toHtml;
-
-const plans = [
-  { name: 'Basic', price: '$9', period: '/month', features: ['Feature A'], buttonText: 'Buy', buttonHref: '#', isFeatured: false },
-  { name: 'Pro', price: '$29', period: '/month', features: ['Feature B'], buttonText: 'Buy', buttonHref: '#', isFeatured: true },
-];
-
-describe('PricingTable.toHtml regular-card color overrides (previously hard-coded, now real props)', () => {
-  test('cardBg emits as the non-featured card background', () => {
-    const { html } = toHtml({ plans, cardBg: '#f0f0f0' }, '');
-    expect(html).toContain('background-color:#f0f0f0');
-  });
-
-  test('textColor emits as the non-featured heading/price color', () => {
-    const { html } = toHtml({ plans, textColor: '#123456' }, '');
-    expect(html).toContain('color:#123456');
-  });
-
-  test('subColor emits as the non-featured period text color', () => {
-    const { html } = toHtml({ plans, subColor: '#abcdef' }, '');
-    expect(html).toContain('color:#abcdef');
-  });
-
-  test('featColor emits as the non-featured feature list text color', () => {
-    const { html } = toHtml({ plans, featColor: '#334455' }, '');
-    expect(html).toContain('color:#334455');
-  });
-
-  test('checkColor emits as the non-featured bullet color', () => {
-    const { html } = toHtml({ plans, checkColor: '#00ff00' }, '');
-    expect(html).toContain('color:#00ff00');
-  });
-
-  test('btnBg/btnColor emit as the non-featured button colors', () => {
-    const { html } = toHtml({ plans, btnBg: '#111111', btnColor: '#eeeeee' }, '');
-    expect(html).toContain('background-color:#111111');
-    expect(html).toContain('color:#eeeeee');
-  });
-
-  test('unset overrides fall back to the exact prior literals (backward compatible)', () => {
-    const { html } = toHtml({ plans }, '');
-    // Regular (non-featured) card literals unchanged from before these props existed.
-    expect(html).toContain('background-color:#ffffff');
-    expect(html).toContain('color:#18181b');
-    expect(html).toContain('color:#64748b');
-    expect(html).toContain('color:#4b5563');
-    expect(html).toContain('color:#10b981');
-  });
-
-  test('unset btnBg falls back to featuredBg (original derivation)', () => {
-    const { html } = toHtml({ plans, featuredBg: '#654321' }, '');
-    expect(html).toContain('background-color:#654321');
-  });
-});
-
-describe('PricingTable.toHtml XSS hardening (new card color props into style=)', () => {
-  test('a cardBg breakout string cannot escape style=""', () => {
-    const malicious = '#fff" onmouseover="alert(1)';
-    const { html } = toHtml({ plans, cardBg: malicious }, '');
-    expect(html).not.toMatch(/"\s+onmouseover="/);
-  });
-
-  test('a textColor breakout string cannot escape style=""', () => {
-    const malicious = '#000" onmouseover="alert(1)';
-    const { html } = toHtml({ plans, textColor: malicious }, '');
-    expect(html).not.toMatch(/"\s+onmouseover="/);
-  });
-
-  test('a btnBg breakout string cannot escape style=""', () => {
-    const malicious = '#000" onmouseover="alert(1)';
-    const { html } = toHtml({ plans, btnBg: malicious }, '');
-    expect(html).not.toMatch(/"\s+onmouseover="/);
-  });
-
-  test('a btnColor breakout string cannot escape style=""', () => {
-    const malicious = '#000" onmouseover="alert(1)';
-    const { html } = toHtml({ plans, btnColor: malicious }, '');
-    expect(html).not.toMatch(/"\s+onmouseover="/);
-  });
-});
-
-describe('PricingTable.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('the new regular-card color props are declared blank by default', () => {
-    const props = (PricingTable as any).craft.props;
-    expect(props).toHaveProperty('cardBg', '');
-    expect(props).toHaveProperty('textColor', '');
-    expect(props).toHaveProperty('subColor', '');
-    expect(props).toHaveProperty('featColor', '');
-    expect(props).toHaveProperty('checkColor', '');
-    expect(props).toHaveProperty('btnBg', '');
-    expect(props).toHaveProperty('btnColor', '');
-  });
-
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (PricingTable as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -19,23 +19,6 @@ interface PricingTableProps {
  featuredBg?: string;
  bulletType?: string;
  anchorId?: string;
-  /* ---- Regular (non-featured) card colors ----
-     All optional; each falls back to the exact literal the card was
-     previously hard-coded to (or, for the button, to featuredBg -- the
-     button's original derivation) when left unset, so existing saved
-     projects render pixel-identical until a color is explicitly picked. */
-  cardBg?: string;
-  textColor?: string;
-  subColor?: string;
-  featColor?: string;
-  checkColor?: string;
-  btnBg?: string;
-  btnColor?: string;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const bulletChars: Record<string, string> = {
@@ -78,13 +61,6 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
  featuredBg = '#3b82f6',
  bulletType = 'check',
  anchorId,
-  cardBg,
-  textColor,
-  subColor,
-  featColor,
-  checkColor,
-  btnBg,
-  btnColor,
 }) => {
  const {
    connectors: { connect, drag },
@@ -93,14 +69,6 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
    selected: node.events.selected,
  }));

-  const regCardBg = cardBg || '#ffffff';
-  const regTextColor = textColor || '#18181b';
-  const regSubColor = subColor || '#64748b';
-  const regFeatColor = featColor || '#4b5563';
-  const regCheckColor = checkColor || '#10b981';
-  const regBtnBg = btnBg || featuredBg;
-  const regBtnColor = btnColor || '#ffffff';
-
  return (
    <section
      ref={(ref: HTMLElement | null): void => { if (ref) connect(drag(ref)); }}
@@ -127,7 +95,7 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
            style={{
              flex: '1 1 280px',
              maxWidth: '360px',
-              backgroundColor: plan.isFeatured ? featuredBg : regCardBg,
+              backgroundColor: plan.isFeatured ? featuredBg : '#ffffff',
              border: plan.isFeatured ? 'none' : '1px solid #e2e8f0',
              borderRadius: '16px',
              padding: '40px 32px',
@@ -159,7 +127,7 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
            <h3 style={{
              fontSize: '20px',
              fontWeight: '600',
-              color: plan.isFeatured ? '#ffffff' : regTextColor,
+              color: plan.isFeatured ? '#ffffff' : '#18181b',
              marginBottom: '8px',
              marginTop: plan.isFeatured ? '8px' : '0',
            }}>
@@ -169,14 +137,14 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
              <span style={{
                fontSize: '48px',
                fontWeight: '700',
-                color: plan.isFeatured ? '#ffffff' : regTextColor,
+                color: plan.isFeatured ? '#ffffff' : '#18181b',
                lineHeight: '1',
              }}>
                {plan.price}
              </span>
              <span style={{
                fontSize: '16px',
-                color: plan.isFeatured ? 'rgba(255,255,255,0.8)' : regSubColor,
+                color: plan.isFeatured ? 'rgba(255,255,255,0.8)' : '#64748b',
              }}>
                {plan.period}
              </span>
@@ -193,12 +161,12 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
              {(Array.isArray(plan.features) ? plan.features : []).map((feature, fi) => (
                <li key={fi} style={{
                  fontSize: '14px',
-                  color: plan.isFeatured ? 'rgba(255,255,255,0.9)' : regFeatColor,
+                  color: plan.isFeatured ? 'rgba(255,255,255,0.9)' : '#4b5563',
                  display: 'flex',
                  alignItems: 'center',
                  gap: '8px',
                }}>
-                  <span style={{ color: plan.isFeatured ? '#bbf7d0' : regCheckColor, fontWeight: '700' }}>{bulletChars[bulletType] || '✓'}</span>
+                  <span style={{ color: plan.isFeatured ? '#bbf7d0' : '#10b981', fontWeight: '700' }}>{bulletChars[bulletType] || '✓'}</span>
                  {feature}
                </li>
              ))}
@@ -210,8 +178,8 @@ export const PricingTable: UserComponent<PricingTableProps> = ({
                marginTop: 'auto',
                display: 'inline-block',
                padding: '14px 32px',
-                backgroundColor: plan.isFeatured ? '#ffffff' : regBtnBg,
-                color: plan.isFeatured ? featuredBg : regBtnColor,
+                backgroundColor: plan.isFeatured ? '#ffffff' : featuredBg,
+                color: plan.isFeatured ? featuredBg : '#ffffff',
                textDecoration: 'none',
                borderRadius: '8px',
                fontWeight: '600',
@@ -239,18 +207,6 @@ PricingTable.craft = {
    featuredBg: '#3b82f6',
    bulletType: 'check',
    anchorId: '',
-    cardBg: '',
-    textColor: '',
-    subColor: '',
-    featColor: '',
-    checkColor: '',
-    btnBg: '',
-    btnColor: '',
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -272,28 +228,16 @@ PricingTable.craft = {
  // Sanitized -- featuredBg is a raw string-interpolation sink below (drives
  // cardBg/btnBg/btnColor, all raw-interpolated into style="...").
  const featuredBg = cssValue(props.featuredBg) || '#3b82f6';
-  // Sanitized -- regular (non-featured) card color overrides, all raw
-  // string-interpolation sinks into style="..." below. Each falls back to
-  // the exact literal the card was previously hard-coded to (or, for the
-  // button, to featuredBg) when unset, so unmodified pricing tables render
-  // identically to before these props existed.
-  const regCardBg = cssValue(props.cardBg) || '#ffffff';
-  const regTextColor = cssValue(props.textColor) || '#18181b';
-  const regSubColor = cssValue(props.subColor) || '#64748b';
-  const regFeatColor = cssValue(props.featColor) || '#4b5563';
-  const regCheckColor = cssValue(props.checkColor) || '#10b981';
-  const regBtnBg = cssValue(props.btnBg) || featuredBg;
-  const regBtnColor = cssValue(props.btnColor) || '#ffffff';

  const cards = plans.map((plan) => {
-    const cardBg = plan.isFeatured ? featuredBg : regCardBg;
+    const cardBg = plan.isFeatured ? featuredBg : '#ffffff';
    const cardBorder = plan.isFeatured ? 'border:none;' : 'border:1px solid #e2e8f0;';
-    const textColor = plan.isFeatured ? '#ffffff' : regTextColor;
-    const subColor = plan.isFeatured ? 'rgba(255,255,255,0.8)' : regSubColor;
-    const featColor = plan.isFeatured ? 'rgba(255,255,255,0.9)' : regFeatColor;
-    const checkColor = plan.isFeatured ? '#bbf7d0' : regCheckColor;
-    const btnBg = plan.isFeatured ? '#ffffff' : regBtnBg;
-    const btnColor = plan.isFeatured ? featuredBg : regBtnColor;
+    const textColor = plan.isFeatured ? '#ffffff' : '#18181b';
+    const subColor = plan.isFeatured ? 'rgba(255,255,255,0.8)' : '#64748b';
+    const featColor = plan.isFeatured ? 'rgba(255,255,255,0.9)' : '#4b5563';
+    const checkColor = plan.isFeatured ? '#bbf7d0' : '#10b981';
+    const btnBg = plan.isFeatured ? '#ffffff' : featuredBg;
+    const btnColor = plan.isFeatured ? featuredBg : '#ffffff';
    const scale = plan.isFeatured ? 'transform:scale(1.05);' : '';
    const shadow = plan.isFeatured ? 'box-shadow:0 20px 60px rgba(59,130,246,0.3);' : 'box-shadow:0 1px 3px rgba(0,0,0,0.06);';

@@ -80,14 +80,3 @@ describe('Tabs.toHtml deterministic + unique ids (thread node id, resolves id-co
    expect(html1).toBe(html2);
  });
 });
-
-describe('Tabs.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (Tabs as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -17,11 +17,6 @@ interface TabsProps {
  inactiveTabColor?: string;
  contentBg?: string;
  anchorId?: string;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const defaultTabs: TabItem[] = [
@@ -119,11 +114,6 @@ Tabs.craft = {
    inactiveTabColor: '#64748b',
    contentBg: '#ffffff',
    anchorId: '',
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -71,14 +71,3 @@ describe('Testimonials.toHtml rating aria-label sink (attacker-controlled `ratin
    expect(html).toContain('aria-label="Rating: 4 out of 5"');
  });
 });
-
-describe('Testimonials.craft.props includes the box-model/animation/visibility rollout props', () => {
-  test('animation, animationDelay, and all 3 hideOn* flags are declared (blank/false defaults)', () => {
-    const props = (Testimonials as any).craft.props;
-    expect(props).toHaveProperty('animation', '');
-    expect(props).toHaveProperty('animationDelay', '');
-    expect(props).toHaveProperty('hideOnDesktop', false);
-    expect(props).toHaveProperty('hideOnTablet', false);
-    expect(props).toHaveProperty('hideOnMobile', false);
-  });
-});
@@ -18,11 +18,6 @@ interface TestimonialsProps {
  cardBg?: string;
  starColor?: string;
  anchorId?: string;
-  animation?: string;
-  animationDelay?: string;
-  hideOnDesktop?: boolean;
-  hideOnTablet?: boolean;
-  hideOnMobile?: boolean;
 }

 const defaultTestimonials: Testimonial[] = [
@@ -136,11 +131,6 @@ Testimonials.craft = {
    cardBg: '#f8fafc',
    starColor: '#f59e0b',
    anchorId: '',
-    animation: '',
-    animationDelay: '',
-    hideOnDesktop: false,
-    hideOnTablet: false,
-    hideOnMobile: false,
  },
  rules: {
    canDrag: () => true,
@@ -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>
    </>
  );
 };
@@ -1,38 +1,16 @@
 import React, { useCallback, useState } from 'react';
 import { useEditor } from '@craftjs/core';
-import { SHADOW_PRESETS } from '../../../constants/presets';
 import {
  StylePanelProps,
  CollapsibleSection,
  ColorPickerField,
-  SectionLabel,
-  PresetButtonGrid,
  labelStyle,
  inputStyle,
  smallInputStyle,
  btnActiveStyle,
  sectionGap,
-  useNodeProp,
-  SpacingControl,
-  BorderControl,
-  BorderValue,
-  buildBorderShorthand,
-  AnimationControl,
-  VisibilityControl,
 } from './shared';

-/** Parses a border shorthand string ("2px solid #hex") produced by
- *  buildBorderShorthand() back into its parts for round-tripping through
- *  BorderControl. See SectionTypePanel.tsx for the identical helper. */
-function parseBorderShorthand(v: string | undefined): BorderValue {
-  if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
-  const m = String(v).match(/^([\d.]+[a-z%]*)\s+(\w+)\s+(.+)$/);
-  if (!m) return { width: '', style: 'none', color: '#000000' };
-  return { width: m[1], style: m[2], color: m[3] };
-}
-
-const capSide = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1);
-
 const bulletOptions = [
  { label: '✓', value: 'check' },
  { label: '●', value: 'dot' },
@@ -48,12 +26,10 @@ const bulletChar: Record<string, string> = {

 export const PricingStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
  const { actions } = useEditor();
-  const { setProp, setPropStyle } = useNodeProp(selectedId);
  const [expandedPlan, setExpandedPlan] = useState<number>(0);

  const plans: any[] = Array.isArray(nodeProps.plans) ? nodeProps.plans : [];
  const currentBullet = nodeProps.bulletType || 'check';
-  const style = nodeProps.style || {};

  const updatePlan = useCallback((planIndex: number, field: string, value: any) => {
    actions.setProp(selectedId, (props: any) => {
@@ -228,79 +204,6 @@ export const PricingStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeP
      {/* Colors */}
      <CollapsibleSection title="Colors" defaultOpen={false}>
        <ColorPickerField label="Featured Plan Color" value={nodeProps.featuredBg || '#3b82f6'} onChange={(v) => actions.setProp(selectedId, (p: any) => { p.featuredBg = v; })} />
-        {/* Regular (non-featured) card colors -- built into PricingTable's
-            render/toHtml but previously hard-coded literals with no control
-            surfacing them. Each falls back to the prior literal when blank. */}
-        <ColorPickerField label="Card Background" value={nodeProps.cardBg || '#ffffff'} onChange={(v) => setProp('cardBg', v)} />
-        <ColorPickerField label="Heading / Price Color" value={nodeProps.textColor || '#18181b'} onChange={(v) => setProp('textColor', v)} />
-        <ColorPickerField label="Period Text Color" value={nodeProps.subColor || '#64748b'} onChange={(v) => setProp('subColor', v)} />
-        <ColorPickerField label="Feature Text Color" value={nodeProps.featColor || '#4b5563'} onChange={(v) => setProp('featColor', v)} />
-        <ColorPickerField label="Checkmark Color" value={nodeProps.checkColor || '#10b981'} onChange={(v) => setProp('checkColor', v)} />
-        <ColorPickerField label="Button Background" value={nodeProps.btnBg || nodeProps.featuredBg || '#3b82f6'} onChange={(v) => setProp('btnBg', v)} />
-        <ColorPickerField label="Button Text Color" value={nodeProps.btnColor || '#ffffff'} onChange={(v) => setProp('btnColor', v)} />
-      </CollapsibleSection>
-
-      {/* Box model: margin, padding, border, shadow, opacity */}
-      <CollapsibleSection title="Spacing & Border" defaultOpen={false}>
-        <SpacingControl
-          label="Margin"
-          value={{
-            top: style.marginTop as string, right: style.marginRight as string,
-            bottom: style.marginBottom as string, left: style.marginLeft as string,
-          }}
-          onChange={(side, v) => setPropStyle(`margin${capSide(side)}`, v)}
-        />
-        <SpacingControl
-          label="Padding"
-          value={{
-            top: style.paddingTop as string, right: style.paddingRight as string,
-            bottom: style.paddingBottom as string, left: style.paddingLeft as string,
-          }}
-          onChange={(side, v) => setPropStyle(`padding${capSide(side)}`, v)}
-        />
-        <BorderControl
-          value={parseBorderShorthand(style.border as string)}
-          onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
-        />
-        <div className="guided-section">
-          <SectionLabel>Shadow</SectionLabel>
-          <PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow as string} onSelect={(v) => setPropStyle('boxShadow', v)} />
-        </div>
-        <div className="guided-section">
-          <SectionLabel>Opacity</SectionLabel>
-          <input
-            type="range"
-            min={0}
-            max={100}
-            value={style.opacity !== undefined ? Math.round(Number(style.opacity) * 100) : 100}
-            onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
-            style={{ width: '100%' }}
-          />
-        </div>
-      </CollapsibleSection>
-
-      {/* Entrance animation */}
-      <CollapsibleSection title="Animation" defaultOpen={false}>
-        <AnimationControl
-          value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay || '0' }}
-          onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
-        />
-      </CollapsibleSection>
-
-      {/* Responsive visibility */}
-      <CollapsibleSection title="Visibility" defaultOpen={false}>
-        <VisibilityControl
-          value={{
-            hideOnDesktop: !!nodeProps.hideOnDesktop,
-            hideOnTablet: !!nodeProps.hideOnTablet,
-            hideOnMobile: !!nodeProps.hideOnMobile,
-          }}
-          onChange={(v) => {
-            setProp('hideOnDesktop', !!v.hideOnDesktop);
-            setProp('hideOnTablet', !!v.hideOnTablet);
-            setProp('hideOnMobile', !!v.hideOnMobile);
-          }}
-        />
      </CollapsibleSection>
    </>
  );
@@ -3,7 +3,6 @@ import {
  BG_COLORS,
  SPACING_PRESETS,
  RADIUS_PRESETS,
-  SHADOW_PRESETS,
 } from '../../../constants/presets';
 import {
  StylePanelProps,
@@ -16,31 +15,10 @@ import {
  inputStyle,
  sectionGap,
  useNodeProp,
-  SpacingControl,
-  BorderControl,
-  BorderValue,
-  buildBorderShorthand,
-  AnimationControl,
-  VisibilityControl,
 } from './shared';
 import { FeaturesEditor } from './FeaturesEditor';
 import { ArrayItemFieldsEditor } from './ArrayItemFields';

-/** Parses a border shorthand string ("2px solid #hex") produced by
- *  buildBorderShorthand() back into its parts for round-tripping through
- *  BorderControl. Anything that doesn't match (undefined/'none'/legacy
- *  hand-authored values) falls back to an empty/none border rather than
- *  throwing, since this is display-only -- the next edit always re-emits a
- *  clean shorthand via buildBorderShorthand(). */
-function parseBorderShorthand(v: string | undefined): BorderValue {
-  if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
-  const m = String(v).match(/^([\d.]+[a-z%]*)\s+(\w+)\s+(.+)$/);
-  if (!m) return { width: '', style: 'none', color: '#000000' };
-  return { width: m[1], style: m[2], color: m[3] };
-}
-
-const capSide = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1);
-
 /* ---------- SECTION-TYPE (Accordion, Tabs, Pricing, Testimonials, etc.) ---------- */
 export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }> = ({ selectedId, nodeProps, typeName }) => {
  const { setProp, setPropStyle } = useNodeProp(selectedId);
@@ -48,12 +26,7 @@ export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }>
  const style = nodeProps.style || {};

  // Find all string/number/boolean props
-  const SKIP_PROPS = new Set([
-    'style', 'children', 'cssId', 'cssClass',
-    // Rendered via dedicated controls below (Animation/Visibility), not the
-    // generic Content field dump -- otherwise they'd show up twice.
-    'animation', 'animationDelay', 'hideOnDesktop', 'hideOnTablet', 'hideOnMobile',
-  ]);
+  const SKIP_PROPS = new Set(['style', 'children', 'cssId', 'cssClass']);
  const scalarProps = Object.entries(nodeProps).filter(
    ([key, val]) => !SKIP_PROPS.has(key) && (typeof val === 'string' || typeof val === 'number' || typeof val === 'boolean')
  );
@@ -153,69 +126,6 @@ export const SectionTypePanel: React.FC<StylePanelProps & { typeName: string }>
          <PresetButtonGrid presets={RADIUS_PRESETS} activeValue={style.borderRadius as string} onSelect={(v) => setPropStyle('borderRadius', v)} />
        </div>
      </CollapsibleSection>
-
-      {/* Box model: margin, padding, border, shadow, opacity */}
-      <CollapsibleSection title="Spacing & Border" defaultOpen={false}>
-        <SpacingControl
-          label="Margin"
-          value={{
-            top: style.marginTop as string, right: style.marginRight as string,
-            bottom: style.marginBottom as string, left: style.marginLeft as string,
-          }}
-          onChange={(side, v) => setPropStyle(`margin${capSide(side)}`, v)}
-        />
-        <SpacingControl
-          label="Padding"
-          value={{
-            top: style.paddingTop as string, right: style.paddingRight as string,
-            bottom: style.paddingBottom as string, left: style.paddingLeft as string,
-          }}
-          onChange={(side, v) => setPropStyle(`padding${capSide(side)}`, v)}
-        />
-        <BorderControl
-          value={parseBorderShorthand(style.border as string)}
-          onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
-        />
-        <div className="guided-section">
-          <SectionLabel>Shadow</SectionLabel>
-          <PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow as string} onSelect={(v) => setPropStyle('boxShadow', v)} />
-        </div>
-        <div className="guided-section">
-          <SectionLabel>Opacity</SectionLabel>
-          <input
-            type="range"
-            min={0}
-            max={100}
-            value={style.opacity !== undefined ? Math.round(Number(style.opacity) * 100) : 100}
-            onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
-            style={{ width: '100%' }}
-          />
-        </div>
-      </CollapsibleSection>
-
-      {/* Entrance animation */}
-      <CollapsibleSection title="Animation" defaultOpen={false}>
-        <AnimationControl
-          value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay || '0' }}
-          onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
-        />
-      </CollapsibleSection>
-
-      {/* Responsive visibility */}
-      <CollapsibleSection title="Visibility" defaultOpen={false}>
-        <VisibilityControl
-          value={{
-            hideOnDesktop: !!nodeProps.hideOnDesktop,
-            hideOnTablet: !!nodeProps.hideOnTablet,
-            hideOnMobile: !!nodeProps.hideOnMobile,
-          }}
-          onChange={(v) => {
-            setProp('hideOnDesktop', !!v.hideOnDesktop);
-            setProp('hideOnTablet', !!v.hideOnTablet);
-            setProp('hideOnMobile', !!v.hideOnMobile);
-          }}
-        />
-      </CollapsibleSection>
    </>
  );
 };
@@ -3,7 +3,6 @@ import { useEditor } from '@craftjs/core';
 import {
  BG_COLORS,
  SPACING_PRESETS,
-  SHADOW_PRESETS,
 } from '../../../constants/presets';
 import {
  StylePanelProps,
@@ -18,33 +17,8 @@ import {
  btnActiveStyle,
  sectionGap,
  useNodeProp,
-  SpacingControl,
-  BorderControl,
-  BorderValue,
-  buildBorderShorthand,
-  AnimationControl,
-  VisibilityControl,
 } from './shared';

-/** Parses a border shorthand string ("2px solid #hex") produced by
- *  buildBorderShorthand() back into its parts for round-tripping through
- *  BorderControl. See SectionTypePanel.tsx for the identical helper. */
-function parseBorderShorthand(v: string | undefined): BorderValue {
-  if (!v || v === 'none') return { width: '', style: 'none', color: '#000000' };
-  const m = String(v).match(/^([\d.]+[a-z%]*)\s+(\w+)\s+(.+)$/);
-  if (!m) return { width: '', style: 'none', color: '#000000' };
-  return { width: m[1], style: m[2], color: m[3] };
-}
-
-const capSide = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1);
-
-const ICON_SHAPES = [
-  { label: 'None', value: 'none' },
-  { label: 'Circle', value: 'circle' },
-  { label: 'Square', value: 'square' },
-  { label: 'Rounded', value: 'rounded' },
-];
-
 /* ---------- SOCIAL / ICON / STAR RATING ---------- */
 export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodeProps }) => {
  const { actions } = useEditor();
@@ -137,72 +111,6 @@ export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodePr
        </div>
      )}

-      {/* Icon shape (SocialLinks) -- exists on the component (iconShape prop
-          drives the circle/square/rounded background box) but previously had
-          no control. */}
-      {nodeProps.iconShape !== undefined && (
-        <div style={sectionGap}>
-          <label style={labelStyle}>Icon Shape</label>
-          <div style={{ display: 'flex', gap: 4 }}>
-            {ICON_SHAPES.map((s) => (
-              <button key={s.value} onClick={() => setProp('iconShape', s.value)} style={{ ...btnActiveStyle(nodeProps.iconShape === s.value), flex: 1 }}>
-                {s.label}
-              </button>
-            ))}
-          </div>
-        </div>
-      )}
-      {/* Gap between links (SocialLinks) -- exists on the component but
-          previously had no control. */}
-      {nodeProps.gap !== undefined && (
-        <div style={sectionGap}>
-          <label style={labelStyle}>Gap</label>
-          <input type="text" value={nodeProps.gap || '10px'} onChange={(e) => setProp('gap', e.target.value)} placeholder="10px" style={inputStyle} />
-        </div>
-      )}
-
-      {/* Background shape / size / link (Icon component) -- bgColor, bgShape,
-          bgSize, link all already exist on Icon.craft.props but had no
-          control; the generic `color`/`iconColor` checks above never matched
-          Icon's actual prop names. */}
-      {nodeProps.bgShape !== undefined && (
-        <div style={sectionGap}>
-          <label style={labelStyle}>Background Shape</label>
-          <div style={{ display: 'flex', gap: 4 }}>
-            {ICON_SHAPES.map((s) => (
-              <button key={s.value} onClick={() => setProp('bgShape', s.value)} style={{ ...btnActiveStyle(nodeProps.bgShape === s.value), flex: 1 }}>
-                {s.label}
-              </button>
-            ))}
-          </div>
-        </div>
-      )}
-      {nodeProps.bgColor !== undefined && (
-        <ColorPickerField label="Background Color" value={nodeProps.bgColor === 'transparent' ? '' : nodeProps.bgColor} onChange={(v) => setProp('bgColor', v)} />
-      )}
-      {nodeProps.bgSize !== undefined && (
-        <div style={sectionGap}>
-          <label style={labelStyle}>Background Size</label>
-          <input type="text" value={nodeProps.bgSize || '56px'} onChange={(e) => setProp('bgSize', e.target.value)} placeholder="56px" style={inputStyle} />
-        </div>
-      )}
-      {nodeProps.link !== undefined && (
-        <div style={sectionGap}>
-          <label style={labelStyle}>Link URL</label>
-          <input type="text" value={nodeProps.link || ''} onChange={(e) => setProp('link', e.target.value)} placeholder="https://..." style={inputStyle} />
-        </div>
-      )}
-
-      {/* Star colors (StarRating) -- exist on the component as filledColor /
-          emptyColor but had no control (the generic `starColor` check above
-          never matched StarRating's actual prop names). */}
-      {nodeProps.filledColor !== undefined && (
-        <ColorPickerField label="Filled Star Color" value={nodeProps.filledColor || '#f59e0b'} onChange={(v) => setProp('filledColor', v)} />
-      )}
-      {nodeProps.emptyColor !== undefined && (
-        <ColorPickerField label="Empty Star Color" value={nodeProps.emptyColor || '#d1d5db'} onChange={(v) => setProp('emptyColor', v)} />
-      )}
-
      {/* Colors */}
      {nodeProps.iconColor !== undefined && (
        <ColorPickerField label="Icon Color" value={nodeProps.iconColor || '#3b82f6'} onChange={(v) => setProp('iconColor', v)} />
@@ -256,69 +164,6 @@ export const SocialStylePanel: React.FC<StylePanelProps> = ({ selectedId, nodePr
          <PresetButtonGrid presets={SPACING_PRESETS} activeValue={style.padding as string} onSelect={(v) => setPropStyle('padding', v)} />
        </div>
      </CollapsibleSection>
-
-      {/* Box model: margin, padding (per-side), border, shadow, opacity */}
-      <CollapsibleSection title="Spacing & Border" defaultOpen={false}>
-        <SpacingControl
-          label="Margin"
-          value={{
-            top: style.marginTop as string, right: style.marginRight as string,
-            bottom: style.marginBottom as string, left: style.marginLeft as string,
-          }}
-          onChange={(side, v) => setPropStyle(`margin${capSide(side)}`, v)}
-        />
-        <SpacingControl
-          label="Padding"
-          value={{
-            top: style.paddingTop as string, right: style.paddingRight as string,
-            bottom: style.paddingBottom as string, left: style.paddingLeft as string,
-          }}
-          onChange={(side, v) => setPropStyle(`padding${capSide(side)}`, v)}
-        />
-        <BorderControl
-          value={parseBorderShorthand(style.border as string)}
-          onChange={(v) => setPropStyle('border', buildBorderShorthand(v))}
-        />
-        <div className="guided-section">
-          <SectionLabel>Shadow</SectionLabel>
-          <PresetButtonGrid presets={SHADOW_PRESETS} activeValue={style.boxShadow as string} onSelect={(v) => setPropStyle('boxShadow', v)} />
-        </div>
-        <div className="guided-section">
-          <SectionLabel>Opacity</SectionLabel>
-          <input
-            type="range"
-            min={0}
-            max={100}
-            value={style.opacity !== undefined ? Math.round(Number(style.opacity) * 100) : 100}
-            onChange={(e) => setPropStyle('opacity', String(Number(e.target.value) / 100))}
-            style={{ width: '100%' }}
-          />
-        </div>
-      </CollapsibleSection>
-
-      {/* Entrance animation */}
-      <CollapsibleSection title="Animation" defaultOpen={false}>
-        <AnimationControl
-          value={{ animation: nodeProps.animation || 'none', animationDelay: nodeProps.animationDelay || '0' }}
-          onChange={(v) => { setProp('animation', v.animation); setProp('animationDelay', v.animationDelay); }}
-        />
-      </CollapsibleSection>
-
-      {/* Responsive visibility */}
-      <CollapsibleSection title="Visibility" defaultOpen={false}>
-        <VisibilityControl
-          value={{
-            hideOnDesktop: !!nodeProps.hideOnDesktop,
-            hideOnTablet: !!nodeProps.hideOnTablet,
-            hideOnMobile: !!nodeProps.hideOnMobile,
-          }}
-          onChange={(v) => {
-            setProp('hideOnDesktop', !!v.hideOnDesktop);
-            setProp('hideOnTablet', !!v.hideOnTablet);
-            setProp('hideOnMobile', !!v.hideOnMobile);
-          }}
-        />
-      </CollapsibleSection>
    </>
  );
 };
@@ -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>
    </>
  );
 };