@sj-distributor/react-iconfont-cli 2.4.0 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sj-distributor/react-iconfont-cli",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "index.js",
   "keywords": [
     "iconfont",
@@ -15,8 +15,8 @@
   "license": "MIT",
   "bin": {
     "sj-iconfont": "./commands/help.js",
-    "sj-iconfont-init": "./commands/createJson.js",
-    "sj-iconfont-h5": "./commands/createIcon.js"
+    "sj-iconfont-h5": "./commands/createIcon.js",
+    "sj-iconfont-init": "./commands/createJson.js"
   },
   "peerDependencies": {
     "react": "*"

package/templates/helper.js.template

@@ -7,11 +7,12 @@
  * @return {string}
  */
 export const getIconColor = (color, index, defaultColor) => {
-  return color
-    ? (
-      typeof color === 'string'
-        ? color
-        : color[index] || defaultColor
-    )
-    : defaultColor;
+  if (!color) return defaultColor;
+
+  // When color is a single value, only tint the first path.
+  if (typeof color === 'string') {
+    return index === 0 ? color : defaultColor;
+  }
+
+  return color[index] || defaultColor;
 };

package/templates/helper.ts.template

@@ -2,11 +2,12 @@
 /* eslint-disable */
 
 export const getIconColor = (color: string | string[] | undefined, index: number, defaultColor: string) => {
-  return color
-    ? (
-      typeof color === 'string'
-        ? color
-        : color[index] || defaultColor
-    )
-    : defaultColor;
+  if (!color) return defaultColor;
+
+  // When color is a single value, only tint the first path.
+  if (typeof color === 'string') {
+    return index === 0 ? color : defaultColor;
+  }
+
+  return color[index] || defaultColor;
 };