javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename and comments

Browse Source
This commit is contained in:
Sean Perkins
2024-07-22 11:07:41 -04:00
parent d12f35705f
commit e917e9fdf2
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/react-router/src/ReactRouter/StackManager.tsx
View File

@@ -112,7 +112,12 @@ export class StackManager extends React.PureComponent<StackManagerProps, StackMa
}
}
const enteringRoute = matchRoute(this.ionRouterOutlet?.props.children, routeInfo) as React.ReactElement;
const enteringRoute = findRouteByRouteInfo(this.ionRouterOutlet?.props.children, routeInfo) as React.ReactElement;
if (enteringRoute === undefined) {
console.warn('Could not match a route for', routeInfo, this.ionRouterOutlet?.props.children);
return;
}
if (enteringViewItem) {
enteringViewItem.reactElement = enteringRoute.props.element;
@@ -432,37 +437,38 @@ export class StackManager extends React.PureComponent<StackManagerProps, StackMa
export default StackManager;
function matchRoute(node: React.ReactNode, routeInfo: RouteInfo) {
/**
* Finds the <Route /> node matching the current route info.
* If no <Route /> can be matched, a fallback node is returned.
*/
function findRouteByRouteInfo(node: React.ReactNode, routeInfo: RouteInfo) {
let matchedNode: React.ReactNode;
let fallbackNode: React.ReactNode;
// <Route /> nodes are rendered inside of a <Routes /> node
const routesNode = findRoutesNode(node) ?? node;
React.Children.forEach(routesNode, (child: React.ReactElement) => {
// Ignore any non-<Route /> nodes
if (child.type === Route) {
const match = matchPath({
pathname: routeInfo.pathname,
componentProps: child.props,
});
if (match) {
matchedNode = child;
}
}
});
if (matchedNode) {
return matchedNode;
}
// If we haven't found a node
// try to find one that doesn't have a path or from prop, that will be our not found route
React.Children.forEach(routesNode, (child: React.ReactElement) => {
if (child.type === Route) {
if (!(child.props.path || child.props.from)) {
matchedNode = child;
// If we haven't found a node
// try to find one that doesn't have a path or from prop, that will be our not found route
fallbackNode = child;
}
}
});
return matchedNode;
return matchedNode ?? fallbackNode;
}
function matchComponent(node: React.ReactElement, pathname: string, forceExact?: boolean) {