Skip to content

Commit b2bfd8e

Browse files
committed
Add merge props
1 parent 107e5b3 commit b2bfd8e

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

src/components/Checkbox/Checkbox.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { LabelHTMLAttributes, PropsWithChildren } from "react";
22
import { checkboxLabelStyles, checkboxInputStyles, CheckboxVariant, CheckboxSize } from "./sharedCheckboxStyles";
33
import styled from "styled-components";
44
import { InputHTMLAttributes } from "react";
5+
import { mergeProps } from 'react-aria';
56
import { useLabelTooltip } from '../Tooltip';
67

78
const StyledLabel = styled.label<{ bold: boolean; variant: CheckboxVariant; isDisabled?: boolean; }>`
@@ -33,7 +34,7 @@ export const Checkbox = ({ children, disabled, variant = 'primary', bold = false
3334

3435
return tooltipText
3536
? <LabelWithTooltipWrapper>
36-
<StyledLabel ref={triggerRef} bold={bold} variant={variant} isDisabled={disabled} {...labelProps} {...triggerProps}>
37+
<StyledLabel ref={triggerRef} bold={bold} variant={variant} isDisabled={disabled} {...mergeProps(triggerProps, labelProps)}>
3738
<StyledInput {...props} type="checkbox" variant={variant} checkboxSize={size} isDisabled={disabled} disabled={disabled} />
3839
{children}
3940
{labelDescription}

0 commit comments

Comments
 (0)