const CheckboxOrRadioGroupCaption: FCWithSlotMarker = ({className, children}) => {
- const {captionId} = React.useContext(CheckboxOrRadioGroupContext)
+ const {captionId, parentName} = React.useContext(CheckboxOrRadioGroupContext)
return (
-
+
{children}
)
diff --git a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupContext.tsx b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupContext.tsx
index 2ca8ae65eb8..1a8bfb34b23 100644
--- a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupContext.tsx
+++ b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupContext.tsx
@@ -4,6 +4,7 @@ import type {CheckboxOrRadioGroupProps} from './CheckboxOrRadioGroup'
export type CheckboxOrRadioGroupContext = {
validationMessageId?: string
captionId?: string
+ parentName?: string
} & CheckboxOrRadioGroupProps
const CheckboxOrRadioGroupContext = React.createContext({})
diff --git a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx
index 9becd2987b7..bc3333f9d86 100644
--- a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx
+++ b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx
@@ -20,7 +20,7 @@ const CheckboxOrRadioGroupLabel: FCWithSlotMarker {
- const {required, disabled} = React.useContext(CheckboxOrRadioGroupContext)
+ const {required, disabled, parentName} = React.useContext(CheckboxOrRadioGroupContext)
return (
{required ? (
diff --git a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx
index a33a87b0b48..d9cc2b6eb35 100644
--- a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx
+++ b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx
@@ -12,9 +12,13 @@ export type CheckboxOrRadioGroupValidationProps = {
const CheckboxOrRadioGroupValidation: FCWithSlotMarker<
React.PropsWithChildren
> = ({children, variant}) => {
- const {validationMessageId = ''} = React.useContext(CheckboxOrRadioGroupContext)
+ const {validationMessageId = '', parentName} = React.useContext(CheckboxOrRadioGroupContext)
return (
-
+
{children}
)
diff --git a/packages/react/src/internal/components/InputValidation.tsx b/packages/react/src/internal/components/InputValidation.tsx
index e013cab6948..f0df156f6e7 100644
--- a/packages/react/src/internal/components/InputValidation.tsx
+++ b/packages/react/src/internal/components/InputValidation.tsx
@@ -6,7 +6,7 @@ import type {FormValidationStatus} from '../../utils/types/FormValidationStatus'
import classes from './InputValidation.module.css'
import {clsx} from 'clsx'
-type Props = {
+type Props = React.HTMLAttributes & {
className?: string
id: string
validationStatus?: FormValidationStatus
@@ -27,6 +27,7 @@ const InputValidation: React.FC> = ({
id,
validationStatus,
style,
+ ...rest
}) => {
const IconComponent = validationStatus ? validationIconMap[validationStatus] : undefined
@@ -37,7 +38,12 @@ const InputValidation: React.FC> = ({
const iconBoxMinHeight = iconSize * captionLineHeight
return (
-
+
{IconComponent ? (