mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-03 12:42:01 +00:00
## Summary Implement 11 Figma design discrepancies for the Node Library sidebar and V2 Node Search dialog, aligning the UI with the [Toolbox Figma design](https://www.figma.com/design/xMFxCziXJe6Denz4dpDGTq/Toolbox?node-id=2074-21394&m=dev). ## Changes - **What**: Sidebar: reorder tabs (All/Essentials/Blueprints), rename Custom→Blueprints, uppercase section headers, chevron-left of folder icon, bookmark-on-hover for node rows, filter dropdown with checkbox items, sort labels (Categorized/A-Z) with label-left/check-right layout, hide section headers in A-Z mode. Search dialog: expand filter chips from 3→6, add Recents and source categories to sidebar, remove "Filter by" label. Pull foundation V2 components from merged PR #8548. - **Dependencies**: Depends on #8987 (V2 Node Search) and #8548 (NodeLibrarySidebarTabV2) ## Review Focus - Filter dropdown (`filterOptions`) is UI-scaffolded but not yet wired to filtering logic (pending V2 integration) - "Recents" category currently returns frequency-based results as placeholder until a usage-tracking store is implemented - Pre-existing type errors from V2 PR dependencies not in the base commit (SearchBoxV2, usePerTabState, TextTicker, getProviderIcon, getLinkTypeColor, SidebarContainerKey) are expected and will resolve when rebased onto main after parent PRs land ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9085-feat-Node-Library-sidebar-and-V2-Search-dialog-Figma-design-improvements-30f6d73d36508175bf72d716f5904476) by [Unito](https://www.unito.io) --------- Co-authored-by: Yourz <crazilou@vip.qq.com> Co-authored-by: github-actions <github-actions@github.com>
142 lines
4.0 KiB
Vue
142 lines
4.0 KiB
Vue
<template>
|
|
<div class="flex min-h-0 flex-col overflow-y-auto py-2.5">
|
|
<!-- Preset categories -->
|
|
<div class="flex flex-col px-1">
|
|
<button
|
|
v-for="preset in topCategories"
|
|
:key="preset.id"
|
|
type="button"
|
|
:data-testid="`category-${preset.id}`"
|
|
:aria-current="selectedCategory === preset.id || undefined"
|
|
:class="categoryBtnClass(preset.id)"
|
|
@click="selectCategory(preset.id)"
|
|
>
|
|
{{ preset.label }}
|
|
</button>
|
|
</div>
|
|
|
|
<!-- Source categories -->
|
|
<div class="my-2 flex flex-col border-y border-border-subtle px-1 py-2">
|
|
<button
|
|
v-for="preset in sourceCategories"
|
|
:key="preset.id"
|
|
type="button"
|
|
:data-testid="`category-${preset.id}`"
|
|
:aria-current="selectedCategory === preset.id || undefined"
|
|
:class="categoryBtnClass(preset.id)"
|
|
@click="selectCategory(preset.id)"
|
|
>
|
|
{{ preset.label }}
|
|
</button>
|
|
</div>
|
|
|
|
<!-- Category tree -->
|
|
<div class="flex flex-col px-1">
|
|
<NodeSearchCategoryTreeNode
|
|
v-for="category in categoryTree"
|
|
:key="category.key"
|
|
:node="category"
|
|
:selected-category="selectedCategory"
|
|
:selected-collapsed="selectedCollapsed"
|
|
@select="selectCategory"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { computed, ref } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import NodeSearchCategoryTreeNode, {
|
|
CATEGORY_SELECTED_CLASS,
|
|
CATEGORY_UNSELECTED_CLASS
|
|
} from '@/components/searchbox/v2/NodeSearchCategoryTreeNode.vue'
|
|
import type { CategoryNode } from '@/components/searchbox/v2/NodeSearchCategoryTreeNode.vue'
|
|
import { nodeOrganizationService } from '@/services/nodeOrganizationService'
|
|
import { useNodeDefStore } from '@/stores/nodeDefStore'
|
|
import { NodeSourceType } from '@/types/nodeSource'
|
|
import type { TreeNode } from '@/types/treeExplorerTypes'
|
|
import { cn } from '@/utils/tailwindUtil'
|
|
|
|
const selectedCategory = defineModel<string>('selectedCategory', {
|
|
required: true
|
|
})
|
|
|
|
const { t } = useI18n()
|
|
const nodeDefStore = useNodeDefStore()
|
|
|
|
const topCategories = computed(() => [
|
|
{ id: 'most-relevant', label: t('g.mostRelevant') },
|
|
{ id: 'recents', label: t('g.recents') },
|
|
{ id: 'favorites', label: t('g.favorites') }
|
|
])
|
|
|
|
const hasEssentialNodes = computed(() =>
|
|
nodeDefStore.visibleNodeDefs.some(
|
|
(n) => n.nodeSource.type === NodeSourceType.Essentials
|
|
)
|
|
)
|
|
|
|
const sourceCategories = computed(() => {
|
|
const categories = []
|
|
if (hasEssentialNodes.value) {
|
|
categories.push({ id: 'essentials', label: t('g.essentials') })
|
|
}
|
|
categories.push(
|
|
{
|
|
id: 'blueprints',
|
|
label: t('sideToolbar.nodeLibraryTab.filterOptions.blueprints')
|
|
},
|
|
{ id: 'partner', label: t('g.partner') },
|
|
{ id: 'comfy', label: t('g.comfy') },
|
|
{ id: 'extensions', label: t('g.extensions') }
|
|
)
|
|
return categories
|
|
})
|
|
|
|
const categoryTree = computed<CategoryNode[]>(() => {
|
|
const tree = nodeOrganizationService.organizeNodes(
|
|
nodeDefStore.visibleNodeDefs,
|
|
{ groupBy: 'category' }
|
|
)
|
|
|
|
const stripRootPrefix = (key: string) => key.replace(/^root\//, '')
|
|
|
|
function mapNode(node: TreeNode): CategoryNode {
|
|
const children = node.children
|
|
?.filter((child): child is TreeNode => !child.leaf)
|
|
.map(mapNode)
|
|
return {
|
|
key: stripRootPrefix(node.key as string),
|
|
label: node.label,
|
|
...(children?.length ? { children } : {})
|
|
}
|
|
}
|
|
|
|
return (tree.children ?? [])
|
|
.filter((node): node is TreeNode => !node.leaf)
|
|
.map(mapNode)
|
|
})
|
|
|
|
function categoryBtnClass(id: string) {
|
|
return cn(
|
|
'cursor-pointer border-none bg-transparent rounded px-3 py-2.5 text-left text-sm transition-colors',
|
|
selectedCategory.value === id
|
|
? CATEGORY_SELECTED_CLASS
|
|
: CATEGORY_UNSELECTED_CLASS
|
|
)
|
|
}
|
|
|
|
const selectedCollapsed = ref(false)
|
|
|
|
function selectCategory(categoryId: string) {
|
|
if (selectedCategory.value === categoryId) {
|
|
selectedCollapsed.value = !selectedCollapsed.value
|
|
} else {
|
|
selectedCollapsed.value = false
|
|
selectedCategory.value = categoryId
|
|
}
|
|
}
|
|
</script>
|