fix(useBackLink): Fix inverted subpath logic, #164

5app · Nov 5, 2021 · 41648a8 · 41648a8
1 parent 9ceda61
commit 41648a8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/useBackLink/index.ts b/src/useBackLink/index.ts
@@ -19,9 +19,11 @@ function useBackLink(options: BackLinkOptions = {}): Location | null {
 	}
 
 	function getShouldSkipLocation(location) {
-		const ignoreSubpath = basePath?.startsWith(
-			stripSlashFromEnd(getLocationPathname(location))
-		);
+		const formattedLocation = basePath
+			? stripSlashFromEnd(getLocationPathname(location))
+			: null;
+
+		const ignoreSubpath = formattedLocation?.startsWith(basePath);
 
 		const skipLocation = shouldSkipLocation?.(location);
 
@@ -42,6 +44,8 @@ function useBackLink(options: BackLinkOptions = {}): Location | null {
 
 	const backLink = getBackLink();
 
+	console.log(basePath, historyStack);
+
 	return backLink || fallback;
 }