refactor root into SidePanel

ShMcK · ShMcK · commit d1e206f20ce2 · 2016-06-14T10:12:40.000-07:00
diff --git a/lib/components/Alert/index.js b/lib/components/Alert/index.js
@@ -39,7 +39,7 @@ var Alert = (function (_super) {
         react_redux_1.connect(function (state) { return ({
             alert: state.alert,
         }); }, function (dispatch) { return ({
-            close: function () { return dispatch(actions_1.alertClose()); },
+            close: function () { dispatch(actions_1.alertClose()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], Alert);
diff --git a/lib/components/AppMenu/CloseWindow.js b/lib/components/AppMenu/CloseWindow.js
@@ -28,7 +28,7 @@ var CloseWindow = (function (_super) {
     };
     CloseWindow = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            windowToggle: function () { return dispatch(actions_1.windowToggle()); },
+            windowToggle: function () { dispatch(actions_1.windowToggle()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], CloseWindow);
diff --git a/lib/components/AppMenu/MenuLink/index.js b/lib/components/AppMenu/MenuLink/index.js
@@ -32,7 +32,7 @@ var MenuLink = (function (_super) {
     };
     MenuLink = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            routeTo: function (route) { return dispatch(actions_1.routeSet(route)); },
+            routeTo: function (route) { dispatch(actions_1.routeSet(route)); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], MenuLink);
diff --git a/lib/components/Common/RouteButton.js b/lib/components/Common/RouteButton.js
@@ -28,7 +28,7 @@ var RouteButton = (function (_super) {
     };
     RouteButton = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            routeTo: function (route) { return dispatch(actions_1.routeSet(route)); },
+            routeTo: function (route) { dispatch(actions_1.routeSet(route)); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], RouteButton);
diff --git a/lib/components/Page/Hints/HintButton.js b/lib/components/Page/Hints/HintButton.js
@@ -37,7 +37,7 @@ var HintButton = (function (_super) {
             hintPosition: state.hintPosition,
             hintsLength: selectors_1.hintsSelector(state).length,
         }); }, function (dispatch) { return ({
-            hintSet: function (position) { return dispatch(actions_1.hintPositionSet(position)); },
+            hintSet: function (position) { dispatch(actions_1.hintPositionSet(position)); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], HintButton);
diff --git a/lib/components/Page/PageToolbar/Continue/index.js b/lib/components/Page/PageToolbar/Continue/index.js
@@ -34,7 +34,7 @@ var Continue = (function (_super) {
     };
     Continue = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            callNextPage: function () { return dispatch(actions_1.pageNext()); }
+            callNextPage: function () { dispatch(actions_1.pageNext()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], Continue);
diff --git a/lib/components/Page/PageToolbar/Save/index.js b/lib/components/Page/PageToolbar/Save/index.js
@@ -34,7 +34,7 @@ var Save = (function (_super) {
     };
     Save = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            save: function () { return dispatch(actions_1.editorSave()); },
+            save: function () { dispatch(actions_1.editorSave()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], Save);
diff --git a/lib/components/Page/PageToolbar/ToggleDevTools/index.js b/lib/components/Page/PageToolbar/ToggleDevTools/index.js
@@ -33,7 +33,7 @@ var ToggleDevTools = (function (_super) {
     ;
     ToggleDevTools = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            toggle: function () { return dispatch(actions_1.editorDevToolsToggle()); },
+            toggle: function () { dispatch(actions_1.editorDevToolsToggle()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], ToggleDevTools);
diff --git a/lib/components/Progress/index.js b/lib/components/Progress/index.js
@@ -46,11 +46,9 @@ var Progress = (function (_super) {
             pagePosition: state.pagePosition,
             info: state.tutorial.info,
             tutorial: state.tutorial
-        }); }, function (dispatch) {
-            return {
-                progressLoad: function () { return dispatch(actions_1.progressLoad()); }
-            };
-        }), 
+        }); }, function (dispatch) { return ({
+            progressLoad: function () { dispatch(actions_1.progressLoad()); }
+        }); }), 
         __metadata('design:paramtypes', [])
     ], Progress);
     return Progress;
diff --git a/lib/components/SidePanel/SidePanel.js b/lib/components/SidePanel/SidePanel.js
@@ -15,26 +15,26 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var index_1 = require('./index');
-var Routes_1 = require('./Routes');
+var index_1 = require('../index');
+var Routes_1 = require('../Routes');
 var Drawer_1 = require('material-ui/Drawer');
-var App = (function (_super) {
-    __extends(App, _super);
-    function App() {
+var SidePanel = (function (_super) {
+    __extends(SidePanel, _super);
+    function SidePanel() {
         _super.apply(this, arguments);
     }
-    App.prototype.render = function () {
+    SidePanel.prototype.render = function () {
         var windowToggle = this.props.windowToggle;
         return (React.createElement("section", null, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: windowToggle}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, null), React.createElement(Routes_1.default, null))), React.createElement(index_1.Alert, null)));
     };
-    App = __decorate([
+    SidePanel = __decorate([
         react_redux_1.connect(function (state) { return ({
             windowToggle: state.windowToggle,
         }); }), 
         __metadata('design:paramtypes', [])
-    ], App);
-    return App;
+    ], SidePanel);
+    return SidePanel;
 }(React.Component));
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = App;
+exports.default = SidePanel;
 ;
diff --git a/lib/components/SidePanel/element.js b/lib/components/SidePanel/element.js
@@ -0,0 +1,15 @@
+"use strict";
+var ReactDOM = require('react-dom');
+var sidePanelElement = {
+    root: null,
+    init: function () {
+        this.root = document.createElement('div');
+        this.root.setAttribute('id', 'crv');
+        return this.root;
+    },
+    unmount: function () {
+        ReactDOM.unmountComponentAtNode(this.root);
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = sidePanelElement;
diff --git a/lib/components/SidePanel/root.js b/lib/components/SidePanel/root.js
@@ -0,0 +1,9 @@
+"use strict";
+var React = require('react');
+var react_redux_1 = require('react-redux');
+var theme_1 = require('../styles/theme');
+var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
+var SidePanel_1 = require('./SidePanel');
+var Root = function (store) { return (React.createElement(react_redux_1.Provider, {store: store}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default}, React.createElement(SidePanel_1.default, null)))); };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Root;
diff --git a/lib/components/Start/Checks/VerifyButton.js b/lib/components/Start/Checks/VerifyButton.js
@@ -27,7 +27,7 @@ var VerifyButton = (function (_super) {
     };
     VerifyButton = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            verify: function () { return dispatch(actions_1.setupVerify()); },
+            verify: function () { dispatch(actions_1.setupVerify()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], VerifyButton);
diff --git a/lib/components/Tutorials/LoadTutorials/index.js b/lib/components/Tutorials/LoadTutorials/index.js
@@ -28,7 +28,7 @@ var LoadTutorials = (function (_super) {
     };
     LoadTutorials = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            tutorialsFind: function () { return dispatch(actions_1.tutorialsFind()); },
+            tutorialsFind: function () { dispatch(actions_1.tutorialsFind()); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], LoadTutorials);
diff --git a/lib/components/Tutorials/SelectTutorial/index.js b/lib/components/Tutorials/SelectTutorial/index.js
@@ -36,7 +36,7 @@ var SelectTutorial = (function (_super) {
     };
     SelectTutorial = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            selectTutorial: function (name) { return dispatch(actions_1.tutorialSet(name)); },
+            selectTutorial: function (name) { dispatch(actions_1.tutorialSet(name)); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], SelectTutorial);
diff --git a/lib/components/Tutorials/UpdateTutorial/index.js b/lib/components/Tutorials/UpdateTutorial/index.js
@@ -38,7 +38,7 @@ var UpdateTutorial = (function (_super) {
     };
     UpdateTutorial = __decorate([
         react_redux_1.connect(null, function (dispatch) { return ({
-            tutorialUpdate: function (title) { return dispatch(actions_1.tutorialUpdate(title)); },
+            tutorialUpdate: function (title) { dispatch(actions_1.tutorialUpdate(title)); },
         }); }), 
         __metadata('design:paramtypes', [])
     ], UpdateTutorial);
diff --git a/lib/components/Tutorials/index.js b/lib/components/Tutorials/index.js
@@ -44,7 +44,7 @@ var Tutorials = (function (_super) {
         react_redux_1.connect(function (state) { return ({
             tutorials: state.tutorials,
         }); }, function (dispatch) { return ({
-            loadTutorials: function () { return dispatch(actions_1.tutorialsFind()); },
+            loadTutorials: function () { dispatch(actions_1.tutorialsFind()); },
         }); }), 
         __metadata('design:paramtypes', [Object])
     ], Tutorials);
diff --git a/lib/components/render.js b/lib/components/render.js
@@ -1,14 +1,9 @@
 "use strict";
-var React = require('react');
 var ReactDOM = require('react-dom');
-var react_redux_1 = require('react-redux');
+var root_1 = require('./SidePanel/root');
 var store_1 = require('../store');
-var App_1 = require('./App');
-var theme_1 = require('./styles/theme');
-var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
-require('./remove-later');
 function render(target) {
-    ReactDOM.render(React.createElement(react_redux_1.Provider, {store: store_1.default}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default}, React.createElement(App_1.default, null))), target);
+    ReactDOM.render(root_1.default(store_1.default), target);
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = render;
diff --git a/lib/components/root.js b/lib/components/root.js
diff --git a/lib/index.js b/lib/index.js
@@ -1,15 +1,17 @@
 "use strict";
 var render_1 = require('./components/render');
-var root_1 = require('./components/root');
+var element_1 = require('./components/SidePanel/element');
 var polyfills_1 = require('core-coderoad/lib/polyfills');
 var subscriptions_1 = require('./subscriptions');
 var store_1 = require('./store');
 var setup_1 = require('./modules/setup');
+var injectTapEventPlugin = require('react-tap-event-plugin');
 var Main = (function () {
     function Main() {
+        injectTapEventPlugin();
         polyfills_1.default();
         store_1.default.dispatch(setup_1.setupVerify());
-        this.root = root_1.default.init();
+        this.root = element_1.default.init();
     }
     Main.prototype.activate = function () {
         atom.workspace.addRightPanel({
diff --git a/lib/subscriptions.js b/lib/subscriptions.js
@@ -2,7 +2,7 @@
 var CompositeDisposable = require('atom').CompositeDisposable;
 var store_1 = require('./store');
 var actions_1 = require('./actions');
-var root_1 = require('./components/root');
+var element_1 = require('./components/SidePanel/element');
 var subscriptions = null;
 function onActivate() {
     subscriptions = new CompositeDisposable;
@@ -16,7 +16,7 @@ function onActivate() {
 }
 exports.onActivate = onActivate;
 function onDeactivate() {
-    root_1.default.unmount();
+    element_1.default.unmount();
     store_1.default.subscribe(function () { return null; });
     subscriptions.dispose();
 }
diff --git a/package.json b/package.json
@@ -43,8 +43,7 @@
     "redux": "3.5.2",
     "redux-logger": "2.6.1",
     "redux-throttle-actions": "1.1.0",
-    "redux-thunk": "2.1.0",
-    "reselect": "2.5.1"
+    "redux-thunk": "2.1.0"
   },
   "engines": {
     "atom": ">=1.0.0 <2.0.0"
diff --git a/src/components/Alert/index.tsx b/src/components/Alert/index.tsx
@@ -16,7 +16,7 @@ const styles = {
 @connect(state => ({
   alert: state.alert,
 }), dispatch => ({
-  close: () => dispatch(alertClose()),
+  close() { dispatch(alertClose()); },
 }))
 export default class Alert extends React.Component<{
   alert?: CR.Alert, close?: any
diff --git a/src/components/AppMenu/CloseWindow.tsx b/src/components/AppMenu/CloseWindow.tsx
@@ -5,7 +5,7 @@ import NavigationClose from 'material-ui/svg-icons/navigation/close';
 import {windowToggle} from '../../actions';
 
 @connect(null, dispatch => ({
-  windowToggle: () => dispatch(windowToggle()),
+  windowToggle() { dispatch(windowToggle()); },
 }))
 export default class CloseWindow extends React.Component<{
   windowToggle?: any}, {}> {
diff --git a/src/components/AppMenu/MenuLink/index.tsx b/src/components/AppMenu/MenuLink/index.tsx
@@ -9,7 +9,7 @@ const styles = {
 };
 
 @connect(null, dispatch => ({
-  routeTo: (route: string) => dispatch(routeSet(route)),
+  routeTo(route: string) { dispatch(routeSet(route)); },
 }))
 export default class MenuLink extends React.Component<{
   route: string, title?: string, routeTo?: any
diff --git a/src/components/Common/RouteButton.tsx b/src/components/Common/RouteButton.tsx
@@ -4,7 +4,7 @@ import RaisedButton from 'material-ui/RaisedButton';
 import {routeSet} from '../../actions';
 
 @connect(null, dispatch => ({
-  routeTo: (route: string) => dispatch(routeSet(route)),
+  routeTo(route: string) { dispatch(routeSet(route)); },
 }))
 export default class RouteButton extends React.Component<{
   label: string, route: string, routeTo?: any, style?: Object
diff --git a/src/components/Page/Hints/HintButton.tsx b/src/components/Page/Hints/HintButton.tsx
@@ -8,7 +8,7 @@ import {hintsSelector} from 'core-coderoad/lib/selectors';
   hintPosition: state.hintPosition,
   hintsLength: hintsSelector(state).length,
 }), dispatch => ({
-  hintSet: (position: number) => dispatch(hintPositionSet(position)),
+  hintSet(position: number) { dispatch(hintPositionSet(position)); },
 }))
 export default class HintButton extends React.Component<{
   hintPosition?: number, hintsLength?: number, type: 'next'|'prev', label: string
diff --git a/src/components/Page/PageToolbar/Continue/index.tsx b/src/components/Page/PageToolbar/Continue/index.tsx
@@ -12,7 +12,7 @@ const styles = {
 };
 
 @connect(null, dispatch => ({
-  callNextPage: () => dispatch(pageNext())
+  callNextPage() { dispatch(pageNext()); },
 }))
 export default class Continue extends React.Component<{
   callNextPage?: any
diff --git a/src/components/Page/PageToolbar/Save/index.tsx b/src/components/Page/PageToolbar/Save/index.tsx
@@ -12,7 +12,7 @@ const styles = {
 };
 
 @connect(null, dispatch => ({
-  save: () => dispatch(editorSave()),
+  save() { dispatch(editorSave()); },
 }))
 export default class Save extends React.Component<{
   save?: any
diff --git a/src/components/Page/PageToolbar/ToggleDevTools/index.tsx b/src/components/Page/PageToolbar/ToggleDevTools/index.tsx
@@ -10,7 +10,7 @@ const styles = {
 };
 
 @connect(null, dispatch => ({
-  toggle: () => dispatch(editorDevToolsToggle()),
+  toggle() { dispatch(editorDevToolsToggle()); },
 }))
 export default class ToggleDevTools extends React.Component<{
   toggle?: any
diff --git a/src/components/Progress/ProgressPage/index.tsx b/src/components/Progress/ProgressPage/index.tsx
@@ -11,7 +11,7 @@ const styles = {
 };
 
 @connect(null, dispatch => ({
-  selectPage: (pagePosition: CR.PagePosition) => {
+  selectPage(pagePosition: CR.PagePosition) {
     dispatch(pageSet(pagePosition));
     dispatch(routeSet('page'));
   },
diff --git a/src/components/Progress/index.tsx b/src/components/Progress/index.tsx
@@ -20,11 +20,9 @@ const styles = {
   pagePosition: state.pagePosition,
   info: state.tutorial.info,
   tutorial: state.tutorial
-}), dispatch => {
-  return {
-    progressLoad: () => dispatch(progressLoad())
-  };
-})
+}), dispatch => ({
+    progressLoad() { dispatch(progressLoad()); }
+}))
 export default class Progress extends React.Component<{
     progress?: CR.Progress, pagePosition?: CR.PagePosition,
     info?: Tutorial.Info, tutorial?: CR.Tutorial, progressLoad?: () => any;
diff --git a/src/components/SidePanel/SidePanel.tsx b/src/components/SidePanel/SidePanel.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {AppMenu, Alert} from './index';
-import Routes from './Routes';
+import {AppMenu, Alert} from '../index';
+import Routes from '../Routes';
 import Drawer from 'material-ui/Drawer';
 import Menu from 'material-ui/svg-icons/navigation/menu';
 
 @connect(state => ({
   windowToggle: state.windowToggle,
 }))
-export default class App extends React.Component<{
+export default class SidePanel extends React.Component<{
   windowToggle?: boolean
 }, {}> {
   render(): React.ReactElement<{}> {
diff --git a/src/components/SidePanel/element.ts b/src/components/SidePanel/element.ts
diff --git a/src/components/SidePanel/root.tsx b/src/components/SidePanel/root.tsx
diff --git a/src/components/Start/Checks/VerifyButton.tsx b/src/components/Start/Checks/VerifyButton.tsx
diff --git a/src/components/Tutorials/LoadTutorials/index.tsx b/src/components/Tutorials/LoadTutorials/index.tsx
diff --git a/src/components/Tutorials/SelectTutorial/index.tsx b/src/components/Tutorials/SelectTutorial/index.tsx
diff --git a/src/components/Tutorials/UpdateTutorial/index.tsx b/src/components/Tutorials/UpdateTutorial/index.tsx
diff --git a/src/components/Tutorials/index.tsx b/src/components/Tutorials/index.tsx
diff --git a/src/components/remove-later.ts b/src/components/remove-later.ts
diff --git a/src/components/render.ts b/src/components/render.ts
diff --git a/src/components/render.tsx b/src/components/render.tsx
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/subscriptions.ts b/src/subscriptions.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ var ToggleDevTools = (function (_super) {`
`33`	`33`	`;`
`34`	`34`	`ToggleDevTools = __decorate([`
`35`	`35`	`react_redux_1.connect(null, function (dispatch) { return ({`
`36`		`- toggle: function () { return dispatch(actions_1.editorDevToolsToggle()); },`
	`36`	`+ toggle: function () { dispatch(actions_1.editorDevToolsToggle()); },`
`37`	`37`	`}); }),`
`38`	`38`	`__metadata('design:paramtypes', [])`
`39`	`39`	`], ToggleDevTools);`