fix: Modal conflicting props classNames.wrapper and centered (#47076)

* fix: conflict wrapper and centered * test: update snap * fix: undefined className * refactor: use classNames for merge class
ant-design · Jan 29, 2024 · 136fe93 · 136fe93
1 parent e02b2ea
commit 136fe93
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx
@@ -144,9 +144,9 @@ const Modal: React.FC<ModalProps> = (props) => {
             className={classNames(hashId, className, modal?.className)}
             style={{ ...modal?.style, ...style }}
             classNames={{
-              wrapper: wrapClassNameExtended,
               ...modal?.classNames,
               ...modalClassNames,
+              wrapper: classNames(wrapClassNameExtended, modalClassNames?.wrapper),
             }}
             styles={{
               ...modal?.styles,

diff --git a/components/modal/interface.ts b/components/modal/interface.ts
@@ -52,7 +52,7 @@ export interface ModalProps extends ModalCommonProps {
   transitionName?: string;
   className?: string;
   rootClassName?: string;
-  classNames?: Omit<NonNullable<DialogProps['classNames']>, 'wrapper'>;
+  classNames?: NonNullable<DialogProps['classNames']>;
   getContainer?: string | HTMLElement | getContainerFunc | false;
   zIndex?: number;
   /** @deprecated Please use `styles.body` instead */