Skip to content

Commit 83f64c4

Browse files
feat: merge basic and size section into one
1 parent 2f8f122 commit 83f64c4

4 files changed

Lines changed: 50 additions & 79 deletions

File tree

apps/demo/src/Views/Ui/components/ModalDemo.tsx

Lines changed: 47 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ export const ModalDemo = () => {
6565
},
6666
];
6767

68-
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
6968
const [headerFooterModal, setHeaderFooterModal] = useState<boolean>(false);
7069
const [isMediumModalOpen, setIsMediumModalOpen] = useState<boolean>(false);
7170
const [isLargeModalOpen, setIsLargeModalOpen] = useState<boolean>(false);
@@ -95,79 +94,6 @@ export const ModalDemo = () => {
9594

9695
<Section title={t("modal.usage.basic")}>
9796
<div className="container">
98-
<Button
99-
label="Open modal"
100-
onClick={() => setIsModalOpen(true)}
101-
></Button>
102-
</div>
103-
<Modal
104-
header="Header"
105-
onHide={() => setIsModalOpen(false)}
106-
visible={isModalOpen}
107-
>
108-
<p style={{ lineHeight: 1.6 }}>{content}</p>
109-
</Modal>
110-
<CodeBlock
111-
exampleCode='const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
112-
113-
<Button label="Open modal" onClick={() => setIsModalOpen(true)}></Button>
114-
<Modal
115-
header="Header"
116-
onHide={() => setIsModalOpen(false)}
117-
visible={isModalOpen}
118-
>
119-
<p style={{ lineHeight: 1.6 }}>{content}</p>
120-
</Modal>'
121-
/>
122-
</Section>
123-
<Section title={t("modal.usage.headerAndFooter")}>
124-
<div className="container">
125-
<Button
126-
label="Open modal"
127-
onClick={() => setHeaderFooterModal(true)}
128-
></Button>
129-
</div>
130-
<Modal
131-
header={<Header />}
132-
onHide={() => setHeaderFooterModal(false)}
133-
visible={headerFooterModal}
134-
footer={
135-
<div>
136-
<Button label="Click me" />
137-
</div>
138-
}
139-
>
140-
<p style={{ lineHeight: 1.6 }}>{content}</p>
141-
</Modal>
142-
<CodeBlock
143-
exampleCode='const Header = () => {
144-
return <h2>Header functional component</h2>;
145-
};
146-
147-
const [headerFooterModal, setHeaderFooterModal] = useState<boolean>(false);
148-
149-
<Button label="Open modal" onClick={() => setHeaderFooterModal(true)}></Button>
150-
<Modal
151-
header={<Header />}
152-
onHide={() => setHeaderFooterModal(false)}
153-
visible={headerFooterModal}
154-
footer={
155-
<div>
156-
<Button label="Click me" />
157-
</div>
158-
}
159-
>
160-
<p style={{ lineHeight: 1.6 }}>{content}</p>
161-
</Modal>'
162-
/>
163-
</Section>
164-
165-
<Section title={t("modal.usage.size")}>
166-
<div className="container">
167-
<Button
168-
label="Auto"
169-
onClick={() => setIsAutoModalOpen(true)}
170-
></Button>
17197
<Button
17298
label="Medium"
17399
onClick={() => setIsMediumModalOpen(true)}
@@ -176,6 +102,10 @@ const [headerFooterModal, setHeaderFooterModal] = useState<boolean>(false);
176102
label="Large"
177103
onClick={() => setIsLargeModalOpen(true)}
178104
></Button>
105+
<Button
106+
label="Auto"
107+
onClick={() => setIsAutoModalOpen(true)}
108+
></Button>
179109
</div>
180110
<Modal
181111
header="Header"
@@ -237,6 +167,49 @@ const [isLargeModalOpen, setIsLargeModalOpen] = useState<boolean>(false);
237167
</Modal>'
238168
/>
239169
</Section>
170+
171+
<Section title={t("modal.usage.headerAndFooter")}>
172+
<div className="container">
173+
<Button
174+
label="Open modal"
175+
onClick={() => setHeaderFooterModal(true)}
176+
></Button>
177+
</div>
178+
<Modal
179+
header={<Header />}
180+
onHide={() => setHeaderFooterModal(false)}
181+
visible={headerFooterModal}
182+
footer={
183+
<div>
184+
<Button label="Click me" />
185+
</div>
186+
}
187+
>
188+
<p style={{ lineHeight: 1.6 }}>{content}</p>
189+
</Modal>
190+
<CodeBlock
191+
exampleCode='const Header = () => {
192+
return <h2>Header functional component</h2>;
193+
};
194+
195+
const [headerFooterModal, setHeaderFooterModal] = useState<boolean>(false);
196+
197+
<Button label="Open modal" onClick={() => setHeaderFooterModal(true)}></Button>
198+
<Modal
199+
header={<Header />}
200+
onHide={() => setHeaderFooterModal(false)}
201+
visible={headerFooterModal}
202+
footer={
203+
<div>
204+
<Button label="Click me" />
205+
</div>
206+
}
207+
>
208+
<p style={{ lineHeight: 1.6 }}>{content}</p>
209+
</Modal>'
210+
/>
211+
</Section>
212+
240213
<Section
241214
title={t("headers.propertiesValue", {
242215
value: "ModalProperties",

apps/demo/src/locales/en/ui.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@
262262
"subtitle": "A modal dialog component for displaying content in an overlay with support for custom headers, footers, and dismissal logic.",
263263
"usage": {
264264
"basic": "Basic",
265-
"headerAndFooter": "Header and footer",
266-
"size": "Size"
265+
"headerAndFooter": "Header and footer"
267266
}
268267
},
269268
"tooltip": {

apps/demo/src/locales/fr/ui.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@
262262
"subtitle": "A modal dialog component for displaying content in an overlay with support for custom headers, footers, and dismissal logic. (fr)",
263263
"usage": {
264264
"basic": "Basic (fr)",
265-
"headerAndFooter": "Header and footer (fr)",
266-
"size":"Size (fr)"
265+
"headerAndFooter": "Header and footer (fr)"
267266
}
268267
},
269268
"tooltip": {

packages/ui/src/assets/css/modal.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626

2727
.dz-modal .dz-modal-header {
28-
align-items: start;
28+
align-items: flex-start;
2929
display: flex;
3030
justify-content: space-between;
3131
padding: 0.7rem;

0 commit comments

Comments
 (0)