fix: model close (#18323)

* 💄 support Modal closeIcon

close #18307

* 🐛 closeIcon should put into span

https://github.com/ant-design/ant-design/pull/18309/files#r314946527

components/modal/Modal.tsx

@@ -223,9 +223,9 @@ export default class Modal extends React.Component<ModalProps, {}> {
       </LocaleReceiver>
     );
 
-    const closeIconToRender = closeIcon || (
+    const closeIconToRender = (
       <span className={`${prefixCls}-close-x`}>
-        <Icon className={`${prefixCls}-close-icon`} type="close" />
+        {closeIcon || <Icon className={`${prefixCls}-close-icon`} type="close" />}
       </span>
     );
 

components/modal/__tests__/__snapshots__/Modal.test.js.snap

@@ -198,9 +198,13 @@ exports[`Modal support closeIcon 1`] = `
           class="ant-modal-close"
           type="button"
         >
-          <a>
+          <span
-            closeIcon
+            class="ant-modal-close-x"
-          </a>
+          >
+            <a>
+              closeIcon
+            </a>
+          </span>
         </button>
         <div
           class="ant-modal-body"