Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FloatingComponent prop #162

Merged
merged 13 commits into from
Mar 29, 2020
8 changes: 8 additions & 0 deletions docs/PROPSMETHODS.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,14 @@ Refer to the [`react-native` SectionList documentation](https://facebook.github.
| -------- | -------- |
| object | No |

### `FloatingComponent`

A floating component inside the modal wrapper that will be independent of scrolling. It requires `zIndex` child with absolute positioning. Check out the [Flatlist example](https://github.com/jeremybarbet/react-native-modalize/blob/master/examples/expo/src/components/modals/FlatList.js).

| Type | Required |
| -------- | -------- |
| node | No |

### `HeaderComponent`

A header component outside of the ScrollView, at the top of the modal.
Expand Down
36 changes: 35 additions & 1 deletion examples/expo/src/components/modals/FlatList.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { Modalize } from 'react-native-modalize';
import faker from 'faker';

Expand All @@ -22,6 +22,21 @@ export class FlatList extends React.PureComponent {
</View>
);

renderFloatingComponent = () => (
<TouchableOpacity style={s.floating} onPress={this.scrollToTop}>
<Text style={s.text}>Top</Text>
</TouchableOpacity>
);

scrollToTop = () => {
if (this.modal.current) {
this.modal.current.scrollTo({
y: 0,
animated: true,
});
}
};

openModal = () => {
if (this.modal.current) {
this.modal.current.open();
Expand All @@ -32,6 +47,7 @@ export class FlatList extends React.PureComponent {
return (
<Modalize
ref={this.modal}
FloatingComponent={this.renderFloatingComponent}
flatListProps={{
data: this.data,
renderItem: this.renderItem,
Expand Down Expand Up @@ -64,4 +80,22 @@ const s = StyleSheet.create({
fontWeight: '200',
color: '#666',
},

floating: {
position: 'absolute',
right: 20,
bottom: 20,
backgroundColor: 'rgba(66,0,128,1)',
width: 60,
height: 60,
borderRadius: 30,
alignItems: 'center',
justifyContent: 'center',
zIndex: 999,
},

text: {
fontSize: 16,
color: '#fff',
},
});
36 changes: 35 additions & 1 deletion examples/react-native-navigation/src/screens/FlatList.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { Navigation } from 'react-native-navigation';
import { Modalize } from 'react-native-modalize';
import faker from 'faker';
Expand Down Expand Up @@ -30,6 +30,21 @@ export class FlatList extends React.PureComponent {
}
};

scrollToTop = () => {
if (this.modal.current) {
this.modal.current.scrollTo({
y: 0,
animated: true,
});
}
};

renderFloatingComponent = () => (
<TouchableOpacity style={s.floating} onPress={this.scrollToTop}>
<Text style={s.text}>Top</Text>
</TouchableOpacity>
);

renderItem = ({ item }) => (
<View style={s.item}>
<Text style={s.item__name}>{item.name}</Text>
Expand All @@ -42,6 +57,7 @@ export class FlatList extends React.PureComponent {
<Modalize
ref={this.modal}
onClosed={this.onClosed}
FloatingComponent={this.renderFloatingComponent}
flatListProps={{
data: this.data,
renderItem: this.renderItem,
Expand Down Expand Up @@ -74,4 +90,22 @@ const s = StyleSheet.create({
fontWeight: '200',
color: '#666',
},

floating: {
vforvasile marked this conversation as resolved.
Show resolved Hide resolved
position: 'absolute',
right: 20,
bottom: 20,
backgroundColor: 'rgba(66,0,128,1)',
width: 60,
height: 60,
borderRadius: 30,
alignItems: 'center',
justifyContent: 'center',
zIndex: 999,
},

text: {
fontSize: 16,
color: '#fff',
},
});
36 changes: 35 additions & 1 deletion examples/react-navigation/src/components/modals/FlatList.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { Modalize } from 'react-native-modalize';
import faker from 'faker';

Expand All @@ -21,6 +21,21 @@ export class FlatList extends React.PureComponent {
}
};

scrollToTop = () => {
if (this.modal.current) {
this.modal.current.scrollTo({
y: 0,
animated: true,
});
}
};

renderFloatingComponent = () => (
<TouchableOpacity style={s.floating} onPress={this.scrollToTop}>
<Text style={s.text}>Top</Text>
</TouchableOpacity>
);

renderItem = ({ item }) => (
<View style={s.item}>
<Text style={s.item__name}>{item.name}</Text>
Expand All @@ -32,6 +47,7 @@ export class FlatList extends React.PureComponent {
return (
<Modalize
ref={this.modal}
FloatingComponent={this.renderFloatingComponent}
flatListProps={{
data: this.data,
renderItem: this.renderItem,
Expand Down Expand Up @@ -64,4 +80,22 @@ const s = StyleSheet.create({
fontWeight: '200',
color: '#666',
},

floating: {
position: 'absolute',
right: 20,
bottom: 20,
backgroundColor: 'rgba(66,0,128,1)',
width: 60,
height: 60,
borderRadius: 30,
alignItems: 'center',
justifyContent: 'center',
zIndex: 999,
},

text: {
fontSize: 16,
color: '#fff',
},
});
11 changes: 11 additions & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,16 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
return this.renderComponent(FooterComponent);
};

private renderFloatingComponent = (): React.ReactNode => {
const { FloatingComponent } = this.props;

if (!FloatingComponent) {
return null;
}

return this.renderComponent(FloatingComponent);
};

private renderOverlay = (): React.ReactNode => {
const { overlayStyle, alwaysOpen, panGestureEnabled, closeOnOverlayTap } = this.props;
const { showContent } = this.state;
Expand Down Expand Up @@ -823,6 +833,7 @@ export class Modalize<FlatListItem = any, SectionListItem = any> extends React.C
)}

{this.renderOverlay()}
{this.renderFloatingComponent()}
</View>
</TapGestureHandler>
</View>
Expand Down
5 changes: 5 additions & 0 deletions src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ export interface IProps<FlatListItem = any, SectionListItem = any> {
*/
sectionListProps?: Animated.AnimatedProps<SectionListProps<SectionListItem>>;

/*
* A floating component inside the modal wrapper that will be independent of scrolling. It requires `zIndex` child with absolute positioning.
*/
FloatingComponent?: React.ReactNode;

/**
* A header component outside of the ScrollView, on top of the modal.
*/
Expand Down