[pull] main from shadcn-ui:main

apps/v4/components/announcement.tsx

@@ -7,7 +7,7 @@ export function Announcement() {
   return (
     <Badge asChild variant="secondary" className="bg-muted">
       <Link href="/docs/changelog">
-        React Aria is now available <ArrowRightIcon />
+        New Questionnaire component <ArrowRightIcon />
       </Link>
     </Badge>
   )

apps/v4/components/component-preview-tabs.tsx

@@ -235,7 +235,7 @@ function PreviewWrapper({
         data-align={align}
         data-chromeless={chromeLessOnMobile}
         className={cn(
-          "preview relative flex h-72 w-full justify-center p-10 data-[align=center]:items-center data-[align=end]:items-end data-[align=start]:items-start data-[chromeless=true]:h-auto data-[chromeless=true]:p-0",
+          "preview relative flex h-72 w-full justify-center p-10 data-[align=center]:items-center data-[align=end]:items-start data-[align=start]:items-start data-[chromeless=true]:h-auto data-[chromeless=true]:p-0 sm:data-[align=end]:items-end",
           previewClassName
         )}
       >

apps/v4/content/docs/changelog/2026-08-questionnaire.mdx

@@ -0,0 +1,52 @@
+---
+title: August 2026 - Questionnaire
+description: A new component for building multi-step question flows with fixed, freeform, multiple, and skippable answers.
+date: 2026-08-05
+---
+
+Today, we're releasing [**Questionnaire**](/docs/components/base/questionnaire),
+a new component for multi-step question flows. Use it for agent clarification
+prompts, onboarding, surveys, intake forms, and configuration.
+
+Questionnaire is available for Base UI, React Aria, and Radix across all eight
+styles.
+
+<ComponentPreview
+  align="end"
+  styleName="base-nova"
+  name="questionnaire-demo"
+  previewClassName="min-h-[560px] p-4 sm:p-8"
+/>
+
+## Features
+
+- Single and multiple selection with native radios and checkboxes.
+- Freeform answers alongside fixed choices.
+- Explicit skipping for optional questions.
+- Previous, next, submit, and custom progress controls.
+- Required and custom validation.
+- Controlled navigation, saved defaults, and conditional questions.
+- Keyboard navigation with optional letter or number shortcuts.
+- Native form serialization and server-rendered collection state.
+- Standalone, Card, and Dialog composition.
+
+## Installation
+
+```bash
+npx shadcn@latest add questionnaire
+```
+
+## @shadcn/react
+
+The `<Questionnaire />` component is also available as an unstyled headless primitive in `@shadcn/react`. [Read the docs](/docs/react/questionnaire) to learn more.
+
+<div className="flex flex-wrap gap-2">
+  <Button asChild size="sm">
+    <Link
+      href="/docs/components/base/questionnaire"
+      className="mt-6 no-underline!"
+    >
+      View Questionnaire
+    </Link>
+  </Button>
+</div>

apps/v4/content/docs/components/aria/meta.json

@@ -43,6 +43,7 @@
     "pagination",
     "popover",
     "progress",
+    "questionnaire",
     "radio-group",
     "resizable",
     "scroll-area",