From 41447152f6c6e77763d834fdbfe82fef98e4f46c Mon Sep 17 00:00:00 2001 From: Tim Dorr Date: Mon, 30 Sep 2019 21:41:29 -0400 Subject: [PATCH] Fix React version check to support 16.10 (#1407) * Fix React version check to support 16.10 Since `parseFloat(React.version)` resolves to `16.1`, that breaks our version check. So, I've switched to checking against the `forwardRef` API's existence, which was also added in 16.3. * Also fix the version check in connectAdvanced. --- src/components/Provider.js | 2 +- src/components/connectAdvanced.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Provider.js b/src/components/Provider.js index 38d70879f..a6e3a5bf2 100644 --- a/src/components/Provider.js +++ b/src/components/Provider.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import { storeShape, subscriptionShape } from '../utils/PropTypes' import warning from '../utils/warning' -const prefixUnsafeLifecycleMethods = parseFloat(React.version) >= 16.3 +const prefixUnsafeLifecycleMethods = typeof React.forwardRef !== "undefined" let didWarnAboutReceivingStore = false function warnAboutReceivingStore() { diff --git a/src/components/connectAdvanced.js b/src/components/connectAdvanced.js index 9222f1645..33b643d43 100644 --- a/src/components/connectAdvanced.js +++ b/src/components/connectAdvanced.js @@ -6,7 +6,7 @@ import { isValidElementType } from 'react-is' import Subscription from '../utils/Subscription' import { storeShape, subscriptionShape } from '../utils/PropTypes' -const prefixUnsafeLifecycleMethods = parseFloat(React.version) >= 16.3 +const prefixUnsafeLifecycleMethods = typeof React.forwardRef !== "undefined" let hotReloadingVersion = 0 const dummyState = {}