From b6528457d69b7694a89d568c9095bb2f44d5864c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 22 May 2026 06:49:44 +0000
Subject: [PATCH 1/2] Initial plan


From 91eebba4429b623e596a0d3ae04411630dee7c28 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 22 May 2026 06:55:45 +0000
Subject: [PATCH 2/2] feat: add RadioButtonField and RadioGroupField command
 form fields

Agent-Logs-Url: https://github.com/Cratis/Components/sessions/29fa560c-a553-463d-b6ca-10f69826b63c

Co-authored-by: einari <134365+einari@users.noreply.github.com>
---
 .../CommandForm/radio-button-field.md         |  30 +++++
 .../CommandForm/radio-group-field.md          |  55 ++++++++
 Documentation/CommandForm/toc.yml             |   4 +
 Source/CommandForm/fields/Fields.stories.tsx  | 125 +++++++++++++++++-
 .../CommandForm/fields/RadioButtonField.tsx   |  30 +++++
 Source/CommandForm/fields/RadioGroupField.tsx |  43 ++++++
 Source/CommandForm/fields/index.ts            |   2 +
 7 files changed, 287 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/CommandForm/radio-button-field.md
 create mode 100644 Documentation/CommandForm/radio-group-field.md
 create mode 100644 Source/CommandForm/fields/RadioButtonField.tsx
 create mode 100644 Source/CommandForm/fields/RadioGroupField.tsx

diff --git a/Documentation/CommandForm/radio-button-field.md b/Documentation/CommandForm/radio-button-field.md
new file mode 100644
index 0000000..8957e8f
--- /dev/null
+++ b/Documentation/CommandForm/radio-button-field.md
@@ -0,0 +1,30 @@
+# RadioButtonField
+
+`RadioButtonField` renders a single PrimeReact `RadioButton` that sets the bound command property to a specific value when selected. Use multiple `RadioButtonField` components bound to the same property to form a radio group.
+
+## Usage
+
+```tsx
+import { CommandDialog } from '@cratis/components';
+import { RadioButtonField } from '@cratis/components/CommandForm';
+
+<CommandDialog command={MyCommand} visible={visible} onHide={() => setVisible(false)}>
+    <RadioButtonField<MyCommand> value={c => c.size} buttonValue="small" label="Small" />
+    <RadioButtonField<MyCommand> value={c => c.size} buttonValue="medium" label="Medium" />
+    <RadioButtonField<MyCommand> value={c => c.size} buttonValue="large" label="Large" />
+</CommandDialog>
+```
+
+## Props
+
+| Prop | Type | Default | Description |
+|------|------|---------|-------------|
+| `value` | `(instance: TCommand) => unknown` | — | **Required.** Accessor function that returns the bound property from the command instance. Pass the command type as the generic parameter for full type safety. |
+| `buttonValue` | `string \| number` | — | **Required.** The value this radio button represents. When selected, the command property is set to this value. |
+| `label` | `string` | — | Text displayed inline next to the radio button. |
+
+## Behavior
+
+- Default value is an empty string.
+- The radio button is checked when the current field value equals `buttonValue`.
+- Validation state is reflected via the PrimeReact `invalid` flag on the radio button.
diff --git a/Documentation/CommandForm/radio-group-field.md b/Documentation/CommandForm/radio-group-field.md
new file mode 100644
index 0000000..0a07200
--- /dev/null
+++ b/Documentation/CommandForm/radio-group-field.md
@@ -0,0 +1,55 @@
+# RadioGroupField
+
+`RadioGroupField` renders a group of PrimeReact `RadioButton` components from an options array, allowing the user to select a single value.
+
+## Usage
+
+```tsx
+import { CommandDialog } from '@cratis/components';
+import { RadioGroupField } from '@cratis/components/CommandForm';
+
+const sizeOptions = [
+    { id: 'small', label: 'Small' },
+    { id: 'medium', label: 'Medium' },
+    { id: 'large', label: 'Large' },
+];
+
+<CommandDialog command={MyCommand} visible={visible} onHide={() => setVisible(false)}>
+    <RadioGroupField<MyCommand>
+        value={c => c.size}
+        options={sizeOptions}
+        optionLabel="label"
+        optionValue="id"
+        title="Size"
+    />
+</CommandDialog>
+```
+
+With horizontal layout:
+
+```tsx
+<RadioGroupField<MyCommand>
+    value={c => c.priority}
+    options={priorityOptions}
+    optionLabel="label"
+    optionValue="id"
+    title="Priority"
+    layout="horizontal"
+/>
+```
+
+## Props
+
+| Prop | Type | Default | Description |
+|------|------|---------|-------------|
+| `value` | `(instance: TCommand) => unknown` | — | **Required.** Accessor function that returns the bound property from the command instance. Pass the command type as the generic parameter for full type safety. |
+| `options` | `Array<Record<string, unknown>>` | — | **Required.** Array of option objects. |
+| `optionLabel` | `string` | — | **Required.** Key in each option object to use as the display label. |
+| `optionValue` | `string` | — | **Required.** Key in each option object to use as the submitted value. |
+| `layout` | `'horizontal' \| 'vertical'` | `'vertical'` | Controls whether the radio buttons are stacked vertically or laid out in a horizontal row. |
+
+## Behavior
+
+- Default value is an empty string.
+- A radio button is checked when the current field value equals its `optionValue`.
+- Validation state is reflected via the PrimeReact `invalid` flag on all radio buttons.
diff --git a/Documentation/CommandForm/toc.yml b/Documentation/CommandForm/toc.yml
index 8584119..5e7cefb 100644
--- a/Documentation/CommandForm/toc.yml
+++ b/Documentation/CommandForm/toc.yml
@@ -16,6 +16,10 @@
   href: multi-select-field.md
 - name: NumberField
   href: number-field.md
+- name: RadioButtonField
+  href: radio-button-field.md
+- name: RadioGroupField
+  href: radio-group-field.md
 - name: SliderField
   href: slider-field.md
 - name: TextAreaField
diff --git a/Source/CommandForm/fields/Fields.stories.tsx b/Source/CommandForm/fields/Fields.stories.tsx
index 55fa4bc..5b2943f 100644
--- a/Source/CommandForm/fields/Fields.stories.tsx
+++ b/Source/CommandForm/fields/Fields.stories.tsx
@@ -18,7 +18,9 @@ import {
     CalendarField,
     ColorPickerField,
     MultiSelectField,
-    ChipsField
+    ChipsField,
+    RadioButtonField,
+    RadioGroupField
 } from './index';
 
 const meta: Meta = {
@@ -48,6 +50,8 @@ class FormFieldsCommand extends Command {
         new PropertyDescriptor('color', String),
         new PropertyDescriptor('multiSelect', Array),
         new PropertyDescriptor('chips', Array),
+        new PropertyDescriptor('radioButton', String),
+        new PropertyDescriptor('radioGroup', String),
     ];
 
     textInput = '';
@@ -62,6 +66,8 @@ class FormFieldsCommand extends Command {
     color = '';
     multiSelect: Array<string | number> = [];
     chips: string[] = [];
+    radioButton = '';
+    radioGroup = '';
 
     constructor() {
         super(Object, false);
@@ -84,7 +90,9 @@ class FormFieldsCommand extends Command {
             'calendarDate',
             'color',
             'multiSelect',
-            'chips'
+            'chips',
+            'radioButton',
+            'radioGroup'
         ];
     }
 }
@@ -145,6 +153,8 @@ export const AllFields: Story = {
                         color: '10b981',
                         multiSelect: ['feature1', 'feature3'],
                         chips: ['alpha', 'beta'],
+                        radioButton: '',
+                        radioGroup: '',
                     }}
                     onFieldChange={async (command, fieldName) => {
                         // Validate on field change
@@ -358,6 +368,43 @@ export const AllFields: Story = {
 
                     <StoryDivider />
 
+                    <StorySection>
+                        <h3>Radio Button</h3>
+
+                        <RadioButtonField<FormFieldsCommand>
+                            value={c => c.radioButton}
+                            buttonValue="option1"
+                            label="Option 1"
+                        />
+                        <RadioButtonField<FormFieldsCommand>
+                            value={c => c.radioButton}
+                            buttonValue="option2"
+                            label="Option 2"
+                        />
+                        <RadioButtonField<FormFieldsCommand>
+                            value={c => c.radioButton}
+                            buttonValue="option3"
+                            label="Option 3"
+                        />
+                    </StorySection>
+
+                    <StoryDivider />
+
+                    <StorySection>
+                        <h3>Radio Group</h3>
+
+                        <RadioGroupField<FormFieldsCommand>
+                            value={c => c.radioGroup}
+                            title="Radio Group Field"
+                            description="Radio buttons from an options array"
+                            options={dropdownOptions}
+                            optionValue="id"
+                            optionLabel="name"
+                        />
+                    </StorySection>
+
+                    <StoryDivider />
+
                     <div style={{ marginTop: '1.5rem', display: 'flex', gap: '0.5rem', alignItems: 'center' }}>
                         <button
                             type="submit"
@@ -630,3 +677,77 @@ export const ChipsFieldExample: Story = {
         );
     }
 };
+
+export const RadioButtonFieldExample: Story = {
+    render: () => {
+        return (
+            <StoryContainer size="sm" asCard>
+                <h2>RadioButtonField</h2>
+                <p>PrimeReact RadioButton for selecting a single value. Multiple RadioButtonFields bound to the same property form a radio group.</p>
+
+                <CommandForm<FormFieldsCommand>
+                    command={FormFieldsCommand}
+                    initialValues={{ radioButton: 'apple' }}
+                >
+                    <RadioButtonField<FormFieldsCommand>
+                        value={c => c.radioButton}
+                        buttonValue="apple"
+                        label="Apple"
+                    />
+                    <RadioButtonField<FormFieldsCommand>
+                        value={c => c.radioButton}
+                        buttonValue="banana"
+                        label="Banana"
+                    />
+                    <RadioButtonField<FormFieldsCommand>
+                        value={c => c.radioButton}
+                        buttonValue="cherry"
+                        label="Cherry"
+                    />
+                </CommandForm>
+            </StoryContainer>
+        );
+    }
+};
+
+export const RadioGroupFieldExample: Story = {
+    render: () => {
+        const options = [
+            { id: 'small', name: 'Small' },
+            { id: 'medium', name: 'Medium' },
+            { id: 'large', name: 'Large' },
+            { id: 'xl', name: 'Extra Large' },
+        ];
+
+        return (
+            <StoryContainer size="sm" asCard>
+                <h2>RadioGroupField</h2>
+                <p>PrimeReact RadioButton group rendered from an options array.</p>
+
+                <CommandForm<FormFieldsCommand>
+                    command={FormFieldsCommand}
+                    initialValues={{ radioGroup: 'medium' }}
+                >
+                    <RadioGroupField<FormFieldsCommand>
+                        value={c => c.radioGroup}
+                        title="T-Shirt Size"
+                        description="Select your preferred size"
+                        options={options}
+                        optionValue="id"
+                        optionLabel="name"
+                    />
+
+                    <RadioGroupField<FormFieldsCommand>
+                        value={c => c.radioGroup}
+                        title="T-Shirt Size (Horizontal)"
+                        description="Same options laid out horizontally"
+                        options={options}
+                        optionValue="id"
+                        optionLabel="name"
+                        layout="horizontal"
+                    />
+                </CommandForm>
+            </StoryContainer>
+        );
+    }
+};
diff --git a/Source/CommandForm/fields/RadioButtonField.tsx b/Source/CommandForm/fields/RadioButtonField.tsx
new file mode 100644
index 0000000..d9d4296
--- /dev/null
+++ b/Source/CommandForm/fields/RadioButtonField.tsx
@@ -0,0 +1,30 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { RadioButton, RadioButtonChangeEvent } from 'primereact/radiobutton';
+import React from 'react';
+import { asCommandFormField, WrappedFieldProps } from '@cratis/arc.react/commands';
+
+interface RadioButtonFieldComponentProps extends WrappedFieldProps<string | number> {
+    label?: string;
+    buttonValue: string | number;
+}
+
+export const RadioButtonField = asCommandFormField<RadioButtonFieldComponentProps>(
+    (props) => (
+        <div className="flex align-items-center">
+            <RadioButton
+                value={props.buttonValue}
+                checked={props.value === props.buttonValue}
+                onChange={(e: RadioButtonChangeEvent) => props.onChange(e.value)}
+                onBlur={props.onBlur}
+                invalid={props.invalid}
+            />
+            {props.label && <label className="ml-2">{props.label}</label>}
+        </div>
+    ),
+    {
+        defaultValue: '',
+        extractValue: (e: unknown) => e as string | number
+    }
+);
diff --git a/Source/CommandForm/fields/RadioGroupField.tsx b/Source/CommandForm/fields/RadioGroupField.tsx
new file mode 100644
index 0000000..e0665e6
--- /dev/null
+++ b/Source/CommandForm/fields/RadioGroupField.tsx
@@ -0,0 +1,43 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { RadioButton, RadioButtonChangeEvent } from 'primereact/radiobutton';
+import React from 'react';
+import { asCommandFormField, WrappedFieldProps } from '@cratis/arc.react/commands';
+
+interface RadioGroupFieldComponentProps extends WrappedFieldProps<string | number> {
+    options: Array<Record<string, unknown>>;
+    optionLabel: string;
+    optionValue: string;
+    layout?: 'horizontal' | 'vertical';
+}
+
+export const RadioGroupField = asCommandFormField<RadioGroupFieldComponentProps>(
+    (props) => {
+        const layout = props.layout ?? 'vertical';
+        return (
+            <div className={`flex ${layout === 'horizontal' ? 'flex-row gap-4 flex-wrap' : 'flex-column gap-2'}`}>
+                {props.options.map((option) => {
+                    const optValue = option[props.optionValue] as string | number;
+                    const optLabel = option[props.optionLabel] as string;
+                    return (
+                        <div key={String(optValue)} className="flex align-items-center">
+                            <RadioButton
+                                value={optValue}
+                                checked={props.value === optValue}
+                                onChange={(e: RadioButtonChangeEvent) => props.onChange(e.value)}
+                                onBlur={props.onBlur}
+                                invalid={props.invalid}
+                            />
+                            <label className="ml-2">{optLabel}</label>
+                        </div>
+                    );
+                })}
+            </div>
+        );
+    },
+    {
+        defaultValue: '',
+        extractValue: (e: unknown) => e as string | number
+    }
+);
diff --git a/Source/CommandForm/fields/index.ts b/Source/CommandForm/fields/index.ts
index 9d7c9ca..6482418 100644
--- a/Source/CommandForm/fields/index.ts
+++ b/Source/CommandForm/fields/index.ts
@@ -11,3 +11,5 @@ export * from './CalendarField';
 export * from './ColorPickerField';
 export * from './MultiSelectField';
 export * from './ChipsField';
+export * from './RadioButtonField';
+export * from './RadioGroupField';