diff --git a/package.json b/package.json index 20e8ea8076..e6c759c35d 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "dependencies": { "@babel/runtime": "^7.23.9", "@nutui/icons-react": "^1.0.5", - "@nutui/icons-react-taro": "2.0.0-beta.0", + "@nutui/icons-react-taro": "^2.0.0-beta.0", "@nutui/jdesign-icons-react-taro": "1.0.6-beta.2", "@nutui/touch-emulator": "^1.0.0", "@react-spring/web": "~9.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b08e62173..a0fd1d67d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: ^1.0.5 version: 1.0.5 '@nutui/icons-react-taro': - specifier: 2.0.0-beta.0 - version: 2.0.0-beta.0 + specifier: ^1.0.5 + version: 1.0.5 '@nutui/jdesign-icons-react-taro': specifier: 1.0.6-beta.2 version: 1.0.6-beta.2 @@ -1615,8 +1615,8 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, tarball: https://r2.cnpmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz} engines: {node: '>= 8'} - '@nutui/icons-react-taro@2.0.0-beta.0': - resolution: {integrity: sha512-Wca6RWjy76fT9Co4T8PTjZCB/nzUxxyBR6efYl5tSKUJEvc6FPGHuA2FL6F0Gs9BBHo6ppTs02DRcSohX6UFWQ==} + '@nutui/icons-react-taro@1.0.5': + resolution: {integrity: sha512-p7dCW29wASH/qQ1OaUGGKA6PRV33wDPb80+qrHnWtT40syIb0W+e92mpplbULWM01s+GYVGyUU3i8b7Iy7qfvw==} '@nutui/icons-react@1.0.5': resolution: {integrity: sha512-0TYl3Fk+sVz95DKqn/7isYAvaK5YGnaBwMMib4rqYLoqi9GGFwgU9rp2hYXu/X5IYdWgshj0xiuGMK75/vUYbQ==} @@ -9914,7 +9914,7 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@nutui/icons-react-taro@2.0.0-beta.0': {} + '@nutui/icons-react-taro@1.0.5': {} '@nutui/icons-react@1.0.5': {} diff --git a/src/packages/inputnumber/doc.en-US.md b/src/packages/inputnumber/doc.en-US.md index beb3542914..5b51a9bb4e 100644 --- a/src/packages/inputnumber/doc.en-US.md +++ b/src/packages/inputnumber/doc.en-US.md @@ -147,7 +147,7 @@ The component provides the following CSS variables, which can be used to customi | \--nutui-inputnumber-input-border | The border value of the input in the number input box | `0` | | \--nutui-inputnumber-input-border-radius | The rounded corners of the input in the number input box | `6px` | | \--nutui-inputnumber-input-margin | The rounded corners of the input in the number input box | `0` | -| \--nutui-inputnumber-button-width | The width of the left and right buttons of the number input box | `14px` | +| \--nutui-inputnumber-button-width | The width of the left and right buttons of the number input box | `16px` | | \--nutui-inputnumber-button-height | The height of the left and right buttons of the number input box | `16px` | | \--nutui-inputnumber-button-border-radius | The rounded corners of the left and right buttons of the number input box | `30px` | | \--nutui-inputnumber-button-background-color | The background color of the left and right buttons of the number input box | `transparent` | diff --git a/src/packages/inputnumber/doc.md b/src/packages/inputnumber/doc.md index d2afd0b4d1..0586586475 100644 --- a/src/packages/inputnumber/doc.md +++ b/src/packages/inputnumber/doc.md @@ -147,7 +147,7 @@ import { InputNumber } from '@nutui/nutui-react' | \--nutui-inputnumber-input-border | 数字输入框中input的border值 | `0` | | \--nutui-inputnumber-input-border-radius | 数字输入框中input的圆角 | `6px` | | \--nutui-inputnumber-input-margin | 数字输入框中input的margin值 | `0` | -| \--nutui-inputnumber-button-width | 数字输入框左右按钮的宽度 | `14px` | +| \--nutui-inputnumber-button-width | 数字输入框左右按钮的宽度 | `16px` | | \--nutui-inputnumber-button-height | 数字输入框左右按钮的高度 | `16px` | | \--nutui-inputnumber-button-border-radius | 数字输入框左右按钮的圆角 | `30px` | | \--nutui-inputnumber-button-background-color | 数字输入框左右按钮的背景色 | `transparent` | diff --git a/src/packages/inputnumber/doc.taro.md b/src/packages/inputnumber/doc.taro.md index fb9a619b1c..d834b22431 100644 --- a/src/packages/inputnumber/doc.taro.md +++ b/src/packages/inputnumber/doc.taro.md @@ -139,7 +139,7 @@ import { InputNumber } from '@nutui/nutui-react-taro' | \--nutui-inputnumber-input-border | 数字输入框中input的border值 | `0` | | \--nutui-inputnumber-input-border-radius | 数字输入框中input的圆角 | `6px` | | \--nutui-inputnumber-input-margin | 数字输入框中input的margin值 | `0` | -| \--nutui-inputnumber-button-width | 数字输入框左右按钮的宽度 | `14px` | +| \--nutui-inputnumber-button-width | 数字输入框左右按钮的宽度 | `16px` | | \--nutui-inputnumber-button-height | 数字输入框左右按钮的高度 | `16px` | | \--nutui-inputnumber-button-border-radius | 数字输入框左右按钮的圆角 | `30px` | | \--nutui-inputnumber-button-background-color | 数字输入框左右按钮的背景色 | `transparent` | diff --git a/src/packages/inputnumber/doc.zh-TW.md b/src/packages/inputnumber/doc.zh-TW.md index 5a1cb78e4c..7db92e45e6 100644 --- a/src/packages/inputnumber/doc.zh-TW.md +++ b/src/packages/inputnumber/doc.zh-TW.md @@ -138,7 +138,7 @@ import { InputNumber } from '@nutui/nutui-react' | \--nutui-inputnumber-input-border | 數字輸入框中input的border值 | `0` | | \--nutui-inputnumber-input-border-radius | 數字輸入框中input的圓角 | `6px` | | \--nutui-inputnumber-input-margin | 數字輸入框中input的margin值 | `0` | -| \--nutui-inputnumber-button-width | 數字輸入框左右按鈕的寬度 | `14px` | +| \--nutui-inputnumber-button-width | 數字輸入框左右按鈕的寬度 | `16px` | | \--nutui-inputnumber-button-height | 數字輸入框左右按鈕的高度 | `16px` | | \--nutui-inputnumber-button-border-radius | 數字輸入框左右按鈕的圓角 | `30px` | | \--nutui-inputnumber-button-background-color | 數字輸入框左右按鈕的背景色 | `transparent` | diff --git a/src/packages/inputnumber/inputnumber.harmony.css b/src/packages/inputnumber/inputnumber.harmony.css index 79800288af..24d0020e88 100644 --- a/src/packages/inputnumber/inputnumber.harmony.css +++ b/src/packages/inputnumber/inputnumber.harmony.css @@ -7,7 +7,7 @@ display: flex; justify-content: center; align-items: center; - width: 14px; + width: 16px; height: 24px; background-color: transparent; border-radius: 16px; @@ -16,7 +16,7 @@ display: flex; justify-content: center; align-items: center; - width: 14px; + width: 16px; height: 24px; background-color: transparent; border-radius: 16px; diff --git a/src/packages/inputnumber/inputnumber.taro.tsx b/src/packages/inputnumber/inputnumber.taro.tsx index 0e1bb46d87..282d26edcb 100644 --- a/src/packages/inputnumber/inputnumber.taro.tsx +++ b/src/packages/inputnumber/inputnumber.taro.tsx @@ -11,12 +11,11 @@ import { Input as TaroInput, InputProps, View, - Text, } from '@tarojs/components' import { Minus, Plus } from '@nutui/icons-react-taro' import { usePropsValue } from '@/utils/use-props-value' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { harmony, harmonyAndRn, rn } from '@/utils/platform-taro' +import { harmonyAndRn } from '@/utils/platform-taro' export interface InputNumberProps extends BasicComponent { value: number | string @@ -91,8 +90,6 @@ export const InputNumber: FunctionComponent< ...props, } const isRnAndHarmony = harmonyAndRn() - const isRn = rn() - const isHarmony = harmony() const classes = classNames(classPrefix, className) const [focused, setFocused] = useState(false) const inputRef = useRef(null) @@ -253,31 +250,16 @@ export const InputNumber: FunctionComponent< return ( - {isRnAndHarmony ? ( - - - - - ) : ( - - )} + - {isRn ? ( + {isRnAndHarmony ? ( - {isRnAndHarmony ? ( - - + - - ) : ( - - )} + ) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index cf74f9beac..342c788ead 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -629,7 +629,7 @@ $inputnumber-input-border-radius: var( 6px ) !default; $inputnumber-input-margin: var(--nutui-inputnumber-input-margin, 0) !default; -$inputnumber-button-width: var(--nutui-inputnumber-button-width, 14px) !default; +$inputnumber-button-width: var(--nutui-inputnumber-button-width, 16px) !default; $inputnumber-button-height: var( --nutui-inputnumber-button-height, 24px