Skip to content

refactor(numberkeyboard): optimize code & correct defaultProps #2508

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
xiaoyatong merged 3 commits into from
Aug 2, 2024
Merged

refactor(numberkeyboard): optimize code & correct defaultProps #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0939fbc
refactor(numberkeyboard): refactor
Miles-hxy Jul 31, 2024
4c9c087
Merge branch 'jdf2e:next' into hxy/731/numberkeyboard
Miles-hxy Jul 31, 2024
3dc427a
chore: delete useless
Miles-hxy Jul 31, 2024
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
51 changes: 33 additions & 18 deletions src/packages/numberkeyboard/numberkeyboard.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const NumberKeyboard: FunctionComponent<
onClose,
onConfirm,
...rest
} = props
} = { ...defaultProps, ...props }
const classPrefix = 'nut-numberkeyboard'

const getBasicKeys = () => {
Expand Down Expand Up @@ -100,17 +100,37 @@ export const NumberKeyboard: FunctionComponent<
}
const onTouchEnd = (item: { id: string; type: string }) => {
setActive(false)
if (item.type === 'num' || item.type === 'custom') {
onChange && onChange(item.id)
switch (item.type) {
case 'num':
case 'custom':
onChange?.(item.id)
break
case 'close':
onClose?.()
break
case 'delete':
onDelete?.()
break
case 'confirm':
onConfirm?.()
break
default:
break
}
if (item.type === 'close') {
onClose && onClose()
}
if (item.type === 'delete') {
onDelete && onDelete()
}
if (item.type === 'confirm') {
onConfirm && onConfirm()
}
const renderContent = (item: { id: string; type: string }) => {
switch (item.type) {
case 'num':
case 'custom':
return <div>{item.id}</div>
case 'delete':
return <DeleteIcon />
case 'close':
return <ArrowDown size={18} />
case 'confirm':
return <>{confirmText || locale.done}</>
default:
return null
}
}
return (
Expand All @@ -127,26 +147,21 @@ export const NumberKeyboard: FunctionComponent<
onTouchEnd={() => onTouchEnd(item)}
onTouchCancel={() => onTouchEnd(item)}
>
{(item.type === 'num' || item.type === 'custom') && (
<div>{item.id}</div>
)}
{item.type === 'delete' && <DeleteIcon />}
{item.type === 'close' && <ArrowDown size={18} />}
{item.type === 'confirm' && <>{confirmText || locale.done}</>}
{renderContent(item)}
</div>
</div>
)
}

return (
<Popup
{...rest}
visible={visible}
position="bottom"
onOverlayClick={onClose}
onCloseIconClick={onClose}
zIndex={9999}
overlayStyle={{ backgroundColor: 'rgba(0, 0, 0, 0)' }}
{...rest}
>
<div className={classNames(classPrefix, className)} style={style}>
{title && (
Expand Down
51 changes: 33 additions & 18 deletions src/packages/numberkeyboard/numberkeyboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const NumberKeyboard: FunctionComponent<
onClose,
onConfirm,
...rest
} = props
} = { ...defaultProps, ...props }
const classPrefix = 'nut-numberkeyboard'

const getBasicKeys = () => {
Expand Down Expand Up @@ -104,17 +104,37 @@ export const NumberKeyboard: FunctionComponent<
}
const onTouchEnd = (item: { id: string; type: string }) => {
setActive(false)
if (item.type === 'num' || item.type === 'custom') {
onChange && onChange(item.id)
switch (item.type) {
case 'num':
case 'custom':
onChange?.(item.id)
break
case 'close':
onClose?.()
break
case 'delete':
onDelete?.()
break
case 'confirm':
onConfirm?.()
break
default:
break
}
if (item.type === 'close') {
onClose && onClose()
}
if (item.type === 'delete') {
onDelete && onDelete()
}
if (item.type === 'confirm') {
onConfirm && onConfirm()
}
const renderContent = (item: { id: string; type: string }) => {
switch (item.type) {
case 'num':
case 'custom':
return <div>{item.id}</div>
case 'delete':
return <DeleteIcon />
case 'close':
return <ArrowDown width={18} height={18} />
case 'confirm':
return <>{confirmText || locale.done}</>
default:
return null
}
}
return (
Expand All @@ -131,26 +151,21 @@ export const NumberKeyboard: FunctionComponent<
onTouchEnd={() => onTouchEnd(item)}
onTouchCancel={() => onTouchEnd(item)}
>
{(item.type === 'num' || item.type === 'custom') && (
<div>{item.id}</div>
)}
{item.type === 'delete' && <DeleteIcon />}
{item.type === 'close' && <ArrowDown width={18} height={18} />}
{item.type === 'confirm' && <>{confirmText || locale.done}</>}
{renderContent(item)}
</div>
</div>
)
}

return (
<Popup
{...rest}
visible={visible}
position="bottom"
onOverlayClick={onClose}
onCloseIconClick={onClose}
zIndex={9999}
overlayStyle={{ backgroundColor: 'rgba(0, 0, 0, 0)' }}
{...rest}
>
<div className={classNames(classPrefix, className)} style={style}>
{title && (
Expand Down