Skip to content

Commit 70a7e45

Browse files
committed
Fix drawer content not expanding properly
Refs: #7487
1 parent 96c1a6a commit 70a7e45

File tree

3 files changed

+21
-33
lines changed

3 files changed

+21
-33
lines changed

packages/components/src/components/drawer/style.scss

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,51 +19,27 @@
1919
left: 0;
2020
height: 100vh;
2121
max-height: 100%;
22-
23-
.drawer__content {
24-
height: 100%;
25-
max-width: rem(400);
26-
box-sizing: border-box;
27-
}
2822
}
2923

3024
&--right {
3125
top: 0;
3226
right: 0;
3327
height: 100vh;
3428
max-height: 100%;
35-
36-
.drawer__content {
37-
height: 100%;
38-
max-width: rem(400);
39-
box-sizing: border-box;
40-
}
4129
}
4230

4331
&--top {
4432
left: 0;
4533
top: 0;
4634
width: 100vw;
4735
max-width: 100%;
48-
49-
.drawer__content {
50-
width: 100%;
51-
max-height: rem(400);
52-
box-sizing: border-box;
53-
}
5436
}
5537

5638
&--bottom {
5739
left: 0;
5840
bottom: 0;
5941
width: 100vw;
6042
max-width: 100%;
61-
62-
.drawer__content {
63-
width: 100%;
64-
max-height: rem(400);
65-
box-sizing: border-box;
66-
}
6743
}
6844
}
6945

packages/samples/react/src/components/drawer/basic.tsx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ export const DrawerBasic: FC = () => {
3434
<DrawerRadioAlign value={align} onChange={(_, value) => setAlign(value as AlignPropType)} />
3535
<div className="flex flex-wrap gap-4">
3636
<KolDrawer ref={drawerElement} _label="I am a drawer" _align={align} _on={{ onClose: () => console.log('Drawer onClose triggered!') }}>
37-
<p>
38-
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
39-
voluptua.
40-
</p>
37+
<div className={align === 'left' || align == 'right' ? 'drawer-content-vertical' : 'drawer-content-horizontal'}>
38+
<p>
39+
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
40+
voluptua.
41+
</p>
42+
</div>
4143
<KolButton _label="Close drawer" _on={{ onClick: () => drawerElement.current?.close() }} />
4244
</KolDrawer>
4345
<KolButton _label="Open drawer" _on={{ onClick: () => drawerElement.current?.open() }} />
@@ -48,10 +50,12 @@ export const DrawerBasic: FC = () => {
4850
_label="I am a Drawer Modal"
4951
_on={{ onClose: () => console.log('Drawer Modal onClose triggered!') }}
5052
>
51-
<p>
52-
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
53-
voluptua.
54-
</p>
53+
<div className={align === 'left' || align == 'right' ? 'drawer-content-vertical' : 'drawer-content-horizontal'}>
54+
<p>
55+
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
56+
voluptua.
57+
</p>
58+
</div>
5559
<KolButton _label="Close drawer modal" _on={{ onClick: () => drawerModalElement.current?.close() }} />
5660
</KolDrawer>
5761
<KolButton _label="Open drawer as modal" _on={{ onClick: () => drawerModalElement.current?.open() }} />

packages/samples/react/src/style.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ hr {
4848
width: 500px;
4949
}
5050

51+
.drawer-content-vertical {
52+
width: rem(400);
53+
}
54+
55+
.drawer-content-horizontal {
56+
height: rem(400);
57+
}
58+
5159
@media (min-width: 1024px) {
5260
.app-container {
5361
display: grid;
@@ -84,4 +92,4 @@ hr {
8492
.no-print * {
8593
display: none !important;
8694
}
87-
}
95+
}

0 commit comments

Comments
 (0)