Skip to content
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

Jump to bottom

fix: disable modal button before press handler promise becomes to resolve state #1252

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: disable modal button before press handler promise becomes to resolve state #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7f2917
fix: fix typo variable name from 'orginPress' to 'originPress'
cw1997 Aug 19, 2022
55026cb
fix: add 'disabled' style to button's style list
cw1997 Aug 19, 2022
d7a97d1
fix: disable modal ok button before press handler promise becomes to …
cw1997 Aug 19, 2022
847fff6
fix: fix type checking logic
cw1997 Aug 19, 2022
6f7837b
fix: use `??` instead of `||` for setting the default value of origin…
cw1997 Aug 27, 2022
a431014
fix: catch the error from originPress(), in finally, restore the butt…
cw1997 Aug 27, 2022
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
21 changes: 13 additions & 8 deletions components/modal/AlertContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,19 @@ export default class AlertContainer extends React.Component<
const { title, actions, content, onAnimationEnd } = this.props
const footer = actions.map((button) => {
// tslint:disable-next-line:only-arrow-functions
const orginPress = button.onPress || function () {}
button.onPress = () => {
const res = orginPress()
if (res && res.then) {
res.then(() => {
this.onClose()
})
} else {
const originPress = button.onPress ?? function () {}
const originStyle = button.style
button.onPress = async () => {
if (button.style === 'disabled') {
return
}
button.style = 'disabled'
// developer should handle the errors by themselves,
// so we don't need to do anything at here
try {
await originPress()
} finally {
button.style = originStyle
this.onClose()
}
}
Expand Down
5 changes: 3 additions & 2 deletions components/modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,16 @@ class AntmModal extends React.Component<ModalProps, any> {
}
if (button.style) {
buttonStyle = button.style
if (typeof buttonStyle === 'string') {
if (typeof button.style === 'string') {
const styleMap: {
[key: string]: object
} = {
cancel: { color: '#000' },
default: {},
destructive: { color: 'red' },
disabled: { color: 'lightgray' },
}
buttonStyle = styleMap[buttonStyle] || {}
buttonStyle = styleMap[button.style] || {}
}
}
const noneBorder =
Expand Down