From 934611e0026552b47699507887eef9f205be0c5d Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Thu, 31 Oct 2024 14:24:04 +0800
Subject: [PATCH 1/4] feat: tag icon

---
 src/packages/tag/demos/taro/demo2.tsx | 7 ++++---
 src/packages/tag/tag.taro.tsx         | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/packages/tag/demos/taro/demo2.tsx b/src/packages/tag/demos/taro/demo2.tsx
index 09ba99c4a1..b23cc25211 100644
--- a/src/packages/tag/demos/taro/demo2.tsx
+++ b/src/packages/tag/demos/taro/demo2.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 // import { Failure } from '@nutui/icons-react-taro'
 import { Cell, Tag } from '@nutui/nutui-react-taro'
 import Taro from '@tarojs/taro'
+import { Icon } from '@tarojs/components'
 
 const Demo2 = () => {
   return (
@@ -32,7 +33,7 @@ const Demo2 = () => {
               onClose={() => Taro.showToast({ title: 'Tag closed' })}
               type="primary"
             >
-              标签
+              标签0
             </Tag>
           }
         />
@@ -42,8 +43,8 @@ const Demo2 = () => {
             <Tag
               closeable
               // TODO: icon 适配
-              closeIcon="C"
-              // closeIcon={<Failure size={8} />}
+              // closeIcon="C"
+              closeIcon={<Icon type="search" color="red" />}
               onClose={() => Taro.showToast({ title: 'Tag closed' })}
               type="primary"
             >
diff --git a/src/packages/tag/tag.taro.tsx b/src/packages/tag/tag.taro.tsx
index b9ffcbe3d5..97efc2c750 100644
--- a/src/packages/tag/tag.taro.tsx
+++ b/src/packages/tag/tag.taro.tsx
@@ -5,7 +5,7 @@ import React, {
   ReactNode,
 } from 'react'
 import type { MouseEvent } from 'react'
-import { View, ITouchEvent, Text } from '@tarojs/components'
+import { View, ITouchEvent, Text, Icon } from '@tarojs/components'
 // import { Close } from '@nutui/icons-react-taro'
 import classNames from 'classnames'
 
@@ -147,7 +147,8 @@ export const Tag: FunctionComponent<Partial<TagProps>> = (props) => {
                 }}
                 className={`${classPrefix}-custom-icon`}
               >
-                X
+                -
+                <Icon type="search" color="red" />-
               </Text>
             )}
           </View>

From 0e34d43caf5fb810384be5d8a23944f6dac55462 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 1 Nov 2024 00:25:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(TextArea):=20=E5=A2=9E=E5=8A=A0disabled?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F,=E8=B0=83=E6=95=B4autosize=20demo,=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/textarea/demos/h5/demo4.tsx   |  2 +-
 src/packages/textarea/demos/taro/demo4.tsx |  2 +-
 src/packages/textarea/textarea.harmony.css | 14 +++++---------
 src/packages/textarea/textarea.scss        | 19 ++++++++-----------
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/packages/textarea/demos/h5/demo4.tsx b/src/packages/textarea/demos/h5/demo4.tsx
index e9b4998e93..802a0f950e 100644
--- a/src/packages/textarea/demos/h5/demo4.tsx
+++ b/src/packages/textarea/demos/h5/demo4.tsx
@@ -2,6 +2,6 @@ import React from 'react'
 import { TextArea } from '@nutui/nutui-react'
 
 const Demo4 = () => {
-  return <TextArea rows={1} autoSize />
+  return <TextArea rows={1} autoSize maxLength={-1} />
 }
 export default Demo4
diff --git a/src/packages/textarea/demos/taro/demo4.tsx b/src/packages/textarea/demos/taro/demo4.tsx
index 0ddc11fb50..fdfba3dd01 100644
--- a/src/packages/textarea/demos/taro/demo4.tsx
+++ b/src/packages/textarea/demos/taro/demo4.tsx
@@ -2,6 +2,6 @@ import React from 'react'
 import { TextArea } from '@nutui/nutui-react-taro'
 
 const Demo4 = () => {
-  return <TextArea rows={1} autoSize />
+  return <TextArea rows={1} autoSize maxLength={-1} />
 }
 export default Demo4
diff --git a/src/packages/textarea/textarea.harmony.css b/src/packages/textarea/textarea.harmony.css
index 2f21e49cd1..c6ff321ba1 100644
--- a/src/packages/textarea/textarea.harmony.css
+++ b/src/packages/textarea/textarea.harmony.css
@@ -24,7 +24,6 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 40px;
   min-width: 0;
   margin: 0;
   padding: 0;
@@ -44,19 +43,16 @@
   cursor: not-allowed;
   color: #c2c4cc;
 }
-.nut-textarea .cpoyText {
-  position: absolute;
-  top: -999999px;
-  left: -999999px;
+.nut-textarea-textarea-disabled::-webkit-input-placeholder {
+  color: #c2c4cc;
+}
+.nut-textarea-textarea-disabled .taro-textarea::-webkit-input-placeholder {
+  color: #c2c4cc;
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
   left: 15px;
 }
-.nut-textarea.nut-textarea-rtl .cpoyText {
-  left: auto;
-  right: -999999px;
-}
 
 .taro-textarea {
   background-color: transparent;
diff --git a/src/packages/textarea/textarea.scss b/src/packages/textarea/textarea.scss
index cb55dffbeb..fb205938a1 100644
--- a/src/packages/textarea/textarea.scss
+++ b/src/packages/textarea/textarea.scss
@@ -25,7 +25,6 @@
     display: block;
     box-sizing: border-box;
     width: 100%;
-    height: 40px;
     min-width: 0;
     margin: 0;
     padding: 0;
@@ -45,24 +44,22 @@
     &-disabled {
       cursor: not-allowed;
       color: $textarea-disabled-color;
+      &::-webkit-input-placeholder {
+        color: $textarea-disabled-color;
+      }
+      .taro-textarea {
+        &::-webkit-input-placeholder {
+          color: $textarea-disabled-color;
+        }
+      }
     }
   }
-  .cpoyText {
-    position: absolute;
-    top: -999999px;
-    left: -999999px;
-  }
 
   &.nut-textarea-rtl {
     &-limit {
       right: auto;
       left: 15px;
     }
-
-    .cpoyText {
-      left: auto;
-      right: -999999px;
-    }
   }
 }
 

From 3c66eb12eb5cd803236b5333eddb81120bf1fe60 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 1 Nov 2024 00:31:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(TextArea):=20=E5=A2=9E=E5=8A=A0disabled?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F,=E8=B0=83=E6=95=B4autosize=20demo,=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/tag/demos/taro/demo2.tsx | 7 +++----
 src/packages/tag/tag.taro.tsx         | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/packages/tag/demos/taro/demo2.tsx b/src/packages/tag/demos/taro/demo2.tsx
index b23cc25211..09ba99c4a1 100644
--- a/src/packages/tag/demos/taro/demo2.tsx
+++ b/src/packages/tag/demos/taro/demo2.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 // import { Failure } from '@nutui/icons-react-taro'
 import { Cell, Tag } from '@nutui/nutui-react-taro'
 import Taro from '@tarojs/taro'
-import { Icon } from '@tarojs/components'
 
 const Demo2 = () => {
   return (
@@ -33,7 +32,7 @@ const Demo2 = () => {
               onClose={() => Taro.showToast({ title: 'Tag closed' })}
               type="primary"
             >
-              标签0
+              标签
             </Tag>
           }
         />
@@ -43,8 +42,8 @@ const Demo2 = () => {
             <Tag
               closeable
               // TODO: icon 适配
-              // closeIcon="C"
-              closeIcon={<Icon type="search" color="red" />}
+              closeIcon="C"
+              // 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
index 97efc2c750..b9ffcbe3d5 100644
--- a/src/packages/tag/tag.taro.tsx
+++ b/src/packages/tag/tag.taro.tsx
@@ -5,7 +5,7 @@ import React, {
   ReactNode,
 } from 'react'
 import type { MouseEvent } from 'react'
-import { View, ITouchEvent, Text, Icon } from '@tarojs/components'
+import { View, ITouchEvent, Text } from '@tarojs/components'
 // import { Close } from '@nutui/icons-react-taro'
 import classNames from 'classnames'
 
@@ -147,8 +147,7 @@ export const Tag: FunctionComponent<Partial<TagProps>> = (props) => {
                 }}
                 className={`${classPrefix}-custom-icon`}
               >
-                -
-                <Icon type="search" color="red" />-
+                X
               </Text>
             )}
           </View>

From d6121cb6c056f29a94df2d012c1391e15b62f3f0 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 1 Nov 2024 17:53:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9cr=E5=92=8C=20skel?=
 =?UTF-8?q?eton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/skeleton/demos/taro/demo5.tsx |   4 +-
 src/packages/skeleton/skeleton.harmony.css | 158 ++++++++++++---------
 src/packages/textarea/demos/h5/demo4.tsx   |   2 +-
 src/packages/textarea/demos/taro/demo4.tsx |   2 +-
 src/packages/textarea/textarea.harmony.css |   8 +-
 src/packages/textarea/textarea.scss        |   6 +-
 src/packages/textarea/textarea.taro.tsx    |   2 +-
 7 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/src/packages/skeleton/demos/taro/demo5.tsx b/src/packages/skeleton/demos/taro/demo5.tsx
index 85be784261..95f67948cf 100644
--- a/src/packages/skeleton/demos/taro/demo5.tsx
+++ b/src/packages/skeleton/demos/taro/demo5.tsx
@@ -35,8 +35,8 @@ const Demo5 = () => {
             }
           />
           <View className="nut-skeleton-content-line">
-            <Text className="nut-skeleton-content-title">NutUI-React</Text>
-            <View className="description">
+            <Text>NutUI-React</Text>
+            <View style={{ marginTop: '10px', width: '70%' }}>
               一套京东风格的轻量级移动端React组件库，提供丰富的基础组件和业务组件，帮助开发者快速搭建移动应用。
             </View>
           </View>
diff --git a/src/packages/skeleton/skeleton.harmony.css b/src/packages/skeleton/skeleton.harmony.css
index 34bf352a46..4e53472b40 100644
--- a/src/packages/skeleton/skeleton.harmony.css
+++ b/src/packages/skeleton/skeleton.harmony.css
@@ -1,29 +1,8 @@
-.nut-avatar-group {
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  background-position: center center;
-  display: inline-block;
-  position: relative;
-  flex: 0 0 auto;
-}
-.nut-avatar-group .nut-avatar {
-  border: 1px solid #fff;
-}
-.nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: -8px;
-}
-
-[dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
-.nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: 0;
-  margin-right: -8px;
-}
-
 .nut-image {
   display: block;
   position: relative;
 }
-.nut-image .nut-img {
+.nut-image-default {
   display: block;
   width: 100%;
   height: 100%;
@@ -32,7 +11,7 @@
   border-radius: 50%;
   overflow: hidden;
 }
-.nut-image .nut-img-loading {
+.nut-image-loading {
   width: 100%;
   height: 100%;
   position: absolute;
@@ -45,7 +24,7 @@
   background: #f5f6fa;
   background-size: 100% 100%;
 }
-.nut-image .nut-img-error {
+.nut-image-error {
   width: 100%;
   height: 100%;
   position: absolute;
@@ -70,81 +49,124 @@
   right: 0;
 }
 
+.nut-avatar-group {
+  display: flex;
+  flex-direction: row;
+  flex: 0 0 auto;
+}
+.nut-avatar-group-avatar,
+.nut-avatar-group .nut-avatar {
+  border: 1px solid #fff;
+  margin-left: -8px;
+}
+.nut-avatar-group-avatar:not(:first-of-type),
+.nut-avatar-group .nut-avatar:not(:first-of-type) {
+  margin-left: -8px;
+}
+
+[dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
+.nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
+  margin-left: 0;
+  margin-right: -8px;
+}
+
 .nut-avatar {
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  background-position: center center;
-  display: inline-block;
   position: relative;
   flex: 0 0 auto;
-  text-align: center;
 }
-.nut-avatar .avatar-img {
-  position: absolute;
+.nut-avatar-round {
+  border-radius: 999px;
+  overflow: hidden;
+}
+.nut-avatar-square {
+  border-radius: 5px;
+}
+.nut-avatar-first-child {
+  margin-left: 0;
+  margin-right: 0;
+}
+.nut-avatar-img {
   width: 100%;
   height: 100%;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
   flex-shrink: 0;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  background-position: center center;
 }
-.nut-avatar .icon {
+.nut-avatar-icon {
   background-size: 100% 100%;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
 }
 .nut-avatar .nut-icon-img {
   width: 100%;
   height: 100%;
 }
-.nut-avatar .text {
-  display: inline-block;
+.nut-avatar-text {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   width: 100%;
   height: 100%;
-  text-align: center;
-  overflow: hidden;
 }
-
-[dir=rtl] .nut-avatar .avatar-img,
-.nut-rtl .nut-avatar .avatar-img {
-  left: auto;
-  right: 50%;
-  transform: translate(50%, -50%);
+.nut-avatar-large {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 60px;
+  height: 60px;
 }
-[dir=rtl] .nut-avatar .icon,
-.nut-rtl .nut-avatar .icon {
-  left: auto;
-  right: 50%;
-  transform: translate(50%, -50%);
+.nut-avatar-large-img {
+  width: 60px;
+  height: 60px;
 }
-
-.nut-avatar-large {
+.nut-avatar-large-img-image {
+  width: 60px;
+  height: 60px;
+}
+.nut-avatar-large-icon {
+  width: 60px;
+  height: 60px;
+}
+.nut-avatar-large .nut-icon-img {
+  width: 100%;
+  height: 100%;
+}
+.nut-avatar-large-text {
   width: 60px;
   height: 60px;
-  line-height: 60px;
 }
-
 .nut-avatar-small {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 32px;
+  height: 32px;
+}
+.nut-avatar-small-img-image {
+  width: 32px;
+  height: 32px;
+}
+.nut-avatar-small-text {
   width: 32px;
   height: 32px;
-  line-height: 32px;
 }
-
 .nut-avatar-normal {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   width: 40px;
   height: 40px;
-  line-height: 40px;
 }
-
-.nut-avatar-round {
-  border-radius: 50%;
-  overflow: hidden;
+.nut-avatar-normal-img-image {
+  width: 40px;
+  height: 40px;
 }
-
-.nut-avatar-square {
-  border-radius: 5px;
+.nut-avatar-normal .nut-icon-img {
+  width: 100%;
+  height: 100%;
+}
+.nut-avatar-normal-text {
+  width: 40px;
+  height: 40px;
 }
 
 .nut-skeleton {
diff --git a/src/packages/textarea/demos/h5/demo4.tsx b/src/packages/textarea/demos/h5/demo4.tsx
index 802a0f950e..10b429a2fe 100644
--- a/src/packages/textarea/demos/h5/demo4.tsx
+++ b/src/packages/textarea/demos/h5/demo4.tsx
@@ -2,6 +2,6 @@ import React from 'react'
 import { TextArea } from '@nutui/nutui-react'
 
 const Demo4 = () => {
-  return <TextArea rows={1} autoSize maxLength={-1} />
+  return <TextArea autoSize maxLength={-1} />
 }
 export default Demo4
diff --git a/src/packages/textarea/demos/taro/demo4.tsx b/src/packages/textarea/demos/taro/demo4.tsx
index fdfba3dd01..266513d773 100644
--- a/src/packages/textarea/demos/taro/demo4.tsx
+++ b/src/packages/textarea/demos/taro/demo4.tsx
@@ -2,6 +2,6 @@ import React from 'react'
 import { TextArea } from '@nutui/nutui-react-taro'
 
 const Demo4 = () => {
-  return <TextArea rows={1} autoSize maxLength={-1} />
+  return <TextArea autoSize maxLength={-1} />
 }
 export default Demo4
diff --git a/src/packages/textarea/textarea.harmony.css b/src/packages/textarea/textarea.harmony.css
index c6ff321ba1..8998627898 100644
--- a/src/packages/textarea/textarea.harmony.css
+++ b/src/packages/textarea/textarea.harmony.css
@@ -36,6 +36,7 @@
   resize: none;
 }
 .nut-textarea-textarea .taro-textarea {
+  color: #1a1a1a;
   background-color: transparent;
   resize: none;
 }
@@ -43,10 +44,13 @@
   cursor: not-allowed;
   color: #c2c4cc;
 }
-.nut-textarea-textarea-disabled::-webkit-input-placeholder {
+.nut-textarea-textarea-disabled::placeholder {
+  color: #c2c4cc;
+}
+.nut-textarea-textarea-disabled .taro-textarea {
   color: #c2c4cc;
 }
-.nut-textarea-textarea-disabled .taro-textarea::-webkit-input-placeholder {
+.nut-textarea-textarea-disabled .taro-textarea::placeholder {
   color: #c2c4cc;
 }
 .nut-textarea.nut-textarea-rtl-limit {
diff --git a/src/packages/textarea/textarea.scss b/src/packages/textarea/textarea.scss
index fb205938a1..dccc7ece64 100644
--- a/src/packages/textarea/textarea.scss
+++ b/src/packages/textarea/textarea.scss
@@ -37,6 +37,7 @@
     resize: none;
 
     .taro-textarea {
+      color: $textarea-text-color;
       background-color: transparent;
       resize: none;
     }
@@ -44,11 +45,12 @@
     &-disabled {
       cursor: not-allowed;
       color: $textarea-disabled-color;
-      &::-webkit-input-placeholder {
+      &::placeholder {
         color: $textarea-disabled-color;
       }
       .taro-textarea {
-        &::-webkit-input-placeholder {
+        color: $textarea-disabled-color;
+        &::placeholder {
           color: $textarea-disabled-color;
         }
       }
diff --git a/src/packages/textarea/textarea.taro.tsx b/src/packages/textarea/textarea.taro.tsx
index 28559ca538..5060c5b4b9 100644
--- a/src/packages/textarea/textarea.taro.tsx
+++ b/src/packages/textarea/textarea.taro.tsx
@@ -122,8 +122,8 @@ export const TextArea: FunctionComponent<Partial<TextAreaProps>> = (props) => {
         className={`${classPrefix}-textarea ${disabled ? `${classPrefix}-textarea-disabled` : ''}`}
         style={Taro.getEnv() === 'WEB' ? undefined : style}
         disabled={Taro.getEnv() === 'WEB' ? disabled : disabled || readOnly}
-        value={inputValue}
         // @ts-ignore
+        value={inputValue}
         onInput={(e: any) => handleChange(e)}
         onBlur={(e: any) => handleBlur(e)}
         onFocus={(e: any) => handleFocus(e)}