Skip to content

docs(Modal): confirm default oktext synch (#6745) #6748

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
merged 2 commits into from
Aug 6, 2023
Merged

docs(Modal): confirm default oktext synch (#6745) #6748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e434725
docs(Modal): confim default oktext synch
selicens Jul 17, 2023
a3153bd
fix: okText logic
selicens Jul 18, 2023
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
10 changes: 5 additions & 5 deletions components/modal/ConfirmDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default defineComponent<ConfirmDialogProps>({
onCancel,
onOk,
close,
okText,
closable = false,
zIndex,
afterClose,
Expand Down Expand Up @@ -141,9 +142,6 @@ export default defineComponent<ConfirmDialogProps>({
const prefixCls = props.prefixCls || 'ant-modal';
const contentPrefixCls = `${prefixCls}-confirm`;
const style = attrs.style || {};
const okText =
renderSomeContent(props.okText) ||
(okCancel ? locale.value.okText : locale.value.justOkText);
const mergedOkCancel = okCancel ?? type === 'confirm';
const autoFocusButton =
props.autoFocusButton === null ? false : props.autoFocusButton || 'ok';
Expand All @@ -157,6 +155,8 @@ export default defineComponent<ConfirmDialogProps>({
attrs.class,
);

const mergedLocal = locale.value;

const cancelButton = mergedOkCancel && (
<ActionButton
actionFn={onCancel}
Expand All @@ -165,7 +165,7 @@ export default defineComponent<ConfirmDialogProps>({
buttonProps={cancelButtonProps}
prefixCls={`${rootPrefixCls}-btn`}
>
{renderSomeContent(props.cancelText) || locale.value.cancelText}
{renderSomeContent(props.cancelText) || mergedLocal.cancelText}
</ActionButton>
);
return (
Expand Down Expand Up @@ -219,7 +219,7 @@ export default defineComponent<ConfirmDialogProps>({
buttonProps={okButtonProps}
prefixCls={`${rootPrefixCls}-btn`}
>
{okText}
{okText || (mergedOkCancel ? mergedLocal.okText : mergedLocal.justOkText)}
</ActionButton>
</div>
)}
Expand Down