Skip to content

Filter themr props #27

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.

Sign up for GitHub

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

Merged
javivelasco merged 4 commits into from
Oct 8, 2016
Merged

Filter themr props #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25cce9f
filter themr props
raveclassic Oct 3, 2016
d965a66
fix jsdoc
raveclassic Oct 3, 2016
d82739e
fix jsdoc
raveclassic Oct 3, 2016
26aac97
tests
raveclassic Oct 3, 2016
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
18 changes: 12 additions & 6 deletions src/components/themr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const THEMR_CONFIG = typeof Symbol !== 'undefined' ?
/**
* Themr decorator
* @param {String|Number|Symbol} componentName - Component name
* @param {TReactCSSThemrTheme} localTheme - Base theme
* @param {{}} options - Themr options
* @param {TReactCSSThemrTheme} [localTheme] - Base theme
* @param {{}} [options] - Themr options
* @returns {function(ThemedComponent:Function):Function} - ThemedComponent
*/
export default (componentName, localTheme, options = {}) => (ThemedComponent) => {
Expand All @@ -46,6 +46,9 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
localTheme
}

/**
* @property {{wrappedInstance: *}} refs
*/
class Themed extends Component {
static displayName = `Themed${ThemedComponent.name}`;

Expand Down Expand Up @@ -134,16 +137,19 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>

render() {
let renderedElement
//exclude themr-only props
//noinspection JSUnusedLocalSymbols
const { composeTheme, themeNamespace, ...props } = this.props //eslint-disable-line no-unused-vars

if (optionWithRef) {
renderedElement = React.createElement(ThemedComponent, {
...this.props,
...props,
ref: 'wrappedInstance',
theme: this.theme_
Copy link
Contributor

@istarkov istarkov Oct 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why theme prop itself is not a problem?

Copy link
Contributor

@istarkov istarkov Oct 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

Copy link
Contributor Author

@raveclassic raveclassic Oct 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost everywhere it is extracted: const {theme, ...props} = this.props; return <input {...props}/>;

})
} else {
renderedElement = React.createElement(ThemedComponent, {
...this.props,
...props,
theme: this.theme_
})
}
Expand All @@ -159,8 +165,8 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>

/**
* Merges two themes by concatenating values with the same keys
* @param {TReactCSSThemrTheme} original - Original theme object
* @param {TReactCSSThemrTheme} mixin - Mixing theme object
* @param {TReactCSSThemrTheme} [original] - Original theme object
* @param {TReactCSSThemrTheme} [mixin] - Mixing theme object
* @returns {TReactCSSThemrTheme} - Merged resulting theme
*/
export function themeable(original = {}, mixin) {
Expand Down
22 changes: 21 additions & 1 deletion test/components/themr.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import { themr, themeable } from '../../src/index'
describe('Themr decorator function', () => {
class Passthrough extends Component {
render() {
return <div {...this.props} />
const { theme, ...props } = this.props //eslint-disable-line no-unused-vars
return <div {...props} />
}
}

Expand Down Expand Up @@ -495,6 +496,25 @@ describe('Themr decorator function', () => {
expect(spy.callCount === 4).toBe(true)
}
)

it('should not pass internal themr props to WrappedComponent', () => {
@themr('Container')
class Container extends Component {
render() {
return <Passthrough {...this.props} />
}
}

const tree = TestUtils.renderIntoDocument(
<Container/>
)

const stub = TestUtils.findRenderedComponentWithType(tree, Passthrough)
// expect(stub.props.theme).toEqual(containerTheme)
expect(stub.props.themeNamespace).toNotExist()
expect(stub.props.composeTheme).toNotExist()
expect(stub.props.theme).toExist()
})
})

describe('themeable function', () => {
Expand Down