From ccf2a6f33a00a0774f4394aa3d8dd0059659c17b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 19 Sep 2024 15:50:48 +0800
Subject: [PATCH 1/4] Revert "fix: <Icon component /> remove
 fill="currentColor" (#670)"

This reverts commit ddab19ea598d1112c7a9c2478688a8fef93309a1.
---
 packages/icons-react/package.json             |  8 ++---
 packages/icons-react/src/components/Icon.tsx  |  2 +-
 packages/icons-react/src/utils.ts             |  1 +
 .../tests/__snapshots__/index.test.tsx.snap   | 29 +++++++++++++++++++
 packages/icons-svg/{README.md => ReadMe.md}   |  0
 5 files changed, 35 insertions(+), 5 deletions(-)
 rename packages/icons-svg/{README.md => ReadMe.md} (100%)

diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json
index 7d5c6926e..9987a9072 100644
--- a/packages/icons-react/package.json
+++ b/packages/icons-react/package.json
@@ -59,6 +59,8 @@
     "glob": "^7.1.6",
     "history": "^4.9.0",
     "lodash": "^4.17.21",
+    "mobx": "^5.1.0",
+    "mobx-react": "^6.1.3",
     "pkg-dir": "4.0.0",
     "prettier": "^2.2.1",
     "rc-test": "^7.0.15",
@@ -73,14 +75,12 @@
     "react": ">=16.0.0",
     "react-dom": ">=16.0.0"
   },
-  "resolutions": {
-    "cheerio": "1.0.0-rc.12"
-  },
   "engines": {
     "node": ">=8"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
-  }
+  },
+  "gitHead": "225d4d2189720ee3b7e4a4d7a6d80e076fa15cbc"
 }
diff --git a/packages/icons-react/src/components/Icon.tsx b/packages/icons-react/src/components/Icon.tsx
index 9add0354d..99be72779 100644
--- a/packages/icons-react/src/components/Icon.tsx
+++ b/packages/icons-react/src/components/Icon.tsx
@@ -14,7 +14,7 @@ export interface IconBaseProps extends React.HTMLProps<HTMLSpanElement> {
 export interface CustomIconComponentProps {
   width: string | number;
   height: string | number;
-  fill?: string;
+  fill: string;
   viewBox?: string;
   className?: string;
   style?: React.CSSProperties;
diff --git a/packages/icons-react/src/utils.ts b/packages/icons-react/src/utils.ts
index 917bd1049..dcee20e3a 100644
--- a/packages/icons-react/src/utils.ts
+++ b/packages/icons-react/src/utils.ts
@@ -92,6 +92,7 @@ export function normalizeTwoToneColors(
 export const svgBaseProps = {
   width: '1em',
   height: '1em',
+  fill: 'currentColor',
   'aria-hidden': 'true',
   focusable: 'false',
 };
diff --git a/packages/icons-react/tests/__snapshots__/index.test.tsx.snap b/packages/icons-react/tests/__snapshots__/index.test.tsx.snap
index 8c3b29661..52c8a3a8f 100644
--- a/packages/icons-react/tests/__snapshots__/index.test.tsx.snap
+++ b/packages/icons-react/tests/__snapshots__/index.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`Icon \`component\` prop can access to svg defs if has children 1`] = `
   <svg
     aria-hidden="true"
     class=""
+    fill="currentColor"
     focusable="false"
     height="1em"
     width="1em"
@@ -582,6 +583,7 @@ exports[`Icon should support event listeners 2`] = `
     <SvgComponent
       aria-hidden="true"
       className=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -589,6 +591,7 @@ exports[`Icon should support event listeners 2`] = `
       <svg
         aria-hidden="true"
         className=""
+        fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="0 0 24 24"
@@ -625,6 +628,7 @@ exports[`Icon should support event listeners 3`] = `
     <SvgComponent
       aria-hidden="true"
       className=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -632,6 +636,7 @@ exports[`Icon should support event listeners 3`] = `
       <svg
         aria-hidden="true"
         className=""
+        fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="0 0 24 24"
@@ -667,6 +672,7 @@ exports[`Icon should support event listeners when passing svg paths as children
     <svg
       aria-hidden="true"
       className=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       viewBox="0 0 24 24"
@@ -691,6 +697,7 @@ exports[`Icon should support pass svg paths as children 1`] = `
   <svg
     aria-hidden="true"
     class=""
+    fill="currentColor"
     focusable="false"
     height="1em"
     viewBox="0 0 24 24"
@@ -714,6 +721,7 @@ exports[`Icon should support svg react component 1`] = `
   <svg
     aria-hidden="true"
     class=""
+    fill="currentColor"
     focusable="false"
     height="1em"
     viewBox="0 0 24 24"
@@ -816,6 +824,7 @@ exports[`Icon.createFromIconfontCN() extraCommonProps should works fine and can
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -832,6 +841,7 @@ exports[`Icon.createFromIconfontCN() extraCommonProps should works fine and can
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -848,6 +858,7 @@ exports[`Icon.createFromIconfontCN() extraCommonProps should works fine and can
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -879,6 +890,7 @@ exports[`Icon.createFromIconfontCN() should support event listeners 1`] = `
         <svg
           aria-hidden="true"
           className=""
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -903,6 +915,7 @@ exports[`Icon.createFromIconfontCN() should support event listeners 1`] = `
         <svg
           aria-hidden="true"
           className=""
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -930,6 +943,7 @@ exports[`Icon.createFromIconfontCN() should support event listeners 1`] = `
         <svg
           aria-hidden="true"
           className=""
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -959,6 +973,7 @@ exports[`Icon.createFromIconfontCN() should support event listeners 1`] = `
         <svg
           aria-hidden="true"
           className="anticon-spin"
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -984,6 +999,7 @@ exports[`Icon.createFromIconfontCN() should support iconfont.cn 1`] = `
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1000,6 +1016,7 @@ exports[`Icon.createFromIconfontCN() should support iconfont.cn 1`] = `
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1016,6 +1033,7 @@ exports[`Icon.createFromIconfontCN() should support iconfont.cn 1`] = `
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1039,6 +1057,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) extraCommonProps should works
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1055,6 +1074,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) extraCommonProps should works
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1071,6 +1091,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) extraCommonProps should works
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1125,6 +1146,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support event listener
         <svg
           aria-hidden="true"
           className=""
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -1149,6 +1171,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support event listener
         <svg
           aria-hidden="true"
           className=""
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -1176,6 +1199,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support event listener
         <svg
           aria-hidden="true"
           className=""
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -1205,6 +1229,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support event listener
         <svg
           aria-hidden="true"
           className="anticon-spin"
+          fill="currentColor"
           focusable="false"
           height="1em"
           width="1em"
@@ -1230,6 +1255,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support iconfont.cn 1`
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1246,6 +1272,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support iconfont.cn 1`
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1262,6 +1289,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support iconfont.cn 1`
     <svg
       aria-hidden="true"
       class=""
+      fill="currentColor"
       focusable="false"
       height="1em"
       width="1em"
@@ -1282,6 +1310,7 @@ exports[`Icon.createFromIconfontCN({scriptUrl:[]}) should support ignore load er
   <svg
     aria-hidden="true"
     class=""
+    fill="currentColor"
     focusable="false"
     height="1em"
     width="1em"
diff --git a/packages/icons-svg/README.md b/packages/icons-svg/ReadMe.md
similarity index 100%
rename from packages/icons-svg/README.md
rename to packages/icons-svg/ReadMe.md

From d4f5bfc3e906ffb83df71369a9988cf2a448d92f Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 19 Sep 2024 15:52:44 +0800
Subject: [PATCH 2/4] Apply suggestions from code review

---
 packages/icons-react/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json
index 9987a9072..7d5c6926e 100644
--- a/packages/icons-react/package.json
+++ b/packages/icons-react/package.json
@@ -59,8 +59,6 @@
     "glob": "^7.1.6",
     "history": "^4.9.0",
     "lodash": "^4.17.21",
-    "mobx": "^5.1.0",
-    "mobx-react": "^6.1.3",
     "pkg-dir": "4.0.0",
     "prettier": "^2.2.1",
     "rc-test": "^7.0.15",
@@ -75,12 +73,14 @@
     "react": ">=16.0.0",
     "react-dom": ">=16.0.0"
   },
+  "resolutions": {
+    "cheerio": "1.0.0-rc.12"
+  },
   "engines": {
     "node": ">=8"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
-  },
-  "gitHead": "225d4d2189720ee3b7e4a4d7a6d80e076fa15cbc"
+  }
 }

From 03a1a039e37fe53bdd410fa06dd2c1708563a91e Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 19 Sep 2024 15:53:12 +0800
Subject: [PATCH 3/4] Discard changes to packages/icons-svg/README.md

---
 packages/icons-svg/{ReadMe.md => README.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/icons-svg/{ReadMe.md => README.md} (100%)

diff --git a/packages/icons-svg/ReadMe.md b/packages/icons-svg/README.md
similarity index 100%
rename from packages/icons-svg/ReadMe.md
rename to packages/icons-svg/README.md

From 9f2597ef093fc9451d88d1e8e6f32f0905edb10b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 19 Sep 2024 15:53:20 +0800
Subject: [PATCH 4/4] Update packages/icons-react/src/components/Icon.tsx

---
 packages/icons-react/src/components/Icon.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/icons-react/src/components/Icon.tsx b/packages/icons-react/src/components/Icon.tsx
index 99be72779..9add0354d 100644
--- a/packages/icons-react/src/components/Icon.tsx
+++ b/packages/icons-react/src/components/Icon.tsx
@@ -14,7 +14,7 @@ export interface IconBaseProps extends React.HTMLProps<HTMLSpanElement> {
 export interface CustomIconComponentProps {
   width: string | number;
   height: string | number;
-  fill: string;
+  fill?: string;
   viewBox?: string;
   className?: string;
   style?: React.CSSProperties;