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

Commit1382462

Browse files
committed
create Router, Route
1 parent54ec7b1 commit1382462

File tree

6 files changed

+87
-28
lines changed

6 files changed

+87
-28
lines changed

‎web-app/src/Routes.tsx

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import*asReactfrom'react'
22

3-
importCondfrom'./components/Cond'
4-
importLoadingfrom'./components/Loading'
3+
importRouterfrom'./components/Router'
4+
importLoadingPagefrom'./containers/LoadingPage'
55
importContinuePagefrom'./containers/Continue'
66
importNewPagefrom'./containers/New'
77
importTutorialPagefrom'./containers/Tutorial'
88

9+
const{ Route}=Router
10+
911
interfaceProps{
1012
state:any
1113
}
@@ -40,18 +42,20 @@ const Routes = ({ state }: Props) => {
4042
// TODO: refactor cond to user <Router><Route> and accept first route as if/else if
4143
return(
4244
<divstyle={{ ...styles.page, ...dimensions}}>
43-
<Condstate={state}path="SelectTutorial.Startup">
44-
<Loading/>
45-
</Cond>
46-
<Condstate={state}path="SelectTutorial.NewTutorial">
47-
<NewPage/>
48-
</Cond>
49-
<Condstate={state}path="SelectTutorial.ContinueTutorial">
50-
<ContinuePage/>
51-
</Cond>
52-
<Condstate={state}path="Tutorial">
53-
<TutorialPagestate={state}/>
54-
</Cond>
45+
<Routerstate={state}>
46+
<Routepath="SelectTutorial.Startup">
47+
<LoadingPagetext="Launching..."/>
48+
</Route>
49+
<Routepath="SelectTutorial.NewTutorial">
50+
<NewPage/>
51+
</Route>
52+
<Routepath="SelectTutorial.ContinueTutorial">
53+
<ContinuePage/>
54+
</Route>
55+
<Routepath="Tutorial">
56+
<TutorialPagestate={state}/>
57+
</Route>
58+
</Router>
5559
</div>
5660
)
5761
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import*asReactfrom'react'
2+
3+
interfaceProps{
4+
children:any
5+
path:string
6+
}
7+
8+
constRoute=({ children}:Props)=>children
9+
10+
exportdefaultRoute
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import*asReactfrom'react'
2+
importRoutefrom'./Route'
3+
import{stateMatch}from'../Cond/utils/state'
4+
5+
interfaceProps{
6+
state:string
7+
children:any
8+
}
9+
10+
// router finds first state match of <Route path='' />
11+
constRouter=({ state, children}:Props)=>{
12+
constchildArray=React.Children.toArray(children)
13+
for(constchildofchildArray){
14+
if(stateMatch(state,child.props.path)){
15+
returnchild.props.children
16+
}
17+
}
18+
returnnull
19+
}
20+
21+
Router.Route=Route
22+
23+
exportdefaultRouter

‎web-app/src/containers/New/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import*asReactfrom'react'
22
import{Button}from'@alifd/next'
3+
34
importCondfrom'../../components/Cond'
45
importDataContextfrom'../../utils/DataContext'
56
import{send}from'../../utils/vscode'
7+
importLoadingPagefrom'../../containers/LoadingPage'
68

79
interfaceProps{
810
onNew(tutorialId:string):void
@@ -27,7 +29,7 @@ export const NewPage = (props: Props) => {
2729
</div>
2830
</Cond>
2931
<Condstate={state}path="SelectTutorial.NewTutorial.InitializeTutorial">
30-
<div>Initializing tutorial...</div>
32+
<LoadingPagetext="Launching Tutorial..."/>
3133
</Cond>
3234
</div>
3335
)

‎web-app/src/containers/Tutorial/index.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
import*asReactfrom'react'
22
import{send}from'../../utils/vscode'
33

4-
importCondfrom'../../components/Cond'
5-
importLoadingfrom'../../components/Loading'
4+
importRouterfrom'../../components/Router'
5+
importLoadingPagefrom'../LoadingPage'
66
importSummaryPagefrom'./SummaryPage'
77
importLevelPagefrom'./LevelPage'
88
importStagePagefrom'./StagePage'
99

10+
const{ Route}=Router
11+
1012
interfaceProps{
1113
state:any
1214
}
1315

1416
constTutorial=(props:Props)=>{
1517
return(
16-
<div>
17-
<Condstate={props.state}path="Tutorial.LoadNext">
18-
<Loading/>
19-
</Cond>
20-
<Condstate={props.state}path="Tutorial.Summary">
18+
<Routerstate={props.state}>
19+
<Routepath="Tutorial.LoadNext">
20+
<LoadingPagetext="Loading Tutorial..."/>
21+
</Route>
22+
<Routepath="Tutorial.Summary">
2123
<SummaryPagestate={props.state}send={send}/>
22-
</Cond>
23-
<Condstate={props.state}path="Tutorial.Level">
24+
</Route>
25+
<Routepath="Tutorial.Level">
2426
<LevelPagestate={props.state}send={send}/>
25-
</Cond>
26-
<Condstate={props.state}path="Tutorial.Stage">
27+
</Route>
28+
<Routepath="Tutorial.Stage">
2729
<StagePagestate={props.state}send={send}/>
28-
</Cond>
29-
</div>
30+
</Route>
31+
</Router>
3032
)
3133
}
3234

‎web-app/stories/Router.stories.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
importReactfrom'react'
2+
3+
import{storiesOf}from'@storybook/react'
4+
importSideBarDecoratorfrom'./utils/SideBarDecorator'
5+
6+
importRouterfrom'../src/components/Router'
7+
8+
const{ Route}=Router
9+
10+
storiesOf('Components',module)
11+
.addDecorator(SideBarDecorator)
12+
.add('Router',()=>(
13+
<Routerstate="Third">
14+
<Routepath="First">First</Route>
15+
<Routepath="Second">Second</Route>
16+
<Routepath="Third">Third</Route>
17+
</Router>
18+
))

0 commit comments

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