Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
182 changes: 92 additions & 90 deletions src/renderer/components/sidebar/folders/Tree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -315,96 +315,98 @@ async function onRemoveCustomIcon() {
</script>

<template>
<ContextMenu.ContextMenu>
<ContextMenu.ContextMenuTrigger as-child>
<UiTree
:model-value="treeData"
:selected-ids="selectedIds"
:editable-id="editableId"
:focused-id="focusedId"
:highlighted-ids="highlightedIds"
@click-node="onClickNode"
@dblclick-node="onDblclickNode"
@toggle-node="onToggleNode"
@drag-node="onDragNode"
@external-drop="onExternalDrop"
@context-menu="onContextMenu"
@update-label="onUpdateLabel"
@cancel-edit="onCancelEdit"
@update:selected-ids="selectedIds = $event"
@update:editable-id="editableId = $event"
@update:focused-id="focusedId = $event"
@update:highlighted-ids="highlightedIds = $event"
>
<template #icon="{ node }">
<div class="mr-1.5 flex flex-shrink-0 items-center">
<UiFolderIcon
v-if="getFolderByIdFromTree(folders, Number(node.id))?.icon"
:name="getFolderByIdFromTree(folders, Number(node.id))!.icon!"
/>
<Folder
v-else
class="h-4 w-4"
/>
</div>
</template>
</UiTree>
</ContextMenu.ContextMenuTrigger>
<ContextMenu.ContextMenuContent>
<template v-if="isContextMultiSelection">
<ContextMenu.ContextMenuItem @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.ContextMenuItem>
</template>
<template v-else>
<ContextMenu.ContextMenuItem
@click="createFolderAndSelect(contextNode?.id)"
>
{{ i18n.t("action.new.folder") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuSeparator />
<ContextMenu.ContextMenuItem @click="onRenameFolder">
{{ i18n.t("action.rename") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuItem @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuSeparator />
<ContextMenu.ContextMenuItem @click="onSetCustomIcon">
{{ i18n.t("action.setCustomIcon") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuItem
v-if="contextNode?.icon"
@click="onRemoveCustomIcon"
<div class="h-full min-h-0">
<ContextMenu.ContextMenu>
<ContextMenu.ContextMenuTrigger as-child>
<UiTree
:model-value="treeData"
:selected-ids="selectedIds"
:editable-id="editableId"
:focused-id="focusedId"
:highlighted-ids="highlightedIds"
@click-node="onClickNode"
@dblclick-node="onDblclickNode"
@toggle-node="onToggleNode"
@drag-node="onDragNode"
@external-drop="onExternalDrop"
@context-menu="onContextMenu"
@update-label="onUpdateLabel"
@cancel-edit="onCancelEdit"
@update:selected-ids="selectedIds = $event"
@update:editable-id="editableId = $event"
@update:focused-id="focusedId = $event"
@update:highlighted-ids="highlightedIds = $event"
>
{{ i18n.t("action.removeCustomIcon") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuSeparator />
<ContextMenu.ContextMenuSub>
<ContextMenu.ContextMenuSubTrigger>
{{ i18n.t("action.defaultLanguage") }}
</ContextMenu.ContextMenuSubTrigger>
<ContextMenu.ContextMenuSubContent>
<div class="scrollbar max-h-[250px] min-h-0 overflow-y-auto">
<ContextMenu.ContextMenuCheckboxItem
v-for="language in languages"
:key="language.value"
:ref="
(el) =>
scrollToSelectedLanguage(
el,
contextNodeDefaultLanguage === language.value,
)
"
:checked="contextNodeDefaultLanguage === language.value"
@click="onSelectLanguage(language.value)"
>
{{ language.name }}
</ContextMenu.ContextMenuCheckboxItem>
<template #icon="{ node }">
<div class="mr-1.5 flex flex-shrink-0 items-center">
<UiFolderIcon
v-if="getFolderByIdFromTree(folders, Number(node.id))?.icon"
:name="getFolderByIdFromTree(folders, Number(node.id))!.icon!"
/>
<Folder
v-else
class="h-4 w-4"
/>
</div>
</ContextMenu.ContextMenuSubContent>
</ContextMenu.ContextMenuSub>
</template>
</ContextMenu.ContextMenuContent>
</ContextMenu.ContextMenu>
</template>
</UiTree>
</ContextMenu.ContextMenuTrigger>
<ContextMenu.ContextMenuContent>
<template v-if="isContextMultiSelection">
<ContextMenu.ContextMenuItem @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.ContextMenuItem>
</template>
<template v-else>
<ContextMenu.ContextMenuItem
@click="createFolderAndSelect(contextNode?.id)"
>
{{ i18n.t("action.new.folder") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuSeparator />
<ContextMenu.ContextMenuItem @click="onRenameFolder">
{{ i18n.t("action.rename") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuItem @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuSeparator />
<ContextMenu.ContextMenuItem @click="onSetCustomIcon">
{{ i18n.t("action.setCustomIcon") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuItem
v-if="contextNode?.icon"
@click="onRemoveCustomIcon"
>
{{ i18n.t("action.removeCustomIcon") }}
</ContextMenu.ContextMenuItem>
<ContextMenu.ContextMenuSeparator />
<ContextMenu.ContextMenuSub>
<ContextMenu.ContextMenuSubTrigger>
{{ i18n.t("action.defaultLanguage") }}
</ContextMenu.ContextMenuSubTrigger>
<ContextMenu.ContextMenuSubContent>
<div class="scrollbar max-h-[250px] min-h-0 overflow-y-auto">
<ContextMenu.ContextMenuCheckboxItem
v-for="language in languages"
:key="language.value"
:ref="
(el) =>
scrollToSelectedLanguage(
el,
contextNodeDefaultLanguage === language.value,
)
"
:checked="contextNodeDefaultLanguage === language.value"
@click="onSelectLanguage(language.value)"
>
{{ language.name }}
</ContextMenu.ContextMenuCheckboxItem>
</div>
</ContextMenu.ContextMenuSubContent>
</ContextMenu.ContextMenuSub>
</template>
</ContextMenu.ContextMenuContent>
</ContextMenu.ContextMenu>
</div>
</template>
125 changes: 71 additions & 54 deletions src/renderer/components/sidebar/library/Library.vue
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,7 @@ function onResizeTagList(val: number[]) {
</script>

<template>
<Resizable.ResizablePanelGroup
id="1"
direction="vertical"
@layout="onResizeTagList"
>
<div class="flex h-full min-h-0 flex-col">
<div
class="shrink-0 overflow-hidden"
data-sidebar-library
Expand All @@ -248,54 +244,75 @@ function onResizeTagList(val: number[]) {
</ContextMenu.ContextMenuContent>
</ContextMenu.ContextMenu>
</div>
<div class="mt-1 flex items-center justify-between py-1 pl-1 select-none">
<UiText
as="div"
variant="caption"
weight="bold"
uppercase
>
{{ i18n.t("sidebar.folders") }}
</UiText>
<UiActionButton
:tooltip="i18n.t('action.new.folder')"
@click="createFolderAndSelect()"
>
<Plus class="h-4 w-4" />
</UiActionButton>
</div>
<Resizable.ResizablePanel as-child>
<Tree
v-if="folders?.length"
v-model="folders"
class="px-0.5 pb-1"
@click-node="onFolderClick"
@toggle-node="onFolderToggle"
@drag-node="onFolderDrag"
/>

<UiEmptyPlaceholder
v-else
:text="i18n.t('placeholder.emptyFoldersList')"
/>
</Resizable.ResizablePanel>
<Resizable.ResizableHandle />
<div class="flex items-center justify-between py-1 pl-1 select-none">
<UiText
as="div"
variant="caption"
weight="bold"
uppercase
>
{{ i18n.t("sidebar.tags") }}
</UiText>
</div>
<Resizable.ResizablePanel
as-child
:min-size="MIN_TAGS_PANEL_SIZE"
:default-size="tagsListHeight"

<Resizable.ResizablePanelGroup
id="1"
direction="vertical"
class="min-h-0 flex-1"
@layout="onResizeTagList"
>
<SidebarTags class="px-1 pb-1" />
</Resizable.ResizablePanel>
</Resizable.ResizablePanelGroup>
<Resizable.ResizablePanel>
<div class="flex h-full min-h-0 flex-col">
<div
class="mt-1 flex items-center justify-between py-1 pl-1 select-none"
>
<UiText
as="div"
variant="caption"
weight="bold"
uppercase
>
{{ i18n.t("sidebar.folders") }}
</UiText>
<UiActionButton
:tooltip="i18n.t('action.new.folder')"
@click="createFolderAndSelect()"
>
<Plus class="h-4 w-4" />
</UiActionButton>
</div>

<div class="min-h-0 flex-1">
<Tree
v-if="folders?.length"
v-model="folders"
class="h-full px-0.5 pb-1"
@click-node="onFolderClick"
@toggle-node="onFolderToggle"
@drag-node="onFolderDrag"
/>

<UiEmptyPlaceholder
v-else
:text="i18n.t('placeholder.emptyFoldersList')"
/>
</div>
</div>
</Resizable.ResizablePanel>

<Resizable.ResizableHandle />

<Resizable.ResizablePanel
:min-size="MIN_TAGS_PANEL_SIZE"
:default-size="tagsListHeight"
>
<div class="flex h-full min-h-0 flex-col">
<div class="flex items-center justify-between py-1 pl-1 select-none">
<UiText
as="div"
variant="caption"
weight="bold"
uppercase
>
{{ i18n.t("sidebar.tags") }}
</UiText>
</div>

<div class="min-h-0 flex-1">
<SidebarTags class="h-full px-1 pb-1" />
</div>
</div>
</Resizable.ResizablePanel>
</Resizable.ResizablePanelGroup>
</div>
</template>