Skip to content

Commit d9a7207

Browse files
authored
chore(storage-browser): grid updates (#5593)
* use auto rows, less columns so gaps can collapse * update css for refresh * remove unused classes * fix sibling selector * add css for add files/folder buttons * clean up paginate * test with Add Files/Add Folder classes * remove test buttons
1 parent 7932c2d commit d9a7207

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

packages/react-storage/src/components/StorageBrowser/Views/LocationActionView/CreateFolderControls.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export const CreateFolderControls = (): React.JSX.Element => {
7777
handleClose();
7878
}}
7979
/>
80+
<Primary {...primaryProps} />
8081
{result?.status === 'COMPLETE' ? (
8182
<Message variant="success">Folder created.</Message>
8283
) : null}
@@ -99,7 +100,6 @@ export const CreateFolderControls = (): React.JSX.Element => {
99100
</Target.Field.Error>
100101
) : null}
101102
</Target.Field.Container>
102-
<Primary {...primaryProps} />
103103
</>
104104
);
105105
};

packages/react-storage/src/components/StorageBrowser/context/elements/defaults.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonElementProps>(
7676
/>
7777
);
7878
case 'navigate':
79+
case 'paginate-current':
80+
case 'paginate-next':
81+
case 'paginate-previous':
7982
return (
8083
<_Button
8184
{...props}
@@ -89,9 +92,6 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonElementProps>(
8992
case 'download':
9093
case 'refresh':
9194
case 'sort':
92-
case 'paginate-current':
93-
case 'paginate-next':
94-
case 'paginate-previous':
9595
return <_Button {...props} size="small" variation="link" ref={ref} />;
9696
case 'table-data':
9797
return (

packages/react-storage/src/styles/storage-browser.css

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,26 @@
88
--storage-browser-loading-animation: spin 1s ease-out infinite;
99
display: grid;
1010
gap: var(--storage-browser-gap);
11-
grid-template-columns: repeat(32, 1fr);
12-
grid-template-rows: repeat(24, min-content);
13-
}
14-
15-
.storage-browser__header {
16-
display: flex;
17-
flex-direction: column;
18-
gap: var(--storage-browser-gap);
11+
grid-template-columns: 1fr 1fr 1fr max-content max-content;
12+
grid-auto-rows: min-content;
1913
}
2014

2115
.storage-browser__title {
2216
margin: 0;
23-
grid-row-start: 2;
24-
grid-column: 1 / span 10;
17+
grid-column: 1 / 4;
2518
}
2619

2720
.storage-browser__navigate {
2821
grid-column: 1 / -1;
2922
}
3023

3124
.storage-browser__paginate {
32-
grid-row-start: 3;
33-
grid-column: 26 / -1;
25+
grid-column: 1 / -1;
3426
justify-self: flex-end;
3527
}
3628

3729
.storage-browser__paginate__list {
38-
gap: var(--storage-browser-gap);
30+
gap: var(--storage-browser-gap-small);
3931
}
4032

4133
.storage-browser__navigate__list,
@@ -68,8 +60,7 @@
6860
}
6961

7062
.storage-browser__target__field {
71-
grid-row-start: 5;
72-
grid-column: 1 / 20;
63+
grid-column: 1 / -1;
7364
display: inline-grid;
7465
gap: var(--storage-browser-gap);
7566
grid-template-rows: repeat(3, auto);
@@ -101,7 +92,6 @@
10192
}
10293

10394
.storage-browser__message {
104-
grid-row: 4 / 5;
10595
grid-column: 1 / -1;
10696
align-items: flex-start;
10797
display: flex;
@@ -116,13 +106,18 @@
116106
}
117107

118108
.storage-browser__summary {
119-
grid-row-start: 3;
120-
grid-column: 1 / -1;
109+
grid-column: 3 / -1;
121110
justify-content: flex-end;
122111
margin: 0;
123112
display: flex;
124113
gap: var(--storage-browser-gap);
125114
}
115+
116+
.storage-browser__destination {
117+
grid-column: 1 / 3;
118+
margin: -0;
119+
}
120+
126121
.storage-browser__summary__definition,
127122
.storage-browser__destination {
128123
display: flex;
@@ -135,17 +130,15 @@
135130
}
136131

137132
.storage-browser__refresh {
138-
grid-row-start: 2;
139-
grid-column: 26 / -1;
133+
grid-column: 5 / -1;
140134
justify-self: flex-end;
141135
}
142136

143137
.storage-browser__refresh:has(~ .storage-browser__actions-menu) {
144-
grid-column: 26 / 30;
138+
grid-column: 4 / 5;
145139
}
146140

147141
.storage-browser__table {
148-
grid-row-start: 5;
149142
grid-column: 1 / -1;
150143
table-layout: fixed;
151144
width: 100%;
@@ -202,8 +195,7 @@
202195
position: relative;
203196
display: inline-block;
204197
justify-self: flex-end;
205-
grid-row-start: 2;
206-
grid-column: 30 / -1;
198+
grid-column: 5 / -1;
207199
}
208200

209201
.storage-browser__actions-menu__menu {
@@ -228,14 +220,22 @@
228220
}
229221

230222
.storage-browser__primary {
231-
grid-row-start: 2;
232-
grid-column: 29 / -1;
223+
grid-column: 5 / -1;
224+
grid-row-start: 1;
233225
justify-self: flex-end;
234226
}
235227

236228
.storage-browser__exit {
237-
grid-row-start: 2;
238-
grid-column: 28 / 29;
229+
grid-column: 4 / 5;
230+
grid-row-start: 1;
231+
justify-self: flex-end;
232+
}
233+
234+
.storage-browser__add-files {
235+
grid-column: 5 / -1;
236+
}
237+
.storage-browser__add-folder {
238+
grid-column: 1 / 5;
239239
justify-self: flex-end;
240240
}
241241

0 commit comments

Comments
 (0)