-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PureComponents, by default #34
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,18 @@ const contextTypes = { | |
[scopeChannel]: PropTypes.object, | ||
} | ||
|
||
function createEmotionStyled(emotion: Object, view: ReactType) { | ||
const defaultProps = { | ||
pure: true, | ||
} | ||
|
||
function createEmotionStyled( | ||
emotion: Object, | ||
view: ReactType, | ||
options: Object, | ||
) { | ||
// Custom Fancy, non-Emotion default options | ||
const {pure} = {...defaultProps, ...options} | ||
|
||
let createStyled: CreateStyled = (tag, options) => { | ||
if (process.env.NODE_ENV !== 'production') { | ||
if (tag === undefined) { | ||
|
@@ -85,7 +96,9 @@ function createEmotionStyled(emotion: Object, view: ReactType) { | |
} | ||
} | ||
|
||
class Styled extends view.Component<*, {theme: Object}> { | ||
const OuterBaseComponent = pure ? view.PureComponent : view.Component | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pattern established in |
||
|
||
class Styled extends OuterBaseComponent<*, {theme: Object}> { | ||
unsubscribe: number | ||
unsubscribeFrame: number | ||
mergedProps: Object | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import React from 'react' | ||
import {mount} from 'enzyme' | ||
import createStyled from '../index' | ||
|
||
test('Creates a React.PureComponent instance, by default', () => { | ||
const Comp = createStyled()('div')`` | ||
const wrapper = mount(<Comp />) | ||
const el = wrapper.getNodes()[0] | ||
|
||
expect(el instanceof React.PureComponent).toBe(true) | ||
}) | ||
|
||
test('Can create a React.Component instance, if defined', () => { | ||
const Comp = createStyled({pure: false})('div')`` | ||
const wrapper = mount(<Comp />) | ||
const el = wrapper.getNodes()[0] | ||
|
||
expect(el instanceof React.Component).toBe(true) | ||
}) | ||
|
||
test('Can create a React.PureComponent instance, if defined', () => { | ||
const Comp = createStyled({pure: true})('div')`` | ||
const wrapper = mount(<Comp />) | ||
const el = wrapper.getNodes()[0] | ||
|
||
expect(el instanceof React.PureComponent).toBe(true) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// @flow | ||
import React from 'react' | ||
import * as emotion from '../emotion/index' | ||
import createEmotionStyled from '../create-emotion-styled' | ||
|
||
/** | ||
* A custom HOC that wraps the default createEmotionStyled to allow | ||
* for options, being passed through a custom argument. | ||
*/ | ||
|
||
export default function createStyled(options) { | ||
return createEmotionStyled(emotion, React, options) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
// @flow | ||
import React from 'react' | ||
import * as emotion from '../emotion/index' | ||
import createEmotionStyled from '../create-emotion-styled' | ||
import createStyled from '../create-styled' | ||
|
||
export default createEmotionStyled(emotion, React) | ||
export default createStyled({pure: true}) | ||
|
||
export * from '../emotion/index' |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Going to (eventually) replace Flow with TS.
This will probably happen during the Emotion 9 -> 10 migration