From 263e26cadf5732972e30e5243d2f9ef09eb7d5fc Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Mon, 25 Apr 2022 14:16:49 +0300 Subject: [PATCH] Fix isActive parameter Signed-off-by: Alex Andreev --- ...xtensions-preferences-navigation-item.injectable.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item.injectable.ts index 676b1d345a..bfffab18f8 100644 --- a/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item.injectable.ts +++ b/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item.injectable.ts @@ -3,7 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { matches } from "lodash/fp"; import { computed } from "mobx"; import extensionPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable"; import navigateToExtensionPreferencesInjectable from "../../../../common/front-end-routing/routes/preferences/extension/navigate-to-extension-preferences.injectable"; @@ -27,11 +26,10 @@ const extensionPreferencesNavigationItemRegistratorInjectable = getInjectable({ ); const isVisible = extensionHasPreferences && extensionHasGeneralPreferences; const extensionRoute = di.inject(extensionPreferencesRouteInjectable); - const extensionPreferencesRouteIsActive = di.inject(routeIsActiveInjectable, extensionRoute); const pathParameters = di.inject(currentPathParametersInjectable); - const extensionPreferencesPathParameters = { extensionId: extension.sanitizedExtensionId }; - const isActive = extensionPreferencesRouteIsActive.get() && - matches(extensionPreferencesPathParameters, pathParameters.get()); + const routeIsActive = di.inject(routeIsActiveInjectable, extensionRoute); + + const isActive = computed(() => routeIsActive.get() && pathParameters.get().extensionId === extension.sanitizedExtensionId); const extensionInjectable = getInjectable({ id: `extension-preferences-navigation-item-${extension.sanitizedExtensionId}`, @@ -39,7 +37,7 @@ const extensionPreferencesNavigationItemRegistratorInjectable = getInjectable({ id: `extension-${extension.sanitizedExtensionId}`, label: `${extension.name}`, navigate: () => navigateToExtensionPreferences(extension.sanitizedExtensionId), - isActive: computed(() => isActive), + isActive, isVisible: computed(() => isVisible), orderNumber: 20, }),