From 1b3dea209292310054c2de132a7d630e0d949178 Mon Sep 17 00:00:00 2001 From: Johan Persson Date: Fri, 27 Feb 2026 15:41:25 +0100 Subject: [PATCH] Fix ToggleButtonGroup orientation prop not reaching React Aria orientation was listed in propDefs with dataAttribute: true, which caused useDefinition to extract it from restProps. React Aria's ToggleButtonGroup never received it and defaulted to horizontal. Remove orientation from propDefs and OwnProps so it flows through restProps to React Aria, which handles data-orientation itself. Signed-off-by: Johan Persson --- packages/ui/report.api.md | 9 +-------- .../components/ToggleButtonGroup/ToggleButtonGroup.tsx | 9 ++------- .../ui/src/components/ToggleButtonGroup/definition.ts | 1 - packages/ui/src/components/ToggleButtonGroup/types.ts | 6 +----- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/packages/ui/report.api.md b/packages/ui/report.api.md index 1c9e544754..c77d044d46 100644 --- a/packages/ui/report.api.md +++ b/packages/ui/report.api.md @@ -2639,9 +2639,6 @@ export const ToggleButtonGroupDefinition: { readonly root: 'bui-ToggleButtonGroup'; }; readonly propDefs: { - readonly orientation: { - readonly dataAttribute: true; - }; readonly className: {}; readonly children: {}; }; @@ -2649,17 +2646,13 @@ export const ToggleButtonGroupDefinition: { // @public (undocumented) export type ToggleButtonGroupOwnProps = { - orientation?: NonNullable; className?: string; children?: ReactNode; }; // @public (undocumented) export interface ToggleButtonGroupProps - extends Omit< - ToggleButtonGroupProps_2, - 'orientation' | 'className' | 'children' - >, + extends Omit, ToggleButtonGroupOwnProps {} // @public (undocumented) diff --git a/packages/ui/src/components/ToggleButtonGroup/ToggleButtonGroup.tsx b/packages/ui/src/components/ToggleButtonGroup/ToggleButtonGroup.tsx index 29ad8965a5..61c715b59d 100644 --- a/packages/ui/src/components/ToggleButtonGroup/ToggleButtonGroup.tsx +++ b/packages/ui/src/components/ToggleButtonGroup/ToggleButtonGroup.tsx @@ -23,19 +23,14 @@ import { ToggleButtonGroupDefinition } from './definition'; /** @public */ export const ToggleButtonGroup = forwardRef( (props: ToggleButtonGroupProps, ref: Ref) => { - const { ownProps, restProps, dataAttributes } = useDefinition( + const { ownProps, restProps } = useDefinition( ToggleButtonGroupDefinition, props, ); const { classes, children } = ownProps; return ( - + {children} ); diff --git a/packages/ui/src/components/ToggleButtonGroup/definition.ts b/packages/ui/src/components/ToggleButtonGroup/definition.ts index 50dfd7dd26..9e31b8d6cc 100644 --- a/packages/ui/src/components/ToggleButtonGroup/definition.ts +++ b/packages/ui/src/components/ToggleButtonGroup/definition.ts @@ -29,7 +29,6 @@ export const ToggleButtonGroupDefinition = root: 'bui-ToggleButtonGroup', }, propDefs: { - orientation: { dataAttribute: true }, className: {}, children: {}, }, diff --git a/packages/ui/src/components/ToggleButtonGroup/types.ts b/packages/ui/src/components/ToggleButtonGroup/types.ts index f58eef3d00..b2bdb1e831 100644 --- a/packages/ui/src/components/ToggleButtonGroup/types.ts +++ b/packages/ui/src/components/ToggleButtonGroup/types.ts @@ -19,15 +19,11 @@ import type { ToggleButtonGroupProps as AriaToggleButtonGroupProps } from 'react /** @public */ export type ToggleButtonGroupOwnProps = { - orientation?: NonNullable; className?: string; children?: ReactNode; }; /** @public */ export interface ToggleButtonGroupProps - extends Omit< - AriaToggleButtonGroupProps, - 'orientation' | 'className' | 'children' - >, + extends Omit, ToggleButtonGroupOwnProps {}