mirror of
https://github.com/ant-design/ant-design.git
synced 2026-02-09 02:49:18 +08:00
* feat: Add global maskClosable configuration capability to Modal and Drawer * Update components/modal/__tests__/Modal.test.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: luozz <15761695277@163.com> * feat: Add mask.closable capability to Drawer and Modal * fix: Preserve the original maskClosable capabilities of ConfigDialog * feat: Added mask handling for Modal Hooks * rerun * fix * docs: update version * fix: improve mask config merging logic - Move default values to the beginning of mergedConfig to ensure user props override them - Validate maskClosable type with double negation - Add maskClosable to mergedProps in Drawer and Modal Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: use normalizeMaskConfig in ConfirmDialog - Export normalizeMaskConfig for external use - Simplify mask config logic in ConfirmDialog using shared utility Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * chore: adjust * fix: simplify closable default value assignment removed: mergedConfig.closable = mergedConfig.closable ?? true; added: closable: maskConfig.closable ?? maskClosable ?? contextMaskConfig.closable ?? true Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Signed-off-by: luozz <15761695277@163.com> Co-authored-by: 罗忠泽 <victor.luo@spotterio.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: thinkasany <480968828@qq.com> Co-authored-by: 二货机器人 <smith3816@gmail.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
202 lines
6.0 KiB
TypeScript
202 lines
6.0 KiB
TypeScript
import type React from 'react';
|
|
import type { DialogProps } from '@rc-component/dialog';
|
|
|
|
import type {
|
|
ClosableType,
|
|
MaskType,
|
|
SemanticClassNamesType,
|
|
SemanticStylesType,
|
|
} from '../_util/hooks';
|
|
import type { Breakpoint } from '../_util/responsiveObserver';
|
|
import type { ButtonProps, LegacyButtonType } from '../button/Button';
|
|
import type { DirectionType } from '../config-provider';
|
|
import type { FocusableConfig, OmitFocusType } from '../drawer/useFocusable';
|
|
|
|
export type ModalSemanticName = keyof ModalSemanticClassNames & keyof ModalSemanticStyles;
|
|
|
|
export type ModalSemanticClassNames = {
|
|
root?: string;
|
|
header?: string;
|
|
body?: string;
|
|
footer?: string;
|
|
container?: string;
|
|
title?: string;
|
|
wrapper?: string;
|
|
mask?: string;
|
|
};
|
|
|
|
export type ModalSemanticStyles = {
|
|
root?: React.CSSProperties;
|
|
header?: React.CSSProperties;
|
|
body?: React.CSSProperties;
|
|
footer?: React.CSSProperties;
|
|
container?: React.CSSProperties;
|
|
title?: React.CSSProperties;
|
|
wrapper?: React.CSSProperties;
|
|
mask?: React.CSSProperties;
|
|
};
|
|
|
|
export type ModalClassNamesType = SemanticClassNamesType<ModalProps, ModalSemanticClassNames>;
|
|
|
|
export type ModalStylesType = SemanticStylesType<ModalProps, ModalSemanticStyles>;
|
|
|
|
interface ModalCommonProps
|
|
extends Omit<
|
|
DialogProps,
|
|
| 'footer'
|
|
| 'width'
|
|
| 'onClose'
|
|
| 'animation'
|
|
| 'maskAnimation'
|
|
| 'transitionName'
|
|
| 'maskTransitionName'
|
|
| 'mask'
|
|
| 'classNames'
|
|
| 'styles'
|
|
| OmitFocusType
|
|
> {
|
|
footer?:
|
|
| React.ReactNode
|
|
| ((
|
|
originNode: React.ReactNode,
|
|
extra: { OkBtn: React.FC; CancelBtn: React.FC },
|
|
) => React.ReactNode);
|
|
closable?:
|
|
| boolean
|
|
| (Exclude<ClosableType, boolean> & { onClose?: () => void; afterClose?: () => void });
|
|
classNames?: ModalClassNamesType;
|
|
styles?: ModalStylesType;
|
|
}
|
|
|
|
export interface ModalProps extends ModalCommonProps {
|
|
/** Whether the modal dialog is visible or not */
|
|
open?: boolean;
|
|
/** Whether to apply loading visual effect for OK button or not */
|
|
confirmLoading?: boolean;
|
|
/** The modal dialog's title */
|
|
title?: React.ReactNode;
|
|
/** Specify a function that will be called when a user clicks the OK button */
|
|
onOk?: (e: React.MouseEvent<HTMLButtonElement>) => void;
|
|
/** Specify a function that will be called when a user clicks mask, close button on top right or Cancel button */
|
|
onCancel?: (e: React.MouseEvent<HTMLButtonElement>) => void;
|
|
afterClose?: () => void;
|
|
/** Callback when the animation ends when Modal is turned on and off */
|
|
afterOpenChange?: (open: boolean) => void;
|
|
/** Centered Modal */
|
|
centered?: boolean;
|
|
/** Width of the modal dialog */
|
|
width?: string | number | Partial<Record<Breakpoint, string | number>>;
|
|
/** Text of the OK button */
|
|
okText?: React.ReactNode;
|
|
/** Button `type` of the OK button */
|
|
okType?: LegacyButtonType;
|
|
/** Text of the Cancel button */
|
|
cancelText?: React.ReactNode;
|
|
/**
|
|
* @deprecated Please use `mask.closable` instead
|
|
* @description Whether to close the modal dialog when the mask (area outside the modal) is clicked
|
|
*/
|
|
maskClosable?: boolean;
|
|
/** Force render Modal */
|
|
forceRender?: boolean;
|
|
okButtonProps?: ButtonProps;
|
|
cancelButtonProps?: ButtonProps;
|
|
/** @deprecated Please use `destroyOnHidden` instead */
|
|
destroyOnClose?: boolean;
|
|
/**
|
|
* @since 5.25.0
|
|
*/
|
|
destroyOnHidden?: boolean;
|
|
style?: React.CSSProperties;
|
|
wrapClassName?: string;
|
|
maskTransitionName?: string;
|
|
transitionName?: string;
|
|
className?: string;
|
|
rootClassName?: string;
|
|
rootStyle?: React.CSSProperties;
|
|
getContainer?: string | HTMLElement | getContainerFunc | false;
|
|
zIndex?: number;
|
|
/** @deprecated Please use `styles.body` instead */
|
|
bodyStyle?: React.CSSProperties;
|
|
/** @deprecated Please use `styles.mask` instead */
|
|
maskStyle?: React.CSSProperties;
|
|
mask?: MaskType;
|
|
keyboard?: boolean;
|
|
wrapProps?: any;
|
|
prefixCls?: string;
|
|
closeIcon?: React.ReactNode;
|
|
modalRender?: (node: React.ReactNode) => React.ReactNode;
|
|
children?: React.ReactNode;
|
|
mousePosition?: MousePosition;
|
|
/**
|
|
* @since 5.18.0
|
|
*/
|
|
loading?: boolean;
|
|
|
|
// Focusable
|
|
/** @deprecated Please use `focusable.focusTriggerAfterClose` instead */
|
|
focusTriggerAfterClose?: boolean;
|
|
focusable?: FocusableConfig;
|
|
}
|
|
|
|
type getContainerFunc = () => HTMLElement;
|
|
|
|
export interface ModalFuncProps extends ModalCommonProps {
|
|
prefixCls?: string;
|
|
className?: string;
|
|
rootClassName?: string;
|
|
open?: boolean;
|
|
title?: React.ReactNode;
|
|
content?: React.ReactNode;
|
|
// TODO: find out exact types
|
|
onOk?: (...args: any[]) => any;
|
|
onCancel?: (...args: any[]) => any;
|
|
afterClose?: () => void;
|
|
okButtonProps?: ButtonProps;
|
|
cancelButtonProps?: ButtonProps;
|
|
centered?: boolean;
|
|
width?: string | number;
|
|
okText?: React.ReactNode;
|
|
okType?: LegacyButtonType;
|
|
cancelText?: React.ReactNode;
|
|
icon?: React.ReactNode;
|
|
/** @deprecated Please use `mask.closable` instead */
|
|
maskClosable?: boolean;
|
|
mask?: MaskType;
|
|
zIndex?: number;
|
|
okCancel?: boolean;
|
|
style?: React.CSSProperties;
|
|
wrapClassName?: string;
|
|
/** @deprecated Please use `styles.mask` instead */
|
|
maskStyle?: React.CSSProperties;
|
|
type?: 'info' | 'success' | 'error' | 'warn' | 'warning' | 'confirm';
|
|
keyboard?: boolean;
|
|
getContainer?: string | HTMLElement | getContainerFunc | false;
|
|
|
|
transitionName?: string;
|
|
maskTransitionName?: string;
|
|
direction?: DirectionType;
|
|
/** @deprecated Please use `styles.body` instead */
|
|
bodyStyle?: React.CSSProperties;
|
|
closeIcon?: React.ReactNode;
|
|
footer?: ModalProps['footer'];
|
|
modalRender?: (node: React.ReactNode) => React.ReactNode;
|
|
|
|
// Focusable
|
|
/** @deprecated Please use `focusable.focusTriggerAfterClose` instead */
|
|
focusTriggerAfterClose?: boolean;
|
|
/** @deprecated Please use `focusable.autoFocusButton` instead */
|
|
autoFocusButton?: null | 'ok' | 'cancel';
|
|
focusable?: FocusableConfig & {
|
|
autoFocusButton?: null | 'ok' | 'cancel';
|
|
};
|
|
}
|
|
|
|
export interface ModalLocale {
|
|
okText: string;
|
|
cancelText: string;
|
|
justOkText: string;
|
|
}
|
|
|
|
export type MousePosition = { x: number; y: number } | null;
|