Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
25ba8a74
Unverified
Commit
25ba8a74
authored
May 01, 2023
by
Jimmy Lai
Committed by
GitHub
May 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app router: don't unmount/remount on search param changes (#49047)
parent
905cb5a5
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
110 additions
and
2 deletions
+110
-2
layout-router.tsx
packages/next/src/client/components/layout-router.tsx
+1
-1
create-router-cache-key.ts
...ient/components/router-reducer/create-router-cache-key.ts
+6
-1
client-component.js
...e/app-dir/search-params-react-key/app/client-component.js
+24
-0
layout.tsx
test/e2e/app-dir/search-params-react-key/app/layout.tsx
+15
-0
page.tsx
test/e2e/app-dir/search-params-react-key/app/page.tsx
+11
-0
layout-params.test.ts
...e2e/app-dir/search-params-react-key/layout-params.test.ts
+48
-0
next.config.js
test/e2e/app-dir/search-params-react-key/next.config.js
+5
-0
No files found.
packages/next/src/client/components/layout-router.tsx
View file @
25ba8a74
...
@@ -564,7 +564,7 @@ export default function OuterLayoutRouter({
...
@@ -564,7 +564,7 @@ export default function OuterLayoutRouter({
- Passed to the router during rendering to ensure it can be immediately rendered when suspending on a Flight fetch.
- Passed to the router during rendering to ensure it can be immediately rendered when suspending on a Flight fetch.
*/
*/
<
TemplateContext
.
Provider
<
TemplateContext
.
Provider
key=
{
c
acheKey
}
key=
{
c
reateRouterCacheKey
(
preservedSegment
,
true
)
}
value=
{
value=
{
<
ScrollAndFocusHandler
segmentPath=
{
segmentPath
}
>
<
ScrollAndFocusHandler
segmentPath=
{
segmentPath
}
>
<
ErrorBoundary
errorComponent=
{
error
}
errorStyles=
{
errorStyles
}
>
<
ErrorBoundary
errorComponent=
{
error
}
errorStyles=
{
errorStyles
}
>
...
...
packages/next/src/client/components/router-reducer/create-router-cache-key.ts
View file @
25ba8a74
import
{
Segment
}
from
'../../../server/app-render/types'
import
{
Segment
}
from
'../../../server/app-render/types'
export
function
createRouterCacheKey
(
segment
:
Segment
)
{
export
function
createRouterCacheKey
(
segment
:
Segment
,
withoutSearchParameters
:
boolean
=
false
)
{
return
Array
.
isArray
(
segment
)
return
Array
.
isArray
(
segment
)
?
`
${
segment
[
0
]}
|
${
segment
[
1
]}
|
${
segment
[
2
]}
`
?
`
${
segment
[
0
]}
|
${
segment
[
1
]}
|
${
segment
[
2
]}
`
:
withoutSearchParameters
&&
segment
.
startsWith
(
'__PAGE__'
)
?
'__PAGE__'
:
segment
:
segment
}
}
test/e2e/app-dir/search-params-react-key/app/client-component.js
0 → 100644
View file @
25ba8a74
'use client'
import
{
useRouter
}
from
'next/navigation'
import
React
,
{
useState
}
from
'react'
export
default
()
=>
{
const
router
=
useRouter
()
const
[
count
,
setCount
]
=
useState
(
0
)
return
(
<>
<
div
id
=
"count"
>
{
count
}
<
/div
>
<
button
id
=
"increment"
onClick
=
{()
=>
setCount
(
count
+
1
)}
>
increment
<
/button
>
<
button
id
=
"push"
onClick
=
{()
=>
router
.
push
(
'/?foo=bar'
)}
>
push
to
/
?
foo
=
bar
<
/button
>
<
button
id
=
"replace"
onClick
=
{()
=>
router
.
replace
(
'/?foo=baz'
)}
>
replace
with
/
?
foo=ba
z
<
/button
>
<
/
>
)
}
test/e2e/app-dir/search-params-react-key/app/layout.tsx
0 → 100644
View file @
25ba8a74
import
React
from
'react'
export
default
function
Layout
({
children
,
}:
{
children
:
React
.
ReactNode
params
:
{}
})
{
return
(
<
html
>
<
head
></
head
>
<
body
>
{
children
}
</
body
>
</
html
>
)
}
test/e2e/app-dir/search-params-react-key/app/page.tsx
0 → 100644
View file @
25ba8a74
import
React
from
'react'
import
ClientComponent
from
'./client-component'
export
default
({
searchParams
})
=>
{
return
(
<
div
>
<
div
id=
"search-params"
>
{
JSON
.
stringify
(
searchParams
)
}
</
div
>
<
ClientComponent
/>
</
div
>
)
}
test/e2e/app-dir/search-params-react-key/layout-params.test.ts
0 → 100644
View file @
25ba8a74
import
{
createNextDescribe
}
from
'e2e-utils'
import
{
check
}
from
'next-test-utils'
createNextDescribe
(
'app dir - search params keys'
,
{
files
:
__dirname
,
},
({
next
})
=>
{
it
(
'should keep the React router instance the same when changing the search params'
,
async
()
=>
{
const
browser
=
await
next
.
browser
(
'/'
)
const
searchParams
=
browser
.
waitForElementByCss
(
'#search-params'
).
text
()
await
browser
.
elementByCss
(
'#increment'
).
click
()
await
browser
.
elementByCss
(
'#increment'
).
click
()
await
browser
.
elementByCss
(
'#push'
).
click
()
await
check
(
async
()
=>
{
const
newSearchParams
=
await
browser
.
waitForElementByCss
(
'#search-params'
)
.
text
()
const
count
=
await
browser
.
waitForElementByCss
(
'#count'
).
text
()
return
newSearchParams
!==
searchParams
&&
count
===
'2'
?
'success'
:
'retry'
},
'success'
)
await
browser
.
elementByCss
(
'#increment'
).
click
()
await
browser
.
elementByCss
(
'#increment'
).
click
()
await
browser
.
elementByCss
(
'#replace'
).
click
()
await
check
(
async
()
=>
{
const
newSearchParams
=
await
browser
.
waitForElementByCss
(
'#search-params'
)
.
text
()
const
count
=
await
browser
.
waitForElementByCss
(
'#count'
).
text
()
return
newSearchParams
!==
searchParams
&&
count
===
'4'
?
'success'
:
'retry'
},
'success'
)
})
}
)
test/e2e/app-dir/search-params-react-key/next.config.js
0 → 100644
View file @
25ba8a74
module
.
exports
=
{
experimental
:
{
appDir
:
true
,
},
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment