diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 387926fec5..a4d4a6cb67 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -34,6 +34,7 @@ import type { ViewTransitionOptions, } from './router' import type { + Assign, Constrain, Expand, MakeDifferenceOptional, @@ -938,7 +939,7 @@ export type ActiveLinkOptions< ActiveLinkOptionProps type ActiveLinkProps = Partial< - LinkComponentReactProps & { + UseLinkReactProps & { [key: `data-${string}`]: unknown } > @@ -976,11 +977,6 @@ export interface LinkPropsChildren { }) => React.ReactNode) } -type LinkComponentReactProps = Omit< - UseLinkReactProps, - keyof CreateLinkProps -> - export type LinkComponentProps< TComp = 'a', TRouter extends AnyRouter = RegisteredRouter, @@ -988,8 +984,10 @@ export type LinkComponentProps< TTo extends string | undefined = '.', TMaskFrom extends string = TFrom, TMaskTo extends string = '.', -> = LinkComponentReactProps & - LinkProps +> = Assign< + LinkProps, + UseLinkReactProps +> export type CreateLinkProps = LinkProps< any,