From 3c3ad712968bdd772b6ba81b60e5554f055c3179 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Sun, 28 Dec 2025 12:45:51 -0800
Subject: [PATCH] hooo boy

---
 examples/navigation.tsx | 210 ++++++++++++++++++++--------------------
 src/index.tsx           |  58 ++++++++++-
 src/types.ts            |   3 +
 3 files changed, 161 insertions(+), 110 deletions(-)

diff --git a/examples/navigation.tsx b/examples/navigation.tsx
index 1232ff8..2b9aac8 100644
--- a/examples/navigation.tsx
+++ b/examples/navigation.tsx
@@ -4,8 +4,8 @@ import { ExampleSection } from './ssr/helpers'
 const TabSwitcher = define('TabSwitcher', {
   parts: {
     Input: {
-      base: 'input',
-      display: 'none', // Hide radio inputs
+      base: 'input[type=radio]',
+      display: 'none',
     },
     TabBar: {
       display: 'flex',
@@ -31,6 +31,13 @@ const TabSwitcher = define('TabSwitcher', {
         ':hover': {
           color: '#111827',
         }
+      },
+
+      selectors: {
+        '.TabSwitcher_Input:checked + &': {
+          color: '#3b82f6',
+          borderBottom: '2px solid #3b82f6'
+        }
       }
     },
     Content: {
@@ -38,52 +45,39 @@ const TabSwitcher = define('TabSwitcher', {
       padding: 20,
       background: '#f9fafb',
       borderRadius: 8,
+
+      selectors: {
+        '.TabSwitcher_Input:checked ~ &': {
+          display: 'block'
+        }
+      }
     }
   },
 
   render({ props, parts: { Root, Input, TabBar, TabLabel, Content } }) {
     return (
       <Root>
-        {/* Hidden radio inputs */}
-        {props.tabs?.map((tab: any, index: number) => (
-          <Input
-            key={`input-${tab.id}`}
-            type="radio"
-            id={`tab-${props.name}-${tab.id}`}
-            name={props.name || 'tabs'}
-            checked={index === 0}
-          />
-        ))}
-
-        {/* Tab labels */}
         <TabBar>
-          {props.tabs?.map((tab: any) => (
-            <TabLabel key={`label-${tab.id}`} for={`tab-${props.name}-${tab.id}`}>
-              {tab.label}
-            </TabLabel>
+          {props.tabs?.map((tab: any, index: number) => (
+            <>
+              <Input
+                key={`input-${tab.id}`}
+                id={`${props.name}-${tab.id}`}
+                name={props.name || 'tabs'}
+                checked={index === 0}
+              />
+              <TabLabel key={`label-${tab.id}`} for={`${props.name}-${tab.id}`}>
+                {tab.label}
+              </TabLabel>
+            </>
           ))}
         </TabBar>
 
-        {/* Tab content panels */}
         {props.tabs?.map((tab: any) => (
-          <Content key={`content-${tab.id}`} class={`content-${props.name}-${tab.id}`}>
+          <Content key={`content-${tab.id}`}>
             {tab.content}
           </Content>
         ))}
-
-        {/* CSS to show active tab and content */}
-        <style dangerouslySetInnerHTML={{
-          __html: props.tabs?.map((tab: any) => `
-            input#tab-${props.name}-${tab.id}:checked + .TabBar label[for="tab-${props.name}-${tab.id}"],
-            input#tab-${props.name}-${tab.id}:checked ~ .TabBar label[for="tab-${props.name}-${tab.id}"] {
-              color: #3b82f6 !important;
-              border-bottom: 2px solid #3b82f6 !important;
-            }
-            input#tab-${props.name}-${tab.id}:checked ~ .content-${props.name}-${tab.id} {
-              display: block !important;
-            }
-          `).join('\n')
-        }} />
       </Root>
     )
   }
@@ -92,7 +86,7 @@ const TabSwitcher = define('TabSwitcher', {
 const Pills = define('Pills', {
   parts: {
     Input: {
-      base: 'input',
+      base: 'input[type=radio]',
       display: 'none',
     },
     PillBar: {
@@ -118,6 +112,16 @@ const Pills = define('Pills', {
           background: '#e5e7eb',
           color: '#111827',
         }
+      },
+
+      selectors: {
+        '.Pills_Input:checked + &': {
+          background: '#3b82f6',
+          color: 'white'
+        },
+        '.Pills_Input:checked + &:hover': {
+          background: '#2563eb'
+        }
       }
     }
   },
@@ -125,33 +129,21 @@ const Pills = define('Pills', {
   render({ props, parts: { Root, Input, PillBar, PillLabel } }) {
     return (
       <Root>
-        {props.items?.map((item: any, index: number) => (
-          <Input
-            key={`input-${item.id}`}
-            type="radio"
-            id={`pill-${props.name}-${item.id}`}
-            name={props.name || 'pills'}
-            checked={index === 0}
-          />
-        ))}
-
         <PillBar>
-          {props.items?.map((item: any) => (
-            <PillLabel key={`label-${item.id}`} for={`pill-${props.name}-${item.id}`}>
-              {item.label}
-            </PillLabel>
+          {props.items?.map((item: any, index: number) => (
+            <>
+              <Input
+                key={`input-${item.id}`}
+                id={`${props.name}-${item.id}`}
+                name={props.name || 'pills'}
+                checked={index === 0}
+              />
+              <PillLabel key={`label-${item.id}`} for={`${props.name}-${item.id}`}>
+                {item.label}
+              </PillLabel>
+            </>
           ))}
         </PillBar>
-
-        <style dangerouslySetInnerHTML={{
-          __html: props.items?.map((item: any) => `
-            input#pill-${props.name}-${item.id}:checked + .PillBar label[for="pill-${props.name}-${item.id}"],
-            input#pill-${props.name}-${item.id}:checked ~ .PillBar label[for="pill-${props.name}-${item.id}"] {
-              background: #3b82f6 !important;
-              color: white !important;
-            }
-          `).join('\n')
-        }} />
       </Root>
     )
   }
@@ -160,7 +152,7 @@ const Pills = define('Pills', {
 const VerticalNav = define('VerticalNav', {
   parts: {
     Input: {
-      base: 'input',
+      base: 'input[type=radio]',
       display: 'none',
     },
     NavBar: {
@@ -190,6 +182,17 @@ const VerticalNav = define('VerticalNav', {
           background: '#f3f4f6',
           color: '#111827',
         }
+      },
+
+      selectors: {
+        '.VerticalNav_Input:checked + &': {
+          background: '#eff6ff',
+          color: '#3b82f6',
+        },
+        '.VerticalNav_Input:checked + &:hover': {
+          background: '#dbeafe',
+          color: '#2563eb'
+        }
       }
     },
     Icon: {
@@ -205,34 +208,22 @@ const VerticalNav = define('VerticalNav', {
   render({ props, parts: { Root, Input, NavBar, NavLabel, Icon } }) {
     return (
       <Root>
-        {props.items?.map((item: any, index: number) => (
-          <Input
-            key={`input-${item.id}`}
-            type="radio"
-            id={`nav-${props.name}-${item.id}`}
-            name={props.name || 'nav'}
-            checked={index === 0}
-          />
-        ))}
-
         <NavBar>
-          {props.items?.map((item: any) => (
-            <NavLabel key={`label-${item.id}`} for={`nav-${props.name}-${item.id}`}>
-              {item.icon && <Icon>{item.icon}</Icon>}
-              {item.label}
-            </NavLabel>
+          {props.items?.map((item: any, index: number) => (
+            <>
+              <Input
+                key={`input-${item.id}`}
+                id={`${props.name}-${item.id}`}
+                name={props.name || 'nav'}
+                checked={index === 0}
+              />
+              <NavLabel key={`label-${item.id}`} for={`${props.name}-${item.id}`}>
+                {item.icon && <Icon>{item.icon}</Icon>}
+                {item.label}
+              </NavLabel>
+            </>
           ))}
         </NavBar>
-
-        <style dangerouslySetInnerHTML={{
-          __html: props.items?.map((item: any) => `
-            input#nav-${props.name}-${item.id}:checked + .NavBar label[for="nav-${props.name}-${item.id}"],
-            input#nav-${props.name}-${item.id}:checked ~ .NavBar label[for="nav-${props.name}-${item.id}"] {
-              background: #eff6ff !important;
-              color: #3b82f6 !important;
-            }
-          `).join('\n')
-        }} />
       </Root>
     )
   }
@@ -476,32 +467,41 @@ const SimpleVerticalNav = define('SimpleVerticalNav', {
 export const NavigationExamplesContent = () => (
   <>
     <ExampleSection title="Tabs">
-      <Tabs items={[
-        { id: 1, label: 'Overview', active: true },
-        { id: 2, label: 'Analytics', active: false },
-        { id: 3, label: 'Reports', active: false },
-        { id: 4, label: 'Settings', active: false },
-      ]} />
+      <TabSwitcher
+        name="demo-tabs"
+        tabs={[
+          { id: 'overview', label: 'Overview', content: <p>Overview content</p> },
+          { id: 'analytics', label: 'Analytics', content: <p>Analytics content</p> },
+          { id: 'reports', label: 'Reports', content: <p>Reports content</p> },
+          { id: 'settings', label: 'Settings', content: <p>Settings content</p> },
+        ]}
+      />
     </ExampleSection>
 
     <ExampleSection title="Pills">
-      <SimplePills items={[
-        { id: 1, label: 'All', active: true },
-        { id: 2, label: 'Active', active: false },
-        { id: 3, label: 'Pending', active: false },
-        { id: 4, label: 'Archived', active: false },
-      ]} />
+      <Pills
+        name="demo-pills"
+        items={[
+          { id: 'all', label: 'All' },
+          { id: 'active', label: 'Active' },
+          { id: 'pending', label: 'Pending' },
+          { id: 'archived', label: 'Archived' },
+        ]}
+      />
     </ExampleSection>
 
     <ExampleSection title="Vertical Navigation">
-      <SimpleVerticalNav items={[
-        { id: 1, label: 'Dashboard', icon: '📊', active: true },
-        { id: 2, label: 'Projects', icon: '📁', active: false },
-        { id: 3, label: 'Team', icon: '👥', active: false },
-        { id: 4, label: 'Calendar', icon: '📅', active: false },
-        { id: 5, label: 'Documents', icon: '📄', active: false },
-        { id: 6, label: 'Settings', icon: '⚙️', active: false },
-      ]} />
+      <VerticalNav
+        name="demo-nav"
+        items={[
+          { id: 'dashboard', label: 'Dashboard', icon: '📊' },
+          { id: 'projects', label: 'Projects', icon: '📁' },
+          { id: 'team', label: 'Team', icon: '👥' },
+          { id: 'calendar', label: 'Calendar', icon: '📅' },
+          { id: 'documents', label: 'Documents', icon: '📄' },
+          { id: 'settings', label: 'Settings', icon: '⚙️' },
+        ]}
+      />
     </ExampleSection>
 
     <ExampleSection title="Breadcrumbs">
diff --git a/src/index.tsx b/src/index.tsx
index 8ba3c53..e7e40a4 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -9,7 +9,7 @@ export const Styles = () => <style dangerouslySetInnerHTML={{ __html: stylesToCS
 const isBrowser = typeof document !== 'undefined'
 let styleElement: HTMLStyleElement | null = null
 
-  // automatically inject <style> tag into browser for SPA
+// automatically inject <style> tag into browser for SPA
 function injectStylesInBrowser() {
   if (!isBrowser) return
 
@@ -30,7 +30,7 @@ export function stylesToCSS(styles: Record<string, Record<string, string>>): str
   for (const [selector, style] of Object.entries(styles)) {
     if (Object.keys(style).length === 0) continue
 
-    out.push(`.${selector} {`)
+    out.push(`${expandSelector(selector)} { `)
     for (const [name, value] of Object.entries(style).sort(([a], [b]) => a.localeCompare(b)))
       out.push(`  ${name}: ${value};`)
     out.push(`}\n`)
@@ -39,6 +39,10 @@ export function stylesToCSS(styles: Record<string, Record<string, string>>): str
   return out.join('\n')
 }
 
+function expandSelector(selector: string): string {
+  return selector.startsWith('.') ? selector : `.${selector}`
+}
+
 // creates a CSS class name
 function makeClassName(baseName: string, partName?: string, variantName?: string, variantKey?: string): string {
   const cls = partName ? `${baseName}_${partName}` : baseName
@@ -76,7 +80,21 @@ function makeStyle(def: TagDef) {
 function makeComponent(baseName: string, rootDef: TagDef, rootProps: Record<string, any>, partName?: string) {
   const def = partName ? rootDef.parts?.[partName]! : rootDef
   const base = def.base ?? 'div'
-  const Tag = (base) as keyof JSX.IntrinsicElements
+
+  // Extract element name from base (e.g., 'input[type=radio]' -> 'input')
+  const tagName = base.split('[')[0]
+  const Tag = (tagName) as keyof JSX.IntrinsicElements
+
+  // Extract attributes from base (e.g., 'input[type=radio]' -> { type: 'radio' })
+  const baseAttrs: Record<string, string> = {}
+  const attrMatch = base.match(/\[([^\]]+)\]/)
+  if (attrMatch && attrMatch[1]) {
+    const attrStr = attrMatch[1]
+    const [attrName, attrValue] = attrStr.split('=')
+    if (attrName && attrValue) {
+      baseAttrs[attrName] = attrValue
+    }
+  }
 
   return ({ children, ...props }: { children: any, [key: string]: any }) => {
     const classNames = [makeClassName(baseName, partName)]
@@ -107,7 +125,7 @@ function makeComponent(baseName: string, rootDef: TagDef, rootProps: Record<stri
       classNames.push(variantKey === true ? variantName : `${variantName}-${variantKey}`)
     }
 
-    return <Tag class={classNames.join(' ')} {...props}>{children}</Tag>
+    return <Tag class={classNames.join(' ')} {...baseAttrs} {...props}>{children}</Tag>
   }
 }
 
@@ -121,15 +139,25 @@ function registerStyles(name: string, def: TagDef) {
   const rootClassName = makeClassName(name)
   styles[rootClassName] ??= makeStyle(def)
 
+  for (let [selector, selectorDef] of Object.entries(def.selectors ?? {})) {
+    selector = selector.replace('&', `.${rootClassName}`)
+    if (styles[selector]) throw `${selector} already defined!`
+    styles[selector] = makeStyle(selectorDef)
+  }
+
   for (const [state, style] of Object.entries(def.states ?? {}))
     styles[`${rootClassName}${stateName(state)}`] = makeStyle(style)
 
   for (const [partName, partDef] of Object.entries(def.parts ?? {})) {
     const partClassName = makeClassName(name, partName)
     styles[partClassName] ??= makeStyle(partDef)
+    for (let [selector, selectorDef] of Object.entries(partDef.selectors ?? {})) {
+      selector = selector.replace('&', `.${partClassName}`)
+      if (styles[selector]) throw `${selector} already defined!`
+      styles[selector] = makeStyle(selectorDef)
+    }
     for (const [state, style] of Object.entries(partDef.states ?? {}))
       styles[`${partClassName}${stateName(state)}`] = makeStyle(style)
-
   }
 
   for (const [variantName, variantConfig] of Object.entries(def.variants ?? {})) {
@@ -144,6 +172,11 @@ function registerStyles(name: string, def: TagDef) {
       const baseClassName = makeClassName(name)
       const className = `${baseClassName}.${variantName}`
       styles[className] ??= makeStyle(variantDef)
+      for (let [selector, selectorDef] of Object.entries(variantDef.selectors ?? {})) {
+        selector = selector.replace('&', `.${className}`)
+        if (styles[selector]) throw `${selector} already defined!`
+        styles[selector] = makeStyle(selectorDef)
+      }
       for (const [state, style] of Object.entries(variantDef.states ?? {}))
         styles[`${className}${stateName(state)}`] = makeStyle(style)
 
@@ -151,6 +184,11 @@ function registerStyles(name: string, def: TagDef) {
         const basePartClassName = makeClassName(name, partName)
         const partClassName = `${basePartClassName}.${variantName}`
         styles[partClassName] ??= makeStyle(partDef)
+        for (let [selector, selectorDef] of Object.entries(partDef.selectors ?? {})) {
+          selector = selector.replace('&', `.${partClassName}`)
+          if (styles[selector]) throw `${selector} already defined!`
+          styles[selector] = makeStyle(selectorDef)
+        }
         for (const [state, style] of Object.entries(partDef.states ?? {}))
           styles[`${partClassName}${stateName(state)}`] = makeStyle(style)
       }
@@ -159,12 +197,22 @@ function registerStyles(name: string, def: TagDef) {
       for (const [variantKey, variantDef] of Object.entries(variantConfig as Record<string, TagDef>)) {
         const className = makeClassName(name, undefined, variantName, variantKey)
         styles[className] ??= makeStyle(variantDef)
+        for (let [selector, selectorDef] of Object.entries(variantDef.selectors ?? {})) {
+          selector = selector.replace('&', `.${className}`)
+          if (styles[selector]) throw `${selector} already defined!`
+          styles[selector] = makeStyle(selectorDef)
+        }
         for (const [state, style] of Object.entries(variantDef.states ?? {}))
           styles[`${className}${stateName(state)}`] = makeStyle(style)
 
         for (const [partName, partDef] of Object.entries(variantDef.parts ?? {})) {
           const partClassName = makeClassName(name, partName, variantName, variantKey)
           styles[partClassName] ??= makeStyle(partDef)
+          for (let [selector, selectorDef] of Object.entries(partDef.selectors ?? {})) {
+            selector = selector.replace('&', `.${partClassName}`)
+            if (styles[selector]) throw `${selector} already defined!`
+            styles[selector] = makeStyle(selectorDef)
+          }
           for (const [state, style] of Object.entries(partDef.states ?? {}))
             styles[`${partClassName}${stateName(state)}`] = makeStyle(style)
         }
diff --git a/src/types.ts b/src/types.ts
index 9a05996..a68dc9a 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -2,6 +2,7 @@ export type TagDef = {
   className?: string
   base?: string
   states?: Record<string, TagDef>,
+  selectors?: Record<string, TagDef>,
   parts?: Record<string, TagDef>
   variants?: Record<string, TagDef | Record<string, TagDef>>
   render?: (obj: any) => any
@@ -155,10 +156,12 @@ export const NonStyleKeys = new Set([
   'className',
   'base',
   'states',
+  'css',
   'parts',
   'variants',
   'render',
   'styles',
+  'selectors',
 ])
 
 export const UnitlessProps = new Set([