Skip to content

Fix adjacent views polishing #1289

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
wants to merge 14 commits into
base: master
Choose a base branch
from
+26,253 −6,248
Open

Fix adjacent views polishing #1289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
38da28b
fix-adjacent-views
AdityaPahilwani Jun 22, 2021
0b1a4db
Loop jumping fixed
AdityaPahilwani Jun 24, 2021
33086fe
Fixed blank jumps and index changes
AdityaPahilwani Jun 26, 2021
fbef115
Near to perfect
AdityaPahilwani Jun 27, 2021
ac1f6b2
Fix to get proper index value
AdityaPahilwani Jun 28, 2021
c948a76
loadMinimalSize fixes
AdityaPahilwani Jun 29, 2021
f8a0667
loop shuffle and button placement fix
AdityaPahilwani Jul 1, 2021
435c0c5
Moving declarationRate to constant
AdityaPahilwani Jul 2, 2021
43d3ba3
adjacent views for vertical slider added
AdityaPahilwani Jul 4, 2021
c0ad7f6
Added examples for adjacent views
AdityaPahilwani Jul 4, 2021
89fc9e3
Moved decelerationRate to props
AdityaPahilwani Jul 4, 2021
6ff80d6
Adjacent views are polished
AdityaPahilwani Jul 4, 2021
57a8189
Changed some naming conventions
AdityaPahilwani Jul 5, 2021
d99ede8
Fix mount offset issue
AdityaPahilwani Jul 13, 2021
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
Prev Previous commit
Next Next commit
Moved decelerationRate to props
  • Loading branch information
@AdityaPahilwani
AdityaPahilwani committed Jul 4, 2021
commit 89fc9e3d69f43b7edbe36d77d0d497188f1248a0
2 changes: 2 additions & 0 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ declare module 'react-native-swiper' {
adjacentViewsWidth?: number
// It works like margin between the adjacent-view
adjacentViewsPadding?: number

decelerationRate?: 'fast' | 'normal' | number;
}

export default class Swiper extends Component<SwiperProps, SwiperState> {
Expand Down
18 changes: 10 additions & 8 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ const styles = {
// missing `module.exports = exports['default'];` with babel6
// export default React.createClass({

const decelerationRate = 0.7

export default class extends Component {
/**
* Props Validation
Expand Down Expand Up @@ -153,7 +151,11 @@ export default class extends Component {

showAdjacentViews: PropTypes.bool,
adjacentViewsWidth: PropTypes.number,
adjacentViewsPadding: PropTypes.number
adjacentViewsPadding: PropTypes.number,
decelerationRate: PropTypes.oneOfType([
PropTypes.number,
PropTypes.oneOf(['fast', 'normal'])
])
}

/**
Expand Down Expand Up @@ -185,7 +187,8 @@ export default class extends Component {

showAdjacentViews: false,
adjacentViewsWidth: 8,
adjacentViewsPadding: 4
adjacentViewsPadding: 4,
decelerationRate: 'normal'
}

/**
Expand Down Expand Up @@ -260,7 +263,7 @@ export default class extends Component {

// Support Optional render page
initState.children = Array.isArray(props.children)
? props.children.filter(child => child)
? props.children.filter((child) => child)
: props.children

initState.total = initState.children ? initState.children.length || 1 : 0
Expand Down Expand Up @@ -311,8 +314,8 @@ export default class extends Component {
let loopVal = this.props.loop ? 2 : 0
initState.offset[initState.dir] =
initState.dir === 'y'
? initState.height * (props.index + loopVal)
: initState.width * (props.index + loopVal);
? initState.height * (props.index + loopVal)
: initState.width * (props.index + loopVal)

this.internals = {
...this.internals,
Expand Down Expand Up @@ -896,7 +899,6 @@ export default class extends Component {
style={this.props.scrollViewStyle}
snapToOffsets={pages.map((x, i) => i * step - snappDiff)}
snapToAlignment={'center'}
decelerationRate={decelerationRate}
>
{pages}
</ScrollView>
Expand Down