Rendering behavior of defaultErrorComponent vs notFoundComponent inside the root route

[GuillaumeLaroucheUQAT]

Throwing an error inside the component of a route will replace it by it's errorComponent or the defaultErrorComponent. However, throwing the notFound() function inside a loader will either replace the component by it's notFoundComponent or the entire route tree by the notFoundComponent defined inside the root route.

Is there a way to define a default notFoundComponent that has the same behavior has the defaultErrorComponent? I've noticed that there's an globalNotFound property in the router options, but it doesn't seem to work like defaultErrorComponent.

A current workaround is to duplicate the content of the component inside the notFoundComponent but it's not elegant.

Example inside the __root.tsx :

export const Route = createRootRoute({
	component: () => <AppLayout />,
	notFoundComponent: () => (
		<AppLayout>
			<Custom404Page />
		</AppLayout>
	),
});

Maybe a solution could be to use the InnerWrap prop in the router options, but it would render the component on every route and limit the ability to replace the component based on the route in the future.