From b95207d58e678ee7b683bc1f3bc69e2855549c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Sun, 31 May 2020 11:50:26 +0800
Subject: [PATCH] Revert "fix: make upload action buttons focusable (#24604)"
 (#24608)

This reverts commit 8e20fe67793974152c1d0092a3452fa6faf86671.
---
 .../__snapshots__/components.test.js.snap     | 12 +++---
 components/upload/UploadList.tsx              |  9 +---
 .../__tests__/__snapshots__/demo.test.js.snap | 42 +++++++++----------
 .../__snapshots__/uploadlist.test.js.snap     | 26 ++++++------
 components/upload/style/index.less            | 21 ++++------
 5 files changed, 48 insertions(+), 62 deletions(-)

diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
index 5165d1cbb2..5ceeba228f 100644
--- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap
+++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
@@ -37634,7 +37634,7 @@ exports[`ConfigProvider components Upload configProvider 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -37737,7 +37737,7 @@ exports[`ConfigProvider components Upload configProvider componentSize large 1`]
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -37840,7 +37840,7 @@ exports[`ConfigProvider components Upload configProvider componentSize middle 1`
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -37943,7 +37943,7 @@ exports[`ConfigProvider components Upload configProvider virtual and dropdownMat
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -38046,7 +38046,7 @@ exports[`ConfigProvider components Upload normal 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -38149,7 +38149,7 @@ exports[`ConfigProvider components Upload prefixCls 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
diff --git a/components/upload/UploadList.tsx b/components/upload/UploadList.tsx
index ed21959d86..2727a8613e 100644
--- a/components/upload/UploadList.tsx
+++ b/components/upload/UploadList.tsx
@@ -112,7 +112,7 @@ export default class UploadList extends React.Component<UploadListProps, any> {
       });
     }
     return (
-      <span title={title} onClick={callback} role="button" tabIndex={0}>
+      <span title={title} onClick={callback}>
         {customIcon}
       </span>
     );
@@ -201,11 +201,7 @@ export default class UploadList extends React.Component<UploadListProps, any> {
               () => this.handleClose(file),
               locale.removeFile,
             )) || (
-            <DeleteOutlined
-              title={locale.removeFile}
-              onClick={() => this.handleClose(file)}
-              tabIndex={0}
-            />
+            <DeleteOutlined title={locale.removeFile} onClick={() => this.handleClose(file)} />
           )
         : null;
 
@@ -220,7 +216,6 @@ export default class UploadList extends React.Component<UploadListProps, any> {
               <DownloadOutlined
                 title={locale.downloadFile}
                 onClick={() => this.handleDownload(file)}
-                tabIndex={0}
               />
             )
           : null;
diff --git a/components/upload/__tests__/__snapshots__/demo.test.js.snap b/components/upload/__tests__/__snapshots__/demo.test.js.snap
index a6360f9116..162f5cfb3a 100644
--- a/components/upload/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/upload/__tests__/__snapshots__/demo.test.js.snap
@@ -181,7 +181,7 @@ exports[`renders ./components/upload/demo/crop-image.md correctly 1`] = `
               aria-label="delete"
               class="anticon anticon-delete"
               role="img"
-              tabindex="0"
+              tabindex="-1"
               title="Remove file"
             >
               <svg
@@ -380,7 +380,7 @@ exports[`renders ./components/upload/demo/defaultFileList.md correctly 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -459,7 +459,7 @@ exports[`renders ./components/upload/demo/defaultFileList.md correctly 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -537,7 +537,7 @@ exports[`renders ./components/upload/demo/defaultFileList.md correctly 1`] = `
                   aria-label="delete"
                   class="anticon anticon-delete"
                   role="img"
-                  tabindex="0"
+                  tabindex="-1"
                   title="Remove file"
                 >
                   <svg
@@ -792,7 +792,7 @@ exports[`renders ./components/upload/demo/file-type.md correctly 1`] = `
                 aria-label="delete"
                 class="anticon anticon-delete"
                 role="img"
-                tabindex="0"
+                tabindex="-1"
                 title="Remove file"
               >
                 <svg
@@ -906,7 +906,7 @@ exports[`renders ./components/upload/demo/file-type.md correctly 1`] = `
                 aria-label="delete"
                 class="anticon anticon-delete"
                 role="img"
-                tabindex="0"
+                tabindex="-1"
                 title="Remove file"
               >
                 <svg
@@ -1021,7 +1021,7 @@ exports[`renders ./components/upload/demo/file-type.md correctly 1`] = `
               aria-label="delete"
               class="anticon anticon-delete"
               role="img"
-              tabindex="0"
+              tabindex="-1"
               title="Remove file"
             >
               <svg
@@ -1135,7 +1135,7 @@ exports[`renders ./components/upload/demo/file-type.md correctly 1`] = `
               aria-label="delete"
               class="anticon anticon-delete"
               role="img"
-              tabindex="0"
+              tabindex="-1"
               title="Remove file"
             >
               <svg
@@ -1241,7 +1241,7 @@ exports[`renders ./components/upload/demo/file-type.md correctly 1`] = `
               aria-label="delete"
               class="anticon anticon-delete"
               role="img"
-              tabindex="0"
+              tabindex="-1"
               title="Remove file"
             >
               <svg
@@ -1418,7 +1418,7 @@ exports[`renders ./components/upload/demo/fileList.md correctly 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -1525,7 +1525,7 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
                 aria-label="delete"
                 class="anticon anticon-delete"
                 role="img"
-                tabindex="0"
+                tabindex="-1"
                 title="Remove file"
               >
                 <svg
@@ -1615,7 +1615,7 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
                 aria-label="delete"
                 class="anticon anticon-delete"
                 role="img"
-                tabindex="0"
+                tabindex="-1"
                 title="Remove file"
               >
                 <svg
@@ -1705,7 +1705,7 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
                 aria-label="delete"
                 class="anticon anticon-delete"
                 role="img"
-                tabindex="0"
+                tabindex="-1"
                 title="Remove file"
               >
                 <svg
@@ -1795,7 +1795,7 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
                 aria-label="delete"
                 class="anticon anticon-delete"
                 role="img"
-                tabindex="0"
+                tabindex="-1"
                 title="Remove file"
               >
                 <svg
@@ -1910,7 +1910,7 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
               aria-label="delete"
               class="anticon anticon-delete"
               role="img"
-              tabindex="0"
+              tabindex="-1"
               title="Remove file"
             >
               <svg
@@ -2075,7 +2075,7 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
                       aria-label="delete"
                       class="anticon anticon-delete"
                       role="img"
-                      tabindex="0"
+                      tabindex="-1"
                       title="Remove file"
                     >
                       <svg
@@ -2167,7 +2167,7 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -2286,7 +2286,7 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
                       aria-label="delete"
                       class="anticon anticon-delete"
                       role="img"
-                      tabindex="0"
+                      tabindex="-1"
                       title="Remove file"
                     >
                       <svg
@@ -2378,7 +2378,7 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -2618,8 +2618,6 @@ exports[`renders ./components/upload/demo/upload-custom-action-icon.md correctly
                   title="Download file"
                 >
                   <span
-                    role="button"
-                    tabindex="0"
                     title="Download file"
                   >
                     download 
@@ -2708,8 +2706,6 @@ exports[`renders ./components/upload/demo/upload-custom-action-icon.md correctly
                   title="Download file"
                 >
                   <span
-                    role="button"
-                    tabindex="0"
                     title="Download file"
                   >
                     download 
diff --git a/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap b/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap
index 45570b5c0b..870e2796eb 100644
--- a/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap
+++ b/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap
@@ -77,7 +77,7 @@ exports[`Upload List handle error 1`] = `
                   aria-label="delete"
                   class="anticon anticon-delete"
                   role="img"
-                  tabindex="0"
+                  tabindex="-1"
                   title="Remove file"
                 >
                   <svg
@@ -183,7 +183,7 @@ exports[`Upload List should be uploading when upload a file 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -310,7 +310,7 @@ exports[`Upload List should be uploading when upload a file 2`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -448,7 +448,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -515,7 +515,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -602,7 +602,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -689,7 +689,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -756,7 +756,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -823,7 +823,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -890,7 +890,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -957,7 +957,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -1024,7 +1024,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
@@ -1091,7 +1091,7 @@ exports[`Upload List should non-image format file preview 1`] = `
                     aria-label="delete"
                     class="anticon anticon-delete"
                     role="img"
-                    tabindex="0"
+                    tabindex="-1"
                     title="Remove file"
                   >
                     <svg
diff --git a/components/upload/style/index.less b/components/upload/style/index.less
index ca6928bede..fbde12889f 100644
--- a/components/upload/style/index.less
+++ b/components/upload/style/index.less
@@ -176,21 +176,16 @@
     &-card-actions {
       position: absolute;
       right: 0;
+      opacity: 0;
 
       &.picture {
         top: 25px;
         line-height: 1;
-      }
-      &.picture .@{iconfont-css-prefix} {
         opacity: 1;
       }
       .@{iconfont-css-prefix} {
-        margin-right: 6px;
+        padding-right: 6px;
         color: @upload-actions-color;
-        opacity: 0;
-      }
-      .@{iconfont-css-prefix}:focus {
-        opacity: 1;
       }
     }
 
@@ -228,10 +223,8 @@
       opacity: 0;
       transition: all 0.3s;
 
-      &:hover,
-      &:focus {
+      &:hover {
         color: @text-color;
-        opacity: 1;
       }
     }
 
@@ -243,7 +236,7 @@
       opacity: 1;
     }
 
-    &:hover &-card-actions .@{iconfont-css-prefix} {
+    &:hover &-card-actions {
       opacity: 1;
     }
 
@@ -253,8 +246,10 @@
       color: @error-color;
     }
 
-    &-error &-card-actions .@{iconfont-css-prefix} {
-      color: @error-color;
+    &-error &-card-actions {
+      .@{iconfont-css-prefix} {
+        color: @error-color;
+      }
       opacity: 1;
     }