fix: better way to find current url

example/src/WebView.tsx

@@ -9,7 +9,7 @@ import {
 import { useCurrentUrl, useWebviewNavigate } from 'react-native-web-screen';
 import { Routes } from './webScreenRoutes';
 import Form from './Strada/Form';
-import { baseURL } from './webScreen';
+import { baseURL, linkingConfig } from './webScreen';
 
 export type Props = { navigation: any } & Pick<VisitableViewProps, 'onMessage'>;
 
@@ -19,7 +19,7 @@ const stradaComponents = [Form];
 const WebView: React.FC<Props> = ({ navigation, ...props }) => {
   const navigateTo = useWebviewNavigate();
 
-  const currentUrl = useCurrentUrl(baseURL);
+  const currentUrl = useCurrentUrl(baseURL, linkingConfig);
 
   const onVisitProposal = ({ action: actionType, url }: VisitProposal) => {
     navigateTo(url, actionType);

example/src/webScreen.ts

@@ -1,8 +1,8 @@
 import { getLinkingObject } from 'react-native-web-screen';
 import { Routes } from './webScreenRoutes';
-import { LinkingOptions } from '@react-navigation/native';
+import { LinkingConfig } from 'packages/navigation/src/hooks/useCurrentUrl';
 
-const config: LinkingOptions<{}>['config'] = {
+export const linkingConfig: LinkingConfig = {
   screens: {
     [Routes.BottomTabs]: {
       screens: {
@@ -26,4 +26,4 @@ const config: LinkingOptions<{}>['config'] = {
 
 export const baseURL = 'http://localhost:45678/';
 
-export const linking = getLinkingObject(baseURL, config);
+export const linking = getLinkingObject(baseURL, linkingConfig);

packages/navigation/src/hooks/useCurrentUrl.ts

@@ -1,16 +1,36 @@
-import { useNavigation } from '@react-navigation/native';
+import { LinkingOptions, useNavigation } from '@react-navigation/native';
 
-export function useCurrentUrl(defaultBaseUrl?: string) {
+export type LinkingConfig = LinkingOptions<{}>['config'];
+
+function findPath(name: string, config: LinkingConfig): string | undefined {
+  if (!config) return undefined;
+  const screens = config.screens;
+  for (const key of Object.keys(screens)) {
+    // @ts-expect-error
+    const pathOrScreen: string | LinkingConfig = screens[key];
+    if (typeof pathOrScreen === 'string') {
+      if (key === name) {
+        return pathOrScreen;
+      }
+    } else {
+      const path = findPath(name, pathOrScreen);
+      if (path) {
+        return path;
+      }
+    }
+  }
+  return undefined;
+}
+
+export function useCurrentUrl(baseUrl: string, config: LinkingConfig) {
   const navigation = useNavigation();
   const state = navigation.getState();
 
   const currentRoute = state.routes[state.index];
-  const params = currentRoute?.params as
-    | { path?: string; baseURL?: string }
-    | undefined;
-
-  const path = params?.path ?? '';
-  const baseURL = params?.baseURL ?? defaultBaseUrl ?? '';
+  if (currentRoute) {
+    const path = findPath(currentRoute?.name, config);
 
-  return `${baseURL}${path}`;
+    return `${baseUrl}${path}`;
+  }
+  return baseUrl;
 }