Skip to content
This repository was archived by the owner on Nov 3, 2025. It is now read-only.

Commit 4b475e9

Browse files
authored
Merge pull request #105 from tpucci/dependabot/npm_and_yarn/mobx-react-6.1.1
⬆️ Bump mobx-react from 5.4.4 to 6.1.1
2 parents 73c8781 + 03feed7 commit 4b475e9

4 files changed

Lines changed: 34 additions & 22 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"jest": "^24.7.0",
5959
"metro-react-native-babel-preset": "^0.55.0",
6060
"mobx": "^5.9.4",
61-
"mobx-react": "^5.4.3",
61+
"mobx-react": "^6.1.1",
6262
"mobx-utils": "^5.4.0",
6363
"patch-package": "^6.1.2",
6464
"postinstall-postinstall": "^2.0.0",

src/FullScreenPortal.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component as ReactComponent, Fragment } from 'react';
22
import { View, StyleSheet } from 'react-native';
3-
import { Observer } from 'mobx-react/native';
3+
import { Observer } from 'mobx-react';
44
import { fromStream } from 'mobx-utils';
55
import { Navigation } from './Navigation';
66

@@ -15,13 +15,19 @@ export class FullScreenPortal extends ReactComponent {
1515
{() => {
1616
if (this.fullScreenStack.current) {
1717
return (
18-
this.fullScreenStack.current &&
19-
this.fullScreenStack.current.map(({ Component, name, isAuthorized }) => (
20-
<Component isAuthorized={isAuthorized} key={name} />
21-
))
18+
<Fragment>
19+
{this.fullScreenStack.current &&
20+
this.fullScreenStack.current.map(({ Component, name, isAuthorized }) => (
21+
<Component isAuthorized={isAuthorized} key={name} />
22+
))}
23+
</Fragment>
2224
);
2325
}
24-
return null;
26+
/**
27+
* @todo Improve typing of <Observer /> to accept null JSXElement.
28+
* Expected: `return null;`
29+
*/
30+
return <Fragment />;
2531
}}
2632
</Observer>
2733
</View>

src/createCanal.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React, { ComponentType, Component as ReactComponent } from 'react';
1+
import React, { ComponentType, Component as ReactComponent, Fragment } from 'react';
22
import { ViewStyle, View, StyleSheet, StyleProp } from 'react-native';
3-
import { Observer } from 'mobx-react/native';
3+
import { Observer } from 'mobx-react';
44
import { fromStream } from 'mobx-utils';
55
import { Subject, Observable, ConnectableObservable } from 'rxjs';
66
import { map, distinctUntilChanged, withLatestFrom, publish } from 'rxjs/operators';
@@ -140,11 +140,13 @@ export const createCanal = <
140140
return (
141141
<View style={this.props.style}>
142142
<Observer>
143-
{() =>
144-
this.stack.current.map(({ name, Component, isAuthorized }) => (
145-
<Component key={name} isAuthorized={isAuthorized} />
146-
))
147-
}
143+
{() => (
144+
<Fragment>
145+
{this.stack.current.map(({ name, Component, isAuthorized }) => (
146+
<Component key={name} isAuthorized={isAuthorized} />
147+
))}
148+
</Fragment>
149+
)}
148150
</Observer>
149151
</View>
150152
);

yarn.lock

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6399,7 +6399,7 @@ hmac-drbg@^1.0.0:
63996399
minimalistic-assert "^1.0.0"
64006400
minimalistic-crypto-utils "^1.0.1"
64016401

6402-
hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0:
6402+
hoist-non-react-statics@^3.3.0:
64036403
version "3.3.0"
64046404
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
64056405
integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
@@ -9095,13 +9095,17 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
90959095
dependencies:
90969096
minimist "0.0.8"
90979097

9098-
mobx-react@^5.4.3:
9099-
version "5.4.4"
9100-
resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz#b3de9c6eabcd0ed8a40036888cb0221ab9568b80"
9101-
integrity sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==
9098+
mobx-react-lite@1.4.0:
9099+
version "1.4.0"
9100+
resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-1.4.0.tgz#193beb5fdddf17ae61542f65ff951d84db402351"
9101+
integrity sha512-5xCuus+QITQpzKOjAOIQ/YxNhOl/En+PlNJF+5QU4Qxn9gnNMJBbweAdEW3HnuVQbfqDYEUnkGs5hmkIIStehg==
9102+
9103+
mobx-react@^6.1.1:
9104+
version "6.1.1"
9105+
resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.1.1.tgz#24a2c8a3393890fa732b4efd34cc6dcccf6e0e7a"
9106+
integrity sha512-hjACWCTpxZf9Sv1YgWF/r6HS6Nsly1SYF22qBJeUE3j+FMfoptgjf8Zmcx2d6uzA07Cezwap5Cobq9QYa0MKUw==
91029107
dependencies:
9103-
hoist-non-react-statics "^3.0.0"
9104-
react-lifecycles-compat "^3.0.2"
9108+
mobx-react-lite "1.4.0"
91059109

91069110
mobx-utils@^5.4.0:
91079111
version "5.4.1"
@@ -10636,7 +10640,7 @@ react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is
1063610640
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
1063710641
integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
1063810642

10639-
react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
10643+
react-lifecycles-compat@^3.0.4:
1064010644
version "3.0.4"
1064110645
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
1064210646
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

0 commit comments

Comments
 (0)