mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-28 18:22:40 +00:00
fix: show inline progress in QPOV2 despite stale overlay flag (#9214)
## Summary Fix inline queue progress being hidden in QPOV2 mode when a stale `Comfy.Queue.History.Expanded` setting remains true from legacy queue overlay usage. ## Changes - Update actionbar inline progress hide condition to respect queue-overlay expansion only when QPOV2 is disabled - Update top menu inline progress summary hide condition with the same gate - Keep legacy behavior unchanged for non-QPOV2 queue overlay mode ## Testing - `pnpm exec eslint src/components/actionbar/ComfyActionbar.vue src/components/TopMenuSection.vue` ✅ - `pnpm typecheck` ✅ ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9214-fix-show-inline-progress-in-QPOV2-despite-stale-overlay-flag-3126d73d36508170ac27fbb26826dca9) by [Unito](https://www.unito.io)
This commit is contained in:
@@ -127,13 +127,15 @@
|
|||||||
<div
|
<div
|
||||||
class="pointer-events-none absolute left-0 right-0 top-full mt-1 flex justify-end pr-1"
|
class="pointer-events-none absolute left-0 right-0 top-full mt-1 flex justify-end pr-1"
|
||||||
>
|
>
|
||||||
<QueueInlineProgressSummary :hidden="isQueueOverlayExpanded" />
|
<QueueInlineProgressSummary
|
||||||
|
:hidden="shouldHideInlineProgressSummary"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
<QueueInlineProgressSummary
|
<QueueInlineProgressSummary
|
||||||
v-else-if="shouldShowInlineProgressSummary && !isActionbarFloating"
|
v-else-if="shouldShowInlineProgressSummary && !isActionbarFloating"
|
||||||
class="pr-1"
|
class="pr-1"
|
||||||
:hidden="isQueueOverlayExpanded"
|
:hidden="shouldHideInlineProgressSummary"
|
||||||
/>
|
/>
|
||||||
<QueueNotificationBannerHost
|
<QueueNotificationBannerHost
|
||||||
v-if="shouldShowQueueNotificationBanners"
|
v-if="shouldShowQueueNotificationBanners"
|
||||||
@@ -241,6 +243,9 @@ const inlineProgressSummaryTarget = computed(() => {
|
|||||||
}
|
}
|
||||||
return progressTarget.value
|
return progressTarget.value
|
||||||
})
|
})
|
||||||
|
const shouldHideInlineProgressSummary = computed(
|
||||||
|
() => isQueueProgressOverlayEnabled.value && isQueueOverlayExpanded.value
|
||||||
|
)
|
||||||
const queueHistoryTooltipConfig = computed(() =>
|
const queueHistoryTooltipConfig = computed(() =>
|
||||||
buildTooltipConfig(t('sideToolbar.queueProgressOverlay.viewJobHistory'))
|
buildTooltipConfig(t('sideToolbar.queueProgressOverlay.viewJobHistory'))
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
<Teleport v-if="inlineProgressTarget" :to="inlineProgressTarget">
|
<Teleport v-if="inlineProgressTarget" :to="inlineProgressTarget">
|
||||||
<QueueInlineProgress
|
<QueueInlineProgress
|
||||||
:hidden="queueOverlayExpanded"
|
:hidden="shouldHideInlineProgress"
|
||||||
:radius-class="cn(isDocked ? 'rounded-[7px]' : 'rounded-[5px]')"
|
:radius-class="cn(isDocked ? 'rounded-[7px]' : 'rounded-[5px]')"
|
||||||
data-testid="queue-inline-progress"
|
data-testid="queue-inline-progress"
|
||||||
/>
|
/>
|
||||||
@@ -287,6 +287,9 @@ const inlineProgressTarget = computed(() => {
|
|||||||
if (isDocked.value) return topMenuContainer ?? null
|
if (isDocked.value) return topMenuContainer ?? null
|
||||||
return panelElement.value
|
return panelElement.value
|
||||||
})
|
})
|
||||||
|
const shouldHideInlineProgress = computed(
|
||||||
|
() => !isQueuePanelV2Enabled.value && queueOverlayExpanded
|
||||||
|
)
|
||||||
watch(
|
watch(
|
||||||
panelElement,
|
panelElement,
|
||||||
(target) => {
|
(target) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user