Redux working

chapter06/src/components/countryFilterBar/countryFilterBar.js

@@ -0,0 +1,38 @@
+/* @flow */
+
+import React from "react";
+import PropTypes from "prop-types";
+import "../general.css";
+
+export class CountryFilterBar extends React.PureComponent<{
+    list?: Array<{ code: string, name: string }>,
+    onSelect: string => void
+}> {
+    static propTypes = {
+        list: PropTypes.arrayOf(PropTypes.object),
+        onSelect: PropTypes.func.isRequired
+    };
+
+    static defaultProps = {
+        list: []
+    };
+
+    onSelect = (e: { target: HTMLOptionElement }) =>
+        this.props.onSelect(e.target.value);
+
+    render() {
+        return (
+            <div className="bordered">
+                Country:&nbsp;
+                <select onChange={this.onSelect}>
+                    <option value="">Select a country:</option>
+                    {this.props.list.map(x => (
+                        <option key={x.code} value={x.code}>
+                            {x.name}
+                        </option>
+                    ))}
+                </select>
+            </div>
+        );
+    }
+}

chapter06/src/components/countryFilterBar/countryFilterBar.old.style.js

@@ -0,0 +1,44 @@
+/* @flow */
+
+import React from "react";
+import PropTypes from "prop-types";
+import "../general.css";
+
+export class CountryFilterBar extends React.PureComponent<{
+    list: Array<{ code: string, name: string }>,
+    onSelect: string => void
+}> {
+    constructor(props) {
+        super(props);
+        this.onSelect = this.onSelect.bind(this);
+    }
+
+    onSelect(e: { target: HTMLOptionElement }) {
+        this.props.onSelect(e.target.value);
+    }
+
+    render() {
+        return (
+            <div className="bordered">
+                Country:&nbsp;
+                <select onChange={this.onSelect}>
+                    <option value="">Select a country:</option>
+                    {this.props.list.map(x => (
+                        <option key={x.code} value={x.code}>
+                            {x.name}
+                        </option>
+                    ))}
+                </select>
+            </div>
+        );
+    }
+}
+
+CountryFilterBar.propTypes = {
+    list: PropTypes.arrayOf(PropTypes.object).isRequired,
+    onSelect: PropTypes.func.isRequired
+};
+
+CountryFilterBar.defaultProps = {
+    list: []
+};

chapter06/src/components/countryFilterBar/countryFilterBar.story.js

@@ -3,7 +3,7 @@
 import React from "react";
 import { storiesOf } from "@storybook/react";
 
-import { CountryFilterBar } from "./";
+import { CountryFilterBar } from ".";
 
 const countries = [
     { code: "AR", name: "Argentine" },

chapter06/src/components/countryFilterBar/index.js

@@ -1,35 +1,4 @@
 /* @flow */
 
-import React from "react";
+import { CountryFilterBar } from "./countryFilterBar.js";
-import PropTypes from "prop-types";
+export { CountryFilterBar };
-import "../general.css";
-
-export class CountryFilterBar extends React.PureComponent<{
-    list: Array<{ code: string, name: string }>,
-    onSelect: string => void
-}> {
-    static propTypes = {
-        list: PropTypes.arrayOf(PropTypes.object).isRequired,
-        onSelect: PropTypes.func.isRequired
-    };
-
-    onSelect(e: { target: HTMLOptionElement }) {
-        this.props.onSelect(e.target.value);
-    }
-
-    render() {
-        return (
-            <div className="bordered">
-                Country:&nbsp;
-                <select onChange={this.onSelect.bind(this)}>
-                    <option value="">Select a country:</option>
-                    {this.props.list.map(x => (
-                        <option key={x.code} value={x.code}>
-                            {x.name}
-                        </option>
-                    ))}
-                </select>
-            </div>
-        );
-    }
-}

chapter06/src/components/expandableCard.1/index.js

@@ -1,7 +1,7 @@
 /* @flow */
 
-import React from "../../../../../../.cache/typescript/2.9/node_modules/@types/react";
+import React from "react";
-import PropTypes from "../../../../../../.cache/typescript/2.9/node_modules/@types/prop-types";
+import PropTypes from "prop-types";
 
 import "../general.css";
 

chapter06/src/components/expandableCard.2/index.js

@@ -22,19 +22,16 @@ export class ExpandableCard extends React.PureComponent<
         open: false
     };
 
-    toggle() {
+    toggle = () => {
         this.setState(state => ({ open: !state.open }));
-    }
+    };
 
     render() {
         if (this.state.open) {
             return (
                 <div className="bordered">
                     {this.props.title}
-                    <div
+                    <div className="toggle" onClick={this.toggle}>
-                        className="toggle"
-                        onClick={this.toggle.bind(this)}
-                    >
                         &#x25B3;
                     </div>
                     <div>{this.props.children}</div>
@@ -44,10 +41,7 @@ export class ExpandableCard extends React.PureComponent<
             return (
                 <div className="bordered">
                     {this.props.title}
-                    <div
+                    <div className="toggle" onClick={this.toggle}>
-                        className="toggle"
-                        onClick={this.toggle.bind(this)}
-                    >
                         &#x25BD;
                     </div>
                 </div>

chapter06/src/components/regionsInformationTable/index.js

@@ -31,7 +31,7 @@ export class RegionsInformationTable extends React.PureComponent<
         regions: []
     };
 
-    update(country: string) {
+    update = (country: string) => {
         console.log(`Country ... ${country}`);
 
         this.setState(() => ({
@@ -68,14 +68,14 @@ export class RegionsInformationTable extends React.PureComponent<
                 }
             ]
         }));
-    }
+    };
 
     render() {
         return (
             <div>
                 <CountryFilterBar
                     list={this.state.countries}
-                    onSelect={this.update.bind(this)}
+                    onSelect={this.update}
                 />
                 <ResultsDataTable results={this.state.regions} />
             </div>

chapter07/src/components/sassButton/sassButton.a11y.js

@@ -16,11 +16,11 @@ export class SassButton extends React.PureComponent<{
         onSelect: PropTypes.func.isRequired
     };
 
-    keyDownAsClick(e: { keyCode: number }) {
+    keyDownAsClick = (e: { keyCode: number }) => {
         if (e.keyCode === 32 || e.keyCode === 13) {
             this.props.onSelect();
         }
-    }
+    };
 
     render() {
         return (
@@ -29,7 +29,7 @@ export class SassButton extends React.PureComponent<{
                     this.props.normal ? "normalButton" : "alertButton"
                 }
                 onClick={this.props.onSelect}
-                onKeyDown={this.keyDownAsClick.bind(this)}
+                onKeyDown={this.keyDownAsClick}
                 tabIndex="0"
                 role="button"
             >

chapter07/src/components/styledButton/styledButton.a11y.js

@@ -50,18 +50,18 @@ export class StyledButton extends React.PureComponent<{
         onSelect: PropTypes.func.isRequired
     };
 
-    keyDownAsClick(e: { keyCode: number }) {
+    keyDownAsClick = (e: { keyCode: number }) => {
         if (e.keyCode === 32 || e.keyCode === 13) {
             this.props.onSelect();
         }
-    }
+    };
 
     render() {
         return (
             <StyledDiv
                 normal={this.props.normal}
                 onClick={this.props.onSelect}
-                onKeyDown={this.keyDownAsClick.bind(this)}
+                onKeyDown={this.keyDownAsClick}
                 tabIndex="0"
                 role="button"
             >

chapter07/src/makeResize.js

@@ -11,11 +11,6 @@ export const makeResize = Comp => {
     return class extends React.Component {
         state = getWindowSize();
 
-        constructor(props) {
-            super(props);
-            this.componentIsResizing = this.componentIsResizing.bind(this);
-        }
-
         componentDidMount() {
             window.addEventListener("resize", this.componentIsResizing);
         }
@@ -24,9 +19,9 @@ export const makeResize = Comp => {
             window.removeEventListener("resize", this.componentIsResizing);
         }
 
-        componentIsResizing() {
+        componentIsResizing = () => {
             this.setState(getWindowSize());
-        }
+        };
 
         render() {
             return <Comp {...this.props} {...this.state} />;

chapter08/src/App.css

@@ -1,28 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  animation: App-logo-spin infinite 20s linear;
-  height: 80px;
-}
-
-.App-header {
-  background-color: #222;
-  height: 150px;
-  padding: 20px;
-  color: white;
-}
-
-.App-title {
-  font-size: 1.5em;
-}
-
-.App-intro {
-  font-size: large;
-}
-
-@keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
-}

chapter08/src/App.js

@@ -1,24 +0,0 @@
-/* @flow */
-
-import React, { Component } from "react";
-import logo from "./logo.svg";
-import "./App.css";
-
-class App extends Component<{}> {
-    render() {
-        return (
-            <div className="App">
-                <header className="App-header">
-                    <img src={logo} className="App-logo" alt="logo" />
-                    <h1 className="App-title">Welcome to React</h1>
-                </header>
-                <p className="App-intro">
-                    To get started, edit <code>src/App.js</code> and save
-                    to reload.
-                </p>
-            </div>
-        );
-    }
-}
-
-export default App;

chapter08/src/App.test.js

@@ -1,9 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-it('renders without crashing', () => {
-  const div = document.createElement('div');
-  ReactDOM.render(<App />, div);
-  ReactDOM.unmountComponentAtNode(div);
-});

chapter08/src/counterApp/clicksDisplay.component.js

@@ -0,0 +1,16 @@
+/* @flow */
+
+import React from "react";
+import { PropTypes } from "prop-types";
+
+export class ClicksDisplay extends React.PureComponent<{
+    clicks: number
+}> {
+    static propTypes = {
+        clicks: PropTypes.number.isRequired
+    };
+
+    render() {
+        return <div>Clicks so far: {this.props.clicks}</div>;
+    }
+}

chapter08/src/counterApp/clicksDisplay.connected.js

@@ -0,0 +1,11 @@
+/* @flow */
+
+import { connect } from "react-redux";
+
+import { ClicksDisplay } from "./clicksDisplay.component";
+
+const getProps = state => ({
+    clicks: state.clicks
+});
+
+export const ConnectedClicksDisplay = connect(getProps)(ClicksDisplay);

chapter08/src/counterApp/counter.actions.js

@@ -0,0 +1,29 @@
+/* @flow */
+
+export const COUNTER_INCREMENT = "counter:increment";
+
+export const COUNTER_RESET = "counter:reset";
+
+export type CounterAction = {
+    type: string,
+    value?: number
+};
+
+export const reset = () =>
+    ({
+        type: COUNTER_RESET
+    }: CounterAction);
+
+export const increment = (inc: number) =>
+    ({
+        type: COUNTER_INCREMENT,
+        value: inc
+    }: CounterAction);
+
+export const decrement = (dec: number) =>
+    ({
+        type: COUNTER_INCREMENT,
+        value: -dec
+    }: CounterAction);
+
+// returning increment(-dec) would have worked as well

chapter08/src/counterApp/counter.component.js

@@ -0,0 +1,37 @@
+/* @flow */
+
+import React from "react";
+import { PropTypes } from "prop-types";
+
+import {
+    increment,
+    decrement,
+    reset,
+    CounterAction
+} from "./counter.actions.js";
+
+export class Counter extends React.PureComponent<{
+    count: number,
+    dispatch: CounterAction => any
+}> {
+    static propTypes = {
+        count: PropTypes.number.isRequired,
+        dispatch: PropTypes.func.isRequired
+    };
+
+    onAdd1 = () => this.props.dispatch(increment(1));
+    onSub2 = () => this.props.dispatch(decrement(2));
+    onReset = () => this.props.dispatch(reset());
+
+    render() {
+        return (
+            <div>
+                Value: {this.props.count}
+                <br />
+                <button onClick={this.onAdd1}>Add 1</button>
+                <button onClick={this.onSub2}>Subtract 2</button>
+                <button onClick={this.onReset}>Reset</button>
+            </div>
+        );
+    }
+}

chapter08/src/counterApp/counter.connected.js

@@ -0,0 +1,9 @@
+/* @flow */
+
+import { connect } from "react-redux";
+
+import { Counter } from "./counter.component";
+
+const getProps = state => ({ count: state.count });
+
+export const ConnectedCounter = connect(getProps)(Counter);

chapter08/src/counterApp/counter.reducer.js

@@ -0,0 +1,28 @@
+/* @flow */
+
+import { COUNTER_INCREMENT, COUNTER_RESET } from "./counter.actions";
+
+import type { CounterAction } from "./counter.actions.js";
+
+export const reducer = (
+    state = {
+        // initial state
+        count: 0,
+        clicks: 0
+    },
+    action: CounterAction
+) => {
+    switch (action.type) {
+        case COUNTER_INCREMENT:
+            return {
+                count: state.count + action.value,
+                clicks: state.clicks + 1
+            };
+
+        case COUNTER_RESET:
+            return { count: 0, clicks: state.clicks + 1 };
+
+        default:
+            return state;
+    }
+};

chapter08/src/counterApp/index.js

@@ -0,0 +1,14 @@
+/* @flow */
+
+import { Counter } from "./counter.component.js";
+import { ConnectedCounter } from "./counter.connected.js";
+
+import { ClicksDisplay } from "./clicksDisplay.component.js";
+import { ConnectedClicksDisplay } from "./clicksDisplay.connected.js";
+
+export {
+    Counter,
+    ConnectedCounter,
+    ClicksDisplay,
+    ConnectedClicksDisplay
+};

chapter08/src/counterApp/store.js

@@ -0,0 +1,7 @@
+/* @flow */
+
+import { createStore } from "redux";
+
+import { reducer } from "./counter.reducer.js";
+
+export const store = createStore(reducer);

chapter08/src/index.css

@@ -1,5 +0,0 @@
-body {
-  margin: 0;
-  padding: 0;
-  font-family: sans-serif;
-}

chapter08/src/index.js

@@ -1,8 +1,19 @@
-import React from 'react';
+import React from "react";
-import ReactDOM from 'react-dom';
+import ReactDOM from "react-dom";
-import './index.css';
+import { Provider } from "react-redux";
-import App from './App';
-import registerServiceWorker from './registerServiceWorker';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+import { ConnectedCounter, ConnectedClicksDisplay } from "./counterApp";
+import { store } from "./counterApp/store";
+import registerServiceWorker from "./registerServiceWorker";
+
+ReactDOM.render(
+    <Provider store={store}>
+        <React.Fragment>
+            <ConnectedCounter />
+            <hr />
+            <ConnectedClicksDisplay />
+        </React.Fragment>
+    </Provider>,
+    document.getElementById("root")
+);
 registerServiceWorker();

chapter08/src/logo.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>