Skip to content

fix: Fixed display of 0% inside label in progress bar #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Fixed display of 0% inside label in progress bar #326

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
846f6f6
fix: Fixed display of 0% inside label in progress bar
andreyjamer Sep 30, 2024
707bc93
fix: Added safe sizes for progress bar component
andreyjamer Sep 30, 2024
00646eb
fix: Removed unnecessary constant
andreyjamer Sep 30, 2024
2976b07
Fixed the display of the progress bar with 0 value
andreyjamer Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs/components/progress/examples/FwbProgressExampleLabelInside.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
label-progress
size="lg"
/>

<div class="mb-4" />

<fwb-progress
:progress="0"
label-position="inside"
label-progress
size="lg"
/>
</template>

<script setup>
Expand Down
18 changes: 15 additions & 3 deletions src/components/FwbProgress/FwbProgress.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
>
<div
:class="innerClasses"
:style="{ width: progress + '%' }"
class="rounded-full font-medium text-blue-100 text-center p-0.5"
:style="{ width: safeProgress + '%' }"
class="rounded-full font-medium text-blue-100 text-center p-0.5 min-w-max box-border"
>
<template v-if="labelProgress && labelPosition === 'inside'">
{{ progress }}%
Expand All @@ -31,7 +31,7 @@
</template>

<script lang="ts" setup>
import { toRefs } from 'vue'
import { computed, toRefs } from 'vue'
import { useProgressClasses } from './composables/useProgressClasses'
import type { ProgressLabelPosition, ProgressSize, ProgressVariant } from './types'

Expand All @@ -44,6 +44,13 @@ interface IProgressProps {
size?: ProgressSize
}

const progressSafeSizes: Record<ProgressSize, number> = {
sm: 1,
md: 2,
lg: 3,
xl: 4,
}

const props = withDefaults(defineProps<IProgressProps>(), {
color: 'default',
label: '',
Expand All @@ -53,6 +60,11 @@ const props = withDefaults(defineProps<IProgressProps>(), {
size: 'md',
})

const safeProgress = computed(() => {
const size = progressSafeSizes[props.size]
return props.progress <= size ? size : props.progress
})

const {
innerClasses,
outerClasses,
Expand Down
Loading