javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 16:16:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove extra typescript dependency (#28220)

Browse Source
This commit is contained in:
Liam DeBeasi
2023-09-26 09:01:53 -04:00
committed by GitHub
parent 0b7f6cf573
commit d0d9e35c37
10 changed files with 320 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/router/router.tsx
View File

@ -312,6 +312,7 @@ export class Router implements ComponentInterface {
const routes = readRoutes(this.el);
const fromChain = findChainForSegments(from, routes);
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
const beforeLeaveHook = fromChain && fromChain[fromChain.length - 1].beforeLeave;
const canLeave = beforeLeaveHook ? await beforeLeaveHook() : true;
@ -320,6 +321,7 @@ export class Router implements ComponentInterface {
}
const toChain = findChainForSegments(to, routes);
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
const beforeEnterHook = toChain && toChain[toChain.length - 1].beforeEnter;
return beforeEnterHook ? beforeEnterHook() : true;

1
core/src/components/router/utils/path.ts
View File

@ -48,6 +48,7 @@ export const chainToSegments = (chain: RouteChain): string[] | null => {
for (const route of chain) {
for (const segment of route.segments) {
if (segment[0] === ':') {
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
const param = route.params && route.params[segment.slice(1)];
if (!param) {
return null;