Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/cyan-owls-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@td-design/react-native': patch
---

修复Toast组件导致物理返回键无法正常使用的bug
13 changes: 8 additions & 5 deletions packages/react-native/src/toast/useToast.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react';
import { BackHandler } from 'react-native';
import { BackHandler, NativeEventSubscription } from 'react-native';

import { useMemoizedFn } from '@td-design/rn-hooks';

Expand Down Expand Up @@ -45,11 +45,14 @@ export default function useToast() {

/** 当Toast显示的时候,不允许安卓物理返回键可用 */
useEffect(() => {
BackHandler.addEventListener('hardwareBackPress', () => visible);
let backHandler: NativeEventSubscription | undefined;
if (visible) {
backHandler = BackHandler.addEventListener('hardwareBackPress', () => true);
} else {
backHandler?.remove();
}

return () => {
BackHandler.removeEventListener('hardwareBackPress', () => false);
};
return () => backHandler?.remove();
}, [visible]);

return {
Expand Down