From 33685b4559e2a0262099b430e70958e0dba3b61f Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 15 Apr 2025 10:19:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(input):=20=E5=A2=9E=E5=8A=A0=20taro=20?= =?UTF-8?q?components=20=E5=B1=9E=E6=80=A7=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/input/input.taro.tsx | 3 ++- src/types/spec/input/taro.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/packages/input/input.taro.tsx b/src/packages/input/input.taro.tsx index 6e09c998cc..32e8a4e518 100644 --- a/src/packages/input/input.taro.tsx +++ b/src/packages/input/input.taro.tsx @@ -39,6 +39,7 @@ export const Input = forwardRef((props: Partial, ref) => { const rtl = useRtl() const { locale } = useConfig() const { + focus, type, name, placeholder, @@ -183,7 +184,7 @@ export const Input = forwardRef((props: Partial, ref) => { placeholderClass={`${classPrefix}-placeholder`} disabled={disabled || readOnly} value={value} - focus={autoFocus} + focus={autoFocus || focus} confirmType={confirmType} onBlur={handleBlur} onFocus={handleFocus} diff --git a/src/types/spec/input/taro.ts b/src/types/spec/input/taro.ts index 194681447b..4ff0fc4f8d 100644 --- a/src/types/spec/input/taro.ts +++ b/src/types/spec/input/taro.ts @@ -14,6 +14,7 @@ export interface TaroInputProps BaseInput, 'onClick' | 'onFocus' > { + focus?: boolean onClick?: (e: ITouchEvent) => void onFocus?: (value: string, height?: number) => void } From 52d3799fe3c81c70de43e64ef57093fef6bfa362 Mon Sep 17 00:00:00 2001 From: oasis Date: Fri, 18 Apr 2025 09:54:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E7=BB=A7=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/spec/input/taro.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/types/spec/input/taro.ts b/src/types/spec/input/taro.ts index 4ff0fc4f8d..eaecc6b23c 100644 --- a/src/types/spec/input/taro.ts +++ b/src/types/spec/input/taro.ts @@ -9,11 +9,13 @@ type OmittedInput = Omit< 'type' | 'ref' | 'onBlur' | 'onFocus' | 'maxlength' | 'password' > -export interface TaroInputProps - extends Omit< - BaseInput, - 'onClick' | 'onFocus' - > { +type TaroInput = Omit< + BaseInput, + 'onClick' | 'onFocus' +> & + OmittedInput + +export interface TaroInputProps extends TaroInput { focus?: boolean onClick?: (e: ITouchEvent) => void onFocus?: (value: string, height?: number) => void From 4c59c00fe20c29204da02f59984fe4e6436c6f84 Mon Sep 17 00:00:00 2001 From: oasis Date: Fri, 18 Apr 2025 15:26:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E7=BB=A7=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/spec/input/taro.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/types/spec/input/taro.ts b/src/types/spec/input/taro.ts index eaecc6b23c..882eb8c7d2 100644 --- a/src/types/spec/input/taro.ts +++ b/src/types/spec/input/taro.ts @@ -16,7 +16,6 @@ type TaroInput = Omit< OmittedInput export interface TaroInputProps extends TaroInput { - focus?: boolean onClick?: (e: ITouchEvent) => void onFocus?: (value: string, height?: number) => void }