Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit79b1085

Browse files
committed
fix typings for ts 3.8
1 parent7155988 commit79b1085

File tree

4 files changed

+39
-38
lines changed

4 files changed

+39
-38
lines changed

‎web-app/src/components/StepHelp/index.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import{Balloon}from'@alifd/next'
22
import*asReactfrom'react'
3-
import{css,jsx}from'@emotion/core'
4-
importIconfrom'../Icon'
53
importButtonfrom'../Button'
4+
importIconfrom'../Icon'
65

76
conststyles={
87
iconButton:{
@@ -31,7 +30,7 @@ interface Props {
3130
constStepHelp=(props:Props)=>{
3231
const[visible,setVisible]=React.useState(false)
3332
// TODO extract or replace load solution
34-
const[loadedSolution,setLoadedSolution]=React.useState()
33+
const[loadedSolution,setLoadedSolution]=React.useState(false)
3534
constonClickHandler=()=>{
3635
if(!loadedSolution){
3736
setLoadedSolution(true)

‎web-app/src/services/state/actions/command.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ import * as T from 'typings'
22
import{assign}from'xstate'
33

44
exportdefault{
5-
//@ts-ignore
65
commandStart:assign({
7-
processes:({ processes}:T.MachineContext,event:T.MachineEvent):T.ProcessEvent[]=>{
8-
const{ process}=event.payload
6+
processes:(context:T.MachineContext,event:T.MachineEvent):any=>{
7+
letprocesses:T.ProcessEvent[]=context.processes
8+
constprocess:T.ProcessEvent=event.payload.process
99
constisRunning=processes.find(p=>p.title===process.title)
1010
if(!isRunning){
1111
processes=processes.concat(process)
1212
}
1313
returnprocesses
1414
},
1515
}),
16-
//@ts-ignore
1716
commandSuccess:assign({
18-
processes:({ processes}:T.MachineContext,event:T.MachineEvent):T.ProcessEvent[]=>{
19-
const{ process}=event.payload
17+
processes:(context:T.MachineContext,event:T.MachineEvent):any=>{
18+
constprocesses:T.ProcessEvent[]=context.processes
19+
constprocess:T.ProcessEvent=event.payload.process
2020
returnprocesses.filter(p=>p.title!==process.title)
2121
},
2222
}),
23-
//@ts-ignore
2423
commandFail:assign({
25-
processes:({ processes}:T.MachineContext,event:T.MachineEvent):T.ProcessEvent[]=>{
26-
const{ process}=event.payload
24+
processes:(context:T.MachineContext,event:T.MachineEvent):any=>{
25+
constprocesses:T.ProcessEvent[]=context.processes
26+
constprocess:T.ProcessEvent=event.payload.process
2727
returnprocesses.filter(p=>p.title!==process.title)
2828
},
2929
}),

‎web-app/src/services/state/actions/context.ts‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import*asCRfrom'typings'
1+
import*asTfrom'typings'
22
import*asGfrom'typings/graphql'
33
import{assign,send,ActionFunctionMap}from'xstate'
44
import*asselectorsfrom'../../selectors'
55
importonErrorfrom'../../../services/sentry/onError'
66

7-
constcontextActions:ActionFunctionMap<CR.MachineContext,CR.MachineEvent>={
7+
constcontextActions:ActionFunctionMap<T.MachineContext,T.MachineEvent>={
88
//@ts-ignore
99
setEnv:assign({
10-
env:(context:CR.MachineContext,event:CR.MachineEvent)=>{
10+
env:(context:T.MachineContext,event:T.MachineEvent)=>{
1111
return{
1212
...context.env,
1313
...event.payload.env,
@@ -16,35 +16,35 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
1616
}),
1717
//@ts-ignore
1818
continueTutorial:assign({
19-
tutorial:(context:CR.MachineContext,event:CR.MachineEvent)=>{
19+
tutorial:(context:T.MachineContext,event:T.MachineEvent)=>{
2020
returnevent.payload.tutorial
2121
},
22-
progress:(context:CR.MachineContext,event:CR.MachineEvent)=>{
22+
progress:(context:T.MachineContext,event:T.MachineEvent)=>{
2323
returnevent.payload.progress
2424
},
25-
position:(context:CR.MachineContext,event:CR.MachineEvent)=>{
25+
position:(context:T.MachineContext,event:T.MachineEvent)=>{
2626
returnevent.payload.position
2727
},
2828
}),
2929
//@ts-ignore
3030
selectTutorialById:assign({
31-
tutorial:(context:CR.MachineContext,event:CR.MachineEvent):any=>{
31+
tutorial:(context:T.MachineContext,event:T.MachineEvent):any=>{
3232
returnevent.payload.tutorial
3333
},
3434
}),
3535
//@ts-ignore
3636
startNewTutorial:assign({
37-
position:(context:CR.MachineContext,event:CR.MachineEvent):CR.Position=>{
38-
constposition:CR.Position=selectors.initialPosition(context)
37+
position:(context:T.MachineContext,event:T.MachineEvent):any=>{
38+
constposition:T.Position=selectors.initialPosition(context)
3939
returnposition
4040
},
41-
progress:():CR.Progress=>{
41+
progress:():T.Progress=>{
4242
return{levels:{},steps:{},complete:false}
4343
},
4444
}),
4545
//@ts-ignore
4646
updateStepPosition:assign({
47-
position:(context:CR.MachineContext,event:CR.MachineEvent):CR.Position=>{
47+
position:(context:T.MachineContext,event:T.MachineEvent):any=>{
4848
// TODO calculate from progress
4949

5050
const{ position}=context
@@ -62,7 +62,7 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
6262

6363
conststep:G.Step=steps[stepIndex+1]
6464

65-
constnextPosition:CR.Position={
65+
constnextPosition:T.Position={
6666
...position,
6767
stepId:step.id,
6868
}
@@ -72,7 +72,7 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
7272
}),
7373
//@ts-ignore
7474
updateLevelPosition:assign({
75-
position:(context:CR.MachineContext):CR.Position=>{
75+
position:(context:T.MachineContext):any=>{
7676
const{ position}=context
7777
constversion=selectors.currentVersion(context)
7878
// merge in the updated position
@@ -82,7 +82,7 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
8282
constlevelIndex=levels.findIndex((l:G.Level)=>l.id===position.levelId)
8383
constlevel:G.Level=levels[levelIndex+1]
8484

85-
constnextPosition:CR.Position={
85+
constnextPosition:T.Position={
8686
levelId:level.id,
8787
stepId:level.steps[0].id,
8888
}
@@ -92,7 +92,7 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
9292
}),
9393
//@ts-ignore
9494
updateLevelProgress:assign({
95-
progress:(context:CR.MachineContext,event:CR.MachineEvent):CR.Progress=>{
95+
progress:(context:T.MachineContext,event:T.MachineEvent):any=>{
9696
// update progress by tracking completed
9797
const{ progress, position}=context
9898

@@ -105,9 +105,9 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
105105
}),
106106
//@ts-ignore
107107
updateStepProgress:assign({
108-
progress:(context:CR.MachineContext,event:CR.MachineEvent):CR.Progress=>{
108+
progress:(context:T.MachineContext,event:T.MachineEvent):any=>{
109109
// update progress by tracking completed
110-
constcurrentProgress:CR.Progress=context.progress
110+
constcurrentProgress:T.Progress=context.progress
111111

112112
const{ stepId}=event.payload
113113

@@ -118,13 +118,13 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
118118
}),
119119
//@ts-ignore
120120
updatePosition:assign({
121-
position:(context:CR.MachineContext,event:CR.MachineEvent):CR.Progress=>{
121+
position:(context:T.MachineContext,event:T.MachineEvent):any=>{
122122
const{ position}=event.payload
123123
returnposition
124124
},
125125
}),
126126
loadNext:send(
127-
(context:CR.MachineContext):CR.Action=>{
127+
(context:T.MachineContext):T.Action=>{
128128
const{ position, progress}=context
129129

130130
constlevel=selectors.currentLevel(context)
@@ -170,7 +170,7 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
170170
},
171171
),
172172
stepNext:send(
173-
(context:CR.MachineContext):CR.Action=>{
173+
(context:T.MachineContext):T.Action=>{
174174
const{ position, progress}=context
175175

176176
constlevel:G.Level=selectors.currentLevel(context)
@@ -203,19 +203,20 @@ const contextActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
203203
tutorial(){
204204
returnnull
205205
},
206-
progress():CR.Progress{
207-
constprogress:CR.Progress=selectors.defaultProgress()
206+
progress():T.Progress{
207+
constprogress:T.Progress=selectors.defaultProgress()
208208
returnprogress
209209
},
210-
position():CR.Position{
211-
constposition:CR.Position=selectors.defaultPosition()
210+
position():T.Position{
211+
constposition:T.Position=selectors.defaultPosition()
212212
returnposition
213213
},
214214
}),
215215
//@ts-ignore
216216
setError:assign({
217-
error:(context:CR.MachineContext,event:CR.MachineEvent):string|null=>{
218-
returnevent.payload.error
217+
error:(context:T.MachineContext,event:T.MachineEvent):any=>{
218+
constmessage:string|null=event.payload.error
219+
returnmessage
219220
},
220221
}),
221222
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as services from './services'
55

66
constcreateOptions=({ editorSend}:any):MachineOptions<CR.MachineContext,CR.MachineEvent>=>({
77
activities:{},
8+
//@ts-ignore
89
actions:createActions(editorSend),
910
guards:{},
1011
services:{},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp