refactor: drop onClick and forwardClickToControl from ControlPresentation props

Click handlers belong on the inner control, not on the wrapper. The
wrapper's click-to-focus behavior is internal — there's no real need
for consumers to disable it (forwardClickToControl) or hook into it
(onClick) for the wrap pattern.

The implementation still extracts onClick out of rest (via a type cast)
to compose with the focus-forwarding handler — this path exists only for
render-prop use, where Ariakit (or similar) forwards its own onClick to
the wrapper-as-trigger. Consumers of ControlPresentation directly won't
see onClick in autocomplete; TypeScript rejects passing it at call
sites.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: pawelgrimm

src/control-presentation/control-presentation.test.tsx

@@ -127,20 +127,7 @@ describe('ControlPresentation', () => {
         expect(screen.getByTestId('b')).toBeInTheDocument()
     })
 
-    it('does not forward the click to the control when forwardClickToControl is false', () => {
-        const { container } = render(
-            <ControlPresentation forwardClickToControl={false}>
-                <input aria-label="Subject" data-testid="subject" />
-            </ControlPresentation>,
-        )
-        const control = screen.getByTestId('subject')
-        expect(control).not.toHaveFocus()
-
-        userEvent.click(container.firstElementChild as Element)
-        expect(control).not.toHaveFocus()
-    })
-
-    it('calls the consumer onClick when the wrapper is clicked', () => {
+    it('calls a consumer onClick passed via Box props when the wrapper is clicked', () => {
         const onClick = jest.fn()
         const { container } = render(
             <ControlPresentation onClick={onClick}>

src/control-presentation/control-presentation.tsx

@@ -23,15 +23,14 @@ export type ControlPresentationProps = {
      */
     endSlot?: SlotContent
 
-    forwardClickToControl?: boolean
-    onClick?: React.MouseEventHandler<HTMLDivElement>
-
     /**
      * The control element (an `<input>`, an Ariakit Select trigger,
      * `<select>`, etc.). Attributes belonging to the control — `type`,
      * `value`, `onChange`, `readOnly`, `disabled`, `aria-invalid`, and so on —
      * are set on this element directly. The wrapper chrome (read-only
      * background, disabled state, error border) derives from those attributes.
+     *
+     * Click handlers belong on the control itself, not on this wrapper.
      */
     children: React.ReactNode
 } & ObfuscatedClassName &
@@ -49,31 +48,31 @@ export type ControlPresentationProps = {
  */
 export const ControlPresentation = forwardRef<HTMLDivElement, ControlPresentationProps>(
     function ControlPresentation(
-        {
-            startSlot,
-            endSlot,
-            forwardClickToControl = true,
-            onClick,
-            exceptionallySetClassName,
-            children,
-            ...rest
-        },
+        { startSlot, endSlot, exceptionallySetClassName, children, ...rest },
         ref,
     ) {
         const controlWrapperRef = React.useRef<HTMLDivElement>(null)
         // The synthetic .click() we dispatch below bubbles back up to this
         // handler. Track that we're inside that re-entry so we can skip
-        // re-invoking onClick + activation for it.
+        // re-invoking the consumer onClick + activation for it.
         const isDispatchedReentryRef = React.useRef(false)
 
+        // `onClick` isn't part of `ControlPresentationProps` — consumers
+        // should put click handlers on the inner control. This extraction
+        // exists only to compose with onClick that arrives via render-prop
+        // wrapping (e.g. Ariakit's Select trigger uses `render={<ControlPresentation/>}`
+        // and forwards its own onClick), where the wrapper IS the trigger.
+        const { onClick, ...restWithoutClick } = rest as typeof rest & {
+            onClick?: React.MouseEventHandler<HTMLDivElement>
+        }
+
         function handleWrapperClick(event: React.MouseEvent<HTMLDivElement>) {
             if (isDispatchedReentryRef.current) {
                 isDispatchedReentryRef.current = false
                 return
             }
 
             onClick?.(event)
-            if (!forwardClickToControl) return
 
             const control = controlWrapperRef.current?.firstElementChild as HTMLElement | null
             if (!control) return
@@ -107,7 +106,7 @@ export const ControlPresentation = forwardRef<HTMLDivElement, ControlPresentatio
         return (
             <Box
                 ref={ref}
-                {...rest}
+                {...restWithoutClick}
                 className={[styles.container, exceptionallySetClassName]}
                 display="flex"
                 alignItems="center"