diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..0f17867 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..2f093a7 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: gajus +patreon: gajus diff --git a/.gitignore b/.gitignore index d54786c..df978de 100755 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,10 @@ coverage dist *.log .* -!.README +!.babelrc +!.editorconfig +!.eslintrc !.gitignore !.npmignore -!.babelrc +!.README !.travis.yml -!.eslintrc diff --git a/README.md b/README.md index d16c474..a6b7399 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # React CSS Modules +[](https://gitspo.com/mentions/gajus/react-css-modules) [](https://travis-ci.org/gajus/react-css-modules) [](https://www.npmjs.org/package/react-css-modules) [](https://github.com/gajus/canonical) @@ -8,9 +9,7 @@ React CSS Modules implement automatic mapping of CSS modules. Every CSS class is assigned a local-scoped identifier with a global unique name. CSS Modules enable a modular and reusable CSS! -> ⚠️⚠️⚠️ -> -> Note: +> ## ⚠️⚠️⚠️ DEPRECATION NOTICE ⚠️⚠️⚠️ > > If you are considering to use `react-css-modules`, evaluate if [`babel-plugin-react-css-modules`](https://github.com/gajus/babel-plugin-react-css-modules) covers your use case. > `babel-plugin-react-css-modules` is a lightweight alternative of `react-css-modules`. @@ -18,8 +17,7 @@ React CSS Modules implement automatic mapping of CSS modules. Every CSS class is > `babel-plugin-react-css-modules` is not a drop-in replacement and does not cover all the use cases of `react-css-modules`. > However, it has a lot smaller performance overhead (0-10% vs +50%; see [Performance](https://github.com/gajus/babel-plugin-react-css-modules#performance)) and a lot smaller size footprint (less than 2kb vs +17kb). > -> It is easy to get started! -> See the demo https://github.com/gajus/babel-plugin-react-css-modules/tree/master/demo +> It is easy to get started! See the demo https://github.com/gajus/babel-plugin-react-css-modules/tree/master/demo - [CSS Modules](#css-modules) - [webpack `css-loader`](#webpack-css-loader) diff --git a/src/extendReactClass.js b/src/extendReactClass.js index f1f41a6..4741bea 100644 --- a/src/extendReactClass.js +++ b/src/extendReactClass.js @@ -19,6 +19,8 @@ export default (Component: Object, defaultStyles: Object, options: Object) => { const hasDefaultstyles = _.isObject(defaultStyles); + let renderResult; + if (this.props.styles || hasDefaultstyles) { const props = Object.assign({}, this.props); @@ -36,12 +38,29 @@ export default (Component: Object, defaultStyles: Object, options: Object) => { writable: false }); - this.props = props; + const originalProps = this.props; + + let renderIsSuccessful = false; + + try { + this.props = props; + + renderResult = super.render(); + + renderIsSuccessful = true; + } finally { + this.props = originalProps; + } + + // @see https://github.com/facebook/react/issues/14224 + if (!renderIsSuccessful) { + renderResult = super.render(); + } } else { styles = {}; - } - const renderResult = super.render(); + renderResult = super.render(); + } if (renderResult) { return linkClass(renderResult, styles, options); diff --git a/src/linkClass.js b/src/linkClass.js index 4618446..4ed3975 100644 --- a/src/linkClass.js +++ b/src/linkClass.js @@ -13,7 +13,9 @@ const linkArray = (array: Array, styles: Object, configuration: Object) => { // eslint-disable-next-line no-use-before-define array[index] = linkElement(React.Children.only(value), styles, configuration); } else if (_.isArray(value)) { - array[index] = linkArray(value, styles, configuration); + const unfreezedValue = Object.isFrozen(value) ? objectUnfreeze(value) : value; + + array[index] = linkArray(unfreezedValue, styles, configuration); } }); @@ -50,14 +52,7 @@ const linkElement = (element: ReactElement, styles: Object, configuration: Objec if (React.isValidElement(children)) { elementShallowCopy.props.children = linkElement(React.Children.only(children), styles, configuration); } else if (_.isArray(children) || isIterable(children)) { - elementShallowCopy.props.children = React.Children.map(children, (node) => { - if (React.isValidElement(node)) { - // eslint-disable-next-line no-use-before-define - return linkElement(React.Children.only(node), styles, configuration); - } else { - return node; - } - }); + elementShallowCopy.props.children = linkArray(objectUnfreeze(children), styles, configuration); } _.forEach(restProps, (propValue, propName) => { diff --git a/tests/linkClass.js b/tests/linkClass.js index 6a13f21..cf7c289 100644 --- a/tests/linkClass.js +++ b/tests/linkClass.js @@ -125,6 +125,33 @@ describe('linkClass', () => { expect(subject.props.children[0].props.className).to.equal('foo-1'); expect(subject.props.children[1].props.className).to.equal('bar-1'); }); + it('assigns a generated className to elements inside nested arrays', () => { + let subject; + + subject =