Skip to content

Commit b4c7b99

Browse files
committed
chore: adjust
1 parent bda5e1b commit b4c7b99

4 files changed

Lines changed: 58 additions & 72 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ es/
4444
.dumi/tmp
4545
.dumi/tmp-production
4646

47-
bun.lockb
47+
bun.lockb
48+
.vscode

assets/preview.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
overflow: hidden;
66
user-select: none;
77
inset: 0;
8+
z-index: 1055;
89

910
&-mask {
1011
position: absolute;

docs/examples/nested.tsx

Lines changed: 53 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,74 @@
11
import React, { useState } from 'react';
2-
import { Button, Divider, Modal } from 'antd';
2+
import { Button, Divider } from 'antd';
3+
import Dialog from '@rc-component/dialog';
34
import Image from '@rc-component/image';
5+
import '@rc-component/dialog/assets/index.css';
6+
import '../../assets/index.less';
47

58
const App: React.FC = () => {
6-
const [show1, setShow1] = useState(false);
7-
const [show2, setShow2] = useState(false);
8-
const [show3, setShow3] = useState(false);
9+
const [show, setShow] = useState(false);
910
return (
1011
<>
1112
<Button
1213
onClick={() => {
13-
setShow1(true);
14+
setShow(true);
1415
}}
1516
>
1617
showModal
1718
</Button>
18-
<Modal
19-
open={show1}
20-
afterOpenChange={(open) => {
21-
setShow1(open);
19+
<Dialog
20+
visible={show}
21+
afterOpenChange={open => {
22+
setShow(open);
2223
}}
23-
onCancel={() => {
24-
setShow1(false);
24+
onClose={() => {
25+
setShow(false);
2526
}}
26-
onOk={() => setShow1(false)}
27+
footer={
28+
<>
29+
<Button
30+
onClick={() => {
31+
setShow(false);
32+
}}
33+
>
34+
Cancel
35+
</Button>
36+
<Button
37+
type="primary"
38+
onClick={() => {
39+
setShow(false);
40+
}}
41+
>
42+
OK
43+
</Button>
44+
</>
45+
}
2746
>
28-
<Button
29-
onClick={() => {
30-
setShow2(true);
47+
<Image
48+
width={200}
49+
alt="svg image"
50+
src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
51+
/>
52+
<Divider />
53+
<Image.PreviewGroup
54+
preview={{
55+
onChange: (current, prev) =>
56+
console.log(`current index: ${current}, prev index: ${prev}`),
3157
}}
3258
>
33-
test2
34-
</Button>
35-
<Modal
36-
open={show2}
37-
afterOpenChange={(open) => {
38-
setShow2(open);
39-
}}
40-
onCancel={() => {
41-
setShow2(false);
42-
}}
43-
onOk={() => setShow2(false)}
44-
>
45-
<Button
46-
onClick={() => {
47-
setShow3(true);
48-
}}
49-
>
50-
test3
51-
</Button>
52-
<Modal
53-
open={show3}
54-
afterOpenChange={(open) => {
55-
setShow3(open);
56-
}}
57-
onCancel={() => {
58-
setShow3(false);
59-
}}
60-
onOk={() => setShow3(false)}
61-
>
62-
<Image
63-
width={200}
64-
alt="svg image"
65-
src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
66-
/>
67-
<Divider />
68-
<Image.PreviewGroup
69-
preview={{
70-
onChange: (current, prev) =>
71-
console.log(`current index: ${current}, prev index: ${prev}`),
72-
}}
73-
>
74-
<Image
75-
width={200}
76-
alt="svg image"
77-
src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
78-
/>
79-
<Image
80-
width={200}
81-
src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg"
82-
/>
83-
</Image.PreviewGroup>
84-
</Modal>
85-
</Modal>
86-
</Modal>
59+
<Image
60+
width={200}
61+
alt="svg image"
62+
src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
63+
/>
64+
<Image
65+
width={200}
66+
src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg"
67+
/>
68+
</Image.PreviewGroup>
69+
</Dialog>
8770
</>
8871
);
8972
};
9073

91-
export default App;
74+
export default App;

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
"dependencies": {
4343
"@rc-component/motion": "^1.0.0",
44-
"@rc-component/portal": "^2.0.0",
44+
"@rc-component/portal": "^2.1.2",
4545
"@rc-component/util": "^1.3.0",
4646
"clsx": "^2.1.1"
4747
},
@@ -50,6 +50,7 @@
5050
"antd": "^6.1.2",
5151
"@rc-component/father-plugin": "^2.0.2",
5252
"@rc-component/np": "^1.0.0",
53+
"@rc-component/dialog": "^1.7.0",
5354
"@testing-library/jest-dom": "^6.4.0",
5455
"@testing-library/react": "^15.0.6",
5556
"@types/jest": "^30.0.0",

0 commit comments

Comments
 (0)