-
{labelChild ? (
/*
@@ -126,7 +123,7 @@ const CheckboxOrRadioGroup: React.FC
{React.Children.toArray(rest).filter(child => React.isValidElement(child))}
-
+
{validationChild && (
diff --git a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption.tsx b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption.tsx
index 1aa1bcd45b3..7b89c12fc0a 100644
--- a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption.tsx
+++ b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption.tsx
@@ -1,11 +1,10 @@
import React from 'react'
import Text from '../../../Text'
-import type {SxProp} from '../../../sx'
import CheckboxOrRadioGroupContext from './CheckboxOrRadioGroupContext'
import classes from './CheckboxOrRadioGroup.module.css'
import {clsx} from 'clsx'
-type CheckboxOrRadioGroupCaptionProps = React.PropsWithChildren & {className?: string}
+type CheckboxOrRadioGroupCaptionProps = React.PropsWithChildren<{className?: string}>
const CheckboxOrRadioGroupCaption: React.FC = ({className, children}) => {
const {captionId} = React.useContext(CheckboxOrRadioGroupContext)
diff --git a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx
index 34cc2c084cd..c42928622be 100644
--- a/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx
+++ b/packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx
@@ -1,22 +1,20 @@
import React from 'react'
import InputValidation from '../InputValidation'
-import type {SxProp} from '../../../sx'
import type {FormValidationStatus} from '../../../utils/types/FormValidationStatus'
import CheckboxOrRadioGroupContext from './CheckboxOrRadioGroupContext'
export type CheckboxOrRadioGroupValidationProps = {
/** Changes the visual style to match the validation status */
variant: FormValidationStatus
-} & SxProp
+}
const CheckboxOrRadioGroupValidation: React.FC> = ({
children,
variant,
- sx,
}) => {
const {validationMessageId = ''} = React.useContext(CheckboxOrRadioGroupContext)
return (
-
+
{children}
)
diff --git a/packages/react/src/internal/components/UnstyledTextInput.tsx b/packages/react/src/internal/components/UnstyledTextInput.tsx
index a86e9db9aac..bb419f84f71 100644
--- a/packages/react/src/internal/components/UnstyledTextInput.tsx
+++ b/packages/react/src/internal/components/UnstyledTextInput.tsx
@@ -1,17 +1,15 @@
-import {type SxProp} from '../../sx'
import React from 'react'
import styles from './UnstyledTextInput.module.css'
import {clsx} from 'clsx'
-import {BoxWithFallback} from './BoxWithFallback'
-type ToggledUnstyledTextInputProps = React.ComponentPropsWithoutRef<'input'> & SxProp
+type ToggledUnstyledTextInputProps = React.ComponentPropsWithoutRef<'input'>
const UnstyledTextInput = React.forwardRef(function UnstyledTextInput(
{className, ...rest},
forwardRef,
) {
- return
+ return
})
UnstyledTextInput.displayName = 'UnstyledTextInput'
diff --git a/packages/react/src/utils/form-story-helpers.tsx b/packages/react/src/utils/form-story-helpers.tsx
index f2a125c0553..899cbfe1015 100644
--- a/packages/react/src/utils/form-story-helpers.tsx
+++ b/packages/react/src/utils/form-story-helpers.tsx
@@ -109,7 +109,7 @@ export const getTextInputArgTypes = (category?: string) =>
return obj
}, {})
-export const textInputExcludedControlKeys = ['as', 'icon', 'leadingVisual', 'sx', 'trailingVisual', 'trailingAction']
+export const textInputExcludedControlKeys = ['as', 'icon', 'leadingVisual', 'trailingVisual', 'trailingAction']
export const textInputWithTokensArgTypes: ArgTypes = {
hideTokenRemoveButtons: {
diff --git a/packages/react/src/utils/story-helpers.tsx b/packages/react/src/utils/story-helpers.tsx
index b95d429733a..5c33c478289 100644
--- a/packages/react/src/utils/story-helpers.tsx
+++ b/packages/react/src/utils/story-helpers.tsx
@@ -110,7 +110,7 @@ export const getTextInputArgTypes = (category?: string) =>
return obj
}, {})
-export const textInputExcludedControlKeys = ['as', 'icon', 'leadingVisual', 'sx', 'trailingVisual', 'trailingAction']
+export const textInputExcludedControlKeys = ['as', 'icon', 'leadingVisual', 'trailingVisual', 'trailingAction']
export const textInputWithTokensArgTypes: ArgTypes = {
hideTokenRemoveButtons: {