-
Notifications
You must be signed in to change notification settings - Fork 0
feat(FoRadialProgress): First implementation #135
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
54c6284
feat(FoRadialProgress): First implementation
michaelcozzolino 2459968
feat(RadialProgressDocs): First implementation
michaelcozzolino 94e9a56
feat(FoRadialProgress): Add snapshots
michaelcozzolino 663a50c
fix(FoRadialProgress): Add missing aria-valuenow attribute
michaelcozzolino File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
packages/core/src/UI/Components/RadialProgress/Types/RadialProgress.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import type { Colorable, Preset, Presettable } from '@/Lib'; | ||
|
|
||
| export type RadialProgressBackgroundPreset = Extract<Preset, 'solid' | 'soft'>; | ||
|
|
||
| export type RadialProgressBackgroundProps = Colorable & Presettable<RadialProgressBackgroundPreset>; | ||
|
|
||
| export interface RadialProgressProps extends Colorable { | ||
| /** The progress' value */ | ||
| value: number; | ||
|
|
||
| /** The progress' background style, if this is set, the color prop will be ignored */ | ||
| background?: RadialProgressBackgroundProps; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from '@/UI/Components/RadialProgress/Types/RadialProgress'; |
72 changes: 72 additions & 0 deletions
72
packages/core/src/UI/Components/RadialProgress/UI/FoRadialProgress.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <template> | ||
| <div class="radial-progress" | ||
| :class="background === undefined ? colorClass : backgroundClass" | ||
| :style="`--value:${value};`" | ||
| role="progressbar" | ||
| :aria-valuenow="value" | ||
| > | ||
| <slot /> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import type { Color, ComponentName, Preset } from '@/Lib'; | ||
| import type { RadialProgressProps } from '@/UI/Components/RadialProgress'; | ||
| import { useFlyonUIVueAppConfig } from '@/Lib'; | ||
| import { useColor } from '@/Lib/UseColor/Internal'; | ||
| import { useFlyonUIVueAppConfigProperty } from '@/Lib/UseFlyonUIVueAppConfig/Internal'; | ||
| import { computed } from 'vue'; | ||
|
|
||
| const props = defineProps<RadialProgressProps>(); | ||
|
|
||
| const componentName: ComponentName = 'FoRadialProgress'; | ||
| const { config } = useFlyonUIVueAppConfig(); | ||
|
|
||
| const colorClass = useColor(config, componentName, () => props.color); | ||
|
|
||
| const backgroundClass = computed((): string => { | ||
| const emptyColorClasses: Record<Color, ''> = { | ||
| neutral: '', | ||
| primary: '', | ||
| secondary: '', | ||
| accent: '', | ||
| info: '', | ||
| success: '', | ||
| warning: '', | ||
| error: '', | ||
| }; | ||
|
|
||
| const colorClasses: Record<Preset, Record<Color, string>> = { | ||
| solid: { | ||
| neutral: 'bg-neutral text-neutral-content border-4 border-transparent', | ||
| primary: 'bg-primary text-primary-content border-4 border-transparent', | ||
| secondary: 'bg-secondary text-secondary-content border-4 border-transparent', | ||
| accent: 'bg-accent text-accent-content border-4 border-transparent', | ||
| info: 'bg-info text-info-content border-4 border-transparent', | ||
| success: 'bg-success text-success-content border-4 border-transparent', | ||
| warning: 'bg-warning text-warning-content border-4 border-transparent', | ||
| error: 'bg-error text-error-content border-4 border-transparent', | ||
| }, | ||
| outline: emptyColorClasses, | ||
| dash: emptyColorClasses, | ||
| soft: { | ||
| neutral: 'bg-neutral/10 text-neutral border-4 border-transparent', | ||
| primary: 'bg-primary/10 text-primary border-4 border-transparent', | ||
| secondary: 'bg-secondary/10 text-secondary border-4 border-transparent', | ||
| accent: 'bg-accent/10 text-accent border-4 border-transparent', | ||
| info: 'bg-info/10 text-info border-4 border-transparent', | ||
| success: 'bg-success/10 text-success border-4 border-transparent', | ||
| warning: 'bg-warning/10 text-warning border-4 border-transparent', | ||
| error: 'bg-error/10 text-error border-4 border-transparent', | ||
| }, | ||
| gradient: emptyColorClasses, | ||
| text: emptyColorClasses, | ||
| dot: emptyColorClasses, | ||
| }; | ||
|
|
||
| const defaultPreset = useFlyonUIVueAppConfigProperty(config, componentName, 'preset', props.background?.preset).value; | ||
| const defaultColor = useFlyonUIVueAppConfigProperty(config, componentName, 'color', props.background?.color).value; | ||
michaelcozzolino marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return colorClasses[defaultPreset][defaultColor]; | ||
michaelcozzolino marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }); | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default as FoRadialProgress } from '@/UI/Components/RadialProgress/UI/FoRadialProgress.vue'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from '@/UI/Components/RadialProgress/Types'; | ||
| export * from '@/UI/Components/RadialProgress/UI'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ | |
|
|
||
| <AvatarDocs section="initials-placeholder" /> | ||
|
|
||
| ## Variants | ||
| ## Presets | ||
|
|
||
| ### Solid | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # Radial Progress | ||
|
|
||
| ## Variants | ||
|
|
||
| ### Default | ||
|
|
||
| <RadialProgressDocs section="default" /> | ||
|
|
||
| ### With values | ||
|
|
||
| <RadialProgressDocs section="with-value" /> | ||
|
|
||
| ### With text | ||
|
|
||
| <RadialProgressDocs section="with-text" /> | ||
|
|
||
| ## Colors | ||
|
|
||
| ### Solid | ||
|
|
||
| <RadialProgressDocs section="color" /> | ||
|
|
||
| ## Background | ||
|
|
||
| ### Color | ||
|
|
||
| <RadialProgressDocs section="background-color" /> | ||
|
|
||
| ### Soft | ||
|
|
||
| <RadialProgressDocs section="soft-background" /> | ||
|
|
||
| ## Sizes | ||
|
|
||
| ### Custom size & thickness | ||
|
|
||
| <RadialProgressDocs section="custom-size-and-thickness" /> | ||
|
|
||
| ## Api | ||
michaelcozzolino marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| ### Props | ||
|
|
||
| <RadialProgressDocs section="props" /> | ||
|
|
||
| ### Slots | ||
|
|
||
| <RadialProgressDocs section="slots" /> | ||
26 changes: 26 additions & 0 deletions
26
packages/docs/Next/Components/RadialProgress/CustomRadialProgressSizeAndThickness.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <template> | ||
| <FoRadialProgress color="neutral" | ||
| :value="70" | ||
| style="--size:12rem; --thickness: 2px;" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress color="neutral" | ||
| :value="70" | ||
| style="--size:12rem; --thickness: 2rem;" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress color="primary" | ||
| :value="70" | ||
| style="--size:12rem; --thickness: 1rem;" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { FoRadialProgress } from 'flyonui-vue'; | ||
| </script> |
7 changes: 7 additions & 0 deletions
7
packages/docs/Next/Components/RadialProgress/DefaultRadialProgress.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <template> | ||
| <FoRadialProgress :value="75" /> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { FoRadialProgress } from 'flyonui-vue'; | ||
| </script> |
51 changes: 51 additions & 0 deletions
51
packages/docs/Next/Components/RadialProgress/RadialProgressBackgroundColor.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <template> | ||
| <FoRadialProgress :value="70"> | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'primary' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'secondary' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'accent' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'info' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'success' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'warning' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
|
|
||
| <FoRadialProgress :background="{ color: 'error' }" | ||
| :value="70" | ||
| > | ||
| 70% | ||
| </FoRadialProgress> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { FoRadialProgress } from 'flyonui-vue'; | ||
| </script> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.