expo-router 0.0.14 → 0.0.16

package/build/getRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,wBAAgB,eAAe,CAC7B,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC,GACpD,SAAS,CAMX;AAqDD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM;;;SAK3C;AAoED,sEAAsE;AACtE,wBAAgB,SAAS,CAAC,aAAa,EAAE,cAAc,GAAG,SAAS,EAAE,CAapE;AA+CD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,SAAS,EAAE,GAClB,SAAS,GAAG,IAAI,CAgBlB"}
+{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,wBAAgB,eAAe,CAC7B,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC,GACpD,SAAS,CAMX;AAqDD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM;;;SAK3C;AAwED,sEAAsE;AACtE,wBAAgB,SAAS,CAAC,aAAa,EAAE,cAAc,GAAG,SAAS,EAAE,CAapE;AA+CD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,SAAS,EAAE,GAClB,SAAS,GAAG,IAAI,CAgBlB"}

package/build/getRoutes.js

@@ -78,13 +78,18 @@ function treeNodeToRouteNode({ name, node, parents, children, }) {
 }
 function contextModuleToFileNodes(contextModule) {
     const nodes = contextModule.keys().map((key) => {
-        // if (process.env.NODE_ENV === "development") {
         // In development, check if the file exports a default component
         // this helps keep things snappy when creating files. In production we load all screens lazily.
-        if (!contextModule(key)?.default) {
+        try {
+            if (!contextModule(key)?.default) {
+                return null;
+            }
+        }
+        catch (error) {
+            // Probably this won't stop metro from freaking out but it's worth a try.
+            console.warn('Error loading route "' + key + '"', error);
             return null;
         }
-        // }
         const node = {
             normalizedName: getNameFromFilePath(key),
             getComponent() {

package/build/getRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutes.js","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getNameFromFilePath,\n  matchDeepDynamicRouteName,\n  matchDynamicName,\n  matchFragmentName,\n} from \"./matchers\";\nimport { PickPartial, RouteNode } from \"./Route\";\nimport { RequireContext } from \"./types\";\nimport { DefaultLayout } from \"./views/Layout\";\n\nexport function createRouteNode(\n  route: PickPartial<RouteNode, \"dynamic\" | \"children\">\n): RouteNode {\n  return {\n    children: [],\n    dynamic: null,\n    ...route,\n  };\n}\n\ntype FileNode = Pick<RouteNode, \"contextKey\" | \"getComponent\" | \"getExtras\"> & {\n  /** Like `(tab)/index` */\n  normalizedName: string;\n};\n\ntype TreeNode = {\n  name: string;\n  children: TreeNode[];\n  parents: string[];\n  /** null when there is no file in a folder. */\n  node: FileNode | null;\n};\n\n/** Convert a flat map of file nodes into a nested tree of files. */\nfunction getRecursiveTree(files: FileNode[]): TreeNode {\n  const tree = {\n    name: \"\",\n    children: [],\n    parents: [],\n    node: null,\n  };\n\n  for (const file of files) {\n    // ['(tab)', 'settings', '[...another]']\n    const parts = file.normalizedName.split(\"/\");\n    let currentNode: TreeNode = tree;\n    for (const part of parts) {\n      const existing = currentNode.children.find((item) => item.name === part);\n      if (existing) {\n        currentNode = existing;\n      } else {\n        const newNode: TreeNode = {\n          name: part,\n          children: [],\n          parents: [...currentNode.parents, currentNode.name],\n          node: null,\n        };\n        currentNode.children.push(newNode);\n        currentNode = newNode;\n      }\n    }\n    currentNode.node = file;\n  }\n\n  return tree;\n}\n\nfunction getTreeNodesAsRouteNodes(nodes: TreeNode[]): RouteNode[] {\n  return nodes.map(treeNodeToRouteNode).filter(Boolean) as RouteNode[];\n}\n\nexport function generateDynamic(name: string) {\n  const deepDynamicName = matchDeepDynamicRouteName(name);\n  const dynamicName = deepDynamicName ?? matchDynamicName(name);\n\n  return dynamicName ? { name: dynamicName, deep: !!deepDynamicName } : null;\n}\n\nfunction treeNodeToRouteNode({\n  name,\n  node,\n  parents,\n  children,\n}: TreeNode): RouteNode | null {\n  const dynamic = generateDynamic(name);\n\n  if (node) {\n    return createRouteNode({\n      route: name,\n      getExtras: node.getExtras,\n      getComponent: node.getComponent,\n      contextKey: node.contextKey,\n      children: getTreeNodesAsRouteNodes(children),\n      dynamic,\n    });\n  }\n\n  // Empty folder, skip it.\n  if (!children.length) {\n    return null;\n  }\n\n  // When there's a directory, but no sibling file with the same name, the directory won't work.\n  // This ensures that we have a file for every directory (containing valid children).\n  return createRouteNode({\n    route: name,\n    generated: true,\n    getExtras: () => ({}),\n    getComponent: () => DefaultLayout,\n    // Generate a fake file name for the directory\n    contextKey: [\".\", ...parents, name + \".tsx\"].filter(Boolean).join(\"/\"),\n    children: getTreeNodesAsRouteNodes(children),\n    dynamic,\n  });\n}\n\nfunction contextModuleToFileNodes(contextModule: RequireContext): FileNode[] {\n  const nodes = contextModule.keys().map((key) => {\n    // if (process.env.NODE_ENV === \"development\") {\n    // In development, check if the file exports a default component\n    // this helps keep things snappy when creating files. In production we load all screens lazily.\n    if (!contextModule(key)?.default) {\n      return null;\n    }\n    // }\n\n    const node: FileNode = {\n      normalizedName: getNameFromFilePath(key),\n      getComponent() {\n        return contextModule(key).default;\n      },\n      contextKey: key,\n      getExtras() {\n        const { default: mod, ...extras } = contextModule(key);\n        return extras;\n      },\n    };\n\n    return node;\n  });\n\n  return nodes.filter(Boolean) as FileNode[];\n}\n\n/** Given a Metro context module, return an array of nested routes. */\nexport function getRoutes(contextModule: RequireContext): RouteNode[] {\n  const files = contextModuleToFileNodes(contextModule);\n  const treeNodes = getRecursiveTree(files).children;\n  const routes = getTreeNodesAsRouteNodes(treeNodes);\n\n  if (process.env.NODE_ENV !== \"production\") {\n    appendDirectoryRoute(routes);\n  }\n\n  // Auto add not found route if it doesn't exist\n  appendUnmatchedRoute(routes);\n\n  return routes;\n}\n\nfunction appendDirectoryRoute(routes: RouteNode[]) {\n  if (!routes.length) {\n    return routes;\n  }\n  const { Directory, getNavOptions } = require(\"./views/Directory\");\n  routes.push(\n    createRouteNode({\n      getComponent() {\n        return Directory;\n      },\n      getExtras() {\n        return { getNavOptions };\n      },\n      route: \"__index\",\n      contextKey: \"./__index.tsx\",\n      generated: true,\n      internal: true,\n    })\n  );\n  return routes;\n}\n\nfunction appendUnmatchedRoute(routes: RouteNode[]) {\n  // Auto add not found route if it doesn't exist\n  const userDefinedDynamicRoute = getUserDefinedDeepDynamicRoute(routes);\n  if (!userDefinedDynamicRoute) {\n    routes.push(\n      createRouteNode({\n        getComponent() {\n          return require(\"./views/Unmatched\").Unmatched;\n        },\n        getExtras() {\n          return {};\n        },\n        route: \"[...404]\",\n        contextKey: \"./[...404].tsx\",\n        dynamic: { name: \"404\", deep: true },\n        generated: true,\n        internal: true,\n      })\n    );\n  }\n  return routes;\n}\n\n/**\n * Exposed for testing.\n * @returns a top-level deep dynamic route if it exists, otherwise null.\n */\nexport function getUserDefinedDeepDynamicRoute(\n  routes: RouteNode[]\n): RouteNode | null {\n  // Auto add not found route if it doesn't exist\n  for (const route of routes) {\n    const isDeepDynamic = matchDeepDynamicRouteName(route.route);\n    if (isDeepDynamic) {\n      return route;\n    }\n    // Recurse through fragment routes\n    if (matchFragmentName(route.route)) {\n      const child = getUserDefinedDeepDynamicRoute(route.children);\n      if (child) {\n        return child;\n      }\n    }\n  }\n  return null;\n}\n"]}
+{"version":3,"file":"getRoutes.js","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getNameFromFilePath,\n  matchDeepDynamicRouteName,\n  matchDynamicName,\n  matchFragmentName,\n} from \"./matchers\";\nimport { PickPartial, RouteNode } from \"./Route\";\nimport { RequireContext } from \"./types\";\nimport { DefaultLayout } from \"./views/Layout\";\n\nexport function createRouteNode(\n  route: PickPartial<RouteNode, \"dynamic\" | \"children\">\n): RouteNode {\n  return {\n    children: [],\n    dynamic: null,\n    ...route,\n  };\n}\n\ntype FileNode = Pick<RouteNode, \"contextKey\" | \"getComponent\" | \"getExtras\"> & {\n  /** Like `(tab)/index` */\n  normalizedName: string;\n};\n\ntype TreeNode = {\n  name: string;\n  children: TreeNode[];\n  parents: string[];\n  /** null when there is no file in a folder. */\n  node: FileNode | null;\n};\n\n/** Convert a flat map of file nodes into a nested tree of files. */\nfunction getRecursiveTree(files: FileNode[]): TreeNode {\n  const tree = {\n    name: \"\",\n    children: [],\n    parents: [],\n    node: null,\n  };\n\n  for (const file of files) {\n    // ['(tab)', 'settings', '[...another]']\n    const parts = file.normalizedName.split(\"/\");\n    let currentNode: TreeNode = tree;\n    for (const part of parts) {\n      const existing = currentNode.children.find((item) => item.name === part);\n      if (existing) {\n        currentNode = existing;\n      } else {\n        const newNode: TreeNode = {\n          name: part,\n          children: [],\n          parents: [...currentNode.parents, currentNode.name],\n          node: null,\n        };\n        currentNode.children.push(newNode);\n        currentNode = newNode;\n      }\n    }\n    currentNode.node = file;\n  }\n\n  return tree;\n}\n\nfunction getTreeNodesAsRouteNodes(nodes: TreeNode[]): RouteNode[] {\n  return nodes.map(treeNodeToRouteNode).filter(Boolean) as RouteNode[];\n}\n\nexport function generateDynamic(name: string) {\n  const deepDynamicName = matchDeepDynamicRouteName(name);\n  const dynamicName = deepDynamicName ?? matchDynamicName(name);\n\n  return dynamicName ? { name: dynamicName, deep: !!deepDynamicName } : null;\n}\n\nfunction treeNodeToRouteNode({\n  name,\n  node,\n  parents,\n  children,\n}: TreeNode): RouteNode | null {\n  const dynamic = generateDynamic(name);\n\n  if (node) {\n    return createRouteNode({\n      route: name,\n      getExtras: node.getExtras,\n      getComponent: node.getComponent,\n      contextKey: node.contextKey,\n      children: getTreeNodesAsRouteNodes(children),\n      dynamic,\n    });\n  }\n\n  // Empty folder, skip it.\n  if (!children.length) {\n    return null;\n  }\n\n  // When there's a directory, but no sibling file with the same name, the directory won't work.\n  // This ensures that we have a file for every directory (containing valid children).\n  return createRouteNode({\n    route: name,\n    generated: true,\n    getExtras: () => ({}),\n    getComponent: () => DefaultLayout,\n    // Generate a fake file name for the directory\n    contextKey: [\".\", ...parents, name + \".tsx\"].filter(Boolean).join(\"/\"),\n    children: getTreeNodesAsRouteNodes(children),\n    dynamic,\n  });\n}\n\nfunction contextModuleToFileNodes(contextModule: RequireContext): FileNode[] {\n  const nodes = contextModule.keys().map((key) => {\n    // In development, check if the file exports a default component\n    // this helps keep things snappy when creating files. In production we load all screens lazily.\n    try {\n      if (!contextModule(key)?.default) {\n        return null;\n      }\n    } catch (error) {\n      // Probably this won't stop metro from freaking out but it's worth a try.\n      console.warn('Error loading route \"' + key + '\"', error);\n      return null;\n    }\n\n    const node: FileNode = {\n      normalizedName: getNameFromFilePath(key),\n      getComponent() {\n        return contextModule(key).default;\n      },\n      contextKey: key,\n      getExtras() {\n        const { default: mod, ...extras } = contextModule(key);\n        return extras;\n      },\n    };\n\n    return node;\n  });\n\n  return nodes.filter(Boolean) as FileNode[];\n}\n\n/** Given a Metro context module, return an array of nested routes. */\nexport function getRoutes(contextModule: RequireContext): RouteNode[] {\n  const files = contextModuleToFileNodes(contextModule);\n  const treeNodes = getRecursiveTree(files).children;\n  const routes = getTreeNodesAsRouteNodes(treeNodes);\n\n  if (process.env.NODE_ENV !== \"production\") {\n    appendDirectoryRoute(routes);\n  }\n\n  // Auto add not found route if it doesn't exist\n  appendUnmatchedRoute(routes);\n\n  return routes;\n}\n\nfunction appendDirectoryRoute(routes: RouteNode[]) {\n  if (!routes.length) {\n    return routes;\n  }\n  const { Directory, getNavOptions } = require(\"./views/Directory\");\n  routes.push(\n    createRouteNode({\n      getComponent() {\n        return Directory;\n      },\n      getExtras() {\n        return { getNavOptions };\n      },\n      route: \"__index\",\n      contextKey: \"./__index.tsx\",\n      generated: true,\n      internal: true,\n    })\n  );\n  return routes;\n}\n\nfunction appendUnmatchedRoute(routes: RouteNode[]) {\n  // Auto add not found route if it doesn't exist\n  const userDefinedDynamicRoute = getUserDefinedDeepDynamicRoute(routes);\n  if (!userDefinedDynamicRoute) {\n    routes.push(\n      createRouteNode({\n        getComponent() {\n          return require(\"./views/Unmatched\").Unmatched;\n        },\n        getExtras() {\n          return {};\n        },\n        route: \"[...404]\",\n        contextKey: \"./[...404].tsx\",\n        dynamic: { name: \"404\", deep: true },\n        generated: true,\n        internal: true,\n      })\n    );\n  }\n  return routes;\n}\n\n/**\n * Exposed for testing.\n * @returns a top-level deep dynamic route if it exists, otherwise null.\n */\nexport function getUserDefinedDeepDynamicRoute(\n  routes: RouteNode[]\n): RouteNode | null {\n  // Auto add not found route if it doesn't exist\n  for (const route of routes) {\n    const isDeepDynamic = matchDeepDynamicRouteName(route.route);\n    if (isDeepDynamic) {\n      return route;\n    }\n    // Recurse through fragment routes\n    if (matchFragmentName(route.route)) {\n      const child = getUserDefinedDeepDynamicRoute(route.children);\n      if (child) {\n        return child;\n      }\n    }\n  }\n  return null;\n}\n"]}

package/build/onboard/Tutorial.js

@@ -111,7 +111,7 @@ const styles = StyleSheet.create({
     container: {
         flex: 1,
         padding: 24,
-        alignItems: "start",
+        alignItems: "flex-start",
         justifyContent: "center",
     },
     title: {
@@ -133,7 +133,7 @@ const styles = StyleSheet.create({
     subtitle: {
         color: "#BCC3CD",
         fontSize: 36,
-        fontWeight: "light",
+        fontWeight: "100",
         paddingBottom: 36,
         maxWidth: 960,
     },

package/build/onboard/Tutorial.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tutorial.js","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from \"react\";\nimport { SafeAreaView, StatusBar, Platform } from \"react-native\";\nimport { View, Text, Pressable, StyleSheet } from \"@bacons/react-views\";\nimport { createEntryFileAsync } from \"./createEntryFile\";\n\n// TODO: Use openLinkFromBrowser thing\nfunction Header() {\n  return (\n    <Pressable>\n      {({ hovered }) => (\n        <Text\n          accessibilityRole=\"header\"\n          accessibilityLevel={1}\n          style={[styles.title, Platform.OS !== \"web\" && { textAlign: \"left\" }]}\n        >\n          Welcome to{\" \"}\n          <Text\n            href=\"https://github.com/expo/expo-router/\"\n            style={[\n              hovered && {\n                textDecorationColor: \"white\",\n                textDecorationLine: \"underline\",\n              },\n            ]}\n          >\n            Expo\n          </Text>\n        </Text>\n      )}\n    </Pressable>\n  );\n}\n\nconst canAutoTouchFile = process.env.EXPO_ROUTER_APP_ROOT != null;\n\nexport function Tutorial() {\n  React.useEffect(() => {\n    if (Platform.OS === \"web\") {\n      // Reset the route on web so the initial route isn't a 404 after\n      // the user has created the entry file.\n      // This is useful for cases where you are testing the tutorial.\n      // To test: touch the new file, then navigate to a missing route `/foobar`, then delete the app folder.\n      // you should see the tutorial again and be able to create the entry file once more.\n      if (typeof location !== \"undefined\" && location.pathname !== \"/\") {\n        location.replace(\"/\");\n      }\n      if (\n        typeof window !== \"undefined\" &&\n        typeof window.document !== \"undefined\"\n      ) {\n        window.document.title = \"npx expo start\";\n      }\n    }\n  }, []);\n\n  return (\n    <View\n      style={{\n        backgroundColor: \"black\",\n        flex: 1,\n        backgroundImage:\n          \"radial-gradient(circle at 1px 1px, rgba(255,255,255,0.15) 1px, transparent 0)\",\n        backgroundPosition: \"-3px -3px\",\n        backgroundSize: \"40px 40px\",\n      }}\n    >\n      <StatusBar barStyle=\"light-content\" />\n\n      <SafeAreaView\n        style={{\n          flex: 1,\n          maxWidth: 960,\n          marginHorizontal: \"auto\",\n          alignItems: \"stretch\",\n        }}\n      >\n        <View style={styles.container}>\n          <Header />\n          <Text\n            accessibilityRole=\"header\"\n            accessibilityLevel={2}\n            style={styles.subtitle}\n          >\n            Get started by creating a file{\"\\n\"}in the{\" \"}\n            <Text style={{ fontWeight: \"bold\" }}>app</Text> directory{\"\\n\"}that\n            exports a React component.\n          </Text>\n          {canAutoTouchFile && <Button />}\n        </View>\n      </SafeAreaView>\n    </View>\n  );\n}\n\nfunction Button() {\n  return (\n    <Pressable\n      onPress={() => {\n        createEntryFileAsync();\n      }}\n      style={{\n        ...Platform.select({\n          native: {\n            position: \"absolute\",\n            bottom: 24,\n            left: 24,\n            right: 24,\n            overflow: \"hidden\",\n          },\n        }),\n      }}\n    >\n      {({ pressed, hovered }) => (\n        <View\n          style={[\n            {\n              transitionDuration: \"200ms\",\n              backgroundColor: Platform.select({\n                web: \"transparent\",\n                default: \"white\",\n              }),\n\n              borderColor: \"white\",\n              borderWidth: 2,\n              paddingVertical: 12,\n              paddingHorizontal: 24,\n            },\n            hovered && {\n              backgroundColor: \"white\",\n            },\n            pressed && {\n              backgroundColor: \"rgba(255,255,255,0.7)\",\n            },\n          ]}\n        >\n          <Text\n            selectable={false}\n            style={[\n              {\n                fontSize: 18,\n                transitionDuration: \"200ms\",\n                fontWeight: \"bold\",\n                color: Platform.select({\n                  web: \"white\",\n                  default: \"black\",\n                }),\n              },\n              styles.code,\n              hovered && { color: \"black\" },\n            ]}\n          >\n            <Text style={{ color: \"#BCC3CD\" }}>$</Text> touch app/index.js\n          </Text>\n        </View>\n      )}\n    </Pressable>\n  );\n}\n\nconst styles = StyleSheet.create({\n  container: {\n    flex: 1,\n    padding: 24,\n    alignItems: \"start\",\n    justifyContent: \"center\",\n  },\n  title: {\n    color: \"white\",\n    fontSize: 64,\n    paddingBottom: 24,\n    fontWeight: \"bold\",\n  },\n  buttonText: {\n    color: \"black\",\n  },\n  code: {\n    fontFamily: Platform.select({\n      default: \"Courier\",\n      ios: \"Courier New\",\n      android: \"monospace\",\n    }),\n  },\n  subtitle: {\n    color: \"#BCC3CD\",\n    fontSize: 36,\n    fontWeight: \"light\",\n    paddingBottom: 36,\n    maxWidth: 960,\n  },\n});\n"]}
+{"version":3,"file":"Tutorial.js","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from \"react\";\nimport { SafeAreaView, StatusBar, Platform } from \"react-native\";\nimport { View, Text, Pressable, StyleSheet } from \"@bacons/react-views\";\nimport { createEntryFileAsync } from \"./createEntryFile\";\n\n// TODO: Use openLinkFromBrowser thing\nfunction Header() {\n  return (\n    <Pressable>\n      {({ hovered }) => (\n        <Text\n          accessibilityRole=\"header\"\n          accessibilityLevel={1}\n          style={[styles.title, Platform.OS !== \"web\" && { textAlign: \"left\" }]}\n        >\n          Welcome to{\" \"}\n          <Text\n            href=\"https://github.com/expo/expo-router/\"\n            style={[\n              hovered && {\n                textDecorationColor: \"white\",\n                textDecorationLine: \"underline\",\n              },\n            ]}\n          >\n            Expo\n          </Text>\n        </Text>\n      )}\n    </Pressable>\n  );\n}\n\nconst canAutoTouchFile = process.env.EXPO_ROUTER_APP_ROOT != null;\n\nexport function Tutorial() {\n  React.useEffect(() => {\n    if (Platform.OS === \"web\") {\n      // Reset the route on web so the initial route isn't a 404 after\n      // the user has created the entry file.\n      // This is useful for cases where you are testing the tutorial.\n      // To test: touch the new file, then navigate to a missing route `/foobar`, then delete the app folder.\n      // you should see the tutorial again and be able to create the entry file once more.\n      if (typeof location !== \"undefined\" && location.pathname !== \"/\") {\n        location.replace(\"/\");\n      }\n      if (\n        typeof window !== \"undefined\" &&\n        typeof window.document !== \"undefined\"\n      ) {\n        window.document.title = \"npx expo start\";\n      }\n    }\n  }, []);\n\n  return (\n    <View\n      style={{\n        backgroundColor: \"black\",\n        flex: 1,\n        backgroundImage:\n          \"radial-gradient(circle at 1px 1px, rgba(255,255,255,0.15) 1px, transparent 0)\",\n        backgroundPosition: \"-3px -3px\",\n        backgroundSize: \"40px 40px\",\n      }}\n    >\n      <StatusBar barStyle=\"light-content\" />\n\n      <SafeAreaView\n        style={{\n          flex: 1,\n          maxWidth: 960,\n          marginHorizontal: \"auto\",\n          alignItems: \"stretch\",\n        }}\n      >\n        <View style={styles.container}>\n          <Header />\n          <Text\n            accessibilityRole=\"header\"\n            accessibilityLevel={2}\n            style={styles.subtitle}\n          >\n            Get started by creating a file{\"\\n\"}in the{\" \"}\n            <Text style={{ fontWeight: \"bold\" }}>app</Text> directory{\"\\n\"}that\n            exports a React component.\n          </Text>\n          {canAutoTouchFile && <Button />}\n        </View>\n      </SafeAreaView>\n    </View>\n  );\n}\n\nfunction Button() {\n  return (\n    <Pressable\n      onPress={() => {\n        createEntryFileAsync();\n      }}\n      style={{\n        ...Platform.select({\n          native: {\n            position: \"absolute\",\n            bottom: 24,\n            left: 24,\n            right: 24,\n            overflow: \"hidden\",\n          },\n        }),\n      }}\n    >\n      {({ pressed, hovered }) => (\n        <View\n          style={[\n            {\n              transitionDuration: \"200ms\",\n              backgroundColor: Platform.select({\n                web: \"transparent\",\n                default: \"white\",\n              }),\n\n              borderColor: \"white\",\n              borderWidth: 2,\n              paddingVertical: 12,\n              paddingHorizontal: 24,\n            },\n            hovered && {\n              backgroundColor: \"white\",\n            },\n            pressed && {\n              backgroundColor: \"rgba(255,255,255,0.7)\",\n            },\n          ]}\n        >\n          <Text\n            selectable={false}\n            style={[\n              {\n                fontSize: 18,\n                transitionDuration: \"200ms\",\n                fontWeight: \"bold\",\n                color: Platform.select({\n                  web: \"white\",\n                  default: \"black\",\n                }),\n              },\n              styles.code,\n              hovered && { color: \"black\" },\n            ]}\n          >\n            <Text style={{ color: \"#BCC3CD\" }}>$</Text> touch app/index.js\n          </Text>\n        </View>\n      )}\n    </Pressable>\n  );\n}\n\nconst styles = StyleSheet.create({\n  container: {\n    flex: 1,\n    padding: 24,\n    alignItems: \"flex-start\",\n    justifyContent: \"center\",\n  },\n  title: {\n    color: \"white\",\n    fontSize: 64,\n    paddingBottom: 24,\n    fontWeight: \"bold\",\n  },\n  buttonText: {\n    color: \"black\",\n  },\n  code: {\n    fontFamily: Platform.select({\n      default: \"Courier\",\n      ios: \"Courier New\",\n      android: \"monospace\",\n    }),\n  },\n  subtitle: {\n    color: \"#BCC3CD\",\n    fontSize: 36,\n    fontWeight: \"100\",\n    paddingBottom: 36,\n    maxWidth: 960,\n  },\n});\n"]}

package/build/views/Layout.d.ts

@@ -1,16 +1,17 @@
-import { RouterFactory, useNavigationBuilder } from '@react-navigation/native';
-import * as React from 'react';
+import { RouterFactory, useNavigationBuilder } from "@react-navigation/native";
+import * as React from "react";
 export declare const LayoutContext: React.Context<{
     contextKey: string;
+    pathname: string;
     state: any;
     navigation: any;
     descriptors: any;
     router: RouterFactory<any, any, any>;
 } | null>;
 export declare type LayoutProps = {
-    initialRouteName?: Parameters<typeof useNavigationBuilder>[1]['initialRouteName'];
-    screenOptions?: Parameters<typeof useNavigationBuilder>[1]['screenOptions'];
-    children?: Parameters<typeof useNavigationBuilder>[1]['children'];
+    initialRouteName?: Parameters<typeof useNavigationBuilder>[1]["initialRouteName"];
+    screenOptions?: Parameters<typeof useNavigationBuilder>[1]["screenOptions"];
+    children?: Parameters<typeof useNavigationBuilder>[1]["children"];
     router?: Parameters<typeof useNavigationBuilder>[0];
 };
 /** An unstyled custom navigator. Good for basic web layouts */
@@ -21,6 +22,7 @@ export declare namespace Layout {
 }
 export declare function useLayoutContext(): {
     contextKey: string;
+    pathname: string;
     state: any;
     navigation: any;
     descriptors: any;
@@ -28,7 +30,7 @@ export declare function useLayoutContext(): {
 };
 export declare function useChild(): any;
 /** Renders the currently selected content. */
-export declare function Children(props: Omit<LayoutProps, 'children'>): any;
+export declare function Children(props: Omit<LayoutProps, "children">): any;
 export declare function TrustedChildren(): any;
 export declare function DefaultLayout(): JSX.Element;
 //# sourceMappingURL=Layout.d.ts.map

package/build/views/Layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layout.d.ts","sourceRoot":"","sources":["../../src/views/Layout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,eAAO,MAAM,aAAa;gBAAqC,MAAM;WAAS,GAAG;gBAAc,GAAG;iBAAe,GAAG;YAAU,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SAAgB,CAAC;AAM3K,oBAAY,WAAW,GAAG;IACtB,gBAAgB,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAClF,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IAC5E,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;CACvD,CAAA;AAED,+DAA+D;AAC/D,wBAAgB,MAAM,CAAC,EACnB,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,MAAoB,GACvB,EAAE,WAAW,eAgBb;yBArBe,MAAM;;;;AAuBtB,wBAAgB,gBAAgB;;;;;;EAQ/B;AAED,wBAAgB,QAAQ,QAcvB;AAED,8CAA8C;AAC9C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,OAc5D;AAED,wBAAgB,eAAe,QAE9B;AAED,wBAAgB,aAAa,gBAE5B"}
+{"version":3,"file":"Layout.d.ts","sourceRoot":"","sources":["../../src/views/Layout.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,eAAO,MAAM,aAAa;gBACZ,MAAM;cACR,MAAM;WACT,GAAG;gBACE,GAAG;iBACF,GAAG;YACR,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACvB,CAAC;AAMhB,oBAAY,WAAW,GAAG;IACxB,gBAAgB,CAAC,EAAE,UAAU,CAC3B,OAAO,oBAAoB,CAC5B,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;IACzB,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IAC5E,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,+DAA+D;AAC/D,wBAAgB,MAAM,CAAC,EACrB,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,MAAoB,GACrB,EAAE,WAAW,eA2Bb;yBAhCe,MAAM;;;;AAkCtB,wBAAgB,gBAAgB;;;;;;;EAM/B;AAED,wBAAgB,QAAQ,QAcvB;AAED,8CAA8C;AAC9C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,OAc5D;AAED,wBAAgB,eAAe,QAE9B;AAED,wBAAgB,aAAa,gBAM5B"}

package/build/views/Layout.js

@@ -1,7 +1,7 @@
-import { StackRouter, useNavigationBuilder } from '@react-navigation/native';
-import * as React from 'react';
-import { useContextKey } from '../Route';
-import { useScreens } from '../useScreens';
+import { StackRouter, useNavigationBuilder, } from "@react-navigation/native";
+import * as React from "react";
+import { useContextKey } from "../Route";
+import { useScreens } from "../useScreens";
 // TODO: This might already exist upstream, maybe something like `useCurrentRender` ?
 export const LayoutContext = React.createContext(null);
 if (process.env.NODE_ENV !== "production") {
@@ -16,7 +16,15 @@ export function Layout({ initialRouteName, screenOptions, children, router = Sta
         screenOptions,
         initialRouteName,
     });
-    return (React.createElement(LayoutContext.Provider, { value: { contextKey, state, navigation, descriptors, router } },
+    const selected = state?.routes[state.index]?.name;
+    return (React.createElement(LayoutContext.Provider, { value: {
+            pathname: selected ?? "",
+            contextKey,
+            state,
+            navigation,
+            descriptors,
+            router,
+        } },
         React.createElement(NavigationContent, null, children)));
 }
 export function useLayoutContext() {
@@ -53,8 +61,8 @@ export function TrustedChildren() {
     return useChild();
 }
 export function DefaultLayout() {
-    return React.createElement(Layout, null,
-        React.createElement(TrustedChildren, null));
+    return (React.createElement(Layout, null,
+        React.createElement(TrustedChildren, null)));
 }
 Layout.Children = Children;
 Layout.useContext = useLayoutContext;

package/build/views/Layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"Layout.js","sourceRoot":"","sources":["../../src/views/Layout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,WAAW,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qFAAqF;AACrF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAqH,IAAI,CAAC,CAAC;AAE3K,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;IACvC,aAAa,CAAC,WAAW,GAAG,eAAe,CAAC;CAC/C;AASD,+DAA+D;AAC/D,MAAM,UAAU,MAAM,CAAC,EACnB,gBAAgB,EAChB,aAAa,EACb,QAAQ,EACR,MAAM,GAAG,WAAW,GACV;IACV,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAClC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAE7B,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,GACvD,oBAAoB,CAAC,MAAM,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,aAAa;QACb,gBAAgB;KACnB,CAAC,CAAC;IAEP,OAAO,CACH,oBAAC,aAAa,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;QACjF,oBAAC,iBAAiB,QAAE,QAAQ,CAAqB,CAC5B,CAC5B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE;QACV,MAAM,IAAI,KAAK,CACX,mDAAmD,CACtD,CAAC;KACL;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,QAAQ;IACpB,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;IAEnC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEvC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC3C,OAAO,KAAK,CAAC,KAAK,KAAK,CAAC,CAAA;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,IAAI,CAAC;KACf;IAED,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC;AACtD,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,QAAQ,CAAC,KAAoC;IACzD,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAChD,mDAAmD;IACnD,IAAI,OAAO,EAAE,UAAU,KAAK,UAAU,EAAE;QACpC,qCAAqC;QACrC,OAAO,CACH,oBAAC,MAAM,OAAK,KAAK;YACb,oBAAC,eAAe,OAAG,CACd,CACZ,CAAC;KACL;IAED,OAAO,QAAQ,EAAE,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,eAAe;IAC3B,OAAO,QAAQ,EAAE,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,aAAa;IACzB,OAAO,oBAAC,MAAM;QAAC,oBAAC,eAAe,OAAG,CAAS,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;AAC3B,MAAM,CAAC,UAAU,GAAG,gBAAgB,CAAC","sourcesContent":["import { RouterFactory, StackRouter, useNavigationBuilder } from '@react-navigation/native';\nimport * as React from 'react';\n\nimport { useContextKey } from '../Route';\nimport { useScreens } from '../useScreens';\n\n// TODO: This might already exist upstream, maybe something like `useCurrentRender` ?\nexport const LayoutContext = React.createContext<{ contextKey: string; state: any; navigation: any; descriptors: any; router: RouterFactory<any, any, any> } | null>(null);\n\nif (process.env.NODE_ENV !== \"production\") {\n    LayoutContext.displayName = \"LayoutContext\";\n}\n\nexport type LayoutProps = {\n    initialRouteName?: Parameters<typeof useNavigationBuilder>[1]['initialRouteName'];\n    screenOptions?: Parameters<typeof useNavigationBuilder>[1]['screenOptions'];\n    children?: Parameters<typeof useNavigationBuilder>[1]['children'];\n    router?: Parameters<typeof useNavigationBuilder>[0];\n}\n\n/** An unstyled custom navigator. Good for basic web layouts */\nexport function Layout({\n    initialRouteName,\n    screenOptions,\n    children,\n    router = StackRouter,\n}: LayoutProps) {\n    const contextKey = useContextKey()\n    const screens = useScreens();\n\n    const { state, navigation, descriptors, NavigationContent } =\n        useNavigationBuilder(router, {\n            children: screens,\n            screenOptions,\n            initialRouteName,\n        });\n\n    return (\n        <LayoutContext.Provider value={{ contextKey, state, navigation, descriptors, router }}>\n            <NavigationContent>{children}</NavigationContent>\n        </LayoutContext.Provider>\n    );\n}\n\nexport function useLayoutContext() {\n    const context = React.useContext(LayoutContext);\n    if (!context) {\n        throw new Error(\n            \"useLayoutContext must be used within a <Layout />\"\n        );\n    }\n    return context;\n}\n\nexport function useChild() {\n    const context = useLayoutContext();\n\n    const { state, descriptors } = context;\n\n    const current = state.routes.find((route, i) => {\n        return state.index === i\n    });\n\n    if (!current) {\n        return null;\n    }\n\n    return descriptors[current.key]?.render() ?? null;\n}\n\n/** Renders the currently selected content. */\nexport function Children(props: Omit<LayoutProps, 'children'>) {\n    const contextKey = useContextKey()\n    const context = React.useContext(LayoutContext);\n    // Ensure the context is for the current contextKey\n    if (context?.contextKey !== contextKey) {\n        // Qualify the content and re-export.\n        return (\n            <Layout {...props}>\n                <TrustedChildren />\n            </Layout>\n        );\n    }\n\n    return useChild();\n}\n\nexport function TrustedChildren() {\n    return useChild();\n}\n\nexport function DefaultLayout() {\n    return <Layout><TrustedChildren /></Layout>;\n}\n\nLayout.Children = Children;\nLayout.useContext = useLayoutContext;\n"]}
+{"version":3,"file":"Layout.js","sourceRoot":"","sources":["../../src/views/Layout.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n  RouterFactory,\n  StackRouter,\n  useNavigationBuilder,\n} from \"@react-navigation/native\";\nimport * as React from \"react\";\n\nimport { useContextKey } from \"../Route\";\nimport { useScreens } from \"../useScreens\";\n\n// TODO: This might already exist upstream, maybe something like `useCurrentRender` ?\nexport const LayoutContext = React.createContext<{\n  contextKey: string;\n  pathname: string;\n  state: any;\n  navigation: any;\n  descriptors: any;\n  router: RouterFactory<any, any, any>;\n} | null>(null);\n\nif (process.env.NODE_ENV !== \"production\") {\n  LayoutContext.displayName = \"LayoutContext\";\n}\n\nexport type LayoutProps = {\n  initialRouteName?: Parameters<\n    typeof useNavigationBuilder\n  >[1][\"initialRouteName\"];\n  screenOptions?: Parameters<typeof useNavigationBuilder>[1][\"screenOptions\"];\n  children?: Parameters<typeof useNavigationBuilder>[1][\"children\"];\n  router?: Parameters<typeof useNavigationBuilder>[0];\n};\n\n/** An unstyled custom navigator. Good for basic web layouts */\nexport function Layout({\n  initialRouteName,\n  screenOptions,\n  children,\n  router = StackRouter,\n}: LayoutProps) {\n  const contextKey = useContextKey();\n  const screens = useScreens();\n\n  const { state, navigation, descriptors, NavigationContent } =\n    useNavigationBuilder(router, {\n      children: screens,\n      screenOptions,\n      initialRouteName,\n    });\n\n  const selected = state?.routes[state.index]?.name;\n\n  return (\n    <LayoutContext.Provider\n      value={{\n        pathname: selected ?? \"\",\n        contextKey,\n        state,\n        navigation,\n        descriptors,\n        router,\n      }}\n    >\n      <NavigationContent>{children}</NavigationContent>\n    </LayoutContext.Provider>\n  );\n}\n\nexport function useLayoutContext() {\n  const context = React.useContext(LayoutContext);\n  if (!context) {\n    throw new Error(\"useLayoutContext must be used within a <Layout />\");\n  }\n  return context;\n}\n\nexport function useChild() {\n  const context = useLayoutContext();\n\n  const { state, descriptors } = context;\n\n  const current = state.routes.find((route, i) => {\n    return state.index === i;\n  });\n\n  if (!current) {\n    return null;\n  }\n\n  return descriptors[current.key]?.render() ?? null;\n}\n\n/** Renders the currently selected content. */\nexport function Children(props: Omit<LayoutProps, \"children\">) {\n  const contextKey = useContextKey();\n  const context = React.useContext(LayoutContext);\n  // Ensure the context is for the current contextKey\n  if (context?.contextKey !== contextKey) {\n    // Qualify the content and re-export.\n    return (\n      <Layout {...props}>\n        <TrustedChildren />\n      </Layout>\n    );\n  }\n\n  return useChild();\n}\n\nexport function TrustedChildren() {\n  return useChild();\n}\n\nexport function DefaultLayout() {\n  return (\n    <Layout>\n      <TrustedChildren />\n    </Layout>\n  );\n}\n\nLayout.Children = Children;\nLayout.useContext = useLayoutContext;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "main": "build/index.js",
   "files": [
     "entry.js",