Skip to content

Commit

Permalink
Slight refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
brophdawg11 committed Jul 1, 2024
1 parent 117b1fa commit 9918a02
Showing 1 changed file with 19 additions and 17 deletions.
36 changes: 19 additions & 17 deletions packages/remix-react/components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,14 @@ function usePrefetchBehavior<T extends HTMLAnchorElement>(

const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;

function enableFogOfWarDiscovery(
function getDiscoverAttr(
discover: DiscoverBehavior,
isAbsolute: boolean,
reloadDocument: boolean | undefined
) {
return discover === "render" && !isAbsolute && !reloadDocument;
return discover === "render" && !isAbsolute && !reloadDocument
? "true"
: undefined;
}

/**
Expand All @@ -230,11 +232,11 @@ let NavLink = React.forwardRef<HTMLAnchorElement, RemixNavLinkProps>(
{...prefetchHandlers}
ref={mergeRefs(forwardedRef, ref)}
to={to}
data-discover={
enableFogOfWarDiscovery(discover, isAbsolute, props.reloadDocument)
? "true"
: undefined
}
data-discover={getDiscoverAttr(
discover,
isAbsolute,
props.reloadDocument
)}
/>
{shouldPrefetch && !isAbsolute ? (
<PrefetchPageLinks page={href} />
Expand Down Expand Up @@ -269,11 +271,11 @@ let Link = React.forwardRef<HTMLAnchorElement, RemixLinkProps>(
{...prefetchHandlers}
ref={mergeRefs(forwardedRef, ref)}
to={to}
data-discover={
enableFogOfWarDiscovery(discover, isAbsolute, props.reloadDocument)
? "true"
: undefined
}
data-discover={getDiscoverAttr(
discover,
isAbsolute,
props.reloadDocument
)}
/>
{shouldPrefetch && !isAbsolute ? (
<PrefetchPageLinks page={href} />
Expand Down Expand Up @@ -302,11 +304,11 @@ let Form = React.forwardRef<HTMLFormElement, RemixFormProps>(
return (
<RouterForm
{...props}
data-discover={
enableFogOfWarDiscovery(discover, isAbsolute, props.reloadDocument)
? "true"
: undefined
}
data-discover={getDiscoverAttr(
discover,
isAbsolute,
props.reloadDocument
)}
/>
);
}
Expand Down

0 comments on commit 9918a02

Please sign in to comment.