Skip to content

fix(file-picker): align folder design with Nextcloud files app #1733

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
susnux merged 1 commit into from
Apr 29, 2025
Merged

fix(file-picker): align folder design with Nextcloud files app #1733

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions lib/components/FilePicker/FileListIcon.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* (leading icon on the name row and header)
*/
.file-picker__file-icon {
position: relative;
width: 32px;
height: 32px;
min-width: 32px;
Expand All @@ -17,3 +18,14 @@
display: flex;
justify-content: center;
}

.file-picker__file-icon--primary {
color: var(--color-primary-element);
}

.file-picker__file-icon-overlay {
color: var(--color-primary-element-text);
position: absolute;
// 32px icon size - 16px overlay size + 2px padding to align with folder icon
inset-block-start: 10px;
}
36 changes: 20 additions & 16 deletions lib/components/FilePicker/FilePreview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,32 @@
<div :style="previewLoaded ? { backgroundImage: `url(${previewURL})`} : undefined"
:class="fileListIconStyles['file-picker__file-icon']">
<template v-if="!previewLoaded">
<IconFile v-if="isFile" :size="20" />
<component :is="folderDecorationIcon" v-else-if="folderDecorationIcon" />
<IconFolder v-else :size="20" />
<IconFile v-if="isFile" :size="32" />
<template v-else>
<NcIconSvgWrapper v-if="folderDecorationIcon"
:class="fileListIconStyles['file-picker__file-icon-overlay']"
inline
:path="folderDecorationIcon"
:size="16" />
<IconFolder :class="fileListIconStyles['file-picker__file-icon--primary']"
:size="32" />
</template>
</template>
</div>
</template>

<script setup lang="ts">
import type { INode } from '@nextcloud/files'

import { mdiAccountPlus, mdiGroup, mdiLink, mdiLock, mdiNetwork, mdiTag } from '@mdi/js'
import { FileType } from '@nextcloud/files'
import { ShareType } from '@nextcloud/sharing'
import { computed, ref, toRef } from 'vue'
import { usePreviewURL } from '../../composables/preview'

import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
import IconFile from 'vue-material-design-icons/File.vue'
import IconFolder from 'vue-material-design-icons/Folder.vue'
import LockIcon from 'vue-material-design-icons/Lock.vue'
import TagIcon from 'vue-material-design-icons/Tag.vue'
import LinkIcon from 'vue-material-design-icons/Link.vue'
import AccountPlusIcon from 'vue-material-design-icons/AccountPlus.vue'
import NetworkIcon from 'vue-material-design-icons/Network.vue'
import AccountGroupIcon from 'vue-material-design-icons/AccountGroup.vue'

// CSS modules
import fileListIconStylesModule from './FileListIcon.module.scss'
Expand All @@ -53,33 +57,33 @@ const folderDecorationIcon = computed(() => {

// Encrypted folders
if (props.node.attributes?.['is-encrypted'] === 1) {
return LockIcon
return mdiLock
}

// System tags
if (props.node.attributes?.['is-tag']) {
return TagIcon
return mdiTag
}

// Link and mail shared folders
const shareTypes = Object.values(props.node.attributes?.['share-types'] || {}).flat() as number[]
if (shareTypes.some(type => type === ShareType.Link || type === ShareType.Email)) {
return LinkIcon
return mdiLink
}

// Shared folders
if (shareTypes.length > 0) {
return AccountPlusIcon
return mdiAccountPlus
}

switch (props.node.attributes?.['mount-type']) {
case 'external':
case 'external-session':
return NetworkIcon
return mdiNetwork
case 'group':
return AccountGroupIcon
return mdiGroup
case 'shared':
return AccountPlusIcon
return mdiAccountPlus
}

return null
Expand Down