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 09ee8b5b17..f010c36b0b 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 @@ -40,6 +40,7 @@ export interface NavigateToRoute { (route: Route, options?: BaseNavigateToRouteOptions): void; , TRequiredKeys extends string>(route: Route, opts: NavigateToRouteOptions): void; (route: Route, opts?: NavigateToRouteOptions): void; + (route: Route, opts?: NavigateToRouteOptions): void; } export const navigateToRouteInjectionToken = getInjectionToken({ diff --git a/src/main/navigate-to-route/navigate-to-route.injectable.ts b/src/main/navigate-to-route/navigate-to-route.injectable.ts index b3dfffae28..0ebae1e06b 100644 --- a/src/main/navigate-to-route/navigate-to-route.injectable.ts +++ b/src/main/navigate-to-route/navigate-to-route.injectable.ts @@ -4,8 +4,10 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { navigateToUrlInjectionToken } from "../../common/front-end-routing/navigate-to-url-injection-token"; +import type { NavigateToRoute, NavigateToRouteOptions } from "../../common/front-end-routing/navigate-to-route-injection-token"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; import { buildURL } from "../../common/utils/buildUrl"; +import type { Route } from "../../common/front-end-routing/front-end-route-injection-token"; const navigateToRouteInjectable = getInjectable({ id: "navigate-to-route", @@ -13,7 +15,7 @@ const navigateToRouteInjectable = getInjectable({ instantiate: (di) => { const navigateToUrl = di.inject(navigateToUrlInjectionToken); - return (route, options) => { + return ((route: Route, options: NavigateToRouteOptions) => { const url = buildURL(route.path, { params: options?.parameters, query: options?.query, @@ -21,7 +23,7 @@ const navigateToRouteInjectable = getInjectable({ }); navigateToUrl(url, options); - }; + }) as NavigateToRoute; }, injectionToken: navigateToRouteInjectionToken, diff --git a/src/renderer/routes/navigate-to-route.injectable.ts b/src/renderer/routes/navigate-to-route.injectable.ts index 8b57a02613..8d2c91ac9a 100644 --- a/src/renderer/routes/navigate-to-route.injectable.ts +++ b/src/renderer/routes/navigate-to-route.injectable.ts @@ -4,9 +4,11 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { navigateToUrlInjectionToken } from "../../common/front-end-routing/navigate-to-url-injection-token"; +import type { NavigateToRoute, NavigateToRouteOptions } from "../../common/front-end-routing/navigate-to-route-injection-token"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; import currentlyInClusterFrameInjectable from "./currently-in-cluster-frame.injectable"; import { buildURL } from "../../common/utils/buildUrl"; +import type { Route } from "../../common/front-end-routing/front-end-route-injection-token"; const navigateToRouteInjectable = getInjectable({ id: "navigate-to-route", @@ -18,7 +20,7 @@ const navigateToRouteInjectable = getInjectable({ currentlyInClusterFrameInjectable, ); - return (route, options) => { + return ((route: Route, options: NavigateToRouteOptions) => { const url = buildURL(route.path, { // TODO: enhance typing params: options?.parameters as any, @@ -30,7 +32,7 @@ const navigateToRouteInjectable = getInjectable({ ...options, forceRootFrame: currentlyInClusterFrame && route.clusterFrame === false, }); - }; + }) as NavigateToRoute; }, injectionToken: navigateToRouteInjectionToken,