From 4904bb7b6c122b9101a7c761b9401f665e4ab933 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Fri, 2 Oct 2026 19:05:20 +0000 Subject: [PATCH] fix(load3d): apply workspace inset to every viewer (#19729) ## Summary - route every Load3D and HDR viewer through one inset-aware dialog configuration - remove raw-viewport centering overrides that let the docked Agent panel cover viewer content - keep the responsive 80vw cap paired with the full-size dialog variant This follows up on findings from the merged [core/1.55 backport](https://github.com/Comfy-Org/ComfyUI_frontend/pull/19702#discussion_r4152132317) and [cloud/1.55 backport](https://github.com/Comfy-Org/ComfyUI_frontend/pull/19703#discussion_r4152121127). ## Changes - apply the shared configuration to HDR, Agent reply, Assets, Job History, node, and viewer-control entry points - centralize `renderer`, `size`, `contentClass`, and `maximizable` so responsive geometry cannot drift across callers - remove brittle class-token assertions; browser coverage measures the visible viewer geometry ## Review Focus - confirm the shared `sm:max-w` override remains paired with `size: full` - confirm viewers with custom `onClose` behavior preserve it when spreading the shared configuration ## Validation - `oxfmt --check` passed for all nine changed files - `git diff --check` passed - the focused Vitest runner stalled before producing output in this workspace; CI is rerunning the affected suites (cherry picked from commit 3c4030d80e619e0276dcd65667dc793acccf1525) --- src/components/load3d/controls/ViewerControls.vue | 7 ++----- src/components/load3d/load3dViewerDialog.ts | 11 +++++++++-- src/components/sidebar/tabs/AssetsSidebarTab.vue | 8 ++------ src/components/sidebar/tabs/JobHistorySidebarTab.vue | 8 ++------ src/extensions/core/load3d.ts | 7 ++----- src/services/hdrViewerService.ts | 8 ++------ .../components/agent/message/ReplyAssetGroup.vue | 6 ++---- 7 files changed, 21 insertions(+), 34 deletions(-) diff --git a/src/components/load3d/controls/ViewerControls.vue b/src/components/load3d/controls/ViewerControls.vue index 9e3d21ef9cf..f20cfc6a531 100644 --- a/src/components/load3d/controls/ViewerControls.vue +++ b/src/components/load3d/controls/ViewerControls.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n' import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue' import Button from '@/components/ui/button/Button.vue' -import { LOAD3D_VIEWER_CONTENT_CLASS } from '@/components/load3d/load3dViewerDialog' +import { LOAD3D_VIEWER_DIALOG_PROPS } from '@/components/load3d/load3dViewerDialog' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' import { useLoad3dService } from '@/services/load3dService' import { useDialogStore } from '@/stores/dialogStore' @@ -42,10 +42,7 @@ const openIn3DViewer = () => { component: Load3DViewerContent, props: props, dialogComponentProps: { - renderer: 'reka', - size: 'full', - contentClass: LOAD3D_VIEWER_CONTENT_CLASS, - maximizable: true, + ...LOAD3D_VIEWER_DIALOG_PROPS, onClose: async () => { await useLoad3dService().handleViewerClose(props.node) } diff --git a/src/components/load3d/load3dViewerDialog.ts b/src/components/load3d/load3dViewerDialog.ts index 2d655dd5729..a586557f16d 100644 --- a/src/components/load3d/load3dViewerDialog.ts +++ b/src/components/load3d/load3dViewerDialog.ts @@ -1,2 +1,9 @@ -export const LOAD3D_VIEWER_CONTENT_CLASS = - 'w-[80vw] max-w-[min(80vw,calc(100vw-var(--workspace-inset-right,0px)-1rem))] h-[80vh] max-h-[80vh]' +import type { DialogComponentProps } from '@/stores/dialogStore' + +export const LOAD3D_VIEWER_DIALOG_PROPS = { + renderer: 'reka', + size: 'full', + contentClass: + 'w-[80vw] max-w-[min(80vw,calc(100vw-var(--workspace-inset-right,0px)-1rem))] sm:max-w-[min(80vw,calc(100vw-var(--workspace-inset-right,0px)-1rem))] h-[80vh] max-h-[80vh]', + maximizable: true +} satisfies DialogComponentProps diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.vue b/src/components/sidebar/tabs/AssetsSidebarTab.vue index 687377c143e..cf8f145422c 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.vue +++ b/src/components/sidebar/tabs/AssetsSidebarTab.vue @@ -201,6 +201,7 @@ import { import { useI18n } from 'vue-i18n' import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue' +import { LOAD3D_VIEWER_DIALOG_PROPS } from '@/components/load3d/load3dViewerDialog' import AssetsSidebarGridView from '@/components/sidebar/tabs/AssetsSidebarGridView.vue' import AssetsSidebarListView from '@/components/sidebar/tabs/AssetsSidebarListView.vue' import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue' @@ -582,12 +583,7 @@ const handleZoomClick = (asset: AssetItem) => { props: { modelUrl: getAssetFileUrl(asset) }, - dialogComponentProps: { - renderer: 'reka', - size: 'full', - contentClass: 'left-1/2 w-[80vw] sm:max-w-[80vw] h-[80vh] max-h-[80vh]', - maximizable: true - } + dialogComponentProps: LOAD3D_VIEWER_DIALOG_PROPS }) return } diff --git a/src/components/sidebar/tabs/JobHistorySidebarTab.vue b/src/components/sidebar/tabs/JobHistorySidebarTab.vue index a2b14e74d70..880b762c7d1 100644 --- a/src/components/sidebar/tabs/JobHistorySidebarTab.vue +++ b/src/components/sidebar/tabs/JobHistorySidebarTab.vue @@ -77,6 +77,7 @@ import { computed, defineAsyncComponent, ref } from 'vue' import { useI18n } from 'vue-i18n' +import { LOAD3D_VIEWER_DIALOG_PROPS } from '@/components/load3d/load3dViewerDialog' import JobFilterActions from '@/components/queue/job/JobFilterActions.vue' import JobFilterTabs from '@/components/queue/job/JobFilterTabs.vue' import JobAssetsList from '@/components/queue/job/JobAssetsList.vue' @@ -188,12 +189,7 @@ const onViewItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => { props: { modelUrl: previewOutput.url || '' }, - dialogComponentProps: { - renderer: 'reka', - size: 'full', - contentClass: 'left-1/2 w-[80vw] sm:max-w-[80vw] h-[80vh] max-h-[80vh]', - maximizable: true - } + dialogComponentProps: LOAD3D_VIEWER_DIALOG_PROPS }) return } diff --git a/src/extensions/core/load3d.ts b/src/extensions/core/load3d.ts index 529805de5af..7e1538629b7 100644 --- a/src/extensions/core/load3d.ts +++ b/src/extensions/core/load3d.ts @@ -2,7 +2,7 @@ import { nextTick } from 'vue' import Load3D from '@/components/load3d/Load3D.vue' import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue' -import { LOAD3D_VIEWER_CONTENT_CLASS } from '@/components/load3d/load3dViewerDialog' +import { LOAD3D_VIEWER_DIALOG_PROPS } from '@/components/load3d/load3dViewerDialog' import { type Load3dCachedOutput, getLoad3dOutputCache, @@ -283,10 +283,7 @@ useExtensionService().registerExtension({ component: Load3DViewerContent, props: props, dialogComponentProps: { - renderer: 'reka', - size: 'full', - contentClass: LOAD3D_VIEWER_CONTENT_CLASS, - maximizable: true, + ...LOAD3D_VIEWER_DIALOG_PROPS, onClose: async () => { await useLoad3dService().handleViewerClose(props.node) } diff --git a/src/services/hdrViewerService.ts b/src/services/hdrViewerService.ts index 011e7c89e3b..363022817e3 100644 --- a/src/services/hdrViewerService.ts +++ b/src/services/hdrViewerService.ts @@ -1,5 +1,6 @@ import { defineAsyncComponent } from 'vue' +import { LOAD3D_VIEWER_DIALOG_PROPS } from '@/components/load3d/load3dViewerDialog' import { t } from '@/i18n' import { useDialogStore } from '@/stores/dialogStore' import { @@ -18,11 +19,6 @@ export function openHdrViewer(url: string) { title: getImageFilenameFromUrl(fullResUrl) ?? t('hdrViewer.title'), component: HdrViewerContent, props: { imageUrl: fullResUrl }, - dialogComponentProps: { - renderer: 'reka', - size: 'full', - contentClass: 'left-1/2 w-[80vw] sm:max-w-[80vw] h-[80vh] max-h-[80vh]', - maximizable: true - } + dialogComponentProps: LOAD3D_VIEWER_DIALOG_PROPS }) } diff --git a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue index 1da9c804781..6064a16fa45 100644 --- a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue +++ b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue @@ -2,6 +2,7 @@ import { computed, defineAsyncComponent, ref, watch } from 'vue' import { useI18n } from 'vue-i18n' +import { LOAD3D_VIEWER_DIALOG_PROPS } from '@/components/load3d/load3dViewerDialog' import Button from '@/components/ui/button/Button.vue' import { findOutputAsset, @@ -125,10 +126,7 @@ function inspect(asset: ReplyAsset): void { component: Load3dViewerContent, props: { modelUrl: asset.url }, dialogComponentProps: { - renderer: 'reka', - size: 'full', - contentClass: 'left-1/2 w-[80vw] sm:max-w-[80vw] h-[80vh] max-h-[80vh]', - maximizable: true, + ...LOAD3D_VIEWER_DIALOG_PROPS, onClose: () => refreshModelThumbnail(asset) } })