fix(solid-router): Should not remount deps when remountDeps does not change (#5693)

Author: birkskyum

e2e/solid-router/basic-file-based/tests/app.spec.ts

@@ -273,7 +273,7 @@ test('Should change post navigating back and forth', async ({ page }) => {
   await expect(page.getByTestId('post-title')).toContainText('sunt aut facere')
 })
 
-test.skip('Should not remount deps when remountDeps does not change ', async ({
+test('Should not remount deps when remountDeps does not change ', async ({
   page,
 }) => {
   await page.goto('/notRemountDeps')

packages/solid-router/src/Match.tsx

@@ -222,19 +222,22 @@ export const MatchInner = (props: { matchId: string }): any => {
 
   const match = () => matchState().match
 
+  const componentKey = () => matchState().key ?? matchState().match.id
+
   const out = () => {
     const Comp = route().options.component ?? router.options.defaultComponent
     if (Comp) {
-      const key = matchState().key ?? matchState().match.id
-      return (
-        <Solid.Show when={key} keyed>
-          <Comp />
-        </Solid.Show>
-      )
+      return <Comp />
     }
     return <Outlet />
   }
 
+  const keyedOut = () => (
+    <Solid.Show when={componentKey()} keyed>
+      {(_key) => out()}
+    </Solid.Show>
+  )
+
   return (
     <Solid.Switch>
       <Solid.Match when={match()._displayPending}>
@@ -327,7 +330,9 @@ export const MatchInner = (props: { matchId: string }): any => {
           throw match().error
         }}
       </Solid.Match>
-      <Solid.Match when={match().status === 'success'}>{out()}</Solid.Match>
+      <Solid.Match when={match().status === 'success'}>
+        {keyedOut()}
+      </Solid.Match>
     </Solid.Switch>
   )
 }