From 562d3bc20d5db42b53f2efc6c902bb46592bae2d Mon Sep 17 00:00:00 2001 From: Ken Date: Sat, 2 Mar 2019 22:24:18 -0800 Subject: [PATCH] step 2.6 demo refinement --- index.html | 20 +---- package-lock.json | 5 ++ step2-05/demo/src/reducers/index.ts | 8 +- step2-06/demo/README.md | 68 ++-------------- step2-06/demo/index.html | 6 +- step2-06/demo/src/actions/index.ts | 4 +- step2-06/demo/src/components/TodoApp.tsx | 17 ++++ step2-06/demo/src/components/TodoFooter.tsx | 20 +++++ step2-06/demo/src/components/TodoHeader.tsx | 65 ++++++++++++++++ step2-06/demo/src/components/TodoList.tsx | 19 +++++ step2-06/demo/src/components/TodoListItem.tsx | 78 +++++++++++++++++++ step2-06/demo/src/index.tsx | 18 +++-- step2-06/demo/src/reducers/index.ts | 54 ++++++++----- .../demo/src/reducers/pureFunctions.spec.ts | 29 ------- step2-06/demo/src/reducers/pureFunctions.ts | 35 --------- 15 files changed, 268 insertions(+), 178 deletions(-) create mode 100644 step2-06/demo/src/components/TodoApp.tsx create mode 100644 step2-06/demo/src/components/TodoFooter.tsx create mode 100644 step2-06/demo/src/components/TodoHeader.tsx create mode 100644 step2-06/demo/src/components/TodoList.tsx create mode 100644 step2-06/demo/src/components/TodoListItem.tsx delete mode 100644 step2-06/demo/src/reducers/pureFunctions.spec.ts delete mode 100644 step2-06/demo/src/reducers/pureFunctions.ts diff --git a/index.html b/index.html index cfcb13e..2472ae1 100644 --- a/index.html +++ b/index.html @@ -117,7 +117,7 @@
  • - Redux: Reducers + Redux: The Store
    demo | exercise
    @@ -125,28 +125,12 @@
  • - Redux: Dispatch Actions + Redux: React Binding
    demo | exercise
    • -
  • -
    - Redux: Connect to UI -
    - demo | exercise -
    -
    -
    • -
  • -
    - Redux: Reduce Boilerplate -
    - demo | exercise -
    -
    -
  • Redux: Service Calls diff --git a/package-lock.json b/package-lock.json index 5e52d08..f73efe1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8527,6 +8527,11 @@ "json-stringify-safe": "^5.0.1" } }, + "redux-react-hook": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/redux-react-hook/-/redux-react-hook-3.2.0.tgz", + "integrity": "sha512-GibqTO/Cgl2nRuhw2wacyfd2Nds8pYAPU/eYuTqXZ9v01CT7s7LSwDfPdtQua7TBqE8XNjrwKZqfDyEtfXt7vQ==" + }, "redux-starter-kit": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/redux-starter-kit/-/redux-starter-kit-0.4.3.tgz", diff --git a/step2-05/demo/src/reducers/index.ts b/step2-05/demo/src/reducers/index.ts index 3fac61f..757ac54 100644 --- a/step2-05/demo/src/reducers/index.ts +++ b/step2-05/demo/src/reducers/index.ts @@ -14,10 +14,6 @@ export const todosReducer = createReducer( }, clear(state, action) { - state[action.id].completed = !state[action.id].completed; - }, - - complete(state, action) { Object.keys(state).forEach(key => { if (state[key].completed) { delete state[key]; @@ -25,6 +21,10 @@ export const todosReducer = createReducer( }); }, + complete(state, action) { + state[action.id].completed = !state[action.id].completed; + }, + edit(state, action) { state[action.id].label = action.label; } diff --git a/step2-06/demo/README.md b/step2-06/demo/README.md index 29823ba..20aa091 100644 --- a/step2-06/demo/README.md +++ b/step2-06/demo/README.md @@ -1,68 +1,14 @@ -# Step 2.6 - Redux: Dispatching actions and examining state (Demo) +# Step 2.6: Redux: React Binding (Demo) [Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/) -In this step, we learn about the Redux methods `dispatch()` and `getState()`. Dispatching action messages to the store is the only means by which to instruct the reducers to modify the shared state tree. +In this step, we will continue with Redux. Step 2.5 code can be used with any other web frameworks. This step, we will hook up the Redux store with React components. -We also see how to compose reducers to make up the complete state shape. +We will demonstrate how to: -## Dispatch +1. Bind Redux store to Class Components +2. Bind Redux store to Functional Components -Given a store reference, you can [dispatch](https://redux.js.org/api/store#dispatch) an action to trigger the middleware and reducers. This changes the store and causes the view to re-render. (We'll look at how to pass the store and the dispatch function into the view later.) +## Bind Redux store to Class Components -```ts -const store = createStore(reducers); -store.dispatch(actions.addTodo('id0', 'hello world')); -``` - -> Important note: Dispatches generally have a "fire and forget" approach. We expect React to re-render the UI correctly of its own accord. (Rendering isn't necessarily synchronous in React! Chaining async action creators is a topic for Step 9.) - -## Reducers scoped to a portion of the state tree - -In general, when an application grows, so does the complexity of the state tree. In a Redux application, it is best to have reducers that deal with only a sub-portion of the tree. - -In our example, we have two parts of our state: `todos` and `filter`. We will [split the reducer](https://redux.js.org/basics/reducers#splitting-reducers) to pass the todos to a `todosReducer()` function and just return `all` to the `filter` key for now. This organization helps in navigating and understanding the reducers because it matches the shape of the state one-to-one: there's a separate reducer for each key in state. - -Compare this example which handles the whole state in one reducer... - -```ts -// remember the shape of the store -{ - todos: { - id0: {...}, - id1: {...}, - }, - - filter: 'all' -} -``` - -...to this one which splits it up. - -```ts -function reducers(state, action) { - return { - todos: function todoReducers(state['todos'], action) { - ... - }, - - filter: function filterReducers(state['filter'], action) { - ... - } - } -} -``` - -With the second example, it is easy to understand which reducer changed a given part of the state. - -## `getState()` - -To examine the state of the store, you can call `store.getState()` to get a snapshot of the current state. - -In general, you should only include serializable things in the state so that you can easily save or transfer it. You can even save this state into a browser's local storage and restore for the next boot of your application! - -## Visualizing the reducer and store change - -If you want a really neat UI to show what the store looks when actions are dispatched to the store, use the [Redux DevTools extension](https://chrome.google.com/webstore/detail/redux-devtools/lmhkpmbekcpmknklioeibfkpmmfibljd). - -This extension (available for Chrome and Firefox) is a work of genius! It lets you replay actions and step backwards to debug the current state of a Redux application. In a large enough application, this kind of debuggability is invaluable. It also helps developers who are not familiar with your application to quickly get a handle on how the state changes in response to some actions. +## Bind Redux store to Functional Components diff --git a/step2-06/demo/index.html b/step2-06/demo/index.html index 92a9499..e848070 100644 --- a/step2-06/demo/index.html +++ b/step2-06/demo/index.html @@ -5,11 +5,7 @@
    -
    - For this step, we look at unit testing. Run - 
    npm test
    - in the command line. -
    +
    diff --git a/step2-06/demo/src/actions/index.ts b/step2-06/demo/src/actions/index.ts index 4a067b9..a483a82 100644 --- a/step2-06/demo/src/actions/index.ts +++ b/step2-06/demo/src/actions/index.ts @@ -4,5 +4,7 @@ export const actions = { addTodo: (label: string) => ({ type: 'addTodo', id: uuid(), label }), remove: (id: string) => ({ type: 'remove', id }), complete: (id: string) => ({ type: 'complete', id }), - clear: () => ({ type: 'clear' }) + clear: () => ({ type: 'clear' }), + setFilter: (filter: string) => ({ type: 'setFilter', filter }), + edit: (id: string, label: string) => ({ type: 'edit', id, label }) }; diff --git a/step2-06/demo/src/components/TodoApp.tsx b/step2-06/demo/src/components/TodoApp.tsx new file mode 100644 index 0000000..4425e1d --- /dev/null +++ b/step2-06/demo/src/components/TodoApp.tsx @@ -0,0 +1,17 @@ +import React from 'react'; +import { Stack } from 'office-ui-fabric-react'; +import { TodoFooter } from './TodoFooter'; +import { TodoHeader } from './TodoHeader'; +import { TodoList } from './TodoList'; + +export const TodoApp = () => { + return ( + + + + + + + + ); +}; diff --git a/step2-06/demo/src/components/TodoFooter.tsx b/step2-06/demo/src/components/TodoFooter.tsx new file mode 100644 index 0000000..d38e454 --- /dev/null +++ b/step2-06/demo/src/components/TodoFooter.tsx @@ -0,0 +1,20 @@ +import React from 'react'; +import { DefaultButton, Stack, Text } from 'office-ui-fabric-react'; +import { actions } from '../actions'; +import { useMappedState, useDispatch } from 'redux-react-hook'; + +export const TodoFooter = () => { + const { todos } = useMappedState(state => state); + const dispatch = useDispatch(); + + const itemCount = Object.keys(todos).filter(id => !todos[id].completed).length; + + return ( + + + {itemCount} item{itemCount === 1 ? '' : 's'} left + + dispatch(actions.clear())}>Clear Completed + + ); +}; diff --git a/step2-06/demo/src/components/TodoHeader.tsx b/step2-06/demo/src/components/TodoHeader.tsx new file mode 100644 index 0000000..a272037 --- /dev/null +++ b/step2-06/demo/src/components/TodoHeader.tsx @@ -0,0 +1,65 @@ +import React from 'react'; +import { Stack, Text, Pivot, PivotItem, TextField, PrimaryButton } from 'office-ui-fabric-react'; +import { FilterTypes } from '../store'; +import { actions } from '../actions'; +import { StoreContext } from 'redux-react-hook'; + +interface TodoHeaderState { + labelInput: string; +} + +export class TodoHeader extends React.Component<{}, TodoHeaderState> { + constructor(props: {}) { + super(props); + this.state = { labelInput: undefined }; + } + + render() { + return ( + + + todos + + + + + ({ + ...(props.focused && { + field: { + backgroundColor: '#c7e0f4' + } + }) + })} + /> + + Add + + + + + + + + + ); + } + + private onAdd = () => { + this.context.dispatch(actions.addTodo(this.state.labelInput)); + this.setState({ labelInput: undefined }); + }; + + private onChange = (evt: React.FormEvent, newValue: string) => { + this.setState({ labelInput: newValue }); + }; + + private onFilter = (item: PivotItem) => { + this.context.dispatch(actions.setFilter(item.props.headerText as FilterTypes)); + }; +} + +TodoHeader.contextType = StoreContext; diff --git a/step2-06/demo/src/components/TodoList.tsx b/step2-06/demo/src/components/TodoList.tsx new file mode 100644 index 0000000..b577baa --- /dev/null +++ b/step2-06/demo/src/components/TodoList.tsx @@ -0,0 +1,19 @@ +import React from 'react'; +import { Stack } from 'office-ui-fabric-react'; +import { TodoListItem } from './TodoListItem'; +import { useMappedState } from 'redux-react-hook'; + +export const TodoList = () => { + const { filter, todos } = useMappedState(state => state); + const filteredTodos = Object.keys(todos).filter(id => { + return filter === 'all' || (filter === 'completed' && todos[id].completed) || (filter === 'active' && !todos[id].completed); + }); + + return ( + + {filteredTodos.map(id => ( + + ))} + + ); +}; diff --git a/step2-06/demo/src/components/TodoListItem.tsx b/step2-06/demo/src/components/TodoListItem.tsx new file mode 100644 index 0000000..e105851 --- /dev/null +++ b/step2-06/demo/src/components/TodoListItem.tsx @@ -0,0 +1,78 @@ +import React from 'react'; +import { Stack, Checkbox, IconButton, TextField, DefaultButton } from 'office-ui-fabric-react'; +import { actions } from '../actions'; +import { StoreContext } from 'redux-react-hook'; + +interface TodoListItemProps { + id: string; +} + +interface TodoListItemState { + editing: boolean; + editLabel: string; +} + +export class TodoListItem extends React.Component { + constructor(props: TodoListItemProps) { + super(props); + this.state = { editing: false, editLabel: undefined }; + } + + render() { + const { id } = this.props; + const { todos } = this.context.getState(); + const dispatch = this.context.dispatch; + + const item = todos[id]; + + return ( + + {!this.state.editing && ( + <> + dispatch(actions.complete(id))} /> +
    + + dispatch(actions.remove(id))} /> +
    + + )} + + {this.state.editing && ( + + + + + + Save + + + )} +     + ); + } + + private onEdit = () => { + const { id } = this.props; + const { todos } = this.context.getState(); + const { label } = todos[id]; + + this.setState({ + editing: true, + editLabel: this.state.editLabel || label + }); + }; + + private onDoneEdit = () => { + this.context.dispatch(actions.edit(this.props.id, this.state.editLabel)); + this.setState({ + editing: false, + editLabel: undefined + }); + }; + + private onChange = (evt: React.FormEvent, newValue: string) => { + this.setState({ editLabel: newValue }); + }; +} + +TodoListItem.contextType = StoreContext; diff --git a/step2-06/demo/src/index.tsx b/step2-06/demo/src/index.tsx index 84837fc..d994e52 100644 --- a/step2-06/demo/src/index.tsx +++ b/step2-06/demo/src/index.tsx @@ -1,13 +1,19 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; import { reducer } from './reducers'; import { createStore } from 'redux'; +import { TodoApp } from './components/TodoApp'; +import { initializeIcons } from '@uifabric/icons'; import { composeWithDevTools } from 'redux-devtools-extension'; -import { actions } from './actions'; +import { StoreContext } from 'redux-react-hook'; const store = createStore(reducer, {}, composeWithDevTools()); -console.log(store.getState()); +initializeIcons(); -store.dispatch(actions.addTodo('hello')); -store.dispatch(actions.addTodo('world')); - -console.log(store.getState()); +ReactDOM.render( + + + , + document.getElementById('app') +); diff --git a/step2-06/demo/src/reducers/index.ts b/step2-06/demo/src/reducers/index.ts index 6eed3c5..757ac54 100644 --- a/step2-06/demo/src/reducers/index.ts +++ b/step2-06/demo/src/reducers/index.ts @@ -1,27 +1,43 @@ import { Store } from '../store'; -import { addTodo, remove, complete, clear } from './pureFunctions'; +import { combineReducers } from 'redux'; +import { createReducer } from 'redux-starter-kit'; -function todoReducer(state: Store['todos'] = {}, action: any): Store['todos'] { - switch (action.type) { - case 'addTodo': - return addTodo(state, action.id, action.label); +export const todosReducer = createReducer( + {}, + { + addTodo(state, action) { + state[action.id] = { label: action.label, completed: false }; + }, - case 'remove': - return remove(state, action.id); + remove(state, action) { + delete state[action.id]; + }, - case 'clear': - return clear(state); + clear(state, action) { + Object.keys(state).forEach(key => { + if (state[key].completed) { + delete state[key]; + } + }); + }, - case 'complete': - return complete(state, action.id); + complete(state, action) { + state[action.id].completed = !state[action.id].completed; + }, + + edit(state, action) { + state[action.id].label = action.label; + } } +); - return state; -} +export const filterReducer = createReducer('all', { + setFilter(state, action) { + return action.filter; + } +}); -export function reducer(state: Store, action: any): Store { - return { - todos: todoReducer(state.todos, action), - filter: 'all' - }; -} +export const reducer = combineReducers({ + todos: todosReducer, + filter: filterReducer +}); diff --git a/step2-06/demo/src/reducers/pureFunctions.spec.ts b/step2-06/demo/src/reducers/pureFunctions.spec.ts deleted file mode 100644 index b3815cf..0000000 --- a/step2-06/demo/src/reducers/pureFunctions.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { addTodo, complete } from './pureFunctions'; -import { Store } from '../store'; - -describe('TodoApp reducers', () => { - it('can add an item', () => { - const state = {}; - - const newState = addTodo(state, '0', 'item1'); - - const keys = Object.keys(newState); - - expect(newState).not.toBe(state); - expect(keys.length).toBe(1); - expect(newState[keys[0]].label).toBe('item1'); - expect(newState[keys[0]].completed).toBeFalsy(); - }); - - it('can complete an item', () => { - const state = {}; - - let newState = addTodo(state, '0', 'item1'); - - const key = Object.keys(newState)[0]; - - newState = complete(newState, key); - - expect(newState[key].completed).toBeTruthy(); - }); -}); diff --git a/step2-06/demo/src/reducers/pureFunctions.ts b/step2-06/demo/src/reducers/pureFunctions.ts deleted file mode 100644 index e1954e5..0000000 --- a/step2-06/demo/src/reducers/pureFunctions.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Store, FilterTypes } from '../store'; - -export function addTodo(state: Store['todos'], id: string, label: string): Store['todos'] { - return { ...state, [id]: { label, completed: false } }; -} - -export function remove(state: Store['todos'], id: string) { - const newTodos = { ...state }; - - delete newTodos[id]; - - return newTodos; -} - -export function complete(state: Store['todos'], id: string) { - // Clone the todo, overriding - const newTodo = { ...state[id], completed: !state[id].completed }; - return { ...state, [id]: newTodo }; -} - -export function clear(state: Store['todos']) { - const newTodos = { ...state }; - - Object.keys(state).forEach(key => { - if (state[key].completed) { - delete newTodos[key]; - } - }); - - return newTodos; -} - -export function setFilter(state: Store['filter'], filter: FilterTypes) { - return filter; -}