Skip to content

Commit 03829b1

Browse files
authored
Merge pull request #1190 from gaearon/fix-context-consumer
fix: safer reads from context consumer
2 parents 608c5da + 7942d26 commit 03829b1

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/reactHotLoader.js

+11-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,18 @@ const reactHotLoader = {
7676
registerComponent(type)
7777
}
7878
if (isContextType({ type })) {
79+
// possible options - Context, Consumer, Provider.
80+
;['Provider', 'Consumer'].forEach(prop => {
81+
const descriptor = Object.getOwnPropertyDescriptor(type, prop)
82+
if (descriptor && descriptor.value) {
83+
updateFunctionProxyById(
84+
`${id}:${prop}`,
85+
descriptor.value,
86+
updateContext,
87+
)
88+
}
89+
})
7990
updateFunctionProxyById(id, type, updateContext)
80-
if (type.Provider) {
81-
updateFunctionProxyById(`${id}:provider`, type.Provider, updateContext)
82-
}
8391
incrementGeneration()
8492
}
8593
if (isLazyType({ type })) {

0 commit comments

Comments
 (0)