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

Commit0d5ef9d

Browse files
committed
refactor StepProgress
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
1 parenta1a661f commit0d5ef9d

File tree

2 files changed

+45
-25
lines changed

2 files changed

+45
-25
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import*asReactfrom'react'
2+
import{Progress}from'@alifd/next'
3+
4+
conststyles={
5+
progress:{
6+
display:'flex'as'flex',
7+
justifyContent:'flex-end'as'flex-end',
8+
alignItems:'center'as'center',
9+
width:'10rem',
10+
color:'white',
11+
},
12+
text:{color:'white'},
13+
}
14+
15+
interfaceProps{
16+
current:number
17+
max:number
18+
}
19+
20+
constStepProgress=(props:Props)=>{
21+
constText=(
22+
<spanstyle={styles.text}>
23+
{props.current} of{props.max}
24+
</span>
25+
)
26+
return(
27+
<Progress
28+
state="success"
29+
progressive
30+
percent={(props.current/props.max)*100}
31+
shape="line"
32+
color="rgb(85, 132, 255)"
33+
css={styles.progress}
34+
textRender={()=>{
35+
returnText
36+
}}
37+
/>
38+
)
39+
}
40+
41+
exportdefaultStepProgress

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

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import * as selectors from '../../services/selectors'
44
importSideMenufrom'./components/SideMenu'
55
importLevelfrom'./components/Level'
66
importIconfrom'../../components/Icon'
7-
// import SettingsPage from './containers/Settings'
87
importReviewPagefrom'./containers/Review'
98
importButtonfrom'../../components/Button'
10-
importResetfrom'./components/Reset'
119
importProcessMessagesfrom'../../components/ProcessMessages'
1210
importTestMessagefrom'../../components/TestMessage'
13-
import{Progress}from'@alifd/next'
11+
importStepProgressfrom'./components/StepProgress'
1412
import{DISPLAY_RUN_TEST_BUTTON}from'../../environment'
1513
importformatLevelsfrom'./formatLevels'
14+
// import SettingsPage from './containers/Settings'
15+
// import Reset from './components/Reset'
1616

1717
conststyles={
1818
header:{
@@ -48,13 +48,6 @@ const styles = {
4848
right:0,
4949
color:'white',
5050
},
51-
taskProgress:{
52-
display:'flex'as'flex',
53-
justifyContent:'flex-end'as'flex-end',
54-
alignItems:'center'as'center',
55-
width:'10rem',
56-
color:'white',
57-
},
5851
processes:{
5952
padding:'0 1rem',
6053
position:'fixed'as'fixed',
@@ -165,21 +158,7 @@ const TutorialPage = (props: PageProps) => {
165158
Continue
166159
</Button>
167160
) :(
168-
<Progress
169-
state="success"
170-
progressive
171-
percent={(stepIndex/level.steps.length)*100}
172-
shape="line"
173-
color="rgb(85, 132, 255)"
174-
css={styles.taskProgress}
175-
textRender={()=>{
176-
return(
177-
<spanstyle={{color:'white'}}>
178-
{stepIndex} of{level.steps.length}
179-
</span>
180-
)
181-
}}
182-
/>
161+
<StepProgresscurrent={stepIndex}max={level.steps.length}/>
183162
)}
184163
</div>
185164
</div>

0 commit comments

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