Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"scripts": {
"setup": "typings install",
"start": "http-server",
"start": "http-server -c-1",
"build": "npm run setup && npm run test && webpack",
"watch": "webpack --watch",
"lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`components/Counter renders 1`] = `
<CounterComponent
<Loadable(PureCounter)
counter={
Object {
"value": 0,
Expand Down
13 changes: 11 additions & 2 deletions src/components/counter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {

import { Store } from '../reducers'

import loadable from '../decorators/loadable'

type OwnProps = {
}

Expand Down Expand Up @@ -42,7 +44,7 @@ const mapDispatchToProps = (dispatch: redux.Dispatch<Store.All>): ConnectedDispa
dispatch(saveCount({ value })),
})

class CounterComponent extends React.Component<ConnectedState & ConnectedDispatch & OwnProps, {}> {
class PureCounter extends React.Component<ConnectedState & ConnectedDispatch & OwnProps, {}> {

_onClickIncrement = (e: React.SyntheticEvent<HTMLButtonElement>) => {
e.preventDefault()
Expand Down Expand Up @@ -86,5 +88,12 @@ class CounterComponent extends React.Component<ConnectedState & ConnectedDispatc
}
}

const isLoading = (p: ConnectedState & ConnectedDispatch & OwnProps) =>
p.isLoading || p.isSaving

// Invoke `loadable` manually pending decorator support
// See: https://github.com/Microsoft/TypeScript/issues/4881
const LoadableCounter = loadable(isLoading)(PureCounter)

// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8787
export const Counter: React.ComponentClass<OwnProps> = connect(mapStateToProps, mapDispatchToProps)(CounterComponent)
export const Counter = connect(mapStateToProps, mapDispatchToProps)(LoadableCounter)
3 changes: 3 additions & 0 deletions src/decorators/__tests__/__snapshots__/loadable_spec.tsx.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`decorators/loadable maps props to loading 1`] = `<TestComponent />`;
26 changes: 26 additions & 0 deletions src/decorators/__tests__/loadable_spec.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// tslint:disable-next-line no-unused-variable
import * as React from 'react'
import * as TestUtils from 'react-dom/test-utils'
import * as ReactShallowRenderer from 'react-test-renderer/shallow'

import loadable from '../loadable'

const TestComponent = () => <div>OK</div>
const LoadableTestComponent = loadable(props => props.isLoading)(TestComponent)

describe('decorators/loadable', () => {

it('sets friendly .displayName', () => {
expect(LoadableTestComponent.displayName)
.toEqual('Loadable(TestComponent)')
})

it('maps props to loading', () => {
const renderer = new ReactShallowRenderer()
expect(renderer.render(<LoadableTestComponent isLoading />).props.children)
.toEqual('Just a moment, please...')

expect(renderer.render(<LoadableTestComponent />))
.toMatchSnapshot()
})
})
16 changes: 16 additions & 0 deletions src/decorators/loadable.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import * as React from 'react'

export default function loadable<P>(isLoading: (p: P) => boolean) {
return (C: React.ComponentClass<P>|React.SFC<P>): React.SFC<P> => {
const LoadableComponent: React.SFC<P> = (props) => {
if (isLoading(props)) {
return <div>Just a moment, please...</div>
}
return <C {...props} />
}

// Set pretty `displayName` for dev tooling
LoadableComponent.displayName = `Loadable(${C.name})`
return LoadableComponent
}
}