fix: always exclude routeParams

RSSNext · Nov 18, 2024 · 1466886 · 1466886
1 parent 3ba9093
commit 1466886
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/apps/renderer/src/lib/path-parser.ts b/apps/renderer/src/lib/path-parser.ts
@@ -104,12 +104,13 @@ export type PathParams = {
 
 export type ParseRegexpPathParamsOptions = {
   excludeNames?: string[]
+  forceExcludeNames?: string[]
 }
 export const parseRegexpPathParams = (
   regexpPath: string,
   options?: ParseRegexpPathParamsOptions,
 ) => {
-  const { excludeNames = [] } = options || {}
+  const { excludeNames = [], forceExcludeNames = [] } = options || {}
   const transformedPath = transformUriPath(regexpPath)
   const { tokens } = parse(transformedPath)
 
@@ -151,7 +152,8 @@ export const parseRegexpPathParams = (
       (item) =>
         typeof item === "object" &&
         "name" in item &&
-        (!excludeNames.includes(item.name) || !item.optional),
+        (!excludeNames.includes(item.name) || !item.optional) &&
+        !forceExcludeNames.includes(item.name),
     ) as PathParams[]
 }
 export const parseFullPathParams = (path: string, regexpPath: string) => {

diff --git a/apps/renderer/src/modules/discover/DiscoverFeedForm.tsx b/apps/renderer/src/modules/discover/DiscoverFeedForm.tsx
@@ -122,8 +122,9 @@ export const DiscoverFeedForm = ({
           "lang",
           "sort",
         ],
+        forceExcludeNames: routeParams ? ["routeParams"] : [],
       }),
-    [route.path],
+    [route.path, routeParams],
   )
 
   const formPlaceholder = useMemo<Record<string, string>>(() => {