Skip to content

fix: fallback icon for folders with extension #1889

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

Merged
kulmann merged 1 commit into from
Jan 28, 2026
Merged

fix: fallback icon for folders with extension #1889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions packages/web-pkg/src/components/FilesList/ResourceIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const defaultSpaceIconDisabled: IconType = {
color: 'var(--oc-role-secondary)'
}

const defaultFallbackIcon: IconType = {
const defaultFileIcon: IconType = {
name: 'resource-type-file',
color: 'var(--oc-role-on-surface)'
}
Expand All @@ -67,10 +67,7 @@ const { resource, size = 'large' } = defineProps<{
const iconMappingInjection = inject<ResourceIconMapping>(resourceIconMappingInjectionKey)

const hasFolderIcon = computed(() => {
if (!!resource.extension) {
return false
}
return resource.type === 'folder' || resource.isFolder
return unref(icon)?.name === defaultFolderIcon.name
})

const hasSpaceIcon = computed(() => {
Expand All @@ -81,6 +78,13 @@ const hasDisabledSpaceIcon = computed(() => {
return isProjectSpaceResource(resource) && resource.disabled === true
})

const fallbackIcon = computed(() => {
if (resource.type === 'folder' || resource.isFolder) {
return defaultFolderIcon
}
return defaultFileIcon
})

const hasPersonalSpaceIcon = computed(() => {
return isPersonalSpaceResource(resource)
})
Expand All @@ -101,18 +105,15 @@ const icon = computed((): IconType => {
if (unref(hasSpaceIcon)) {
return defaultSpaceIcon
}
if (unref(hasFolderIcon)) {
return defaultFolderIcon
}

const icon =
const typeIconOrUndefined =
defaultFileIconMapping[unref(extension)] ||
iconMappingInjection?.mimeType[unref(mimeType)] ||
iconMappingInjection?.extension[unref(extension)]

return {
...defaultFallbackIcon,
...icon
...unref(fallbackIcon),
...typeIconOrUndefined
}
})
</script>