From 17d384f503246955123bc4b157945e6de90a722d Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 22 Jun 2022 13:59:20 -0400
Subject: [PATCH] Fix type error

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../front-end-routing/navigate-to-route-injection-token.ts   | 5 +++--
 .../extension/extension-preferences-route.injectable.ts      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/front-end-routing/navigate-to-route-injection-token.ts b/src/common/front-end-routing/navigate-to-route-injection-token.ts
index 1df8c4690e..92cff19be9 100644
--- a/src/common/front-end-routing/navigate-to-route-injection-token.ts
+++ b/src/common/front-end-routing/navigate-to-route-injection-token.ts
@@ -3,6 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
+import type { SetRequired } from "type-fest";
 import type { Route } from "./front-end-route-injection-token";
 
 type RequiredKeys<T> = Exclude<
@@ -37,9 +38,9 @@ export type NavigateToRouteOptions<TParameter> = Parameters<TParameter> & {
   withoutAffectingBackButton?: boolean;
 };
 
-export type NavigateToRoute = <TRoute extends Route<TParameter>, TParameter extends object | void>(
+export type NavigateToRoute = <TRoute extends Route<object | void>>(
   route: TRoute,
-  options?: NavigateToRouteOptions<TParameter>,
+  options?: NavigateToRouteOptions<SetRequired<TRoute, "parameterSignature">["parameterSignature"]>,
 ) => void;
 
 export const navigateToRouteInjectionToken = getInjectionToken<NavigateToRoute>(
diff --git a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
index 38d25b4114..3d2971d7c1 100644
--- a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
@@ -7,9 +7,9 @@ import { computed } from "mobx";
 import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 import type { Route } from "../../../front-end-route-injection-token";
 
-interface ExtensionPreferenceRouteParams {
+export interface ExtensionPreferenceRouteParams {
   extensionId: string;
-  tabId?: string;
+  tabId?: string | undefined;
 }
 
 const extensionPreferencesRouteInjectable = getInjectable({