p85126437
/
amis
forked from p96170835/amis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

如果事件阻止了,不关闭

This commit is contained in:
2betop 2020-05-09 09:54:04 +08:00
parent 3fb4114461
commit c89994e64a
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Drawer.tsx
View File

@ -24,7 +24,7 @@ export interface DrawerProps {
bodyClassName?: string; bodyClassName?: string;
size: any; size: any;
overlay: boolean; overlay: boolean;
onHide: () => void; onHide: (e: any) => void;
closeOnEsc?: boolean; closeOnEsc?: boolean;
container: any; container: any;
show?: boolean; show?: boolean;
@ -109,10 +109,13 @@ export class Drawer extends React.Component<DrawerProps, DrawerState> {
@autobind @autobind
handleRootClick(e: MouseEvent) { handleRootClick(e: MouseEvent) {
const {classPrefix: ns, closeOnOutside, onHide, show} = this.props; const {classPrefix: ns, closeOnOutside, onHide, show} = this.props;
if ((e.target as HTMLElement).closest(`.${ns}Drawer-content`)) { if (
e.defaultPrevented ||
(e.target as HTMLElement).closest(`.${ns}Drawer-content`)
) {
return; return;
} }
closeOnOutside && show && onHide && onHide(); closeOnOutside && show && onHide && onHide(e);
} }
render() { render() {

2
src/components/Modal.tsx
View File

@ -20,7 +20,7 @@ export interface ModalProps {
contentClassName?: string; contentClassName?: string;
size?: any; size?: any;
overlay?: boolean; overlay?: boolean;
onHide: () => void; onHide: (e: any) => void;
closeOnEsc?: boolean; closeOnEsc?: boolean;
container?: any; container?: any;
show?: boolean; show?: boolean;

4
src/components/ModalManager.ts
View File

@ -8,7 +8,7 @@ import keycode from 'keycode';
interface ModalComponent interface ModalComponent
extends React.Component<{ extends React.Component<{
onHide: () => void; onHide: (e: any) => void;
disabled?: boolean; disabled?: boolean;
closeOnEsc?: boolean; closeOnEsc?: boolean;
}> {} }> {}
@ -44,6 +44,6 @@ function handleWindowKeyDown(e: Event) {
} }
const {disabled, closeOnEsc} = modal.props; const {disabled, closeOnEsc} = modal.props;
if (closeOnEsc && !disabled) { if (closeOnEsc && !disabled) {
modal.props.onHide(); modal.props.onHide(e);
} }
} }