mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## Summary Fix four bugs in the subgraph promoted widget panel where linked promotions were not distinguished from independent ones, causing incorrect UI state in both the SubgraphEditor (Settings) panel and the Parameters tab WidgetActions menu. ## Changes - **What**: Add `isLinkedPromotion` helper to correctly identify widgets driven by subgraph input connections. Fix `disambiguatingSourceNodeId` lookup mismatch that broke `isWidgetShownOnParents` and `handleHideInput` for non-nested promoted widgets. Replace fragile CSS icon selectors with `data-testid` attributes. ## Bugs fixed Companion fix PR for #10502 (red-green test PR). All 4 E2E tests from #10502 now pass: | Bug | Root cause | Fix | |-----|-----------|-----| | Linked promoted widgets have hide toggle enabled | `SubgraphEditor` only checked `node.id === -1` (physical) — linked promotions from subgraph input connections were not detected | Added `isLinkedPromotion` helper that checks `input._widget` bindings; `SubgraphNodeWidget` `:is-physical` prop now covers both physical and linked cases | | Linked promoted widgets show eye icon instead of link icon | Same root cause as above — `isPhysical` prop was only true for `node.id === -1` | Extended the `:is-physical` condition to include `isLinkedPromotion` check | | Widget labels show raw names instead of renamed values | `SubgraphEditor` passed `widget.name` instead of `widget.label \|\| widget.name` | Changed `:widget-name` binding to prefer `widget.label` | | WidgetActions menu shows Hide/Show for linked promotions | `v-if="hasParents"` didn't exclude linked promotions | Added `canToggleVisibility` computed that combines `hasParents` with `!isLinked` check via `isLinkedPromotion` | ### Additional bugs discovered and fixed | Bug | Root cause | Fix | |-----|-----------|-----| | "Show input" always displayed instead of "Hide input" for promoted widgets | `SectionWidgets.isWidgetShownOnParents` used `getSourceNodeId(widget)` which falls back to `widget.sourceNodeId` when `disambiguatingSourceNodeId` is undefined — this mismatches the promotion store key (`undefined`) | Changed to `widget.disambiguatingSourceNodeId` directly | | "Hide input" click does nothing | `WidgetActions.handleHideInput` used `getSourceNodeId(widget)` for the same reason — `demote()` couldn't find the entry to remove | Same fix — use `widget.disambiguatingSourceNodeId` directly | ## Tests added ### E2E (Playwright) — `browser_tests/tests/subgraphPromotedWidgetPanel.spec.ts` | Test | What it verifies | |------|-----------------| | linked promoted widgets have hide toggle disabled | All toggle buttons in SubgraphEditor shown section are disabled for linked widgets (covers 1-level and 2-level nested promotions via `subgraph-nested-promotion` fixture) | | linked promoted widgets show link icon instead of eye icon | Link icons appear for linked widgets, no eye icons present | | widget labels display renamed values instead of raw names | `widget.label` is displayed when set, not `widget.name` | | linked promoted widget menu should not show Hide/Show input | Three-dot menu on Parameters tab omits Hide/Show options for linked promotions, Rename is still available | ### Unit (Vitest) — `src/core/graph/subgraph/promotionUtils.test.ts` 7 tests covering `isLinkedPromotion`: basic matching, negative cases, nested subgraph with `disambiguatingSourceNodeId`, multiple inputs, and mixed linked/independent state. ### Unit (Vitest) — `src/components/rightSidePanel/parameters/WidgetActions.test.ts` - Added `isSubgraphNode: () => false` to mock nodes to prevent crash from new `isLinked` computed ## Review Focus - `isLinkedPromotion` reads `input._widget` (WeakRef-backed, non-reactive) directly in the template. This is intentional — `_widget` bindings are set during subgraph initialization before the user opens the panel, so stale reads don't occur in practice. A computed-based approach was attempted but reverted because `_widget` changes cannot trigger Vue reactivity. - `getSourceNodeId` removal in `SectionWidgets` and `WidgetActions` is intentional — the old fallback (`?? widget.sourceNodeId`) caused key mismatches with the promotion store for non-nested widgets. ## Screenshots Before <img width="723" height="935" alt="image" src="https://github.com/user-attachments/assets/09862578-a0d1-45b4-929c-f22f7494ebe2" /> After <img width="999" height="952" alt="image" src="https://github.com/user-attachments/assets/ed8fe604-6b44-46b9-a315-6da31d6b405a" />
270 lines
7.6 KiB
Vue
270 lines
7.6 KiB
Vue
<script setup lang="ts">
|
|
import { useMounted, watchDebounced } from '@vueuse/core'
|
|
import { storeToRefs } from 'pinia'
|
|
import {
|
|
computed,
|
|
nextTick,
|
|
onBeforeUnmount,
|
|
onMounted,
|
|
ref,
|
|
shallowRef,
|
|
useTemplateRef,
|
|
watch
|
|
} from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
|
|
import { getWidgetName } from '@/core/graph/subgraph/promotionUtils'
|
|
import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
|
|
import CollapseToggleButton from '@/components/rightSidePanel/layout/CollapseToggleButton.vue'
|
|
import { DraggableList } from '@/scripts/ui/draggableList'
|
|
import { usePromotionStore } from '@/stores/promotionStore'
|
|
import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
|
|
|
|
import { searchWidgets } from '../shared'
|
|
import type { NodeWidgetsList } from '../shared'
|
|
import SectionWidgets from './SectionWidgets.vue'
|
|
|
|
const { node } = defineProps<{
|
|
node: SubgraphNode
|
|
}>()
|
|
|
|
const { t } = useI18n()
|
|
const canvasStore = useCanvasStore()
|
|
const promotionStore = usePromotionStore()
|
|
const rightSidePanelStore = useRightSidePanelStore()
|
|
const { focusedSection, searchQuery } = storeToRefs(rightSidePanelStore)
|
|
|
|
const advancedInputsCollapsed = ref(true)
|
|
const firstSectionCollapsed = ref(false)
|
|
const isAllCollapsed = computed({
|
|
get() {
|
|
const hasAdvanced = advancedInputsWidgets.value.length > 0
|
|
return hasAdvanced
|
|
? firstSectionCollapsed.value && advancedInputsCollapsed.value
|
|
: firstSectionCollapsed.value
|
|
},
|
|
set(collapse: boolean) {
|
|
firstSectionCollapsed.value = collapse
|
|
advancedInputsCollapsed.value = collapse
|
|
}
|
|
})
|
|
const draggableList = ref<DraggableList | undefined>(undefined)
|
|
const sectionWidgetsRef = useTemplateRef('sectionWidgetsRef')
|
|
const advancedInputsSectionRef = useTemplateRef('advancedInputsSectionRef')
|
|
|
|
const promotionEntries = computed(() =>
|
|
promotionStore.getPromotions(node.rootGraph.id, node.id)
|
|
)
|
|
|
|
watch(
|
|
focusedSection,
|
|
async (section) => {
|
|
if (section === 'advanced-inputs') {
|
|
advancedInputsCollapsed.value = false
|
|
rightSidePanelStore.clearFocusedSection()
|
|
|
|
await nextTick()
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 300))
|
|
|
|
const sectionComponent = advancedInputsSectionRef.value
|
|
const sectionElement = sectionComponent?.rootElement
|
|
if (sectionElement) {
|
|
sectionElement.scrollIntoView({ behavior: 'smooth', block: 'start' })
|
|
}
|
|
}
|
|
},
|
|
{ immediate: true }
|
|
)
|
|
|
|
const widgetsList = computed((): NodeWidgetsList => {
|
|
const entries = promotionEntries.value
|
|
const { widgets = [] } = node
|
|
|
|
const result: NodeWidgetsList = []
|
|
for (const {
|
|
sourceNodeId: entryNodeId,
|
|
sourceWidgetName,
|
|
disambiguatingSourceNodeId
|
|
} of entries) {
|
|
const widget = widgets.find((w) => {
|
|
if (isPromotedWidgetView(w)) {
|
|
if (
|
|
String(w.sourceNodeId) !== entryNodeId ||
|
|
w.sourceWidgetName !== sourceWidgetName
|
|
)
|
|
return false
|
|
|
|
if (!disambiguatingSourceNodeId) return true
|
|
|
|
return (
|
|
(w.disambiguatingSourceNodeId ?? w.sourceNodeId) ===
|
|
disambiguatingSourceNodeId
|
|
)
|
|
}
|
|
return w.name === sourceWidgetName
|
|
})
|
|
if (widget) {
|
|
result.push({ node, widget })
|
|
}
|
|
}
|
|
return result
|
|
})
|
|
|
|
const advancedInputsWidgets = computed((): NodeWidgetsList => {
|
|
const interiorNodes = node.subgraph.nodes
|
|
|
|
const allInteriorWidgets = interiorNodes.flatMap((interiorNode) => {
|
|
const { widgets = [] } = interiorNode
|
|
return widgets
|
|
.filter((w) => !w.computedDisabled)
|
|
.map((widget) => ({ node: interiorNode, widget }))
|
|
})
|
|
|
|
return allInteriorWidgets.filter(
|
|
({ node: interiorNode, widget }) =>
|
|
!promotionStore.isPromoted(node.rootGraph.id, node.id, {
|
|
sourceNodeId: String(interiorNode.id),
|
|
sourceWidgetName: getWidgetName(widget),
|
|
disambiguatingSourceNodeId: isPromotedWidgetView(widget)
|
|
? widget.disambiguatingSourceNodeId
|
|
: undefined
|
|
})
|
|
)
|
|
})
|
|
|
|
const parents = computed<SubgraphNode[]>(() => [node])
|
|
|
|
const searchedWidgetsList = shallowRef<NodeWidgetsList>(widgetsList.value)
|
|
const isSearching = ref(false)
|
|
|
|
async function searcher(query: string) {
|
|
isSearching.value = query.trim() !== ''
|
|
searchedWidgetsList.value = searchWidgets(widgetsList.value, query)
|
|
}
|
|
|
|
const isMounted = useMounted()
|
|
|
|
function setDraggableState() {
|
|
if (!isMounted.value) return
|
|
|
|
draggableList.value?.dispose()
|
|
const container = sectionWidgetsRef.value?.widgetsContainer
|
|
if (isSearching.value || !container?.children?.length) return
|
|
|
|
draggableList.value = new DraggableList(container, '.draggable-item')
|
|
|
|
draggableList.value.applyNewItemsOrder = function () {
|
|
const reorderedItems: HTMLElement[] = []
|
|
|
|
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
|
|
})
|
|
|
|
if (oldPosition === -1) {
|
|
console.error('[TabSubgraphInputs] draggableItem not found in items')
|
|
return
|
|
}
|
|
|
|
for (let index = 0; index < this.getAllItems().length; index++) {
|
|
const item = reorderedItems[index]
|
|
if (typeof item === 'undefined') {
|
|
reorderedItems[index] = this.draggableItem as HTMLElement
|
|
}
|
|
}
|
|
|
|
const newPosition = reorderedItems.indexOf(
|
|
this.draggableItem as HTMLElement
|
|
)
|
|
|
|
promotionStore.movePromotion(
|
|
node.rootGraph.id,
|
|
node.id,
|
|
oldPosition,
|
|
newPosition
|
|
)
|
|
canvasStore.canvas?.setDirty(true, true)
|
|
}
|
|
}
|
|
|
|
watchDebounced(searchedWidgetsList, () => setDraggableState(), {
|
|
debounce: 100
|
|
})
|
|
onMounted(() => setDraggableState())
|
|
onBeforeUnmount(() => draggableList.value?.dispose())
|
|
|
|
const label = computed(() => {
|
|
return searchedWidgetsList.value.length !== 0
|
|
? t('rightSidePanel.inputs')
|
|
: t('rightSidePanel.inputsNone')
|
|
})
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
class="flex items-center border-b border-interface-stroke px-4 pt-1 pb-4"
|
|
>
|
|
<FormSearchInput
|
|
v-model="searchQuery"
|
|
:searcher
|
|
:update-key="widgetsList"
|
|
class="flex-1"
|
|
/>
|
|
<CollapseToggleButton
|
|
v-model="isAllCollapsed"
|
|
:show="!isSearching && advancedInputsWidgets.length > 0"
|
|
/>
|
|
</div>
|
|
<SectionWidgets
|
|
ref="sectionWidgetsRef"
|
|
:collapse="firstSectionCollapsed && !isSearching"
|
|
:node
|
|
:label
|
|
:parents
|
|
:widgets="searchedWidgetsList"
|
|
:is-draggable="!isSearching"
|
|
:enable-empty-state="isSearching"
|
|
:tooltip="
|
|
isSearching || searchedWidgetsList.length
|
|
? ''
|
|
: t('rightSidePanel.inputsNoneTooltip')
|
|
"
|
|
class="border-b border-interface-stroke"
|
|
@update:collapse="
|
|
(v) => {
|
|
firstSectionCollapsed = v
|
|
nextTick(setDraggableState)
|
|
}
|
|
"
|
|
>
|
|
<template #empty>
|
|
<div class="px-4 pt-5 pb-15 text-center text-sm text-muted-foreground">
|
|
{{ t('rightSidePanel.noneSearchDesc') }}
|
|
</div>
|
|
</template>
|
|
</SectionWidgets>
|
|
<SectionWidgets
|
|
v-if="advancedInputsWidgets.length > 0"
|
|
ref="advancedInputsSectionRef"
|
|
v-model:collapse="advancedInputsCollapsed"
|
|
:label="t('rightSidePanel.advancedInputs')"
|
|
:parents="parents"
|
|
:widgets="advancedInputsWidgets"
|
|
show-node-name
|
|
class="border-b border-interface-stroke"
|
|
/>
|
|
</template>
|