Skip to content

Commit 16b35dc

Browse files
ShMcKShMcK
committed
refactor components to use connect functional composition rather than decorators. This fixes many vs-code typescript issues
1 parent 26b74e6 commit 16b35dc

File tree

69 files changed

+389
-727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+389
-727
lines changed

‎lib/components/Alert/index.js

+5-25
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../actions');
@@ -38,22 +29,11 @@ var Alert = (function (_super) {
3829
var action = alert.action, message = alert.message, open = alert.open, duration = alert.duration;
3930
return (React.createElement(Snackbar_1.default, {className: 'cr-alert ' + action, style: styles.snackbar, open: open, action: action || 'NOTE', message: message || '', autoHideDuration: duration || 2000, onActionTouchTap: alertClose, onRequestClose: alertClose}));
4031
};
41-
Alert = __decorate([
42-
react_redux_1.connect(function (state) { return ({
43-
alert: state.alert || defaultAlert,
44-
}); }, { alertClose: actions_1.alertClose }),
45-
__metadata('design:paramtypes', [])
46-
], Alert);
4732
return Alert;
4833
}(React.Component));
34+
var mapStateToProps = function (state) { return ({
35+
alert: state.alert || defaultAlert,
36+
}); };
37+
var mapDispatchToProps = { alertClose: actions_1.alertClose };
4938
Object.defineProperty(exports, "__esModule", { value: true });
50-
exports.default = Alert;
51-
Alert.propTypes = {
52-
alert: React.PropTypes.shape({
53-
action: React.PropTypes.string,
54-
message: React.PropTypes.string,
55-
duration: React.PropTypes.number.optional,
56-
color: React.PropTypes.string,
57-
}),
58-
alertClose: React.PropTypes.func.optional
59-
};
39+
exports.default = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(Alert);

‎lib/components/AppMenu/CloseWindow.js

+2-17
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../actions');
@@ -28,14 +19,8 @@ var CloseWindow = (function (_super) {
2819
React.createElement(close_1.default, {color: 'white'})
2920
));
3021
};
31-
CloseWindow = __decorate([
32-
react_redux_1.connect(null, { windowToggle: actions_1.windowToggle }),
33-
__metadata('design:paramtypes', [])
34-
], CloseWindow);
3522
return CloseWindow;
3623
}(React.Component));
24+
var mapDispatchToProps = { windowToggle: actions_1.windowToggle };
3725
Object.defineProperty(exports, "__esModule", { value: true });
38-
exports.default = CloseWindow;
39-
CloseWindow.propTypes = {
40-
windowToggle: React.PropTypes.func.optional,
41-
};
26+
exports.default = react_redux_1.connect(null, mapDispatchToProps)(CloseWindow);

‎lib/components/AppMenu/MenuLink/index.js

+2-19
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../../actions');
@@ -30,16 +21,8 @@ var MenuLink = (function (_super) {
3021
var _a = this.props, route = _a.route, title = _a.title, routeSet = _a.routeSet;
3122
return (React.createElement(MenuItem_1.default, {style: styles, primaryText: title ? title : route, onTouchTap: routeSet.bind(this, route), key: route}));
3223
};
33-
MenuLink = __decorate([
34-
react_redux_1.connect(null, { routeSet: actions_1.routeSet }),
35-
__metadata('design:paramtypes', [])
36-
], MenuLink);
3724
return MenuLink;
3825
}(React.Component));
26+
var mapDispatchToProps = { routeSet: actions_1.routeSet };
3927
Object.defineProperty(exports, "__esModule", { value: true });
40-
exports.default = MenuLink;
41-
MenuLink.propTypes = {
42-
route: React.PropTypes.string,
43-
title: React.PropTypes.string.optional,
44-
routeSet: React.PropTypes.func.optional,
45-
};
28+
exports.default = react_redux_1.connect()(MenuLink);

‎lib/components/AppMenu/Quit/index.js

+2-17
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../../actions');
@@ -31,14 +22,8 @@ var Quit = (function (_super) {
3122
Quit.prototype.render = function () {
3223
return (React.createElement(MenuItem_1.default, {style: styles.menuItem, key: 'quit', onClick: this.props.quit}, "quit"));
3324
};
34-
Quit = __decorate([
35-
react_redux_1.connect(null, { quit: actions_1.quit }),
36-
__metadata('design:paramtypes', [])
37-
], Quit);
3825
return Quit;
3926
}(React.Component));
27+
var mapDispatchToProps = { quit: actions_1.quit };
4028
Object.defineProperty(exports, "__esModule", { value: true });
41-
exports.default = Quit;
42-
Quit.propTypes = {
43-
quit: React.PropTypes.func.optional,
44-
};
29+
exports.default = react_redux_1.connect(null, mapDispatchToProps)(Quit);

‎lib/components/AppMenu/index.js

+4-19
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var CloseWindow_1 = require('./CloseWindow');
@@ -30,16 +21,10 @@ var AppMenu = (function (_super) {
3021
var route = this.props.route;
3122
return (React.createElement(AppBar_1.default, {title: 'CodeRoad', className: 'cr-menu-bar', style: { styles: styles }, iconElementLeft: React.createElement(CloseWindow_1.default, null), iconElementRight: menuRight_1.default(route)}));
3223
};
33-
AppMenu = __decorate([
34-
react_redux_1.connect(function (state) { return ({
35-
route: state.route,
36-
}); }),
37-
__metadata('design:paramtypes', [])
38-
], AppMenu);
3924
return AppMenu;
4025
}(React.Component));
26+
var mapStateToProps = function (state) { return ({
27+
route: state.route,
28+
}); };
4129
Object.defineProperty(exports, "__esModule", { value: true });
42-
exports.default = AppMenu;
43-
AppMenu.propTypes = {
44-
route: React.PropTypes.string.optional,
45-
};
30+
exports.default = react_redux_1.connect(mapStateToProps)(AppMenu);

‎lib/components/AppMenu/issuesLink.js

-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +0,0 @@
1-
"use strict";
2-
var React = require('react');
3-
var MenuItem_1 = require('material-ui/MenuItem');
4-
function issuesLink() {
5-
var tutorial = store.getState().tutorial;
6-
if (!tutorial || !tutorial.config || !tutorial.config.issuesPath) {
7-
return null;
8-
}
9-
return (React.createElement(MenuItem_1.default, {key: 'issue', className: 'link'},
10-
React.createElement("a", {href: tutorial.config.issuesPath}, "post issue")
11-
));
12-
}
13-
Object.defineProperty(exports, "__esModule", { value: true });
14-
exports.default = issuesLink;

‎lib/components/Common/RouteButton.js

+2-20
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../actions');
@@ -26,17 +17,8 @@ var RouteButton = (function (_super) {
2617
var _a = this.props, label = _a.label, route = _a.route, style = _a.style, routeSet = _a.routeSet;
2718
return (React.createElement(RaisedButton_1.default, {label: label, style: style || {}, onTouchTap: routeSet.bind(this, route), secondary: true}));
2819
};
29-
RouteButton = __decorate([
30-
react_redux_1.connect(null, { routeSet: actions_1.routeSet }),
31-
__metadata('design:paramtypes', [])
32-
], RouteButton);
3320
return RouteButton;
3421
}(React.Component));
22+
var mapDispatchToProps = { routeSet: actions_1.routeSet };
3523
Object.defineProperty(exports, "__esModule", { value: true });
36-
exports.default = RouteButton;
37-
RouteButton.propTypes = {
38-
label: React.PropTypes.string,
39-
route: React.PropTypes.string,
40-
routeSet: React.PropTypes.func.optional,
41-
style: React.PropTypes.object.optional,
42-
};
24+
exports.default = react_redux_1.connect(null, mapDispatchToProps)(RouteButton);

‎lib/components/FinalPage/index.js

-15
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,7 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
17-
var react_redux_1 = require('react-redux');
188
var Card_1 = require('material-ui/Card');
199
var FlatButton_1 = require('material-ui/FlatButton');
2010
var styles = {
@@ -45,12 +35,7 @@ var FinalPage = (function (_super) {
4535
React.createElement(FlatButton_1.default, {label: 'Learn how to Create a Tutorial'})
4636
))));
4737
};
48-
FinalPage = __decorate([
49-
react_redux_1.connect(null, null),
50-
__metadata('design:paramtypes', [])
51-
], FinalPage);
5238
return FinalPage;
5339
}(React.Component));
5440
Object.defineProperty(exports, "__esModule", { value: true });
5541
exports.default = FinalPage;
56-
FinalPage.propTypes = {};

‎lib/components/Page/Hints/HintButton.js

+6-17
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../../actions');
@@ -34,14 +25,12 @@ var HintButton = (function (_super) {
3425
return null;
3526
}
3627
};
37-
HintButton = __decorate([
38-
react_redux_1.connect(function (state) { return ({
39-
hintPosition: state.hintPosition,
40-
hintsLength: selectors_1.hintsSelector(state).length,
41-
}); }, { hintPositionSet: actions_1.hintPositionSet }),
42-
__metadata('design:paramtypes', [])
43-
], HintButton);
4428
return HintButton;
4529
}(React.Component));
30+
var mapStateToProps = function (state) { return ({
31+
hintPosition: state.hintPosition,
32+
hintsLength: selectors_1.hintsSelector(state).length,
33+
}); };
34+
var mapDispatchToProps = { hintPositionSet: actions_1.hintPositionSet };
4635
Object.defineProperty(exports, "__esModule", { value: true });
47-
exports.default = HintButton;
36+
exports.default = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(HintButton);

‎lib/components/Page/Hints/index.js

+4-16
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var selectors_1 = require('../../../selectors');
@@ -45,13 +36,10 @@ var Hints = (function (_super) {
4536
React.createElement(HintButton_1.default, {type: 'prev', label: 'Previous'}),
4637
React.createElement(HintButton_1.default, {type: 'next', label: 'Next'}))));
4738
};
48-
Hints = __decorate([
49-
react_redux_1.connect(function (state) { return ({
50-
hint: selectors_1.hintSelector(state),
51-
}); }),
52-
__metadata('design:paramtypes', [])
53-
], Hints);
5439
return Hints;
5540
}(React.Component));
41+
var mapStateToProps = function (state) { return ({
42+
hint: selectors_1.hintSelector(state),
43+
}); };
5644
Object.defineProperty(exports, "__esModule", { value: true });
57-
exports.default = Hints;
45+
exports.default = react_redux_1.connect(mapStateToProps)(Hints);

‎lib/components/Page/PageToolbar/Continue/index.js

+2-14
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10-
else for (var i = 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-
return c > 3 && r && Object.defineProperty(target, key, r), r;
12-
};
13-
var __metadata = (this && this.__metadata) || function (k, v) {
14-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15-
};
167
var React = require('react');
178
var react_redux_1 = require('react-redux');
189
var actions_1 = require('../../../../actions');
@@ -32,11 +23,8 @@ var Continue = (function (_super) {
3223
Continue.prototype.render = function () {
3324
return (React.createElement(RaisedButton_1.default, {style: styles, label: 'Continue', primary: true, onTouchTap: this.props.pageNext}));
3425
};
35-
Continue = __decorate([
36-
react_redux_1.connect(null, { pageNext: actions_1.pageNext }),
37-
__metadata('design:paramtypes', [])
38-
], Continue);
3926
return Continue;
4027
}(React.Component));
28+
var mapDispatchToProps = { pageNext: actions_1.pageNext };
4129
Object.defineProperty(exports, "__esModule", { value: true });
42-
exports.default = Continue;
30+
exports.default = react_redux_1.connect(null, mapDispatchToProps)(Continue);

0 commit comments

Comments
 (0)