Skip to content

Commit a555a12

Browse files
authored
Fix ripple (#62)
* new example * fix ripple not appearing * fix example name
1 parent ba57d82 commit a555a12

20 files changed

+2412
-2636
lines changed

example/.expo-shared/assets.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"f9155ac790fd02fadcdeca367b02581c04a353aa6d5aa84409a59f6804c87acd": true,
3+
"89ed26367cdb9b771858e026f2eb95bfdb90e5ae943e716575327ec325f39c44": true
4+
}

example/.expo/packager-info.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"devToolsPort": 19002,
3-
"expoServerPort": null,
4-
"packagerPort": null,
5-
"packagerPid": null,
6-
"expoServerNgrokUrl": null,
7-
"packagerNgrokUrl": null,
8-
"ngrokPid": null,
9-
"webpackServerPort": null
10-
}
3+
"expoServerPort": 19000,
4+
"packagerPort": 19001,
5+
"packagerPid": 5200,
6+
"expoServerNgrokUrl": "https://up-n7i.cedule.example.exp.direct",
7+
"packagerNgrokUrl": "https://packager.up-n7i.cedule.example.exp.direct",
8+
"ngrokPid": 5238
9+
}

example/.expo/settings.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"lanType": "ip",
44
"dev": true,
55
"minify": false,
6-
"urlRandomness": "rh-h82"
7-
}
6+
"urlRandomness": "up-n7i",
7+
"https": false
8+
}

example/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ node_modules/**/*
22
.expo/*
33
npm-debug.*
44
*.jks
5+
*.p8
56
*.p12
67
*.key
78
*.mobileprovision
89
*.orig.*
910
web-build/
1011
web-report/
12+
13+
# macOS
14+
.DS_Store

example/.watchmanconfig

-1
This file was deleted.

example/App.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import {
1010
UsageWithCustomOverflow,
1111
UsageWithCustomOverflow2,
1212
} from './screens';
13-
import { createStackNavigator, createAppContainer } from 'react-navigation';
1413
import React from 'react';
14+
import { createAppContainer } from 'react-navigation';
15+
import { createStackNavigator } from 'react-navigation-stack';
16+
1517

1618
// just for custom overflow menu onPress action
1719
import { ActionSheetProvider } from '@expo/react-native-action-sheet';

example/app.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
"name": "navbar-buttons-demo",
44
"slug": "navbar-buttons-demo",
55
"privacy": "public",
6-
"sdkVersion": "33.0.0",
7-
"packagerOpts": {
8-
"config": "./metro.config.js"
9-
},
6+
"sdkVersion": "36.0.0",
107
"platforms": ["ios", "android", "web"],
118
"version": "1.0.0",
129
"orientation": "portrait",

example/metro.config.js

-21
This file was deleted.

example/package.json

+26-15
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,36 @@
55
"android": "expo start --android",
66
"ios": "expo start --ios",
77
"web": "expo start --web",
8-
"eject": "expo eject"
8+
"eject": "expo eject",
9+
"prepare": "relative-deps"
10+
},
11+
"relativeDependencies": {
12+
"react-navigation-header-buttons": "../"
913
},
1014
"dependencies": {
11-
"@babel/runtime": "^7.4.5",
12-
"@expo/react-native-action-sheet": "^2.1.0",
13-
"expo": "^33.0.0",
14-
"react": "16.8.3",
15-
"react-dom": "^16.8.6",
16-
"react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz",
17-
"react-native-paper": "^2.16.0",
18-
"react-native-platform-touchable": "^1.1.1",
19-
"react-native-web": "^0.11.4",
20-
"react-navigation": "^3.11.0"
15+
"@expo/react-native-action-sheet": "^3.4.1",
16+
"@react-native-community/masked-view": "^0.1.6",
17+
"expo": "~36.0.0",
18+
"react": "~16.9.0",
19+
"react-dom": "~16.9.0",
20+
"react-native": "https://github.com/expo/react-native/archive/sdk-36.0.0.tar.gz",
21+
"react-native-gesture-handler": "~1.5.0",
22+
"react-native-paper": "^3.4.0",
23+
"react-native-reanimated": "~1.4.0",
24+
"react-native-safe-area-context": "^0.6.2",
25+
"react-native-screens": "2.0.0-alpha.12",
26+
"react-native-web": "~0.11.7",
27+
"react-navigation": "^4.0.10",
28+
"react-navigation-header-buttons": "^3.0.4",
29+
"react-navigation-stack": "^2.0.15"
2130
},
2231
"devDependencies": {
23-
"@types/react": "^16.8.19",
24-
"@types/react-native": "^0.57.60",
25-
"babel-preset-expo": "^5.1.1",
26-
"typescript": "^3.4.5"
32+
"@babel/core": "^7.0.0",
33+
"@types/react": "~16.9.0",
34+
"@types/react-native": "~0.60.23",
35+
"babel-preset-expo": "~8.0.0",
36+
"relative-deps": "^1.0.0",
37+
"typescript": "~3.6.3"
2738
},
2839
"private": true
2940
}

example/screens/UsageCustom.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ScreenProps from './index';
66
export class UsageCustom extends React.Component<ScreenProps> {
77
static navigationOptions = {
88
title: 'Custom',
9-
headerRight: (
9+
headerRight: () => (
1010
<HeaderButtons>
1111
<Item
1212
title="shifted"

example/screens/UsageCustomOverflow.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class RightHeaderButtons extends React.Component {
4444
export class UsageWithCustomOverflow extends React.Component<ScreenProps> {
4545
static navigationOptions = ({ navigation }) => ({
4646
title: 'Custom Overflow',
47-
headerRight: <RightHeaderButtons />,
47+
headerRight: () => <RightHeaderButtons />,
4848
});
4949

5050
render() {

example/screens/UsageCustomRipple.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const DisableableHeaderButton = props => (
1818
export class UsageCustomRipple extends React.Component<ScreenProps> {
1919
static navigationOptions = {
2020
title: 'Ripple',
21-
headerRight: (
21+
headerRight: () => (
2222
<HeaderButtons HeaderButtonComponent={DisableableHeaderButton}>
2323
<Item title="search" iconName="ios-search" onPress={() => alert('search')} />
2424
<Item title="select" onPress={() => alert('select')} />

example/screens/UsageDifferentFontFamilies.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const MultiFontFamilyHeaderButton = props => (
1111
export class UsageDifferentFontFamilies extends React.Component<ScreenProps> {
1212
static navigationOptions = {
1313
title: 'Font families',
14-
headerRight: (
14+
headerRight: () => (
1515
<HeaderButtons HeaderButtonComponent={MultiFontFamilyHeaderButton}>
1616
<Item
1717
title="settings-ion"

example/screens/UsageDisabled.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const DisableableHeaderButton = props => (
1818
export class UsageDisabled extends React.Component<ScreenProps> {
1919
static navigationOptions = {
2020
title: 'Disableable',
21-
headerRight: (
21+
headerRight: () => (
2222
<HeaderButtons HeaderButtonComponent={DisableableHeaderButton}>
2323
<Item title="search" iconName="ios-search" onPress={() => alert('search')} disabled />
2424
<Item title="select" onPress={() => alert('select')} />

example/screens/UsageLeft.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const MaterialHeaderButton = props => (
1212
export class UsageLeft extends React.Component<ScreenProps> {
1313
static navigationOptions = ({ navigation, navigation: { state } }) => ({
1414
title: 'Usage Left',
15-
headerLeft: (
15+
headerLeft: () => (
1616
<HeaderButtons left HeaderButtonComponent={MaterialHeaderButton}>
1717
<Item
1818
title="Test"
@@ -21,7 +21,7 @@ export class UsageLeft extends React.Component<ScreenProps> {
2121
/>
2222
</HeaderButtons>
2323
),
24-
headerRight: (
24+
headerRight: () => (
2525
<HeaderButtons HeaderButtonComponent={MaterialHeaderButton}>
2626
<Item title="back" onPress={() => navigation.goBack()} />
2727
</HeaderButtons>

example/screens/UsageWithIcons.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const IoniconsHeaderButton = props => (
1313
export class UsageWithIcons extends React.Component<ScreenProps> {
1414
static navigationOptions = {
1515
title: 'Vector Icons',
16-
headerRight: (
16+
headerRight: () => (
1717
<HeaderButtons HeaderButtonComponent={IoniconsHeaderButton}>
1818
{/* use Item or HeaderButtons.Item */}
1919
<Item title="search" iconName="ios-search" onPress={() => alert('search')} />

example/screens/UsageWithOverflow.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const MaterialHeaderButton = props => (
1717
export class UsageWithOverflow extends React.Component<ScreenProps> {
1818
static navigationOptions = {
1919
title: 'Usage With Overflow',
20-
headerRight: (
20+
headerRight: () => (
2121
<HeaderButtons
2222
HeaderButtonComponent={MaterialHeaderButton}
2323
OverflowIcon={<MaterialIcons name="more-vert" size={23} color="blue" />}

example/tsconfig.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"compilerOptions": {
3-
"noEmit": true,
4-
"lib": ["dom", "esnext"],
3+
"allowSyntheticDefaultImports": true,
54
"jsx": "react-native",
5+
"lib": ["dom", "esnext"],
66
"moduleResolution": "node",
7-
"allowSyntheticDefaultImports": true,
8-
"skipLibCheck": true
7+
"noEmit": true,
8+
"skipLibCheck": true,
9+
"resolveJsonModule": true
910
}
1011
}

0 commit comments

Comments
 (0)