@tanstack/router-core 0.0.1-beta.185 → 0.0.1-beta.187

package/src/scroll-restoration.ts

@@ -22,7 +22,7 @@ export type ScrollRestorationOptions = {
   getKey?: (location: ParsedLocation) => string
 }
 
-const defaultGetKey = (location: ParsedLocation) => location.key!
+const defaultGetKey = (location: ParsedLocation) => location.state.key!
 
 export function watchScrollPositions(
   router: AnyRouter,

package/src/utils.ts

@@ -31,21 +31,21 @@ export type UnionToIntersection<U> = (
   ? I
   : never
 
-type Compute<T> = { [K in keyof T]: T[K] } | never
-
-type AllKeys<T> = T extends any ? keyof T : never
-
-export type MergeUnion<T, Keys extends keyof T = keyof T> = Compute<
-  {
-    [K in Keys]: T[Keys]
-  } & {
-    [K in AllKeys<T>]?: T extends any
-      ? K extends keyof T
-        ? T[K]
-        : never
-      : never
-  }
->
+// type Compute<T> = { [K in keyof T]: T[K] } | never
+
+// type AllKeys<T> = T extends any ? keyof T : never
+
+// export type MergeUnion<T, Keys extends keyof T = keyof T> = Compute<
+//   {
+//     [K in Keys]: T[Keys]
+//   } & {
+//     [K in AllKeys<T>]?: T extends any
+//       ? K extends keyof T
+//         ? T[K]
+//         : never
+//       : never
+//   }
+// >
 
 export type Values<O> = O[ValueKeys<O>]
 export type ValueKeys<O> = Extract<keyof O, PropertyKey>
@@ -69,6 +69,10 @@ export type Updater<TPrevious, TResult = TPrevious> =
   | TResult
   | ((prev?: TPrevious) => TResult)
 
+export type NonNullableUpdater<TPrevious, TResult = TPrevious> =
+  | TResult
+  | ((prev: TPrevious) => TResult)
+
 export type PickExtract<T, U> = {
   [K in keyof T as T[K] extends U ? K : never]: T[K]
 }
@@ -86,9 +90,9 @@ function isFunction(d: any): d is Function {
 }
 
 export function functionalUpdate<TResult>(
-  updater: Updater<TResult>,
+  updater: Updater<TResult> | NonNullableUpdater<TResult>,
   previous: TResult,
-) {
+): TResult {
   if (isFunction(updater)) {
     return updater(previous as TResult)
   }