Skip to content

Button Taro版本新增 button原始类型属性支持 Uploader Taro上传组件按钮原始类型设置为type=button #2195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oasis-cloud merged 1 commit into from
May 31, 2024
Merged

Button Taro版本新增 button原始类型属性支持 Uploader Taro上传组件按钮原始类型设置为type=button #2195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/packages/button/button.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface ButtonProps
disabled: boolean
icon: React.ReactNode
rightIcon: React.ReactNode
nativeType: 'submit' | 'reset' | 'button'
onClick: (e: MouseEvent<HTMLButtonElement>) => void
}

Expand Down Expand Up @@ -70,6 +71,7 @@ export const Button = React.forwardRef<HTMLButtonElement, Partial<ButtonProps>>(
children,
className,
style,
nativeType,
onClick,
...rest
} = {
Expand Down Expand Up @@ -108,6 +110,7 @@ export const Button = React.forwardRef<HTMLButtonElement, Partial<ButtonProps>>(
<button
{...rest}
ref={ref}
type={nativeType}
className={classNames(
prefixCls,
`${prefixCls}-${type}`,
Expand Down
14 changes: 11 additions & 3 deletions src/packages/uploader/uploader.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,12 +491,16 @@ const InternalUploader: ForwardRefRenderFunction<
<div className="nut-uploader-slot">
<>
{children || (
<Button size="small" type="primary">
<Button nativeType="button" size="small" type="primary">
上传文件
</Button>
)}
{Number(maxCount) > fileList.length && (
<Button className="nut-uploader-input" onClick={_chooseImage} />
<Button
nativeType="button"
className="nut-uploader-input"
onClick={_chooseImage}
/>
)}
</>
</div>
Expand Down Expand Up @@ -526,7 +530,11 @@ const InternalUploader: ForwardRefRenderFunction<
{uploadIcon}
<span className="nut-uploader-icon-tip">{uploadLabel}</span>
</div>
<Button className="nut-uploader-input" onClick={_chooseImage} />
<Button
nativeType="button"
className="nut-uploader-input"
onClick={_chooseImage}
/>
</div>
)}
</div>
Expand Down