💄 refactor alert code for better semantic

close ant-design#19426
MrHeer · Oct 28, 2019 · ff382ab · ff382ab
1 parent f8a3da5
commit ff382ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/components/alert/index.tsx b/components/alert/index.tsx
@@ -52,7 +52,7 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     );
 
     this.state = {
-      closing: true,
+      closing: false,
       closed: false,
     };
   }
@@ -66,15 +66,15 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     dom.style.height = `${dom.offsetHeight}px`;
 
     this.setState({
-      closing: false,
+      closing: true,
     });
     (this.props.onClose || noop)(e);
   };
 
   animationEnd = () => {
     this.setState({
+      closing: false,
       closed: true,
-      closing: true,
     });
     (this.props.afterClose || noop)();
   };
@@ -91,6 +91,7 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
       icon,
     } = this.props;
     let { closable, type, showIcon, iconType } = this.props;
+    const { closing, closed } = this.state;
 
     const prefixCls = getPrefixCls('alert', customizePrefixCls);
 
@@ -133,7 +134,7 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
       prefixCls,
       `${prefixCls}-${type}`,
       {
-        [`${prefixCls}-close`]: !this.state.closing,
+        [`${prefixCls}-closing`]: closing,
         [`${prefixCls}-with-description`]: !!description,
         [`${prefixCls}-no-icon`]: !showIcon,
         [`${prefixCls}-banner`]: !!banner,
@@ -162,23 +163,22 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     const iconNode = (icon &&
       (React.isValidElement<{ className?: string }>(icon) ? (
         React.cloneElement(icon, {
-          className: classNames({
+          className: classNames(`${prefixCls}-icon`, {
             [icon.props.className as string]: icon.props.className,
-            [`${prefixCls}-icon`]: true,
           }),
         })
       ) : (
         <span className={`${prefixCls}-icon`}>{icon}</span>
       ))) || <Icon className={`${prefixCls}-icon`} type={iconType} theme={iconTheme} />;
 
-    return this.state.closed ? null : (
+    return closed ? null : (
       <Animate
         component=""
         showProp="data-show"
         transitionName={`${prefixCls}-slide-up`}
         onEnd={this.animationEnd}
       >
-        <div data-show={this.state.closing} className={alertCls} style={style} {...dataOrAriaProps}>
+        <div data-show={!closing} className={alertCls} style={style} {...dataOrAriaProps}>
           {showIcon ? iconNode : null}
           <span className={`${prefixCls}-message`}>{message}</span>
           <span className={`${prefixCls}-description`}>{description}</span>

diff --git a/components/alert/style/index.less b/components/alert/style/index.less
@@ -77,6 +77,7 @@
     line-height: 22px;
     background-color: transparent;
     border: none;
+    outline: none;
     cursor: pointer;
 
     .@{iconfont-css-prefix}-close {
@@ -138,7 +139,7 @@
     display: block;
   }
 
-  &&-close {
+  &&-closing {
     height: 0 !important;
     margin: 0;
     padding-top: 0;