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

Commit 2a50831

Browse files
committed
🐛 (transition) fix
1 parent 02d2d27 commit 2a50831

24 files changed

+167
-54
lines changed

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ jest
1616

1717
# Doc
1818
.docz
19+
20+
# TSDX Code gen
21+
.rts2_cache_cjs
22+
.rts2_cache_esm

example/__tests__/App-test.tsx renamed to example/__tests__/App.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'react-native';
22
import React from 'react';
3-
import App from '../App';
3+
import {App} from '../src/App';
44

55
// Note: test renderer must be required after react-native.
66
import renderer from 'react-test-renderer';

example/jest.config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
module.exports = {
2-
preset: 'react-native',
2+
moduleDirectories: ['node_modules', '../node_modules'],
33
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
4+
moduleNameMapper: {
5+
'^react-nonav$': '<rootDir>/../src/',
6+
'^react-native$': '<rootDir>/node_modules/react-native/',
7+
'^react-native-reanimated$':
8+
'<rootDir>/node_modules/react-native-reanimated/',
9+
},
10+
modulePathIgnorePatterns: ['<rootDir>/../node_modules/react-native/'],
11+
preset: 'react-native',
412
setupFiles: ['<rootDir>/jest.setup.js'],
513
};

example/metro.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module.exports = {
1919
resolver: {
2020
blacklistRE: blacklist([
2121
new RegExp(`${rootPath}/node_modules/react-native/.*`),
22+
new RegExp(`${rootPath}/node_modules/react-native-reanimated/.*`),
2223
]),
2324
extraNodeModules: {
2425
'react-nonav': path.resolve(__dirname, '../src'),

example/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"ios": "react-native run-ios",
99
"start": "react-native start",
1010
"test": "jest",
11+
"test:ci": "jest --runInBand",
1112
"lint": "eslint ."
1213
},
1314
"dependencies": {

example/src/App.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import {StyleSheet, StatusBar, Text} from 'react-native';
2+
import {StyleSheet, StatusBar} from 'react-native';
33
import {FullScreenPortal, Canal, Screen, transition} from 'react-nonav';
44
import {Home} from './canals/home/Home';
55
import {Player} from './canals/player/Player';
@@ -16,16 +16,16 @@ const styles = StyleSheet.create({
1616
console.disableYellowBox = true;
1717

1818
export const App = observer(() => (
19-
<>
19+
<FullScreenPortal>
2020
<StatusBar barStyle="light-content" />
2121
<Canal style={styles.appContainer}>
2222
<Screen name="Home" Component={Home} visible />
2323
<Screen
2424
name="Player"
25-
Transitioner={transition.SlideLeft}
25+
Transitioner={transition.SlideUp}
2626
Component={Player}
2727
visible={PlayerModule.isMoviePlaying}
2828
/>
2929
</Canal>
30-
</>
30+
</FullScreenPortal>
3131
));

example/src/canals/home/Home.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {TabBar} from '../../atoms/TabBar';
66

77
import {HomeScreen} from './screens/HomeScreen';
88
import {DownloadScreen} from './screens/DownloadScreen';
9-
import {FadeTransitioner} from '../../atoms/FadeTransitioner';
109

1110
export const Home = () => {
1211
const [navigationScreen, setNavigationState] = useState('Home');
@@ -18,13 +17,13 @@ export const Home = () => {
1817
name="Home"
1918
Component={HomeScreen}
2019
visible={navigationScreen === 'Home'}
21-
Transitioner={FadeTransitioner}
20+
Transitioner={transition.Fade}
2221
/>
2322
<Screen
2423
name="Downloads"
2524
Component={DownloadScreen}
2625
visible={navigationScreen === 'Downloads'}
27-
Transitioner={FadeTransitioner}
26+
Transitioner={transition.Fade}
2827
/>
2928
</Canal>
3029
<TabBar

example/src/canals/player/Player.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ import {PlayerModule} from '../../module/PlayerModule';
88

99
export const Player = observer(() => {
1010
return (
11-
<View
12-
style={[StyleSheet.absoluteFill, {backgroundColor: 'red'}]}
13-
pointerEvents="box-none">
14-
{/* <Canal style={{flex: 1}}>
11+
<View style={StyleSheet.absoluteFill} pointerEvents="box-none">
12+
<Canal style={{flex: 1}}>
1513
<Screen
1614
name="PlayerCanal"
1715
visible={!PlayerModule.isPlayerMinimized}
1816
Component={PlayerCanal}
1917
Transitioner={PlayerTransitioner}
2018
/>
21-
</Canal> */}
19+
</Canal>
2220
</View>
2321
);
2422
});

example/src/canals/player/PlayerCanal.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
2-
import {Canal, Screen} from 'react-nonav';
3-
import {FadeTransitioner} from '../../atoms/FadeTransitioner';
2+
import {Canal, Screen, transition} from 'react-nonav';
43
import {RemoteControlScreen} from './screens/RemoteControlScreen';
54

65
export const PlayerCanal = () => {
@@ -10,7 +9,7 @@ export const PlayerCanal = () => {
109
visible
1110
name="RemoteControl"
1211
Component={RemoteControlScreen}
13-
Transitioner={FadeTransitioner}
12+
Transitioner={transition.Fade}
1413
/>
1514
</Canal>
1615
);

example/tsconfig.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
"noEmit": true,
1212
"resolveJsonModule": true,
1313
"strict": true,
14-
"target": "esnext"
14+
"target": "esnext",
15+
"baseUrl": ".",
16+
"paths": {
17+
"react-nonav": ["../src"]
18+
}
1519
},
1620
"exclude": [
1721
"node_modules",

0 commit comments

Comments
 (0)