Skip to content

fix(dialog): 关闭按钮默认在底部，24px白色图标 #2118

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
Mar 22, 2024
Merged

fix(dialog): 关闭按钮默认在底部，24px白色图标 #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a9596a
fix(dialog): 关闭按钮默认在底部，24px白色图标
irisSong Mar 22, 2024
8b40cce
fix: 修改关闭按钮默认尺寸是24
irisSong Mar 22, 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
11 changes: 5 additions & 6 deletions src/packages/dialog/demos/h5/demo6.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useState } from 'react'
import { Cell, Dialog } from '@nutui/nutui-react'
import { Close } from '@nutui/icons-react'

const Demo6 = () => {
const [visible1, setVisible1] = useState(false)
Expand All @@ -18,6 +17,10 @@ const Demo6 = () => {
title="顶部带关闭按钮"
visible={visible1}
closeIcon
closeIconPosition="top-right"
style={{
'--nutui-dialog-close-color': '#8c8c8c',
}}
onConfirm={() => setVisible1(false)}
onCancel={() => setVisible1(false)}
>
Expand All @@ -33,13 +36,9 @@ const Demo6 = () => {
className="test-dialog"
title="底部带关闭按钮"
visible={visible2}
closeIcon={<Close width="24px" height="24px" />}
closeIconPosition="bottom"
onConfirm={() => setVisible2(false)}
onCancel={() => setVisible2(false)}
style={{
'--nutui-dialog-close-color': '#FFFFFF',
}}
closeIcon
>
支持函数调用和组件调用两种方式。
</Dialog>
Expand Down
11 changes: 5 additions & 6 deletions src/packages/dialog/demos/taro/demo6.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useState } from 'react'
import { Cell, Dialog } from '@nutui/nutui-react-taro'
import { Close } from '@nutui/icons-react-taro'

const Demo6 = () => {
const [visible1, setVisible1] = useState(false)
Expand All @@ -18,6 +17,10 @@ const Demo6 = () => {
title="顶部带关闭按钮"
visible={visible1}
closeIcon
closeIconPosition="top-right"
style={{
'--nutui-dialog-close-color': '#8c8c8c',
}}
onConfirm={() => setVisible1(false)}
onCancel={() => setVisible1(false)}
>
Expand All @@ -33,13 +36,9 @@ const Demo6 = () => {
className="test-dialog"
title="底部带关闭按钮"
visible={visible2}
closeIcon={<Close width="24px" height="24px" />}
closeIconPosition="bottom"
onConfirm={() => setVisible2(false)}
onCancel={() => setVisible2(false)}
style={{
'--nutui-dialog-close-color': '#FFFFFF',
}}
closeIcon
>
支持函数调用和组件调用两种方式。
</Dialog>
Expand Down
5 changes: 5 additions & 0 deletions src/packages/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
align-items: center;
top: $dialog-close-top;
color: $dialog-close-color;
.nut-icon {
font-size: 24px;
height: 24px;
width: 24px;
}

&-top-right {
right: $dialog-close-right;
Expand Down
2 changes: 1 addition & 1 deletion src/packages/dialog/dialog.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const defaultProps = {
disableConfirmButton: false,
footerDirection: 'horizontal',
lockScroll: true,
closeIconPosition: 'top-right',
closeIconPosition: 'bottom',
closeIcon: false,
beforeCancel: () => true,
beforeClose: () => true,
Expand Down
2 changes: 1 addition & 1 deletion src/packages/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const defaultProps = {
disableConfirmButton: false,
footerDirection: 'horizontal',
lockScroll: true,
closeIconPosition: 'top-right',
closeIconPosition: 'bottom',
closeIcon: false,
beforeCancel: () => true,
beforeClose: () => true,
Expand Down
2 changes: 1 addition & 1 deletion src/styles/variables-jmapp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ $dialog-vertical-footer-ok-margin-top: var(
--nutui-dialog-vertical-footer-ok-margin-top,
5px
) !default;
$dialog-close-color: var(--nutui-dialog-close-color, #8c8c8c) !default;
$dialog-close-color: var(--nutui-dialog-close-color, #ffffff) !default;
$dialog-close-width: var(--nutui-dialog-close-width, 18px) !default;
$dialog-close-height: var(--nutui-dialog-close-height, 18px) !default;
$dialog-close-top: var(--nutui-dialog-close-top, 16px) !default;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ $dialog-vertical-footer-ok-margin-top: var(
--nutui-dialog-vertical-footer-ok-margin-top,
5px
) !default;
$dialog-close-color: var(--nutui-dialog-close-color, #8c8c8c) !default;
$dialog-close-color: var(--nutui-dialog-close-color, #ffffff) !default;
$dialog-close-width: var(--nutui-dialog-close-width, 18px) !default;
$dialog-close-height: var(--nutui-dialog-close-height, 18px) !default;
$dialog-close-top: var(--nutui-dialog-close-top, 16px) !default;
Expand Down