From 2555b26b1ba436d50bcb30995d9e5d0407d5ce81 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Fri, 8 Nov 2024 11:32:37 +0800
Subject: [PATCH] feat: update icon

---
 src/packages/button/button.taro.tsx      |   4 +-
 src/packages/button/demos/taro/demo4.tsx | 355 +++++++--------------
 src/packages/button/demos/taro/demo5.tsx | 373 ++++++++---------------
 3 files changed, 239 insertions(+), 493 deletions(-)

diff --git a/src/packages/button/button.taro.tsx b/src/packages/button/button.taro.tsx
index 8903271d79..03bba559ab 100644
--- a/src/packages/button/button.taro.tsx
+++ b/src/packages/button/button.taro.tsx
@@ -158,9 +158,7 @@ export const Button = React.forwardRef<HTMLButtonElement, Partial<ButtonProps>>(
         onClick={(e) => handleClick(e as any)}
       >
         <View className="nut-button-wrap">
-          {loading && !harmonyAndRn() && (
-            <Loading className="nut-icon-loading" />
-          )}
+          {loading && <Loading className="nut-icon-loading" />}
           {!loading && icon ? icon : null}
           {children && (
             <View
diff --git a/src/packages/button/demos/taro/demo4.tsx b/src/packages/button/demos/taro/demo4.tsx
index 9ed9c52db4..3fa3641dd6 100644
--- a/src/packages/button/demos/taro/demo4.tsx
+++ b/src/packages/button/demos/taro/demo4.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import { Button, Cell } from '@nutui/nutui-react-taro'
-import { Star, Plus } from '@nutui/icons-react-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
+import { Plus, Star } from '@nutui/icons-react-taro'
 import pxTransform from '@/utils/px-transform'
 
 const Demo4 = () => {
@@ -13,243 +12,121 @@ const Demo4 = () => {
   }
   return (
     <>
-      {!harmonyAndRn() ? (
-        <Cell style={{ flexWrap: 'wrap' }}>
-          <Button
-            type="primary"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            type="primary"
-            fill="outline"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            type="primary"
-            fill="dashed"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-              backgroundColor: `var(--nutui-color-primary-light-pressed)`,
-              borderColor: `var(--nutui-color-primary)`,
-              color: `var(--nutui-color-primary)`,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            type="default"
-            fill="none"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-              backgroundColor: `var(--nutui-gray-3)`,
-              color: `var(--nutui-gray-7)`,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            type="default"
-            fill="none"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-              backgroundColor: `var(--nutui-gray-1)`,
-              color: `var(--nutui-gray-7)`,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            type="default"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            shape="square"
-            fill="outline"
-            type="primary"
-            icon={<Plus />}
-            style={marginStyle}
-          />
-          <Button
-            fill="outline"
-            type="primary"
-            icon={<Plus />}
-            style={marginStyle}
-          />
-          <Button
-            type="primary"
-            fill="dashed"
-            icon={<Plus />}
-            style={marginStyle}
-          />
-          <Button
-            shape="round"
-            type="primary"
-            size="large"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            shape="round"
-            type="primary"
-            size="xlarge"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-        </Cell>
-      ) : (
-        <Cell style={{ flexWrap: 'wrap' }}>
-          <Button
-            type="primary"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            type="primary"
-            fill="outline"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            type="primary"
-            fill="dashed"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{
-              ...{
-                backgroundColor: `#ffebf1`,
-                borderColor: `#ff0f23`,
-                color: `#ff0f23`,
-              },
-              ...marginStyle,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            type="default"
-            fill="none"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{
-              ...{
-                backgroundColor: `#f5f6fa`,
-                color: `#1a1a1a`,
-              },
-              ...marginStyle,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            type="default"
-            fill="none"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{
-              ...{
-                backgroundColor: `#ffffff`,
-                color: `#1a1a1a`,
-              },
-              ...marginStyle,
-            }}
-          >
-            Button
-          </Button>
-          <Button
-            type="default"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Button
-          </Button>
-          <Button
-            shape="square"
-            fill="outline"
-            type="primary"
-            // icon={<Plus />}
-            style={{ width: pxTransform(32), ...marginStyle }}
-          />
-          <Button
-            fill="outline"
-            type="primary"
-            // icon={<Plus />}
-            style={{ width: pxTransform(32), ...marginStyle }}
-          />
-          <Button
-            type="primary"
-            fill="dashed"
-            // icon={<Plus />}
-            style={{ width: pxTransform(32), ...marginStyle }}
-          />
-          <Button
-            shape="round"
-            type="primary"
-            size="large"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(100), ...marginStyle }}
-          >
-            Button
-          </Button>
-          <Button
-            shape="round"
-            type="primary"
-            size="xlarge"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(200), ...marginStyle }}
-          >
-            Button
-          </Button>
-        </Cell>
-      )}
+      <Cell style={{ flexWrap: 'wrap' }}>
+        <Button
+          type="primary"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Button
+        </Button>
+        <Button
+          type="primary"
+          fill="outline"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Button
+        </Button>
+        <Button
+          type="primary"
+          fill="dashed"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Button
+        </Button>
+        <Button
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+            backgroundColor: `var(--nutui-color-primary-light-pressed)`,
+            borderColor: `var(--nutui-color-primary)`,
+            color: `var(--nutui-color-primary)`,
+          }}
+        >
+          Button
+        </Button>
+        <Button
+          type="default"
+          fill="none"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+            backgroundColor: `var(--nutui-gray-3)`,
+            color: `var(--nutui-gray-7)`,
+          }}
+        >
+          Button
+        </Button>
+        <Button
+          type="default"
+          fill="none"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+            backgroundColor: `var(--nutui-gray-1)`,
+            color: `var(--nutui-gray-7)`,
+          }}
+        >
+          Button
+        </Button>
+        <Button
+          type="default"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+          }}
+        >
+          Button
+        </Button>
+        <Button
+          shape="square"
+          fill="outline"
+          type="primary"
+          icon={<Plus />}
+          style={marginStyle}
+        />
+        <Button
+          fill="outline"
+          type="primary"
+          icon={<Plus />}
+          style={marginStyle}
+        />
+        <Button
+          type="primary"
+          fill="dashed"
+          icon={<Plus />}
+          style={marginStyle}
+        />
+        <Button
+          shape="round"
+          type="primary"
+          size="large"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Button
+        </Button>
+        <Button
+          shape="round"
+          type="primary"
+          size="xlarge"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Button
+        </Button>
+      </Cell>
     </>
   )
 }
diff --git a/src/packages/button/demos/taro/demo5.tsx b/src/packages/button/demos/taro/demo5.tsx
index 2f3775630c..fb5e4bb308 100644
--- a/src/packages/button/demos/taro/demo5.tsx
+++ b/src/packages/button/demos/taro/demo5.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import { Button, Cell } from '@nutui/nutui-react-taro'
-import { Star, Plus } from '@nutui/icons-react-taro'
-import { harmonyAndRn, harmony } from '@/utils/platform-taro'
+import { Plus, Star } from '@nutui/icons-react-taro'
 import pxTransform from '@/utils/px-transform'
 
 const Demo5 = () => {
@@ -13,255 +12,127 @@ const Demo5 = () => {
   }
   return (
     <>
-      {!harmonyAndRn() ? (
-        <Cell style={{ flexWrap: 'wrap' }}>
-          <Button
-            disabled
-            type="primary"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="primary"
-            fill="outline"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="primary"
-            fill="dashed"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            fill="solid"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="default"
-            fill="none"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-              backgroundColor: `var(--nutui-gray-3)`,
-              color: `var(--nutui-gray-5)`,
-            }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="default"
-            fill="none"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-              backgroundColor: `var(--nutui-gray-1)`,
-              color: `var(--nutui-gray-5)`,
-            }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={{
-              margin: 8,
-            }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            shape="square"
-            fill="outline"
-            type="primary"
-            icon={<Plus size="20" />}
-            style={marginStyle}
-          />
-          <Button
-            disabled
-            type="primary"
-            icon={<Plus size="20" />}
-            style={marginStyle}
-          />
-          <Button
-            disabled
-            type="primary"
-            fill="dashed"
-            icon={<Plus />}
-            style={marginStyle}
-          />
-          <Button
-            disabled
-            shape="round"
-            type="primary"
-            size="large"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            shape="round"
-            type="primary"
-            size="xlarge"
-            icon={<Star />}
-            rightIcon={<Star />}
-            style={marginStyle}
-          >
-            Disabled
-          </Button>
-        </Cell>
-      ) : (
-        <Cell style={{ flexWrap: 'wrap' }}>
-          <Button
-            disabled
-            type="primary"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(harmony() ? 100 : 80), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="primary"
-            fill="outline"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(harmony() ? 100 : 80), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="primary"
-            fill="dashed"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(harmony() ? 100 : 80), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            fill="solid"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(harmony() ? 100 : 80), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="default"
-            fill="none"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{
-              ...{
-                backgroundColor: `#f6f6f6`,
-                color: `#888b94`,
-                width: pxTransform(harmony() ? 100 : 80),
-              },
-              ...marginStyle,
-            }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            type="default"
-            fill="none"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{
-              ...{
-                backgroundColor: `#ffffff`,
-                color: `#888b94`,
-                width: pxTransform(harmony() ? 100 : 80),
-              },
-              ...marginStyle,
-            }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(harmony() ? 100 : 80), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            shape="square"
-            fill="outline"
-            type="primary"
-            // icon={<Plus size="20" />}
-            style={{ width: pxTransform(32), ...marginStyle }}
-          />
-          <Button
-            disabled
-            type="primary"
-            // icon={<Plus size="20" />}
-            style={{ width: pxTransform(32), ...marginStyle }}
-          />
-          <Button
-            disabled
-            type="primary"
-            fill="dashed"
-            // icon={<Plus />}
-            style={{ width: pxTransform(32), ...marginStyle }}
-          />
-          <Button
-            disabled
-            shape="round"
-            type="primary"
-            size="large"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(120), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-          <Button
-            disabled
-            shape="round"
-            type="primary"
-            size="xlarge"
-            // icon={<Star />}
-            // rightIcon={<Star />}
-            style={{ width: pxTransform(200), ...marginStyle }}
-          >
-            Disabled
-          </Button>
-        </Cell>
-      )}
+      <Cell style={{ flexWrap: 'wrap' }}>
+        <Button
+          disabled
+          type="primary"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          type="primary"
+          fill="outline"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          type="primary"
+          fill="dashed"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          fill="solid"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          type="default"
+          fill="none"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+            backgroundColor: `var(--nutui-gray-3)`,
+            color: `var(--nutui-gray-5)`,
+          }}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          type="default"
+          fill="none"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+            backgroundColor: `var(--nutui-gray-1)`,
+            color: `var(--nutui-gray-5)`,
+          }}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={{
+            margin: 8,
+          }}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          shape="square"
+          fill="outline"
+          type="primary"
+          icon={<Plus size="20" />}
+          style={marginStyle}
+        />
+        <Button
+          disabled
+          type="primary"
+          icon={<Plus size="20" />}
+          style={marginStyle}
+        />
+        <Button
+          disabled
+          type="primary"
+          fill="dashed"
+          icon={<Plus />}
+          style={marginStyle}
+        />
+        <Button
+          disabled
+          shape="round"
+          type="primary"
+          size="large"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Disabled
+        </Button>
+        <Button
+          disabled
+          shape="round"
+          type="primary"
+          size="xlarge"
+          icon={<Star />}
+          rightIcon={<Star />}
+          style={marginStyle}
+        >
+          Disabled
+        </Button>
+      </Cell>
     </>
   )
 }