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

Commitb11cd33

Browse files
committed
refactor components to use selectors
1 parent20fbe11 commitb11cd33

File tree

7 files changed

+65
-48
lines changed

7 files changed

+65
-48
lines changed

‎lib/components/Start/Checks/index.js

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
"use strict";
2+
var__extends=(this&&this.__extends)||function(d,b){
3+
for(varpinb)if(b.hasOwnProperty(p))d[p]=b[p];
4+
function__(){this.constructor=d;}
5+
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
6+
};
7+
var__decorate=(this&&this.__decorate)||function(decorators,target,key,desc){
8+
varc=arguments.length,r=c<3 ?target :desc===null ?desc=Object.getOwnPropertyDescriptor(target,key) :desc,d;
9+
if(typeofReflect==="object"&&typeofReflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);
10+
elsefor(vari=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3 ?d(r) :c>3 ?d(target,key,r) :d(target,key))||r;
11+
returnc>3&&r&&Object.defineProperty(target,key,r),r;
12+
};
13+
var__metadata=(this&&this.__metadata)||function(k,v){
14+
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
15+
};
216
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
318
varSystemChecks_1=require('./SystemChecks');
419
varSetupChecks_1=require('./SetupChecks');
520
varInstallGuide_1=require('./InstallGuide');
@@ -8,16 +23,25 @@ var styles = {
823
margin:'5px',
924
padding:'10px',
1025
};
11-
varChecks=function(_a){
12-
varchecks=_a.checks;
13-
if(!checks){
14-
returnReact.createElement(index_1.ContentCard,{title:'Error Loading Package.json',content:''});
26+
varChecks=(function(_super){
27+
__extends(Checks,_super);
28+
functionChecks(){
29+
_super.apply(this,arguments);
1530
}
16-
return(React.createElement("div",{style:styles},!checks.system.passed
17-
?React.createElement(SystemChecks_1.default,{checks:checks})
18-
:null,!checks.setup.passed
19-
?React.createElement(SetupChecks_1.default,{checks:checks})
20-
:null,React.createElement(InstallGuide_1.default,{checks:checks})));
21-
};
31+
Checks.prototype.render=function(){
32+
varchecks=this.props.checks;
33+
if(!checks){
34+
returnReact.createElement(index_1.ContentCard,{title:'Error Loading Package.json'});
35+
}
36+
return(React.createElement("div",{style:styles},!checks.system.passed ?React.createElement(SystemChecks_1.default,{checks:checks}) :null,!checks.setup.passed ?React.createElement(SetupChecks_1.default,{checks:checks}) :null,React.createElement(InstallGuide_1.default,{checks:checks})));
37+
};
38+
Checks=__decorate([
39+
react_redux_1.connect(function(state){return({
40+
checks:state.checks,
41+
});}),
42+
__metadata('design:paramtypes',[])
43+
],Checks);
44+
returnChecks;
45+
}(React.Component));
2246
Object.defineProperty(exports,"__esModule",{value:true});
2347
exports.default=Checks;

‎lib/components/Start/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ var Start = (function (_super) {
2929
_super.apply(this,arguments);
3030
}
3131
Start.prototype.render=function(){
32-
varchecks=this.props.checks;
33-
return(React.createElement("section",{className:'cr-start'},React.createElement("div",{style:headerStyles},checks.passed
34-
?React.createElement(Welcome_1.default,null)
35-
:React.createElement(Checks_1.default,{checks:checks}))));
32+
varready=this.props.ready;
33+
return(React.createElement("section",{className:'cr-start'},React.createElement("div",{style:headerStyles},ready ?React.createElement(Welcome_1.default,null) :React.createElement(Checks_1.default,null))));
3634
};
3735
Start=__decorate([
3836
react_redux_1.connect(function(state){return({
39-
checks:state.checks,
37+
ready:state.checks.passed,
4038
});}),
4139
__metadata('design:paramtypes',[])
4240
],Start);

‎lib/components/common/ContentCard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var styles = {
77
};
88
varContentCard=function(_a){
99
vartitle=_a.title,content=_a.content;
10-
return(React.createElement(Card_1.Card,{style:styles},title ?React.createElement(Card_1.CardHeader,{title:title}) :null,React.createElement(Card_1.CardText,null,React.createElement(index_1.Markdown,null,content))));
10+
return(React.createElement(Card_1.Card,{style:styles},title ?React.createElement(Card_1.CardHeader,{title:title}) :null,React.createElement(Card_1.CardText,null,React.createElement(index_1.Markdown,null,content||''))));
1111
};
1212
Object.defineProperty(exports,"__esModule",{value:true});
1313
exports.default=ContentCard;

‎src/components/Page/PageToolbar/ToggleDevTools/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ export default class ToggleDevTools extends React.Component<{
1919
return(
2020
<FlatButton
2121
style={styles}
22-
icon={
23-
<Code/>
24-
}
22+
icon={<Code/>}
2523
onTouchTap={this.props.toggle}
2624
/>
2725
);

‎src/components/Start/Checks/index.tsx

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import*asReactfrom'react';
2+
import{connect}from'react-redux';
23
importSystemChecksfrom'./SystemChecks';
34
importSetupChecksfrom'./SetupChecks';
45
importInstallGuidefrom'./InstallGuide';
@@ -9,25 +10,23 @@ const styles = {
910
padding:'10px',
1011
};
1112

12-
constChecks:React.StatelessComponent<{
13-
checks:CR.Checks
14-
}>=({checks})=>{
15-
if(!checks){
16-
return<ContentCard
17-
title='Error Loading Package.json'
18-
content=''
19-
/>;
13+
@connect(state=>({
14+
checks:state.checks,
15+
}))
16+
exportdefaultclassChecksextendsReact.Component<{
17+
checks?:CR.Checks
18+
},{}>{
19+
render(){
20+
const{checks}=this.props;
21+
if(!checks){
22+
return<ContentCardtitle='Error Loading Package.json'/>;
23+
}
24+
return(
25+
<divstyle={styles}>
26+
{!checks.system.passed ?<SystemCheckschecks={checks}/> :null}
27+
{!checks.setup.passed ?<SetupCheckschecks={checks}/> :null}
28+
<InstallGuidechecks={checks}/>
29+
</div>
30+
);
2031
}
21-
return(
22-
<divstyle={styles}>
23-
{!checks.system.passed
24-
?<SystemCheckschecks={checks}/>
25-
:null}
26-
{!checks.setup.passed
27-
?<SetupCheckschecks={checks}/>
28-
:null}
29-
<InstallGuidechecks={checks}/>
30-
</div>
31-
);
32-
};
33-
exportdefaultChecks;
32+
}

‎src/components/Start/index.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@ const headerStyles = {
1111
};
1212

1313
@connect(state=>({
14-
checks:state.checks,
14+
ready:state.checks.passed,
1515
}))
1616
exportdefaultclassStartextendsReact.Component<{
17-
checks?:CR.Checks
17+
ready?:CR.Checks
1818
},{}>{
1919
render(){
20-
const{checks}=this.props;
20+
const{ready}=this.props;
2121
return(
2222
<sectionclassName='cr-start'>
2323
<divstyle={headerStyles}>
24-
{checks.passed
25-
?<Welcome/>
26-
:<Checkschecks={checks}/>}
24+
{ready ?<Welcome/> :<Checks/>}
2725
</div>
2826
</section>
2927
);

‎src/components/common/ContentCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ const styles = {
77
};
88

99
constContentCard:React.StatelessComponent<{
10-
title:string,content:string
10+
title:string,content?:string
1111
}>=({title, content})=>(
1212
<Cardstyle={styles}>
1313
{title ?<CardHeadertitle={title}/> :null}
1414
<CardText>
15-
<Markdown>{content}</Markdown>
15+
<Markdown>{content||''}</Markdown>
1616
</CardText>
1717
</Card>
1818
);

0 commit comments

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