Skip to content

Commit afe9e77

Browse files
committed
fix: issue 7240 causing fouc
1 parent 03ac20e commit afe9e77

2 files changed

Lines changed: 118 additions & 2 deletions

File tree

‎packages/solid-router/src/headContentUtils.tsx‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as Solid from 'solid-js'
22
import {
33
escapeHtml,
44
getAssetCrossOrigin,
5-
replaceEqualDeep,
65
resolveManifestAssetLink,
76
} from '@tanstack/router-core'
87
import { useRouter } from './useRouter'
@@ -211,10 +210,36 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
211210
if (prev === undefined) {
212211
return next
213212
}
214-
return replaceEqualDeep(prev, next)
213+
return replaceEqualTags(prev, next)
215214
})
216215
}
217216

217+
function replaceEqualTags(
218+
prev: Array<RouterManagedTag>,
219+
next: Array<RouterManagedTag>,
220+
) {
221+
const prevByKey = new Map<string, RouterManagedTag>()
222+
for (const tag of prev) {
223+
prevByKey.set(JSON.stringify(tag), tag)
224+
}
225+
226+
let isEqual = prev.length === next.length
227+
const result = next.map((tag, index) => {
228+
const existing = prevByKey.get(JSON.stringify(tag))
229+
if (existing) {
230+
if (existing !== prev[index]) {
231+
isEqual = false
232+
}
233+
return existing
234+
}
235+
236+
isEqual = false
237+
return tag
238+
})
239+
240+
return isEqual ? prev : result
241+
}
242+
218243
export function uniqBy<T>(arr: Array<T>, fn: (item: T) => string) {
219244
const seen = new Set<string>()
220245
return arr.filter((item) => {

‎packages/solid-router/tests/Scripts.test.tsx‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,97 @@ describe('ssr scripts', () => {
223223
).toHaveLength(1)
224224
})
225225

226+
test('keeps manifest stylesheet links mounted when preload counts change', async () => {
227+
const history = createTestBrowserHistory()
228+
229+
const rootRoute = createRootRoute({
230+
component: () => {
231+
return (
232+
<>
233+
<HeadContent />
234+
<Outlet />
235+
</>
236+
)
237+
},
238+
})
239+
240+
const aRoute = createRoute({
241+
path: '/a',
242+
getParentRoute: () => rootRoute,
243+
component: () => <Link to="/b">Go to B</Link>,
244+
})
245+
246+
const bRoute = createRoute({
247+
path: '/b',
248+
getParentRoute: () => rootRoute,
249+
component: () => <Link to="/a">Go to A</Link>,
250+
})
251+
252+
const router = createRouter({
253+
history,
254+
routeTree: rootRoute.addChildren([aRoute, bRoute]),
255+
})
256+
257+
router.ssr = {
258+
manifest: {
259+
routes: {
260+
[rootRoute.id]: {
261+
preloads: ['/root.js'],
262+
assets: [
263+
{
264+
tag: 'link',
265+
attrs: {
266+
rel: 'stylesheet',
267+
href: '/main.css',
268+
},
269+
},
270+
],
271+
},
272+
[aRoute.id]: {
273+
preloads: ['/a.js'],
274+
assets: [],
275+
},
276+
[bRoute.id]: {
277+
preloads: ['/b.js', '/b-child.js'],
278+
assets: [],
279+
},
280+
},
281+
},
282+
}
283+
284+
await router.navigate({ to: '/a' })
285+
await router.load()
286+
287+
render(() => <RouterProvider router={router} />)
288+
289+
const getStylesheetLink = () =>
290+
Array.from(document.head.querySelectorAll('link[rel="stylesheet"]')).find(
291+
(link) => link.getAttribute('href') === '/main.css',
292+
)
293+
294+
await waitFor(() => {
295+
expect(getStylesheetLink()).toBeInstanceOf(HTMLLinkElement)
296+
})
297+
298+
const initialLink = getStylesheetLink()
299+
expect(initialLink).toBeInstanceOf(HTMLLinkElement)
300+
301+
fireEvent.click(screen.getByRole('link', { name: 'Go to B' }))
302+
303+
await waitFor(() => {
304+
expect(router.state.location.pathname).toBe('/b')
305+
})
306+
307+
await screen.findByRole('link', { name: 'Go to A' })
308+
309+
expect(getStylesheetLink()).toBe(initialLink)
310+
expect(
311+
Array.from(
312+
document.head.querySelectorAll('link[rel="stylesheet"]'),
313+
).filter((link) => link.getAttribute('href') === '/main.css'),
314+
).toHaveLength(1)
315+
})
316+
226317
test('applies assetCrossOrigin to manifest assets and preloads', async () => {
227318
const history = createTestBrowserHistory()
228319

0 commit comments

Comments
 (0)