Merge branch 'release-next'

remix-run · Jan 18, 2023 · 0e4c524 · 0e4c524
2 parents d6aceaf + 74979cb
commit 0e4c524
Show file tree

Hide file tree

Showing 51 changed files with 5,967 additions and 426 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@ node_modules/
 /packages/react-router-dom-v5-compat/react-router-dom
 
 .eslintcache
-/.env
+/.env
+/NOTES.md
diff --git a/contributors.yml b/contributors.yml
@@ -79,6 +79,7 @@
 - janpaepke
 - jasonpaulos
 - jdufresne
+- jenseng
 - JesusTheHun
 - jimniels
 - jmargeta
@@ -98,6 +99,7 @@
 - latin-1
 - lequangdongg
 - liuhanqu
+- lkwr
 - lopezac
 - lordofthecactus
 - loun4

diff --git a/examples/navigation-blocking/.gitignore b/examples/navigation-blocking/.gitignore
@@ -0,0 +1,5 @@
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local
diff --git a/examples/navigation-blocking/.stackblitzrc b/examples/navigation-blocking/.stackblitzrc
@@ -0,0 +1,4 @@
+{
+  "installDependencies": true,
+  "startCommand": "npm run dev"
+}
diff --git a/examples/navigation-blocking/README.md b/examples/navigation-blocking/README.md
@@ -0,0 +1,15 @@
+---
+title: Navigation Blocking
+toc: false
+order: 1
+---
+
+# Navigation Blocking
+
+This example demonstrates using `unstable_useBlocker` to prevent navigating away from a page where you might lose user-entered form data. A potentially better UX for this is storing user-entered information in `sessionStorage` and pre-populating the form on return.
+
+## Preview
+
+Open this example on [StackBlitz](https://stackblitz.com):
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/remix-run/react-router/tree/main/examples/navigation-blocking?file=src/App.tsx)
diff --git a/examples/navigation-blocking/index.html b/examples/navigation-blocking/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>React Router - Navigation Blocking</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>