feat(input): update icon (#2711)

jdf2e · Nov 8, 2024 · d53f051 · d53f051
1 parent 76ca5fc
commit d53f051
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/src/packages/input/demos/taro/demo13.tsx b/src/packages/input/demos/taro/demo13.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { Button, Input } from '@nutui/nutui-react-taro'
 import { Tips } from '@nutui/icons-react-taro'
 import { Text, View } from '@tarojs/components'
-import { harmonyAndRn } from '@/utils/platform-taro'
 import pxTransform from '@/utils/px-transform'
 
 const Demo13 = () => {
@@ -17,9 +16,7 @@ const Demo13 = () => {
           backgroundColor: '#ffffff',
         }}
       >
-        {!harmonyAndRn() ? (
-          <Tips style={{ marginLeft: pxTransform(10) }} />
-        ) : null}
+        <Tips style={{ marginLeft: pxTransform(10) }} />
         <Input
           placeholder="请输入短信验证码"
           placeholderTextColor="#757575"

diff --git a/src/packages/input/demos/taro/demo6.tsx b/src/packages/input/demos/taro/demo6.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import { Input } from '@nutui/nutui-react-taro'
 import { Close } from '@nutui/icons-react-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo6 = () => {
   return (
@@ -13,7 +12,7 @@ const Demo6 = () => {
       />
       <Input
         clearable
-        clearIcon={!harmonyAndRn() ? <Close /> : null}
+        clearIcon={<Close />}
         placeholder="显示清除图标"
         placeholderTextColor="#757575"
       />

diff --git a/src/packages/input/demos/taro/demo9.tsx b/src/packages/input/demos/taro/demo9.tsx
@@ -2,7 +2,6 @@ import React, { useState } from 'react'
 import { Input } from '@nutui/nutui-react-taro'
 import { View } from '@tarojs/components'
 import { Eye, Marshalling } from '@nutui/icons-react-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
 import pxTransform from '@/utils/px-transform'
 
 const Demo9 = () => {
@@ -35,12 +34,10 @@ const Demo9 = () => {
         >
           {/* eslint-disable-next-line no-nested-ternary */}
           {inputType === 'text' ? (
-            !harmonyAndRn() ? (
-              <Eye color="var(--nutui-gray-7)" />
-            ) : null
-          ) : !harmonyAndRn() ? (
+            <Eye color="var(--nutui-gray-7)" />
+          ) : (
             <Marshalling color="var(--nutui-gray-7)" />
-          ) : null}
+          )}
         </View>
       </View>
     </>

diff --git a/src/packages/input/input.scss b/src/packages/input/input.scss
@@ -47,3 +47,7 @@
     -webkit-text-fill-color: $input-disabled-color;
   }
 }
+
+.nut-input-clear {
+  flex: 0;
+}
diff --git a/src/packages/input/input.taro.tsx b/src/packages/input/input.taro.tsx
@@ -18,7 +18,6 @@ import { formatNumber } from './utils'
 import { useConfig, useRtl } from '@/packages/configprovider/index.taro'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { usePropsValue } from '@/utils/use-props-value'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 export type InputAlign = 'left' | 'center' | 'right'
 export type InputFormatTrigger = 'onChange' | 'onBlur'
@@ -241,8 +240,7 @@ export const Input = forwardRef(
           onBlur={handleBlur}
           onFocus={handleFocus}
           onInput={(e: any) => {
-            console.log('eeeeee', e.detail.value)
-            handleInput((e.currentTarget || e.detail).value)
+            handleInput((e.detail || e.currentTarget).value)
           }}
         />
         <View
@@ -262,10 +260,7 @@ export const Input = forwardRef(
             }
           }}
         >
-          {clearIcon ||
-            (!harmonyAndRn() ? (
-              <MaskClose className="nut-input-clear" />
-            ) : null)}
+          {clearIcon || <MaskClose className="nut-input-clear" />}
         </View>
       </View>
     )