Skip to content

Commit 0544125

Browse files
authored
chore: uikit update and enchance Diclosure usage (#2898)
1 parent 3377b87 commit 0544125

File tree

6 files changed

+89
-147
lines changed

6 files changed

+89
-147
lines changed

package-lock.json

Lines changed: 37 additions & 93 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@gravity-ui/paranoid": "^3.0.0",
2525
"@gravity-ui/react-data-table": "^2.2.1",
2626
"@gravity-ui/table": "^1.10.1",
27-
"@gravity-ui/uikit": "^7.16.2",
27+
"@gravity-ui/uikit": "^7.22.0",
2828
"@gravity-ui/unipika": "^5.2.1",
2929
"@gravity-ui/websql-autocomplete": "^13.7.0",
3030
"@hookform/resolvers": "^3.10.0",

src/containers/Cluster/ClusterOverview/ClusterOverview.scss

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
.ydb-cluster-dashboard {
44
&__dashboard-wrapper {
55
gap: var(--g-spacing-6);
6-
7-
padding-top: var(--g-spacing-4);
86
}
97

108
&__dashboard-wrapper_collapsed {
@@ -28,39 +26,25 @@
2826
height: 100%;
2927
}
3028
&__overview-wrapper {
31-
--g-button-background-color-hover: var(--g-color-base-background);
32-
--g-button-padding: 0;
33-
34-
padding: var(--g-spacing-4);
35-
3629
border: 1px solid var(--g-color-line-generic);
3730
border-radius: 5px;
3831

39-
.g-button:active {
40-
transform: unset;
32+
.g-disclosure__trigger {
33+
width: 100%;
34+
height: 60px;
35+
padding: var(--g-spacing-4);
4136
}
4237
}
38+
&__disclosure-content {
39+
padding: 0 var(--g-spacing-4) var(--g-spacing-4) var(--g-spacing-4);
40+
}
4341

4442
&__overview-wrapper_collapsed {
4543
&:hover {
4644
border-color: var(--g-color-line-generic-hover);
4745
}
4846
}
4947

50-
&__disclosure-summary {
51-
display: flex;
52-
justify-content: space-between;
53-
align-items: center;
54-
55-
width: 100%;
56-
height: 28px;
57-
58-
cursor: pointer;
59-
.g-button__text {
60-
width: 100%;
61-
}
62-
}
63-
6448
&__card {
6549
min-width: 280px;
6650
height: 132px;

src/containers/Cluster/ClusterOverview/ClusterOverview.tsx

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
import {ArrowToggle, Disclosure, Flex, Icon, Text} from '@gravity-ui/uikit';
3+
import {Disclosure, Flex, Icon, Text} from '@gravity-ui/uikit';
44

55
import {ResponseError} from '../../../components/Errors/ResponseError';
66
import {
@@ -56,35 +56,34 @@ export function ClusterOverview(props: ClusterOverviewProps) {
5656
}
5757

5858
return (
59-
<Flex direction="column" className={b('overview-wrapper', {collapsed: !expandDashboard})}>
60-
<Disclosure
61-
arrowPosition="end"
62-
expanded={expandDashboard}
63-
onUpdate={() => setExpandDashboard(!expandDashboard)}
64-
>
65-
<Disclosure.Summary>
66-
{(disclosureProps) => (
67-
<div {...disclosureProps} className={b('disclosure-summary')}>
68-
<Flex alignItems="center" justifyContent="space-between" width={'100%'}>
69-
<Flex gap={2} alignItems="center">
70-
<Icon data={overviewIcon} size={16} />
71-
<Text variant="body-2" color="primary" className={b('title')}>
72-
{i18n('label_overview')}
73-
</Text>
74-
</Flex>
75-
{!expandDashboard && <ClusterDashboard {...props} collapsed />}
76-
</Flex>
77-
<ArrowToggle
78-
size={16}
79-
direction={disclosureProps.expanded ? 'top' : 'bottom'}
80-
/>
81-
</div>
82-
)}
83-
</Disclosure.Summary>
59+
<Disclosure
60+
arrowPosition="end"
61+
size="l"
62+
expanded={expandDashboard}
63+
onUpdate={() => setExpandDashboard(!expandDashboard)}
64+
className={b('overview-wrapper', {collapsed: !expandDashboard})}
65+
summary={
66+
<Flex
67+
alignItems="center"
68+
justifyContent="space-between"
69+
width={'100%'}
70+
className={b('disclosure-summary')}
71+
>
72+
<Flex gap={2} alignItems="center">
73+
<Icon data={overviewIcon} size={16} />
74+
<Text variant="body-2" color="primary" className={b('title')}>
75+
{i18n('label_overview')}
76+
</Text>
77+
</Flex>
78+
{!expandDashboard && <ClusterDashboard {...props} collapsed />}
79+
</Flex>
80+
}
81+
>
82+
<div className={b('disclosure-content')}>
8483
<ClusterDashboard {...props} />
8584
<ClusterInfo {...props} bridgePiles={bridgePiles} />
86-
</Disclosure>
87-
</Flex>
85+
</div>
86+
</Disclosure>
8887
);
8988
}
9089

0 commit comments

Comments
 (0)