Commitce08fa6

committed

fix router edge case

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent4de3c42 commitce08fa6Copy full SHA for ce08fa6

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@ import SelectTutorialPage from './containers/SelectTutorial'`
`8`	`8`	`importCompletedPagefrom'./containers/Tutorial/CompletedPage'`
`9`	`9`	`importTutorialPagefrom'./containers/Tutorial'`
`10`	`10`
	`11`	`+/*`
	`12`	`+ * NOTE: due to a lack of URLs and a dependency on xstate`
	`13`	`+ * we have to implement a custom router here`
	`14`	`+ */`
`11`	`15`	`constRoutes=()=>{`
`12`	`16`	`const{ context, route, send}=useStateMachine()`
`13`	`17`
`@@ -35,7 +39,7 @@ const Routes = () => {`
`35`	`39`	`<Routepaths={{Tutorial:{Level:{Load:true}}}}>`
`36`	`40`	`<LoadingPagetext="Loading Level..."processes={context.processes}/>`
`37`	`41`	`</Route>`
`38`		`-<Routepaths={{Tutorial:{LoadNext:true,Level:true}}}>`
	`42`	`+<Routepaths={{Tutorial:{Level:true}}}>`
`39`	`43`	`<TutorialPagesend={send}context={context}/>`
`40`	`44`	`</Route>`
`41`	`45`	`{/* Completed */}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ const matches = (route: string, paths: object): boolean => {`
`15`	`15`	`for(constkeyofkeys){`
`16`	`16`	`constnext=current[key]`
`17`	`17`	`if(next){`
	`18`	`+// exit early if property value is true`
	`19`	`+if(next===true){`
	`20`	`+returntrue`
	`21`	`+}`
`18`	`22`	`current=next`
`19`	`23`	`continue`
`20`	`24`	`}else{`

Comments

(0)