Skip to content

Commit 0bb12b7

Browse files
committed
🐞 Bugfix for RN 0.60
1 parent 3cea012 commit 0bb12b7

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/ModalView.ios.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ const COMMAND_KEYS = {
5151
requestModalPresentation: 'requestModalPresentation',
5252
};
5353

54-
5554
const VirtualizedListContext = React.createContext(null);
55+
// fix for react-native 0.60
56+
const hasScrollViewContext = (ScrollView.Context?.Provider != null);
5657

5758
export class ModalView extends React.PureComponent {
5859
static proptypes = {
@@ -348,9 +349,13 @@ export class ModalView extends React.PureComponent {
348349
setIsModalInPresentation: this.setIsModalInPresentation,
349350
}}>
350351
<VirtualizedListContext.Provider value={null}>
351-
<ScrollView.Context.Provider value={null}>
352-
{this._renderModal()}
353-
</ScrollView.Context.Provider>
352+
{hasScrollViewContext? (
353+
<ScrollView.Context.Provider value={null}>
354+
{this._renderModal()}
355+
</ScrollView.Context.Provider>
356+
):(
357+
this._renderModal()
358+
)}
354359
</VirtualizedListContext.Provider>
355360
</ModalContext.Provider>
356361
);

0 commit comments

Comments
 (0)