Skip to content

Commit feee244

Browse files
authored
Merge pull request #2844 from appwrite/fix-progress
Fix: hide empty segment
2 parents 13e2b0d + ba95658 commit feee244

3 files changed

Lines changed: 21 additions & 5 deletions

File tree

src/lib/components/progressbar/ProgressBar.svelte

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,31 @@
99
*/
1010
export let maxSize: $$Props['maxSize'];
1111
12+
/**
13+
* Hides empty segments where size is <= 0;
14+
*/
15+
export let hideEmptySegments: $$Props['hideEmptySegments'] = false;
16+
1217
/**
1318
* The data for the progressbar
1419
*/
1520
export let data: $$Props['data'];
1621
22+
$: segments = hideEmptySegments ? data.filter((item) => item.size > 0) : data;
23+
1724
/**
1825
* The remaining value of the progressbar
1926
*/
20-
$: remainder = data.reduce((sum: number, item: ProgressbarData) => sum - item.size, maxSize);
27+
$: remainder = segments.reduce(
28+
(sum: number, item: ProgressbarData) => sum - item.size,
29+
maxSize
30+
);
31+
32+
$: segmentGap = segments.length > 1 ? '2px' : '0px';
2133
</script>
2234

23-
<section class="progressbar__container">
24-
{#each $$props.data as item}
35+
<section class="progressbar__container" style:--progressbar-segment-gap={segmentGap}>
36+
{#each segments as item}
2537
<Tooltip disabled={!item.tooltip} maxWidth="max-content">
2638
<div
2739
class="progressbar__content"
@@ -64,7 +76,7 @@
6476
border-radius: var(--progressbar-border-radius);
6577
display: flex;
6678
flex-direction: row;
67-
gap: 2px;
79+
gap: var(--progressbar-segment-gap, 2px);
6880
margin-top: 1rem;
6981
overflow: hidden;
7082
}

src/lib/components/progressbar/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export type ProgressbarData = {
1111

1212
export type ProgressbarProps = {
1313
maxSize: number;
14+
hideEmptySegments?: boolean;
1415
data: Array<ProgressbarData>;
1516
};
1617

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/varchar.svelte

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@
145145
</span>
146146
</Tooltip>
147147
</Layout.Stack>
148-
<ProgressBar maxSize={bytesMax} data={getProgressData(bytesUsed, bytesMax, size)} />
148+
<ProgressBar
149+
hideEmptySegments
150+
maxSize={bytesMax}
151+
data={getProgressData(bytesUsed, bytesMax, size)} />
149152
{#if exceedsLimit}
150153
<Typography.Text variant="m-400" color="--fgcolor-danger">
151154
This column exceeds the remaining row space. Consider using text, mediumtext, or

0 commit comments

Comments
 (0)