apply updates to following exercises

Author: kentcdodds

exercises/05.actions/01.problem.action-reference/ui/index.js

@@ -56,9 +56,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				setContentKey(historyKey)
 			}
-
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/01.solution.action-reference/ui/index.js

@@ -56,9 +56,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				setContentKey(historyKey)
 			}
-
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/02.problem.client/ui/index.js

@@ -67,9 +67,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				setContentKey(historyKey)
 			}
-
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/02.solution.client/ui/index.js

@@ -68,9 +68,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				setContentKey(historyKey)
 			}
-
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/03.problem.server/ui/index.js

@@ -68,9 +68,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				setContentKey(historyKey)
 			}
-
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/03.solution.server/ui/index.js

@@ -68,9 +68,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				setContentKey(historyKey)
 			}
-
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/04.problem.revalidation/ui/index.js

@@ -98,10 +98,12 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				// 🐨 swap this with updateContentKey
+				startTransition(() => setContentKey(historyKey))
+			} else {
+				// 🐨 swap this with updateContentKey
+				setContentKey(historyKey)
 			}
-
-			// 🐨 swap this with updateContentKey
-			startTransition(() => setContentKey(historyKey))
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/04.solution.revalidation/ui/index.js

@@ -96,9 +96,10 @@ function Root() {
 				const fetchPromise = fetchContent(nextLocation)
 				const nextContentPromise = createFromFetch(fetchPromise)
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => updateContentKey(historyKey))
+			} else {
+				updateContentKey(historyKey)
 			}
-
-			updateContentKey(historyKey)
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/05.problem.history-revalidation/ui/index.js

@@ -105,9 +105,10 @@ function Root() {
 
 				// if we don't have this key in the cache already, set it now
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => updateContentKey(historyKey))
+			} else {
+				updateContentKey(historyKey)
 			}
-
-			updateContentKey(historyKey)
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)

exercises/05.actions/05.solution.history-revalidation/ui/index.js

@@ -102,9 +102,10 @@ function Root() {
 			if (!contentCache.has(historyKey)) {
 				// if we don't have this key in the cache already, set it now
 				contentCache.set(historyKey, nextContentPromise)
+				startTransition(() => updateContentKey(historyKey))
+			} else {
+				updateContentKey(historyKey)
 			}
-
-			updateContentKey(historyKey)
 		}
 		window.addEventListener('popstate', handlePopState)
 		return () => window.removeEventListener('popstate', handlePopState)