Add forwardRef option to translate HOC to allow passing down ref #20
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,7 +61,7 @@ | |
| "webpack": "^1.13.1" | ||
| }, | ||
| "dependencies": { | ||
| "hoist-non-react-statics": "^3.0.0", | ||
| "prop-types": "^15.5.8" | ||
| } | ||
| } | ||
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 | ||||
|---|---|---|---|---|---|---|
| @@ -1,15 +1,37 @@ | ||||||
| import React from 'react' | ||||||
| import hoistNonReactStatics from 'hoist-non-react-statics' | ||||||
| import PropTypes from 'prop-types' | ||||||
| import I18nContext from './i18n-context' | ||||||
|
|
||||||
| // higher order decorator for components that need `t` | ||||||
| export default function translate({ forwardRef } = {}) { | ||||||
| return WrappedComponent => { | ||||||
| const _translate = originalProps => { | ||||||
| const props = Object.assign({}, originalProps) | ||||||
| const forwardedRef = props.forwardedRef | ||||||
|
|
||||||
| delete props.forwardedRef | ||||||
|
|
||||||
| return ( | ||||||
| <I18nContext.Consumer> | ||||||
| {t => <WrappedComponent {...props} t={t} ref={forwardedRef} />} | ||||||
|
There was a problem hiding this comment. Codacy has a fix for the issue: Replace
Suggested change
|
||||||
| </I18nContext.Consumer> | ||||||
| ) | ||||||
| } | ||||||
| _translate.propTypes = { | ||||||
| forwardedRef: PropTypes.oneOfType([ | ||||||
| PropTypes.func, | ||||||
| PropTypes.shape({ current: PropTypes.elementType }), | ||||||
| ]), | ||||||
| } | ||||||
|
|
||||||
| if (forwardRef) { | ||||||
| const forwarded = React.forwardRef((props, ref) => { | ||||||
| return <_translate {...props} forwardedRef={ref} /> | ||||||
| }) | ||||||
|
|
||||||
| return hoistNonReactStatics(forwarded, WrappedComponent) | ||||||
| } | ||||||
|
|
||||||
| return hoistNonReactStatics(_translate, WrappedComponent) | ||||||
| } | ||||||
|
|
||||||
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 |
|---|---|---|
|
|
@@ -257,7 +257,8 @@ arrify@^1.0.0, arrify@^1.0.1: | |
|
|
||
| asap@~2.0.3: | ||
| version "2.0.6" | ||
| resolved "https://dev.ottolearn.io/npm/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" | ||
| integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= | ||
|
|
||
| asn1@~0.2.3: | ||
| version "0.2.3" | ||
|
|
@@ -1291,7 +1292,8 @@ copy-descriptor@^0.1.0: | |
|
|
||
| core-js@^1.0.0: | ||
| version "1.2.7" | ||
| resolved "https://dev.ottolearn.io/npm/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" | ||
| integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= | ||
|
|
||
| core-js@^2.4.0, core-js@^2.5.0: | ||
| version "2.5.5" | ||
|
|
@@ -1482,7 +1484,8 @@ emojis-list@^2.0.0: | |
|
|
||
| encoding@^0.1.11: | ||
| version "0.1.12" | ||
| resolved "https://dev.ottolearn.io/npm/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" | ||
| integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= | ||
| dependencies: | ||
| iconv-lite "~0.4.13" | ||
|
|
||
|
|
@@ -1786,16 +1789,17 @@ fb-watchman@^2.0.0: | |
| bser "^2.0.0" | ||
|
|
||
| fbjs@^0.8.16: | ||
| version "0.8.17" | ||
| resolved "https://dev.ottolearn.io/npm/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" | ||
| integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= | ||
| dependencies: | ||
| core-js "^1.0.0" | ||
| isomorphic-fetch "^2.1.1" | ||
| loose-envify "^1.0.0" | ||
| object-assign "^4.1.0" | ||
| promise "^7.1.1" | ||
| setimmediate "^1.0.5" | ||
| ua-parser-js "^0.7.18" | ||
|
|
||
| figures@^2.0.0: | ||
| version "2.0.0" | ||
|
|
@@ -2108,9 +2112,12 @@ [email protected]: | |
| version "4.2.1" | ||
| resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" | ||
|
|
||
| hoist-non-react-statics@^3.0.0: | ||
| version "3.3.0" | ||
| resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" | ||
| integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA== | ||
| dependencies: | ||
| react-is "^16.7.0" | ||
|
|
||
| home-or-tmp@^2.0.0: | ||
| version "2.0.0" | ||
|
|
@@ -2145,12 +2152,19 @@ [email protected]: | |
| version "0.4.19" | ||
| resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" | ||
|
|
||
| iconv-lite@^0.4.17, iconv-lite@^0.4.4: | ||
| version "0.4.21" | ||
| resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798" | ||
| dependencies: | ||
| safer-buffer "^2.1.0" | ||
|
|
||
| iconv-lite@~0.4.13: | ||
| version "0.4.24" | ||
| resolved "https://dev.ottolearn.io/npm/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" | ||
| integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== | ||
| dependencies: | ||
| safer-buffer ">= 2.1.2 < 3" | ||
|
|
||
| ieee754@^1.1.4: | ||
| version "1.1.11" | ||
| resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455" | ||
|
|
@@ -2428,7 +2442,8 @@ is-resolvable@^1.0.0: | |
|
|
||
| is-stream@^1.0.1, is-stream@^1.1.0: | ||
| version "1.1.0" | ||
| resolved "https://dev.ottolearn.io/npm/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" | ||
| integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= | ||
|
|
||
| is-symbol@^1.0.1: | ||
| version "1.0.1" | ||
|
|
@@ -2466,7 +2481,8 @@ isobject@^3.0.0, isobject@^3.0.1: | |
|
|
||
| isomorphic-fetch@^2.1.1: | ||
| version "2.2.1" | ||
| resolved "https://dev.ottolearn.io/npm/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" | ||
| integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= | ||
| dependencies: | ||
| node-fetch "^1.0.1" | ||
| whatwg-fetch ">=0.10.0" | ||
|
|
@@ -2816,6 +2832,11 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: | |
| version "3.0.2" | ||
| resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" | ||
|
|
||
| "js-tokens@^3.0.0 || ^4.0.0": | ||
| version "4.0.0" | ||
| resolved "https://dev.ottolearn.io/npm/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" | ||
| integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== | ||
|
|
||
| js-yaml@^3.7.0, js-yaml@^3.9.1: | ||
| version "3.13.1" | ||
| resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" | ||
|
|
@@ -2998,7 +3019,14 @@ longest@^1.0.1: | |
| version "1.0.1" | ||
| resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" | ||
|
|
||
| loose-envify@^1.0.0, loose-envify@^1.3.1, loose-envify@^1.4.0: | ||
| version "1.4.0" | ||
| resolved "https://dev.ottolearn.io/npm/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" | ||
| integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== | ||
| dependencies: | ||
| js-tokens "^3.0.0 || ^4.0.0" | ||
|
|
||
| loose-envify@^1.1.0: | ||
| version "1.3.1" | ||
| resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" | ||
| dependencies: | ||
|
|
@@ -3195,7 +3223,8 @@ neo-async@^2.6.0: | |
|
|
||
| node-fetch@^1.0.1: | ||
| version "1.7.3" | ||
| resolved "https://dev.ottolearn.io/npm/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" | ||
| integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ== | ||
| dependencies: | ||
| encoding "^0.1.11" | ||
| is-stream "^1.0.1" | ||
|
|
@@ -3327,7 +3356,8 @@ oauth-sign@~0.8.2: | |
|
|
||
| object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: | ||
| version "4.1.1" | ||
| resolved "https://dev.ottolearn.io/npm/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" | ||
| integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= | ||
|
|
||
| object-copy@^0.1.0: | ||
| version "0.1.0" | ||
|
|
@@ -3600,11 +3630,21 @@ progress@^2.0.0: | |
|
|
||
| promise@^7.1.1: | ||
| version "7.3.1" | ||
| resolved "https://dev.ottolearn.io/npm/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" | ||
| integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== | ||
| dependencies: | ||
| asap "~2.0.3" | ||
|
|
||
| prop-types@^15.5.8: | ||
| version "15.7.2" | ||
| resolved "https://dev.ottolearn.io/npm/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" | ||
| integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== | ||
| dependencies: | ||
| loose-envify "^1.4.0" | ||
| object-assign "^4.1.1" | ||
| react-is "^16.8.1" | ||
|
|
||
| prop-types@^15.6.0: | ||
| version "15.6.1" | ||
| resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" | ||
| dependencies: | ||
|
|
@@ -3673,6 +3713,16 @@ react-is@^16.3.2: | |
| version "16.3.2" | ||
| resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22" | ||
|
|
||
| react-is@^16.7.0: | ||
| version "16.8.6" | ||
| resolved "https://registry.yarnpkg.com/npm/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" | ||
| integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== | ||
|
|
||
| react-is@^16.8.1: | ||
| version "16.9.0" | ||
| resolved "https://dev.ottolearn.io/npm/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" | ||
| integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw== | ||
|
|
||
| react-test-renderer@^16.3.2: | ||
| version "16.3.2" | ||
| resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.2.tgz#3d1ed74fda8db42521fdf03328e933312214749a" | ||
|
|
@@ -3937,9 +3987,10 @@ safe-regex@^1.1.0: | |
| dependencies: | ||
| ret "~0.1.10" | ||
|
|
||
| "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0: | ||
| version "2.1.2" | ||
| resolved "https://dev.ottolearn.io/npm/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" | ||
| integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== | ||
|
|
||
| sane@^2.0.0: | ||
| version "2.5.1" | ||
|
|
@@ -3991,7 +4042,8 @@ set-value@^2.0.0: | |
|
|
||
| setimmediate@^1.0.4, setimmediate@^1.0.5: | ||
| version "1.0.5" | ||
| resolved "https://dev.ottolearn.io/npm/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" | ||
| integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= | ||
|
|
||
| [email protected]: | ||
| version "2.2.6" | ||
|
|
@@ -4414,9 +4466,10 @@ typedarray@^0.0.6: | |
| version "0.0.6" | ||
| resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" | ||
|
|
||
| ua-parser-js@^0.7.18: | ||
| version "0.7.20" | ||
| resolved "https://dev.ottolearn.io/npm/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098" | ||
| integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw== | ||
|
|
||
| uglify-js@^3.1.4: | ||
| version "3.6.0" | ||
|
|
@@ -4594,8 +4647,9 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: | |
| iconv-lite "0.4.19" | ||
|
|
||
| whatwg-fetch@>=0.10.0: | ||
| version "3.0.0" | ||
| resolved "https://dev.ottolearn.io/npm/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" | ||
| integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== | ||
|
|
||
| whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0: | ||
| version "2.1.0" | ||
|
|
||
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.
Codacy has a fix for the issue: Replace
originalPropswith(originalProps)