Skip to content

Commit 98603c2

Browse files
committed
Merged from meliorence#152
1 parent 8e1185a commit 98603c2

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/Gallery.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default class Gallery extends PureComponent {
5555
this.activeImageResponder = this.activeImageResponder.bind(this);
5656
}
5757

58-
componentWillMount () {
58+
UNSAFE_componentWillMount () {
5959
let onResponderReleaseOrTerminate = (evt, gestureState) => {
6060
if (this.activeResponder) {
6161
if (this.activeResponder === this.viewPagerResponder &&

src/libraries/TransformableImage/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class TransformableImage extends PureComponent {
5151
};
5252
}
5353

54-
componentWillMount () {
54+
UNSAFE_componentWillMount () {
5555
if (!this.state.imageDimensions) {
5656
this.getImageSize(this.props.image);
5757
}
@@ -61,7 +61,7 @@ export default class TransformableImage extends PureComponent {
6161
this._mounted = true;
6262
}
6363

64-
componentWillReceiveProps (nextProps) {
64+
UNSAFE_componentWillReceiveProps (nextProps) {
6565
if (!sameImage(this.props.image, nextProps.image)) {
6666
// image source changed, clear last image's imageDimensions info if any
6767
this.setState({ imageDimensions: nextProps.image.dimensions, keyAcumulator: this.state.keyAcumulator + 1 });

src/libraries/ViewPager/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default class ViewPager extends PureComponent {
8787
});
8888
}
8989

90-
componentWillMount () {
90+
UNSAFE_componentWillMount () {
9191
this.gestureResponder = createResponder({
9292
onStartShouldSetResponder: (evt, gestureState) => true,
9393
onResponderGrant: this.onResponderGrant,
@@ -260,7 +260,7 @@ export default class ViewPager extends PureComponent {
260260
}
261261

262262
keyExtractor (item, index) {
263-
return index;
263+
return index.toString();
264264
}
265265

266266
renderRow ({ item, index }) {
@@ -316,7 +316,6 @@ export default class ViewPager extends PureComponent {
316316
style={[style, { flex: 1 }]}
317317
{...gestureResponder}>
318318
<FlatList
319-
{...this.props.flatListProps}
320319
style={[{ flex: 1 }, scrollViewStyle]}
321320
ref={'innerFlatList'}
322321
keyExtractor={this.keyExtractor}
@@ -331,6 +330,7 @@ export default class ViewPager extends PureComponent {
331330
// https://github.com/facebook/react-native/issues/15734#issuecomment-330616697 and
332331
// https://github.com/facebook/react-native/issues/14945#issuecomment-354651271
333332
contentOffset = {{x: this.getScrollOffsetOfPage(parseInt(this.props.initialPage)), y:0}}
333+
{...this.props.flatListProps}
334334
/>
335335
</View>
336336
);

src/libraries/ViewTransformer/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ export default class ViewTransformer extends React.Component {
9595
return new Transform(this.state.scale, this.state.translateX, this.state.translateY);
9696
}
9797

98-
componentWillMount () {
98+
UNSAFE_componentWillMount () {
9999
this.gestureResponder = createResponder({
100100
onStartShouldSetResponder: (evt, gestureState) => true,
101101
onMoveShouldSetResponderCapture: (evt, gestureState) => true,
102102
// onMoveShouldSetResponder: this.handleMove,
103-
onResponderMove: this.onResponderMove,
104-
onResponderGrant: this.onResponderGrant,
105-
onResponderRelease: this.onResponderRelease,
106-
onResponderTerminate: this.onResponderRelease,
103+
onResponderMove: this.onResponderMove.bind(this),
104+
onResponderGrant: this.onResponderGrant.bind(this),
105+
onResponderRelease: this.onResponderRelease.bind(this),
106+
onResponderTerminate: this.onResponderRelease.bind(this),
107107
onResponderTerminationRequest: (evt, gestureState) => false, // Do not allow parent view to intercept gesture
108108
onResponderSingleTapConfirmed: (evt, gestureState) => {
109109
this.props.onSingleTapConfirmed && this.props.onSingleTapConfirmed();

0 commit comments

Comments
 (0)