From a2e940432f08b1e0634e42ff06d95600fb4c8634 Mon Sep 17 00:00:00 2001 From: tmvnkr Date: Wed, 15 Oct 2025 16:00:39 +0200 Subject: [PATCH] fix(S2): forward focus to textarea in FieldGroup --- packages/@react-spectrum/s2/src/Field.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@react-spectrum/s2/src/Field.tsx b/packages/@react-spectrum/s2/src/Field.tsx index 22c73463a86..dee3c461cf3 100644 --- a/packages/@react-spectrum/s2/src/Field.tsx +++ b/packages/@react-spectrum/s2/src/Field.tsx @@ -197,13 +197,13 @@ export const FieldGroup = forwardRef(function FieldGroup(props: FieldGroupProps, // Forward focus to input element when clicking on a non-interactive child (e.g. icon or padding) if (e.pointerType === 'mouse' && !(e.target as Element).closest('button,input,textarea')) { e.preventDefault(); - e.currentTarget.querySelector('input')?.focus(); + (e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus(); } }} onPointerUp={e => { if (e.pointerType !== 'mouse' && !(e.target as Element).closest('button,input,textarea')) { e.preventDefault(); - e.currentTarget.querySelector('input')?.focus(); + (e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus(); } }} style={props.UNSAFE_style}