Skip to content

Feat: slide gap support #108

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.

Sign up for GitHub

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

Open
ars2062 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat: slide gap support #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default class Screen extends React.Component {
springConfig={{ speed: 11 }} {/* RN Animated.spring config */}
minDistanceForAction={0.15} {/* Swipe less that 15% keep active slide */}
positionFixed {/* Fix mobile safari vertical bounces */}
gap={16} {/* gap space between each slide item */}
controlsProps={{
DotComponent: ({ index, activeIndex, isActive, onPress }) => <Text onPress={onPress}>Your Custom Dot {activeIndex+1}/{index+1}</Text>
}}
Expand Down Expand Up @@ -135,6 +136,7 @@ This is possible because `Swiper` used `cloneElement` and inject internally the
| onAnimationEnd | | `function` | Any swiper animation end |
| onIndexChanged | | `function` | Called when active index changed |
| controlsProps | | `object` | see below |
| gap | `0` | `number` | gap space between each slide item |

### Controls Props

Expand Down
7 changes: 7 additions & 0 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,13 @@ interface SwiperSpringAnimationConfig {
}

export interface SwiperProps {
/**
* gap between each item
*
* @default 0
*/
gap?: number;

/**
* Swiper vertical layout
*
Expand Down
16 changes: 9 additions & 7 deletions src/Swiper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class Swiper extends React.Component {
height: 0,
activeIndex: props.from,
pan: new Animated.ValueXY(),
gap: props.gap || 0,
};

this._animatedValueX = 0;
Expand Down Expand Up @@ -158,8 +159,8 @@ class Swiper extends React.Component {

_fixState() {
const { vertical } = this.props;
const { width, height, activeIndex } = this.state;
this._animatedValueX = vertical ? 0 : width * activeIndex * (I18nManager.isRTL ? 1 : -1);
const { width, height, activeIndex, gap } = this.state;
this._animatedValueX = vertical ? 0 : (width * activeIndex + activeIndex * gap) * (I18nManager.isRTL ? 1 : -1);
this._animatedValueY = vertical ? height * activeIndex * -1 : 0;
this.state.pan.setOffset({
x: this._animatedValueX,
Expand All @@ -177,7 +178,7 @@ class Swiper extends React.Component {

_changeIndex(delta = 1) {
const { loop, vertical } = this.props;
const { width, height, activeIndex } = this.state;
const { width, height, activeIndex, gap } = this.state;

let toValue = { x: 0, y: 0 };
let skipChanges = !delta;
Expand All @@ -203,7 +204,7 @@ class Swiper extends React.Component {
if (vertical) {
toValue.y = height * -1 * calcDelta;
} else {
toValue.x = width * (I18nManager.isRTL ? 1 : -1) * calcDelta;
toValue.x = (width * calcDelta + gap * calcDelta) * (I18nManager.isRTL ? 1 : -1);
}
this._spring(toValue);

Expand All @@ -220,7 +221,7 @@ class Swiper extends React.Component {
}

render() {
const { pan, x, y, width, height } = this.state;
const { pan, x, y, width, height, gap } = this.state;

const {
theme,
Expand Down Expand Up @@ -249,7 +250,7 @@ class Swiper extends React.Component {
>
<Animated.View
style={StyleSheet.flatten([
styles.swipeArea(vertical, this.count, width, height),
styles.swipeArea(vertical, this.count, width, height, gap),
swipeAreaStyle,
{
transform: [{ translateX: pan.x }, { translateY: pan.y }],
Expand Down Expand Up @@ -353,13 +354,14 @@ const styles = {
height,
justifyContent: 'space-between',
}),
swipeArea: (vertical, count, width, height) => ({
swipeArea: (vertical, count, width, height, gap) => ({
position: 'absolute',
top: 0,
left: 0,
width: vertical ? width : width * count,
height: vertical ? height * count : height,
flexDirection: vertical ? 'column' : 'row',
gap,
}),
};

Expand Down