Skip to content

fix: aria described by sometimes returning stale 'undefined' value #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PavlovicWorkCo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: aria described by sometimes returning stale 'undefined' value #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions lib/src/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ const Card = React.forwardRef<CardElement, CardProps>(
const { targetRef, handleRedundantClick, handleAuxiliaryClick } =
useRedundantClick();
const [targetHasFocus, setTargetHasFocus] = React.useState<"" | null>(null);
const generatedDescriptionId = React.useId();

const handleClick = composeEventHandlers(
props.onClick,
handleRedundantClick
handleRedundantClick,
);

const handleAuxClick = composeEventHandlers(
props.onAuxClick,
handleAuxiliaryClick
handleAuxiliaryClick,
);

const handleFocus = composeEventHandlers(props.onFocus, (event) => {
Expand All @@ -58,7 +59,7 @@ const Card = React.forwardRef<CardElement, CardProps>(
<CardProvider
scope={__scopeCard}
targetRef={targetRef}
descriptionId={undefined}
descriptionId={generatedDescriptionId}
>
<Primitive.div
{...cardProps}
Expand All @@ -71,7 +72,7 @@ const Card = React.forwardRef<CardElement, CardProps>(
/>
</CardProvider>
);
}
},
);

Card.displayName = CARD_NAME;
Expand Down Expand Up @@ -99,7 +100,7 @@ const CardTarget = React.forwardRef<CardTargetElement, CardTargetProps>(
ref={composedRefs}
/>
);
}
},
);

CardTarget.displayName = TARGET_NAME;
Expand All @@ -117,15 +118,13 @@ const CardTargetDescription = React.forwardRef<
CardTargetDescriptionElement,
CardTargetDescriptionProps
>((props: ScopedProps<CardTargetDescriptionProps>, forwardedRef) => {
const generatedId = React.useId();
const { __scopeCard, ...targetProps } = props;
const context = useCardContext(TARGET_DESCRIPTION_NAME, __scopeCard);
context.descriptionId = props.id || generatedId;

return (
<Primitive.span
{...targetProps}
id={context.descriptionId}
id={props.id ?? context.descriptionId}
aria-hidden="true"
ref={forwardedRef}
/>
Expand All @@ -151,7 +150,7 @@ const CardExclude = React.forwardRef<CardExcludeElement, CardExcludeProps>(
return (
<Primitive.div data-exclude="" {...targetProps} ref={forwardedRef} />
);
}
},
);

CardExclude.displayName = EXCLUDE_NAME;
Expand Down