From 46cb1c8cdee52ce9f3b6be3126958ae53ae2d927 Mon Sep 17 00:00:00 2001
From: HeskeyBaozi <hezhiyu233@foxmail.com>
Date: Thu, 2 Aug 2018 18:02:43 +0800
Subject: [PATCH] resolve conflict.

---
 components/modal/Modal.tsx                    | 10 ++++-
 .../__snapshots__/Modal.test.js.snap          | 38 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx
index 9d3c50541e..459f8afd48 100644
--- a/components/modal/Modal.tsx
+++ b/components/modal/Modal.tsx
@@ -7,12 +7,12 @@ import Button from '../button';
 import { ButtonType, NativeButtonProps } from '../button/button';
 import LocaleReceiver from '../locale-provider/LocaleReceiver';
 import { getConfirmLocale } from './locale';
+import Icon from '../icon';
 
 let mousePosition: { x: number, y: number } | null;
 let mousePositionEventBinded: boolean;
 
 export interface ModalProps {
-  prefixCls?: string;
   /** 对话框是否可见*/
   visible?: boolean;
   /** 确定按钮 loading*/
@@ -55,6 +55,7 @@ export interface ModalProps {
   mask?: boolean;
   keyboard?: boolean;
   wrapProps?: any;
+  prefixCls?: string;
 }
 
 export interface ModalFuncProps {
@@ -192,6 +193,12 @@ export default class Modal extends React.Component<ModalProps, {}> {
       </LocaleReceiver>
     );
 
+    const closeIcon = (
+      <span className={`${prefixCls}-close-x`}>
+        <Icon className={`${prefixCls}-close-icon`} type={'close'}/>
+      </span>
+    );
+
     return (
       <Dialog
         {...restProps}
@@ -201,6 +208,7 @@ export default class Modal extends React.Component<ModalProps, {}> {
         visible={visible}
         mousePosition={mousePosition}
         onClose={this.handleCancel}
+        closeIcon={closeIcon}
       />
     );
   }
diff --git a/components/modal/__tests__/__snapshots__/Modal.test.js.snap b/components/modal/__tests__/__snapshots__/Modal.test.js.snap
index 1bd7877de2..233e838026 100644
--- a/components/modal/__tests__/__snapshots__/Modal.test.js.snap
+++ b/components/modal/__tests__/__snapshots__/Modal.test.js.snap
@@ -26,7 +26,24 @@ exports[`Modal render correctly 1`] = `
           >
             <span
               class="ant-modal-close-x"
-            />
+            >
+              <i
+                class="anticon ant-modal-close-icon"
+              >
+                <svg
+                  aria-hidden="true"
+                  data-icon="close"
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 1024 1024"
+                  width="1em"
+                >
+                  <path
+                    d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9c-4.4 5.2-.7 13.1 6.1 13.1h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
+                  />
+                </svg>
+              </i>
+            </span>
           </button>
           <div
             class="ant-modal-body"
@@ -94,7 +111,24 @@ exports[`Modal render without footer 1`] = `
           >
             <span
               class="ant-modal-close-x"
-            />
+            >
+              <i
+                class="anticon ant-modal-close-icon"
+              >
+                <svg
+                  aria-hidden="true"
+                  data-icon="close"
+                  fill="currentColor"
+                  height="1em"
+                  viewBox="0 0 1024 1024"
+                  width="1em"
+                >
+                  <path
+                    d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9c-4.4 5.2-.7 13.1 6.1 13.1h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
+                  />
+                </svg>
+              </i>
+            </span>
           </button>
           <div
             class="ant-modal-body"