mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-08 00:50:05 +00:00
## Summary Replace color/dark-color pairs in components with design tokens to allow for easy overriding. <!-- Also standardizes the icon pattern to simplify the tailwind config. --> ## Changes - **What**: Token based colors, for now, mostly. - **Breaking**: Got approval from Design to collapse some very similar pairs of colors that seem to have diverged in implementations over time. Some of the colors might be a little different, but we can tweak them later. ## Review Focus Still have quite a few places from which to remove `dark-theme`, but this at least gets the theming much closer. Need to decide if I want to keep going in here or cut this and do the rest in a subsequent PR. ## Screenshots (if applicable) <!-- Add screenshots or video recording to help explain your changes --> ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5908-WIP-Make-components-themeable-2816d73d365081ffbc05d189fe71084b) by [Unito](https://www.unito.io) --------- Co-authored-by: github-actions <github-actions@github.com>
316 lines
9.1 KiB
Vue
316 lines
9.1 KiB
Vue
<script setup lang="ts">
|
|
import { refDebounced, watchDebounced } from '@vueuse/core'
|
|
import {
|
|
computed,
|
|
customRef,
|
|
onBeforeUnmount,
|
|
onMounted,
|
|
ref,
|
|
triggerRef
|
|
} from 'vue'
|
|
|
|
import SearchBox from '@/components/common/SearchBox.vue'
|
|
import SubgraphNodeWidget from '@/core/graph/subgraph/SubgraphNodeWidget.vue'
|
|
import {
|
|
type WidgetItem,
|
|
demoteWidget,
|
|
isRecommendedWidget,
|
|
matchesPropertyItem,
|
|
matchesWidgetItem,
|
|
promoteWidget,
|
|
widgetItemToProperty
|
|
} from '@/core/graph/subgraph/proxyWidgetUtils'
|
|
import {
|
|
type ProxyWidgetsProperty,
|
|
parseProxyWidgets
|
|
} from '@/core/schemas/proxyWidget'
|
|
import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
|
|
import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
|
|
import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
import { DraggableList } from '@/scripts/ui/draggableList'
|
|
import { useLitegraphService } from '@/services/litegraphService'
|
|
import { useDialogStore } from '@/stores/dialogStore'
|
|
|
|
const canvasStore = useCanvasStore()
|
|
|
|
const draggableList = ref<DraggableList | undefined>(undefined)
|
|
const draggableItems = ref()
|
|
const searchQuery = ref<string>('')
|
|
const debouncedQuery = refDebounced(searchQuery, 200)
|
|
const proxyWidgets = customRef<ProxyWidgetsProperty>((track, trigger) => ({
|
|
get() {
|
|
track()
|
|
const node = activeNode.value
|
|
if (!node) return []
|
|
return parseProxyWidgets(node.properties.proxyWidgets)
|
|
},
|
|
set(value?: ProxyWidgetsProperty) {
|
|
trigger()
|
|
const node = activeNode.value
|
|
if (!value) return
|
|
if (!node) {
|
|
console.error('Attempted to toggle widgets with no node selected')
|
|
return
|
|
}
|
|
node.properties.proxyWidgets = value
|
|
}
|
|
}))
|
|
|
|
const activeNode = computed(() => {
|
|
const node = canvasStore.selectedItems[0]
|
|
if (node instanceof SubgraphNode) return node
|
|
useDialogStore().closeDialog()
|
|
return undefined
|
|
})
|
|
|
|
const activeWidgets = computed<WidgetItem[]>({
|
|
get() {
|
|
const node = activeNode.value
|
|
if (!node) return []
|
|
return proxyWidgets.value.flatMap(([id, name]: [string, string]) => {
|
|
const wNode = node.subgraph._nodes_by_id[id]
|
|
if (!wNode?.widgets) return []
|
|
const w = wNode.widgets.find((w) => w.name === name)
|
|
if (!w) return []
|
|
return [[wNode, w]]
|
|
})
|
|
},
|
|
set(value: WidgetItem[]) {
|
|
const node = activeNode.value
|
|
if (!node) {
|
|
console.error('Attempted to toggle widgets with no node selected')
|
|
return
|
|
}
|
|
//map back to id/name
|
|
const widgets: ProxyWidgetsProperty = value.map(widgetItemToProperty)
|
|
proxyWidgets.value = widgets
|
|
}
|
|
})
|
|
|
|
const interiorWidgets = computed<WidgetItem[]>(() => {
|
|
const node = activeNode.value
|
|
if (!node) return []
|
|
const { updatePreviews } = useLitegraphService()
|
|
const interiorNodes = node.subgraph.nodes
|
|
for (const node of interiorNodes) {
|
|
node.updateComputedDisabled()
|
|
updatePreviews(node)
|
|
}
|
|
return interiorNodes
|
|
.flatMap(nodeWidgets)
|
|
.filter(([_, w]: WidgetItem) => !w.computedDisabled)
|
|
})
|
|
|
|
const candidateWidgets = computed<WidgetItem[]>(() => {
|
|
const node = activeNode.value
|
|
if (!node) return []
|
|
const widgets = proxyWidgets.value
|
|
return interiorWidgets.value.filter(
|
|
(widgetItem: WidgetItem) => !widgets.some(matchesPropertyItem(widgetItem))
|
|
)
|
|
})
|
|
const filteredCandidates = computed<WidgetItem[]>(() => {
|
|
const query = debouncedQuery.value.toLowerCase()
|
|
if (!query) return candidateWidgets.value
|
|
return candidateWidgets.value.filter(
|
|
([n, w]: WidgetItem) =>
|
|
n.title.toLowerCase().includes(query) ||
|
|
w.name.toLowerCase().includes(query)
|
|
)
|
|
})
|
|
|
|
const recommendedWidgets = computed(() => {
|
|
const node = activeNode.value
|
|
if (!node) return [] //Not reachable
|
|
return filteredCandidates.value.filter(isRecommendedWidget)
|
|
})
|
|
|
|
const filteredActive = computed<WidgetItem[]>(() => {
|
|
const query = debouncedQuery.value.toLowerCase()
|
|
if (!query) return activeWidgets.value
|
|
return activeWidgets.value.filter(
|
|
([n, w]: WidgetItem) =>
|
|
n.title.toLowerCase().includes(query) ||
|
|
w.name.toLowerCase().includes(query)
|
|
)
|
|
})
|
|
|
|
function toKey(item: WidgetItem) {
|
|
return `${item[0].id}: ${item[1].name}`
|
|
}
|
|
function nodeWidgets(n: LGraphNode): WidgetItem[] {
|
|
if (!n.widgets) return []
|
|
return n.widgets.map((w: IBaseWidget) => [n, w])
|
|
}
|
|
function demote([node, widget]: WidgetItem) {
|
|
const subgraphNode = activeNode.value
|
|
if (!subgraphNode) return []
|
|
demoteWidget(node, widget, [subgraphNode])
|
|
triggerRef(proxyWidgets)
|
|
}
|
|
function promote([node, widget]: WidgetItem) {
|
|
const subgraphNode = activeNode.value
|
|
if (!subgraphNode) return []
|
|
promoteWidget(node, widget, [subgraphNode])
|
|
triggerRef(proxyWidgets)
|
|
}
|
|
function showAll() {
|
|
const node = activeNode.value
|
|
if (!node) return //Not reachable
|
|
const widgets = proxyWidgets.value
|
|
const toAdd: ProxyWidgetsProperty =
|
|
filteredCandidates.value.map(widgetItemToProperty)
|
|
widgets.push(...toAdd)
|
|
proxyWidgets.value = widgets
|
|
}
|
|
function hideAll() {
|
|
const node = activeNode.value
|
|
if (!node) return //Not reachable
|
|
//Not great from a nesting perspective, but path is cold
|
|
//and it cleans up potential error states
|
|
proxyWidgets.value = proxyWidgets.value.filter(
|
|
(widgetItem) => !filteredActive.value.some(matchesWidgetItem(widgetItem))
|
|
)
|
|
}
|
|
function showRecommended() {
|
|
const node = activeNode.value
|
|
if (!node) return //Not reachable
|
|
const widgets = proxyWidgets.value
|
|
const toAdd: ProxyWidgetsProperty =
|
|
recommendedWidgets.value.map(widgetItemToProperty)
|
|
//TODO: Add sort step here
|
|
//Input should always be before output by default
|
|
widgets.push(...toAdd)
|
|
proxyWidgets.value = widgets
|
|
}
|
|
|
|
function setDraggableState() {
|
|
draggableList.value?.dispose()
|
|
if (debouncedQuery.value || !draggableItems.value?.children?.length) return
|
|
draggableList.value = new DraggableList(
|
|
draggableItems.value,
|
|
'.draggable-item'
|
|
)
|
|
//Original implementation plays really poorly with vue,
|
|
//It has been modified to not add/remove elements
|
|
draggableList.value.applyNewItemsOrder = function () {
|
|
const reorderedItems = []
|
|
|
|
let oldPosition = -1
|
|
this.getAllItems().forEach((item, index) => {
|
|
if (item === this.draggableItem) {
|
|
oldPosition = index
|
|
return
|
|
}
|
|
if (!this.isItemToggled(item)) {
|
|
reorderedItems[index] = item
|
|
return
|
|
}
|
|
const newIndex = this.isItemAbove(item) ? index + 1 : index - 1
|
|
reorderedItems[newIndex] = item
|
|
})
|
|
|
|
for (let index = 0; index < this.getAllItems().length; index++) {
|
|
const item = reorderedItems[index]
|
|
if (typeof item === 'undefined') {
|
|
reorderedItems[index] = this.draggableItem
|
|
}
|
|
}
|
|
const newPosition = reorderedItems.indexOf(this.draggableItem)
|
|
const aw = activeWidgets.value
|
|
const [w] = aw.splice(oldPosition, 1)
|
|
aw.splice(newPosition, 0, w)
|
|
activeWidgets.value = aw
|
|
}
|
|
}
|
|
watchDebounced(
|
|
filteredActive,
|
|
() => {
|
|
setDraggableState()
|
|
},
|
|
{ debounce: 100 }
|
|
)
|
|
onMounted(() => {
|
|
setDraggableState()
|
|
})
|
|
onBeforeUnmount(() => {
|
|
draggableList.value?.dispose()
|
|
})
|
|
</script>
|
|
<template>
|
|
<SearchBox
|
|
v-model:model-value="searchQuery"
|
|
class="p-2"
|
|
:placeholder="$t('g.search') + '...'"
|
|
/>
|
|
<div
|
|
v-if="filteredActive.length"
|
|
class="pt-1 pb-4 border-b-1 border-node-component-border"
|
|
>
|
|
<div class="flex py-0 px-4 justify-between">
|
|
<div class="text-slate-100 text-[9px] font-semibold uppercase">
|
|
{{ $t('subgraphStore.shown') }}
|
|
</div>
|
|
<a
|
|
class="cursor-pointer text-right text-blue-100 text-[11px] font-normal"
|
|
@click.stop="hideAll"
|
|
>
|
|
{{ $t('subgraphStore.hideAll') }}</a
|
|
>
|
|
</div>
|
|
<div ref="draggableItems">
|
|
<div
|
|
v-for="[node, widget] in filteredActive"
|
|
:key="toKey([node, widget])"
|
|
class="w-full draggable-item"
|
|
style=""
|
|
>
|
|
<SubgraphNodeWidget
|
|
:node-title="node.title"
|
|
:widget-name="widget.name"
|
|
:is-shown="true"
|
|
:is-draggable="!debouncedQuery"
|
|
@toggle-visibility="demote([node, widget])"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div v-if="filteredCandidates.length" class="pt-1 pb-4">
|
|
<div class="flex py-0 px-4 justify-between">
|
|
<div class="text-slate-100 text-[9px] font-semibold uppercase">
|
|
{{ $t('subgraphStore.hidden') }}
|
|
</div>
|
|
<a
|
|
class="cursor-pointer text-right text-blue-100 text-[11px] font-normal"
|
|
@click.stop="showAll"
|
|
>
|
|
{{ $t('subgraphStore.showAll') }}</a
|
|
>
|
|
</div>
|
|
<div
|
|
v-for="[node, widget] in filteredCandidates"
|
|
:key="toKey([node, widget])"
|
|
class="w-full"
|
|
>
|
|
<SubgraphNodeWidget
|
|
:node-title="node.title"
|
|
:widget-name="widget.name"
|
|
@toggle-visibility="promote([node, widget])"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div
|
|
v-if="recommendedWidgets.length"
|
|
class="justify-center flex py-4 border-t-1 border-node-component-border"
|
|
>
|
|
<Button
|
|
size="small"
|
|
class="rounded border-none px-3 py-0.5"
|
|
@click.stop="showRecommended"
|
|
>
|
|
{{ $t('subgraphStore.showRecommended') }}
|
|
</Button>
|
|
</div>
|
|
</template>
|