Skip to content
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

Jump to bottom

fix(rn): 修复 previewImage 时,点击 Android 虚拟导航键触发底部页面返回的问题 #10175

Merged
merged 6 commits into from
Sep 3, 2021
Merged

fix(rn): 修复 previewImage 时,点击 Android 虚拟导航键触发底部页面返回的问题 #10175

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cbcf3ba
fix: 修复 previewImage 时,点击 Android 虚拟导航键触发底部页面返回的问题
iChengbo Sep 2, 2021
65cbd37
fix: 和小程序行为保持一致, 点击返回关闭预览
iChengbo Sep 2, 2021
eecd5dc
Merge branch 'next' into fix/backhandler
iChengbo Sep 2, 2021
60b028d
Merge branch 'next' into fix/backhandler
zhiqingchen Sep 2, 2021
d550c16
Merge branch 'next' into fix/backhandler
zhiqingchen Sep 2, 2021
cde5497
Merge branch 'next' into fix/backhandler
zhiqingchen Sep 3, 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
9 changes: 8 additions & 1 deletion packages/taro-rn/src/lib/previewImage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { View, ActivityIndicator, StyleSheet, Alert } from 'react-native'
import { View, ActivityIndicator, StyleSheet, Alert, BackHandler } from 'react-native'
import RootSiblings from 'react-native-root-siblings'
import ImageViewer from 'react-native-image-zoom-viewer'
import { saveMedia } from '../media'
Expand Down Expand Up @@ -28,8 +28,14 @@ export function previewImage(obj: Taro.previewImage.Option): void {
if (index === -1) {
throw new Error('"current" or "urls" is invalid')
}

let sibling
function backhandler() {
return true
}

function onSwipeDown() {
BackHandler.removeEventListener('hardwareBackPress', backhandler)
sibling?.destroy()
sibling = undefined
}
Expand Down Expand Up @@ -113,6 +119,7 @@ export function previewImage(obj: Taro.previewImage.Option): void {
/>
</View>
)
BackHandler.addEventListener('hardwareBackPress', backhandler)
} catch (e) {
onFail(e)
}
Expand Down