Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
17 changes: 11 additions & 6 deletions web_src/js/components/DiffFileTreeItem.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<script lang="ts" setup>
import {SvgIcon, type SvgName} from '../svg.ts';
import {diffTreeStore} from '../modules/stores.ts';
import {ref} from 'vue';
import {computed, ref} from 'vue';
import {fileIsViewed} from '../utils/filetree.ts';
import type {Item, File, FileStatus} from '../utils/filetree.ts';

defineProps<{
const props = defineProps<{
item: Item,
}>();

const store = diffTreeStore();
const collapsed = ref(false);
const isViewed = computed(() => {
return fileIsViewed(props.item);
});
const collapsed = ref(isViewed.value);

function getIconForDiffStatus(pType: FileStatus) {
const diffTypes: Record<FileStatus, { name: SvgName, classes: Array<string> }> = {
Expand All @@ -35,7 +39,7 @@ function fileIcon(file: File) {
<!--title instead of tooltip above as the tooltip needs too much work with the current methods, i.e. not being loaded or staying open for "too long"-->
<a
v-if="item.isFile" class="item-file"
:class="{ 'selected': store.selectedItem === '#diff-' + item.file.NameHash, 'viewed': item.file.IsViewed }"
:class="{ 'selected': store.selectedItem === '#diff-' + item.file.NameHash, 'viewed': isViewed }"
:title="item.name" :href="'#diff-' + item.file.NameHash"
>
<!-- file -->
Expand All @@ -48,7 +52,7 @@ function fileIcon(file: File) {
</a>

<template v-else-if="item.isFile === false">
<div class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed">
<div class="item-directory" :class="{ 'viewed': isViewed }" :title="item.name" @click.stop="collapsed = !collapsed">
<!-- directory -->
<SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
<SvgIcon
Expand Down Expand Up @@ -88,7 +92,8 @@ a:hover {
border-radius: 4px;
}

.item-file.viewed {
.item-file.viewed,
.item-directory.viewed {
color: var(--color-text-light-3);
}

Expand Down
4 changes: 4 additions & 0 deletions web_src/js/utils/filetree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,7 @@ export function mergeChildIfOnlyOneDir(nodes: Item[]): void {
}
}
}

export function fileIsViewed(item: Item): boolean {
return item.isFile ? item.file.IsViewed : (item as DirItem).children.every(fileIsViewed);
}