Skip to content

[pull] main from shadcn-ui:main #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 6, 2026
Merged

[pull] main from shadcn-ui:main #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions apps/v4/registry/bases/aria/examples/questionnaire-example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
Questionnaire,
QuestionnaireActions,
QuestionnaireChoice,
QuestionnaireChoiceDescription,
QuestionnaireChoices,
QuestionnaireDescription,
QuestionnaireError,
Expand Down Expand Up @@ -227,21 +228,21 @@ function QuestionnaireCardQuestions() {
<QuestionnaireChoices>
<QuestionnaireChoice value="delegation">
<span className="font-medium">Sub-agent delegation</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show when work is delegated and what comes back.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="questions">
<span className="font-medium">Question prompts</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show choices while the agent waits for input.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="both">
<span className="font-medium">Both together</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Explore one unified interaction pattern.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireInput
aria-label="Another direction"
Expand Down Expand Up @@ -334,21 +335,21 @@ function QuestionnaireQuestions() {
<QuestionnaireChoices>
<QuestionnaireChoice value="delegation">
<span className="font-medium">Sub-agent delegation</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show when work is delegated and what comes back.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="questions">
<span className="font-medium">Question prompts</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show choices while the agent waits for input.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="both">
<span className="font-medium">Both together</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Explore one unified interaction pattern.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireInput
aria-label="Another direction"
Expand Down
16 changes: 15 additions & 1 deletion apps/v4/registry/bases/aria/ui/questionnaire.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,25 @@ function QuestionnaireChoice({
</QuestionnairePrimitive.ChoiceLabel>
<QuestionnairePrimitive.ChoiceShortcut
data-slot="questionnaire-choice-shortcut"
className="cn-questionnaire-choice-shortcut cn-questionnaire-shortcut pointer-events-none ms-auto mt-0.5 hidden shrink-0 group-data-[shortcut]/questionnaire-choice:inline-flex"
className="cn-questionnaire-choice-shortcut cn-questionnaire-shortcut pointer-events-none ms-auto hidden shrink-0 group-data-[shortcut]/questionnaire-choice:inline-flex"
/>
</QuestionnairePrimitive.Choice>
)
}

function QuestionnaireChoiceDescription({
className,
...props
}: React.ComponentProps<"span">) {
return (
<span
data-slot="questionnaire-choice-description"
className={cn("cn-questionnaire-choice-description", className)}
{...props}
/>
)
}

function QuestionnaireInput({
className,
...props
Expand Down Expand Up @@ -307,6 +320,7 @@ export {
Questionnaire,
QuestionnaireActions,
QuestionnaireChoice,
QuestionnaireChoiceDescription,
QuestionnaireChoices,
QuestionnaireDescription,
QuestionnaireError,
Expand Down
25 changes: 13 additions & 12 deletions apps/v4/registry/bases/base/examples/questionnaire-example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
Questionnaire,
QuestionnaireActions,
QuestionnaireChoice,
QuestionnaireChoiceDescription,
QuestionnaireChoices,
QuestionnaireDescription,
QuestionnaireError,
Expand Down Expand Up @@ -230,21 +231,21 @@ function QuestionnaireCardQuestions() {
<QuestionnaireChoices>
<QuestionnaireChoice value="delegation">
<span className="font-medium">Sub-agent delegation</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show when work is delegated and what comes back.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="questions">
<span className="font-medium">Question prompts</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show choices while the agent waits for input.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="both">
<span className="font-medium">Both together</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Explore one unified interaction pattern.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireInput
aria-label="Another direction"
Expand Down Expand Up @@ -337,21 +338,21 @@ function QuestionnaireQuestions() {
<QuestionnaireChoices>
<QuestionnaireChoice value="delegation">
<span className="font-medium">Sub-agent delegation</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show when work is delegated and what comes back.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="questions">
<span className="font-medium">Question prompts</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show choices while the agent waits for input.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="both">
<span className="font-medium">Both together</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Explore one unified interaction pattern.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireInput
aria-label="Another direction"
Expand Down
16 changes: 15 additions & 1 deletion apps/v4/registry/bases/base/ui/questionnaire.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,25 @@ function QuestionnaireChoice({
</QuestionnairePrimitive.ChoiceLabel>
<QuestionnairePrimitive.ChoiceShortcut
data-slot="questionnaire-choice-shortcut"
className="cn-questionnaire-choice-shortcut cn-questionnaire-shortcut pointer-events-none ms-auto mt-0.5 hidden shrink-0 group-data-[shortcut]/questionnaire-choice:inline-flex"
className="cn-questionnaire-choice-shortcut cn-questionnaire-shortcut pointer-events-none ms-auto hidden shrink-0 group-data-[shortcut]/questionnaire-choice:inline-flex"
/>
</QuestionnairePrimitive.Choice>
)
}

function QuestionnaireChoiceDescription({
className,
...props
}: React.ComponentProps<"span">) {
return (
<span
data-slot="questionnaire-choice-description"
className={cn("cn-questionnaire-choice-description", className)}
{...props}
/>
)
}

function QuestionnaireInput({
className,
...props
Expand Down Expand Up @@ -307,6 +320,7 @@ export {
Questionnaire,
QuestionnaireActions,
QuestionnaireChoice,
QuestionnaireChoiceDescription,
QuestionnaireChoices,
QuestionnaireDescription,
QuestionnaireError,
Expand Down
25 changes: 13 additions & 12 deletions apps/v4/registry/bases/radix/examples/questionnaire-example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
Questionnaire,
QuestionnaireActions,
QuestionnaireChoice,
QuestionnaireChoiceDescription,
QuestionnaireChoices,
QuestionnaireDescription,
QuestionnaireError,
Expand Down Expand Up @@ -230,21 +231,21 @@ function QuestionnaireCardQuestions() {
<QuestionnaireChoices>
<QuestionnaireChoice value="delegation">
<span className="font-medium">Sub-agent delegation</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show when work is delegated and what comes back.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="questions">
<span className="font-medium">Question prompts</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show choices while the agent waits for input.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="both">
<span className="font-medium">Both together</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Explore one unified interaction pattern.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireInput
aria-label="Another direction"
Expand Down Expand Up @@ -337,21 +338,21 @@ function QuestionnaireQuestions() {
<QuestionnaireChoices>
<QuestionnaireChoice value="delegation">
<span className="font-medium">Sub-agent delegation</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show when work is delegated and what comes back.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="questions">
<span className="font-medium">Question prompts</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Show choices while the agent waits for input.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireChoice value="both">
<span className="font-medium">Both together</span>
<span className="text-muted-foreground">
<QuestionnaireChoiceDescription>
Explore one unified interaction pattern.
</span>
</QuestionnaireChoiceDescription>
</QuestionnaireChoice>
<QuestionnaireInput
aria-label="Another direction"
Expand Down
16 changes: 15 additions & 1 deletion apps/v4/registry/bases/radix/ui/questionnaire.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,25 @@ function QuestionnaireChoice({
</QuestionnairePrimitive.ChoiceLabel>
<QuestionnairePrimitive.ChoiceShortcut
data-slot="questionnaire-choice-shortcut"
className="cn-questionnaire-choice-shortcut cn-questionnaire-shortcut pointer-events-none ms-auto mt-0.5 hidden shrink-0 group-data-[shortcut]/questionnaire-choice:inline-flex"
className="cn-questionnaire-choice-shortcut cn-questionnaire-shortcut pointer-events-none ms-auto hidden shrink-0 group-data-[shortcut]/questionnaire-choice:inline-flex"
/>
</QuestionnairePrimitive.Choice>
)
}

function QuestionnaireChoiceDescription({
className,
...props
}: React.ComponentProps<"span">) {
return (
<span
data-slot="questionnaire-choice-description"
className={cn("cn-questionnaire-choice-description", className)}
{...props}
/>
)
}

function QuestionnaireInput({
className,
...props
Expand Down Expand Up @@ -307,6 +320,7 @@ export {
Questionnaire,
QuestionnaireActions,
QuestionnaireChoice,
QuestionnaireChoiceDescription,
QuestionnaireChoices,
QuestionnaireDescription,
QuestionnaireError,
Expand Down
12 changes: 8 additions & 4 deletions apps/v4/registry/styles/style-luma.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,11 +1616,11 @@
}

.cn-questionnaire-choice {
@apply border-input bg-input/20 hover:bg-input/40 data-checked:border-primary/40 data-checked:bg-primary/10 data-invalid:border-destructive has-[>input:focus-visible]:border-ring has-[>input:focus-visible]:ring-ring/50 gap-3 rounded-3xl border px-4 py-3 text-sm has-[>input:focus-visible]:ring-3;
@apply border-input bg-input/20 hover:bg-input/40 data-checked:border-primary/40 data-checked:bg-primary/10 data-invalid:border-destructive has-[>input:focus-visible]:border-ring has-[>input:focus-visible]:ring-ring/50 gap-2.5 rounded-3xl border px-4 py-3 text-sm has-[>input:focus-visible]:ring-3;
}

.cn-questionnaire-choice-indicator {
@apply bg-input/90 group-data-checked/questionnaire-choice:bg-primary dark:group-data-checked/questionnaire-choice:bg-primary group-data-checked/questionnaire-choice:text-primary-foreground group-data-checked/questionnaire-choice:border-primary size-4 rounded-[5px] border-transparent;
@apply bg-input/90 group-data-checked/questionnaire-choice:bg-primary dark:group-data-checked/questionnaire-choice:bg-primary group-data-checked/questionnaire-choice:text-primary-foreground group-data-checked/questionnaire-choice:border-primary size-4 translate-y-[--spacing(0.45)] group-has-data-[slot=questionnaire-choice-description]/questionnaire-choice:translate-y-0.5 rounded-[5px] border-transparent;
}

.cn-questionnaire-choice-indicator-dot {
Expand All @@ -1635,8 +1635,12 @@
@apply gap-1;
}

.cn-questionnaire-choice-description {
@apply text-muted-foreground;
}

.cn-questionnaire-shortcut {
@apply border-primary/10 bg-background/80 text-muted-foreground size-5 items-center justify-center rounded-full border font-mono text-[0.625rem] font-medium leading-none;
@apply border-primary/10 bg-background/80 text-muted-foreground size-5 translate-y-[--spacing(0.45)] group-has-data-[slot=questionnaire-choice-description]/questionnaire-choice:translate-y-0.5 items-center justify-center rounded-full border font-mono text-[0.625rem] font-medium leading-none;
}

.cn-questionnaire-input-wrapper {
Expand All @@ -1648,7 +1652,7 @@
}

.cn-questionnaire-error {
@apply text-sm;
@apply mt-2 text-sm;
}

.cn-questionnaire-actions {
Expand Down
10 changes: 7 additions & 3 deletions apps/v4/registry/styles/style-lyra.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@
}

.cn-questionnaire-choice-indicator {
@apply border-input group-data-checked/questionnaire-choice:bg-primary group-data-checked/questionnaire-choice:text-primary-foreground group-data-checked/questionnaire-choice:border-primary size-4 rounded-none;
@apply border-input group-data-checked/questionnaire-choice:bg-primary group-data-checked/questionnaire-choice:text-primary-foreground group-data-checked/questionnaire-choice:border-primary size-4 translate-y-[--spacing(0.45)] group-has-data-[slot=questionnaire-choice-description]/questionnaire-choice:translate-y-0.5 rounded-none;
}

.cn-questionnaire-choice-indicator-dot {
Expand All @@ -1614,8 +1614,12 @@
@apply gap-0.5;
}

.cn-questionnaire-choice-description {
@apply text-muted-foreground;
}

.cn-questionnaire-shortcut {
@apply border-input bg-background text-muted-foreground size-4 items-center justify-center rounded-none border font-mono text-[0.625rem] font-medium leading-none;
@apply border-input bg-background text-muted-foreground size-4 translate-y-[--spacing(0.45)] group-has-data-[slot=questionnaire-choice-description]/questionnaire-choice:translate-y-0.5 items-center justify-center rounded-none border font-mono text-[0.625rem] font-medium leading-none;
}

.cn-questionnaire-input-wrapper {
Expand All @@ -1627,7 +1631,7 @@
}

.cn-questionnaire-error {
@apply text-xs;
@apply mt-2 text-xs;
}

.cn-questionnaire-actions {
Expand Down
Loading
Loading