Fix bad rebase
This commit is contained in:
@@ -253,7 +253,7 @@ function ImageView({
|
|||||||
if (isOut && !wasOut) {
|
if (isOut && !wasOut) {
|
||||||
// Stop the animation from blocking the screen forever.
|
// Stop the animation from blocking the screen forever.
|
||||||
cancelAnimation(dismissSwipeTranslateY)
|
cancelAnimation(dismissSwipeTranslateY)
|
||||||
runOnJS(onRequestClose)()
|
onFlyAway()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
@@ -283,7 +283,6 @@ function ImageView({
|
|||||||
onZoom={onZoom}
|
onZoom={onZoom}
|
||||||
imageSrc={imageSrc}
|
imageSrc={imageSrc}
|
||||||
onRequestClose={onRequestClose}
|
onRequestClose={onRequestClose}
|
||||||
onFlyAway={onFlyAway}
|
|
||||||
isScrollViewBeingDragged={isDragging}
|
isScrollViewBeingDragged={isDragging}
|
||||||
showControls={showControls}
|
showControls={showControls}
|
||||||
safeAreaRef={safeAreaRef}
|
safeAreaRef={safeAreaRef}
|
||||||
@@ -324,7 +323,6 @@ function LightboxImage({
|
|||||||
onTap,
|
onTap,
|
||||||
onZoom,
|
onZoom,
|
||||||
onRequestClose,
|
onRequestClose,
|
||||||
onFlyAway,
|
|
||||||
isScrollViewBeingDragged,
|
isScrollViewBeingDragged,
|
||||||
isScaled,
|
isScaled,
|
||||||
isFlyingAway,
|
isFlyingAway,
|
||||||
@@ -338,7 +336,6 @@ function LightboxImage({
|
|||||||
onRequestClose: () => void
|
onRequestClose: () => void
|
||||||
onTap: () => void
|
onTap: () => void
|
||||||
onZoom: (scaled: boolean) => void
|
onZoom: (scaled: boolean) => void
|
||||||
onFlyAway: () => void
|
|
||||||
isScrollViewBeingDragged: boolean
|
isScrollViewBeingDragged: boolean
|
||||||
isScaled: boolean
|
isScaled: boolean
|
||||||
isActive: boolean
|
isActive: boolean
|
||||||
@@ -415,7 +412,7 @@ function LightboxImage({
|
|||||||
})
|
})
|
||||||
.onEnd(e => {
|
.onEnd(e => {
|
||||||
'worklet'
|
'worklet'
|
||||||
if (isFlyingAway.value || isFlyingAway.value) {
|
if (openProgress.value !== 1 || isFlyingAway.value) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (Math.abs(e.velocityY) > 1000) {
|
if (Math.abs(e.velocityY) > 1000) {
|
||||||
|
|||||||
Reference in New Issue
Block a user