Skip to content

Commit a71b4e2

Browse files
committed
Merge branch 'release-next' into dev
2 parents e2c0d82 + edd9ad4 commit a71b4e2

33 files changed

+488
-341
lines changed

.changeset/404-root-with-path.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/error-response-type.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/partial-future-config.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/soft-forks-cough.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/start-view-transition.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

contributors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
- tkindy
219219
- tlinhart
220220
- tom-sherman
221+
- tomasr8
221222
- triangularcube
222223
- trungpv1601
223224
- turansky

docs/components/form.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,7 @@ See also: [`<Link preventScrollReset>`][link-preventscrollreset]
273273

274274
The `unstable_viewTransition` prop enables a [View Transition][view-transitions] for this navigation by wrapping the final state update in `document.startViewTransition()`. If you need to apply specific styles for this view transition, you will also need to leverage the [`unstable_useViewTransitionState()`][use-view-transition-state].
275275

276-
<docs-warn>
277-
Please note that this API is marked unstable and may be subject to breaking changes without a major release.
278-
</docs-warn>
276+
<docs-warning>Please note that this API is marked unstable and may be subject to breaking changes without a major release</docs-warning>
279277

280278
# Examples
281279

docs/components/link.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,16 @@ The `unstable_viewTransition` prop enables a [View Transition][view-transitions]
153153

154154
```jsx
155155
<Link to={to} unstable_viewTransition>
156+
Click me
157+
</Link>
156158
```
157159

158-
If you need to apply specific styles for this view transition, you will also need to leverage the [`unstable_useViewTransitionState()`][use-view-transition-state]:
160+
If you need to apply specific styles for this view transition, you will also need to leverage the [`unstable_useViewTransitionState()`][use-view-transition-state] hook (or check out the `transitioning` class and `isTransitioning` render prop in [NavLink][navlink]):
159161

160162
```jsx
161163
function ImageLink(to) {
162-
let isTransitioning = unstable_useViewTransitionState(to);
164+
const isTransitioning =
165+
unstable_useViewTransitionState(to);
163166
return (
164167
<Link to={to} unstable_viewTransition>
165168
<p
@@ -185,9 +188,9 @@ function ImageLink(to) {
185188
}
186189
```
187190

188-
<docs-warn>
189-
Please note that this API is marked unstable and may be subject to breaking changes without a major release.
190-
</docs-warn>
191+
<docs-warning>`unstable_viewTransition` only works when using a data router, see [Picking a Router][picking-a-router]</docs-warning>
192+
193+
<docs-warning>Please note that this API is marked unstable and may be subject to breaking changes without a major release</docs-warning>
191194

192195
[link-native]: ./link-native
193196
[scrollrestoration]: ./scroll-restoration
@@ -196,3 +199,5 @@ Please note that this API is marked unstable and may be subject to breaking chan
196199
[history-state]: https://developer.mozilla.org/en-US/docs/Web/API/History/state
197200
[use-view-transition-state]: ../hooks//use-view-transition-state
198201
[view-transitions]: https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API
202+
[picking-a-router]: ../routers/picking-a-router
203+
[navlink]: ./nav-link

docs/components/nav-link.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,9 @@ You may also use the `className`/`style` props or the render props passed to `ch
171171
</NavLink>
172172
```
173173

174-
<docs-warn>
174+
<docs-warning>
175175
Please note that this API is marked unstable and may be subject to breaking changes without a major release.
176-
</docs-warn>
176+
</docs-warning>
177177

178178
[aria-current]: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-current
179179
[view-transitions]: https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API
180-
[use-view-transition-state]: ../hooks//use-view-transition-state

docs/hooks/use-navigate.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ function EditContact() {
8989

9090
The `unstable_viewTransition` option enables a [View Transition][view-transitions] for this navigation by wrapping the final state update in `document.startViewTransition()`. If you need to apply specific styles for this view transition, you will also need to leverage the [`unstable_useViewTransitionState()`][use-view-transition-state].
9191

92-
<docs-warn>
93-
Please note that this API is marked unstable and may be subject to breaking changes without a major release.
94-
</docs-warn>
92+
<docs-warning>`unstable_viewTransition` only works when using a data router, see [Picking a Router][picking-a-router]</docs-warning>
93+
94+
<docs-warning>Please note that this API is marked unstable and may be subject to breaking changes without a major release</docs-warning>
9595

9696
[link]: ../components/link
9797
[redirect]: ../fetch/redirect
@@ -101,3 +101,4 @@ Please note that this API is marked unstable and may be subject to breaking chan
101101
[scrollrestoration]: ../components/scroll-restoration
102102
[use-view-transition-state]: ../hooks//use-view-transition-state
103103
[view-transitions]: https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API
104+
[picking-a-router]: ../routers/picking-a-router

0 commit comments

Comments
 (0)