improve description of preventAriaAttribution and set own label click handler only if it is not true

Author: haschek

src/components/Form/FieldItem.tsx

@@ -33,7 +33,8 @@ export interface FieldItemProps extends React.HTMLAttributes<HTMLDivElement>, Te
     /**
      * Prevent the automatic connection of the field item parts.
      * By default, label, input element, helper text and message are connected to each
-     * other via `for`, `aria-labelledby` and `aria-describedby`.
+     * other via `for`, `aria-labelledby` and `aria-describedby`, and a click on the label focuses
+     * input elements that cannot be connected natively via `for`.
      * Set it to `true` if the using application manages the accessibility attributes itself.
      */
     preventAriaAttribution?: boolean;
@@ -237,7 +238,7 @@ export const FieldItem = ({
 
     const handleLabelClick: React.MouseEventHandler<HTMLLabelElement> = (event) => {
         labelProps?.onClick?.(event);
-        if (event.defaultPrevented || disabled || preventAriaAttribution) {
+        if (event.defaultPrevented || disabled) {
             return;
         }
         const labelElement = event.currentTarget;
@@ -265,7 +266,7 @@ export const FieldItem = ({
     const label = (
         <Label
             {...labelProps}
-            onClick={handleLabelClick}
+            onClick={preventAriaAttribution ? labelProps?.onClick : handleLabelClick}
             className={`${eccgui}-fielditem__label` + (labelProps?.className ? " " + labelProps.className : "")}
             disabled={disabled}
         />

src/components/Form/tests/FieldItem.test.tsx

@@ -668,11 +668,13 @@ describe("FieldItem label activation", () => {
 
     it("does not add focus behavior when automatic connections are disabled", async () => {
         const user = userEvent.setup();
-        renderCombobox({ preventAriaAttribution: true });
+        const onClick = jest.fn();
+        renderCombobox({ preventAriaAttribution: true, labelProps: { text: "Type", onClick } });
         const focusControl = jest.spyOn(screen.getByRole("combobox"), "focus");
 
         await user.click(screen.getByText("Type"));
 
+        expect(onClick).toHaveBeenCalledTimes(1);
         expect(focusControl).not.toHaveBeenCalled();
     });
 });