-
Notifications
You must be signed in to change notification settings - Fork 932
feat(Icon): add global options on Vue-only side #5354
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
Open
zAlweNy26
wants to merge
1
commit into
nuxt:v4
Choose a base branch
from
zAlweNy26:vue-icon-component
base: v4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,39 @@ | ||
| <script lang="ts"> | ||
| import type { IconProps as NuxtIconProps } from '../../types' | ||
|
|
||
| export interface IconProps { | ||
| name: NuxtIconProps['name'] | ||
| } | ||
| </script> | ||
|
|
||
| <script setup lang="ts"> | ||
| import type { IconProps } from '../../types' | ||
| import type { IconifyRenderMode } from '@iconify/vue' | ||
| import { computed } from 'vue' | ||
| import { Icon as IconifyIcon } from '@iconify/vue' | ||
| import { useAppConfig } from '#imports' | ||
| import type { RuntimeOptions } from '@nuxt/icon' | ||
|
|
||
| const props = defineProps<IconProps>() | ||
|
|
||
| const appConfig = useAppConfig() | ||
|
|
||
| function resolveCustomizeFn( | ||
| customize: RuntimeOptions['customize'] | boolean | null | undefined, | ||
| globalCustomize: RuntimeOptions['customize'] | undefined | ||
| ): RuntimeOptions['customize'] | undefined { | ||
| if (customize === false) return undefined | ||
| if (customize === true || customize === null) return globalCustomize | ||
| return customize | ||
| } | ||
|
|
||
| defineProps<IconProps>() | ||
| const resolvedMode = computed(() => { | ||
| const mode = props.mode || appConfig.icon?.mode | ||
| if (mode === 'css') return 'style' | ||
| return mode as IconifyRenderMode | ||
| }) | ||
| </script> | ||
|
|
||
| <template> | ||
| <IconifyIcon v-if="typeof name === 'string'" :icon="name.replace(/^i-/, '')" /> | ||
| <IconifyIcon | ||
| v-if="typeof name === 'string'" | ||
| :icon="name.replace(/^i-/, '')" | ||
| :mode="resolvedMode" | ||
| :width="size || appConfig.icon?.size" | ||
| :height="size || appConfig.icon?.size" | ||
| :customise="resolveCustomizeFn(props.customize, appConfig.icon?.customize)" | ||
| /> | ||
| <component :is="name" v-else /> | ||
| </template> |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
customizeprop type doesn't include boolean or null values, but the Vue Icon component expects to handle these values to control whether the global customize function should be used.View Details
Analysis
IconProps.customize type is too restrictive, prevents boolean/null values
What fails: IconProps interface in src/runtime/components/Icon.vue only accepts RuntimeOptions['customize'] (function type) but the Vue component implementation explicitly supports boolean | null | undefined values
How to reproduce:
Result: TypeScript compilation fails with "Type 'boolean' is not assignable to type 'IconifyIconCustomizeCallback'"
Expected: Should accept boolean and null values as the Vue component's resolveCustomizeFn function handles these cases (lines 13-20 in src/runtime/vue/components/Icon.vue)
The @nuxt/icon component already defines customize as
IconifyIconCustomizeCallback | boolean | null, so NuxtUI should match this type definition.