Commited19795

committed

cleanup machine

1 parent55661c9 commited19795Copy full SHA for ed19795

File tree

3 files changed

+33

-30

lines changed

web-app/src
- components/Router
  - index.tsx
- services/state
  - actions
    - editor.ts
  - machine.ts

3 files changed

+33

-30

lines changed

`‎web-app/src/components/Router/index.tsx`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`import*asReactfrom'react'`
`2`	`2`	`import*asCRfrom'typings'`
`3`		`-import{useMachine}from'@xstate/react'`
	`3`	`+import{useMachine}from'../../services/xstate-react'`
`4`	`4`	`importmachinefrom'../../services/state/machine'`
`5`	`5`
`6`	`6`	`importRoutefrom'./Route'`
`7`	`7`	`importdebuggerWrapperfrom'../Debugger/debuggerWrapper'`
`8`	`8`	`importchannelfrom'../../services/channel'`
`9`	`9`	`importmessageBusReceiverfrom'../../services/channel/receiver'`
	`10`	`+importactionsfrom'../../services/state/actions'`
	`11`	`+importguardsfrom'../../services/state/guards'`
	`12`	`+`
`10`	`13`
`11`	`14`	`interfaceProps{`
`12`	`15`	`children:any`
`@@ -20,11 +23,13 @@ interface CloneElementProps {`
`20`	`23`	`// router finds first state match of <Route path='' />`
`21`	`24`	`constRouter=({ children}:Props):React.ReactElement<CloneElementProps>\|null=>{`
`22`	`25`	`const[state,send]=useMachine(machine,{`
`23`		`-logger:console.log.bind('XSTATE:')`
	`26`	`+actions,`
	`27`	`+guards,`
	`28`	`+interpreterOptions:{`
	`29`	`+logger:console.log.bind('XSTATE:')`
	`30`	`+}`
`24`	`31`	`})`
`25`	`32`
`26`		`-console.log('state',state)`
`27`		`-`
`28`	`33`	`channel.setMachineSend(send)`
`29`	`34`
`30`	`35`	`// event bus listener`

`‎web-app/src/services/state/actions/editor.ts`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,14 @@ export default {`
`36`	`36`	`stepId,`
`37`	`37`	`}`
`38`	`38`	`})`
`39`		`-}`
	`39`	`+},`
	`40`	`+loadLevel():void{`
	`41`	`+// load step actions`
	`42`	`+},`
	`43`	`+loadStage():void{`
	`44`	`+// load step actions`
	`45`	`+},`
	`46`	`+loadStep():void{`
	`47`	`+// load step actions`
	`48`	`+},`
`40`	`49`	`}`

`‎web-app/src/services/state/machine.ts`

Lines changed: 14 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`import{Machine}from'xstate'`
`2`	`2`	`import*asCRfrom'typings'`
`3`	`3`
`4`		`-importactionsfrom'./actions'`
`5`		`-importguardsfrom'./guards'`
`6`		`-`
`7`	`4`	`exportconstmachine=Machine<CR.MachineContext,CR.MachineStateSchema,CR.MachineEvent>(`
`8`	`5`	`{`
`9`	`6`	`id:'root',`
`@@ -69,26 +66,22 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`69`	`66`	`},`
`70`	`67`	`LoadNext:{`
`71`	`68`	`id:'tutorial-load-next',`
`72`		`-after:{`
`73`		`-0:[{`
	`69`	`+onEntry:['loadNext'],`
	`70`	`+on:{`
	`71`	`+NEXT_STEP:{`
`74`	`72`	`target:'Stage',`
`75`		`-cond:'hasNextStep',`
	`73`	`+actions:['updatePosition']`
`76`	`74`	`},`
`77`		`-{`
	`75`	`+NEXT_STAGE:{`
`78`	`76`	`target:'Stage',`
`79`		`-cond:'hasNextStage',`
`80`		`-actions:['updateStagePosition']`
	`77`	`+actions:['updatePosition']`
`81`	`78`	`},`
`82`		`-{`
	`79`	`+NEXT_LEVEL:{`
`83`	`80`	`target:'Level',`
`84`		`-cond:'hasNextLevel',`
`85`		`-actions:['updateLevelPosition']`
`86`		`-},`
`87`		`-{`
`88`		`-target:'#completed-tutorial',`
	`81`	`+actions:['updatePosition']`
`89`	`82`	`},`
`90`		`-],`
`91`		`-},`
	`83`	`+COMPLETED:'#completed-tutorial'`
	`84`	`+}`
`92`	`85`	`},`
`93`	`86`
`94`	`87`	`Summary:{`
`@@ -107,7 +100,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`107`	`100`	`},`
`108`	`101`	`},`
`109`	`102`	`Stage:{`
`110`		`-onEntry:['loadStage','stepLoadCommits'],`
	`103`	`+onEntry:['loadStage'],`
`111`	`104`	`initial:'Normal',`
`112`	`105`	`states:{`
`113`	`106`	`Normal:{`
`@@ -126,6 +119,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`126`	`119`	`on:{`
`127`	`120`	`TEST_PASS:{`
`128`	`121`	`target:'TestPass',`
	`122`	`+// TODO: combine updateStepProgress & updateStepPosition`
`129`	`123`	`actions:['updateStepProgress']`
`130`	`124`	`},`
`131`	`125`	`TEST_FAIL:'TestFail',`
`@@ -149,7 +143,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`149`	`143`	`{`
`150`	`144`	`target:'Normal',`
`151`	`145`	`cond:'hasNextStep',`
`152`		`-actions:['stepLoadCommits'],`
	`146`	`+actions:['loadStep'],`
`153`	`147`	`},`
`154`	`148`	`{`
`155`	`149`	`target:'StageComplete',`
`@@ -177,12 +171,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`177`	`171`	`},`
`178`	`172`	`},`
`179`	`173`	`},`
`180`		`-},`
`181`		`-{`
`182`		`-actions,`
`183`		`-guards,`
`184`		`-activities:{},`
`185`		`-},`
	`174`	`+}`
`186`	`175`	`)`
`187`	`176`
`188`	`177`	`exportdefaultmachine`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commited19795

File tree

3 files changed

3 files changed

`‎web-app/src/components/Router/index.tsx`

`‎web-app/src/services/state/actions/editor.ts`

`‎web-app/src/services/state/machine.ts`

0 commit comments