feat(tag): update icon (#2713)

oasis-cloud · web-flow · commit 8af6d71db604 · 2024-11-08T16:53:36.000+08:00
* feat(tag): update icon

* feat(tag): update icon

* feat(tag): update icon
diff --git a/src/packages/tag/demos/taro/demo2.tsx b/src/packages/tag/demos/taro/demo2.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-// import { Failure } from '@nutui/icons-react-taro'
+import { Failure } from '@nutui/icons-react-taro'
 import { Cell, Tag } from '@nutui/nutui-react-taro'
 import Taro from '@tarojs/taro'
 
@@ -41,9 +41,7 @@ const Demo2 = () => {
           extra={
             <Tag
               closeable
-              // TODO: icon 适配
-              closeIcon="C"
-              // closeIcon={<Failure size={8} />}
+              closeIcon={<Failure size={8} />}
               onClose={() => Taro.showToast({ title: 'Tag closed' })}
               type="primary"
             >
diff --git a/src/packages/tag/tag.taro.tsx b/src/packages/tag/tag.taro.tsx
@@ -1,12 +1,12 @@
+import type { MouseEvent } from 'react'
 import React, {
   CSSProperties,
   FunctionComponent,
-  useState,
   ReactNode,
+  useState,
 } from 'react'
-import type { MouseEvent } from 'react'
-import { View, ITouchEvent, Text } from '@tarojs/components'
-// import { Close } from '@nutui/icons-react-taro'
+import { ITouchEvent, View } from '@tarojs/components'
+import { Close } from '@nutui/icons-react-taro'
 import classNames from 'classnames'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
@@ -132,23 +132,13 @@ export const Tag: FunctionComponent<Partial<TagProps>> = (props) => {
                 {closeIcon}
               </View>
             ) : (
-              // TODO: icon 适配
-              // <Close
-              //   size={8}
-              //   onClick={(e) => {
-              //     setVisible(false)
-              //     onClose && onClose(e)
-              //   }}
-              // />
-              <Text
+              <Close
+                size={8}
                 onClick={(e) => {
                   setVisible(false)
                   onClose && onClose(e)
                 }}
-                className={`${classPrefix}-custom-icon`}
-              >
-                X
-              </Text>
+              />
             )}
           </View>
         )
