From 58468331751e52832dff5da225b40b5791588172 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Tue, 2 Nov 2021 09:28:15 +0100 Subject: [PATCH] used regex instead of slice Signed-off-by: Alex Rybchenko --- .../src/components/TabbedLayout/RoutedTabs.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx index c5c771b739..5debafd3f8 100644 --- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx +++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx @@ -35,8 +35,8 @@ export function useSelectedSubRoute(subRoutes: SubRoute[]): { // TODO: remove once react-router updated const sortedRoutes = routes.sort((a, b) => - // remove added "/*" symbols from path before comparing - b.path.slice(0, -2).localeCompare(a.path.slice(0, -2)), + // remove "/*" symbols from path end before comparing + b.path.replace(/\/\*$/, '').localeCompare(a.path.replace(/\/\*$/, '')), ); const element = useRoutes(sortedRoutes) ?? subRoutes[0].children;