diff --git a/src/AlbumView.js b/src/AlbumView.js index ba84fed..21a0732 100644 --- a/src/AlbumView.js +++ b/src/AlbumView.js @@ -155,7 +155,7 @@ export default class extends React.PureComponent { _onDeletePageFinish = (data) => { const selectedItems = this.state.selectedItems - .filter(item => data.indexOf(item.uri) >= 0); + .filter(item => data.some(image => item.uri === image.uri)); this.setState({selectedItems}); }; @@ -183,7 +183,7 @@ export default class extends React.PureComponent { if (this.state.selectedItems.length > 0) { this.props.navigation.navigate(PageKeys.preview, { ...this.props, - images: this.state.selectedItems.map(item => item.uri), + images: this.state.selectedItems, callback: this._onDeletePageFinish, }); } diff --git a/src/PreviewMultiView.js b/src/PreviewMultiView.js index d9df48d..c8c5912 100644 --- a/src/PreviewMultiView.js +++ b/src/PreviewMultiView.js @@ -70,7 +70,7 @@ export default class extends React.PureComponent { _onScroll = ({nativeEvent: {contentOffset: {x}}}) => { const safeArea = getSafeAreaInset(); const width = Dimensions.get('window').width - safeArea.left - safeArea.right; - const index = Math.floor(x / width); + const index = Math.round(x / width); if (index < 0 || index >= this.state.images.length) { return; }