Skip to content
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
d4ea383
feat(app-mode): layout grid primitive + system cells (Phase 1)
eliheuer Apr 16, 2026
96330d5
feat(bento): Phase 2a — per-input cells with uniform width
eliheuer Apr 14, 2026
0d31e3b
feat(bento): Phase 2b — per-output cells + design tokens
eliheuer Apr 14, 2026
43302f8
feat(app-mode): semi-customizable floating panels MVP (Phase 4)
eliheuer Apr 16, 2026
7da9659
style(app-mode): Phase 4 polish — typography, spacing, panel chrome
eliheuer Apr 16, 2026
451752b
refactor(app-mode): rename bento/ -> layout/
eliheuer Apr 16, 2026
1d16073
feat(app-mode): welcome screen — wordmark, copy, Run pill
eliheuer Apr 16, 2026
dde524f
feat(app-mode): unified chrome — shared sidebar + panel-matched cells
eliheuer Apr 16, 2026
8f8aa62
style(app-mode): flush left-dock + surface Run errors as toast
eliheuer Apr 16, 2026
a4addaa
i18n(app-mode): route output-thumb alt + block-drag aria-label throug…
eliheuer Apr 16, 2026
e28af8c
feat(app-builder): WYSIWYG floating panel shared with App Mode
eliheuer Apr 17, 2026
d9ae0dd
feat(app-mode): hoist Run cluster out of panel + mirror welcome copy
eliheuer Apr 17, 2026
c9b8e53
Merge branch 'main' into app-mode-semi-customizable-layout
DrJKL Apr 21, 2026
299292a
refactor(app-mode): address PR review feedback
eliheuer Apr 22, 2026
d436f54
fix(app-mode): second-round CodeRabbit feedback
eliheuer Apr 22, 2026
385b611
fix(app-mode): third-round CodeRabbit feedback
eliheuer Apr 22, 2026
9657403
Merge branch 'main' into app-mode-semi-customizable-layout
eliheuer Apr 22, 2026
3361a66
refactor(app-mode): unify App Mode and Builder chrome + panel
eliheuer Apr 23, 2026
3b70a54
refactor(app-mode): one grid system — fixed-gutter flex zones
eliheuer Apr 23, 2026
551a702
polish(app-builder): grid-aligned chrome bars + unified blue / orange…
eliheuer Apr 23, 2026
76dc717
polish(app-builder): highlight selectable widgets in builder:inputs
eliheuer Apr 23, 2026
550d855
polish(app-builder): output-selection parity + footer cleanup
eliheuer Apr 23, 2026
9adcea8
polish(app-mode): go/stop semantic cluster + run progress bar
eliheuer Apr 23, 2026
916ad31
refactor(app-mode): route go/stop colors through local CSS vars
eliheuer Apr 23, 2026
d621c7d
chore(app-mode): pre-squash CR-pattern cleanup
eliheuer Apr 23, 2026
69e1bff
Merge remote-tracking branch 'upstream/main' into app-mode-semi-custo…
eliheuer Apr 23, 2026
82f1980
chore(app-mode): pre-squash cleanup from .agents/checks audit
eliheuer Apr 23, 2026
fd022de
refactor(app-mode): unify App Builder and App Mode into one WYSIWYG s…
eliheuer Apr 23, 2026
e8c7076
chore: drop unused type exports flagged by knip
eliheuer Apr 23, 2026
38b197c
polish(app-mode): pre-draft-flip panel UX pass
eliheuer Apr 23, 2026
adc1db4
chore(app-mode): pre-review code-quality cleanup pass
eliheuer Apr 24, 2026
fbddb28
Merge remote-tracking branch 'upstream/main' into app-mode-semi-custo…
eliheuer Apr 24, 2026
d1f29f0
polish(app-mode): workspace pan/zoom + nav cluster + welcome touch-up
eliheuer Apr 24, 2026
32ab581
polish(app-mode): panel-block reorder — architecture + visuals
eliheuer Apr 24, 2026
583ba29
polish(app-mode): phase-3 drag demo + accent sweep
eliheuer Apr 26, 2026
0628acf
feat(app-mode): output preview as a movable window
eliheuer Apr 26, 2026
7c0d078
feat(app-mode): migrate run chrome into OutputWindow
eliheuer Apr 26, 2026
ccf166d
chore(app-mode): drop dead Interrupt/Progress cells
eliheuer Apr 26, 2026
4083442
feat(app-mode): multi-window output workspace (scaffolding)
eliheuer Apr 26, 2026
f067835
refactor(app-mode): drop the thumbnail history strip
eliheuer Apr 27, 2026
fc8e2f3
feat(app-mode): multi-window polish — asset resolution + close + clea…
eliheuer Apr 27, 2026
09d6ff6
polish(app-mode): UI pass — panel/window chrome, widget outlines, aut…
eliheuer Apr 27, 2026
8f3b9be
polish(app-mode): output overlay + widget chrome refinements
eliheuer Apr 27, 2026
d2e637b
polish(app-mode): floating-panel layout fixes + pre-review cleanup
eliheuer Apr 27, 2026
98f57a9
polish(app-mode): pan reliability + drag perf + dot-grid polish
eliheuer Apr 27, 2026
8c3fb37
polish(app-mode): address outstanding review nits
eliheuer Apr 27, 2026
a4128c8
docs(app-mode): defer agent design-system discoverability work
eliheuer Apr 27, 2026
ea0601a
chore(app-mode): comment trim pass for review (-343 lines)
eliheuer Apr 27, 2026
201fc1e
polish(app-mode): progress bar tracks sampler + window snap during drag
eliheuer Apr 27, 2026
bd4f9ef
chore(app-mode): trim small net-new files (-82 lines)
eliheuer Apr 27, 2026
17ecf38
refactor(app-mode): extract shared PanelHeader component
eliheuer Apr 27, 2026
895c0c1
refactor(app-mode): extract usePointerDrag base hook
eliheuer Apr 28, 2026
56bbd35
chore(app-mode): trim PR-added comments in modified files (-15 lines)
eliheuer Apr 28, 2026
d8355f4
chore(app-mode): drop remaining `!` Tailwind in chrome cells
eliheuer Apr 28, 2026
543f4b3
chore(app-mode): address CR review nits (batch 1/3)
eliheuer Apr 28, 2026
75b77b0
chore(app-mode): address CR review minors (batch 2/3)
eliheuer Apr 28, 2026
d676184
fix(app-mode): address CR review majors (batch 3/3)
eliheuer Apr 28, 2026
ed93de5
docs(app-mode): drop stale check count in discoverability note
eliheuer Apr 28, 2026
36c23a6
test(app-mode): fix LinearWelcome tests broken by run-pill addition
eliheuer Apr 28, 2026
ff60b57
polish(builder): step badges + Preview-step layout
eliheuer Apr 28, 2026
1289e61
refactor(app-mode): drop temp accent/active tokens for design-system
eliheuer Apr 28, 2026
d4dc570
refactor(builder): unify selection chrome, drop zoom-dependent sizing
eliheuer Apr 28, 2026
f6a29be
refactor(design-system): fold layout tokens into style.css
eliheuer Apr 28, 2026
c497c8c
refactor(design-system): consolidate App Mode tokens, drop README
eliheuer Apr 28, 2026
90f140b
chore(app-mode): trim noisy comments across new files
eliheuer Apr 28, 2026
563742f
feat(app-mode): resize OutputWindow, smooth fly-to, grid-edge spawn
eliheuer Apr 29, 2026
1d16598
feat(app-mode): align panel widgets + metadata-driven subtitle
eliheuer Apr 29, 2026
61ff478
refactor(app-mode): extract FLIP composable, persist panel layout
eliheuer Apr 29, 2026
d434a0d
chore(app-mode): comment sweep + LinearArrange refactor
eliheuer Apr 29, 2026
91bd183
refactor(app-mode): center welcome card; drop side-flip machinery
eliheuer Apr 29, 2026
b007a55
fix(app-mode): drop double focus-ring on widget pills
eliheuer Apr 29, 2026
676a443
Merge branch 'main' into app-mode-semi-customizable-layout
DrJKL Apr 29, 2026
13b3e09
feat(app-mode): no-zoom dashboard mode with adaptive bento layout
eliheuer Apr 30, 2026
6f91765
feat(app-mode): add slicing-tree bento candidate
eliheuer Apr 30, 2026
2a21d12
fix(app-mode): snap dashboard tiles to chrome cell grid
eliheuer Apr 30, 2026
c274133
feat(app-mode): fill canvas via slicing-tree + stretch + cover-fit
eliheuer Apr 30, 2026
0d18fe0
feat(app-mode): asymmetric bento stretch — newest tile uncropped
eliheuer May 1, 2026
8f00acb
feat(app-mode): cap dashboard at 9 tiles, full slicing-tree always
eliheuer May 1, 2026
5edcdf8
fix(app-mode): drop the 8px body padding around output images
eliheuer May 1, 2026
274d32c
fix(app-mode): N=1 stays uncropped, anchored opposite the panel
eliheuer May 1, 2026
152653a
refactor(app-mode): rebuild dashboard layout for visual fidelity
eliheuer May 1, 2026
1f0cfea
feat(app-mode): bento templates fill avail rect, hide header on small…
eliheuer May 1, 2026
de52814
refactor(app-mode): clean up output header chrome + fix panel-drag fr…
eliheuer May 1, 2026
4754980
style(app-mode): match input-cell label/subtitle type, breathe out te…
eliheuer May 1, 2026
681a959
feat(app-mode): theme toggle, zoom-mode parity, gradient skeletons
eliheuer May 2, 2026
989754e
Merge remote-tracking branch 'upstream/main' into app-mode-semi-custo…
eliheuer May 6, 2026
4fb60b8
refactor(app-mode): use palette tokens instead of local --app-mode-* …
eliheuer May 6, 2026
2746856
refactor(app-mode): tighten design-system conformance
eliheuer May 6, 2026
9c171c1
refactor(app-mode): conformance pass per AGENTS.md
eliheuer May 6, 2026
055e46e
refactor(app-mode): minor cleanups from deep audit
eliheuer May 7, 2026
2640d09
lint(autofix): tailwind class order in files using foreground tokens
eliheuer May 7, 2026
c6cf567
test(app-mode): include layout.panelRows in linearData expectations
eliheuer May 7, 2026
fd75632
test(app-mode): unit coverage for new store math
eliheuer May 7, 2026
1acdb42
refactor(app-mode): scope foreground tokens to App Mode via arbitrary…
eliheuer May 7, 2026
a4d4145
Revert "lint(autofix): tailwind class order in files using foreground…
eliheuer May 7, 2026
1a7300b
lint(autofix): canonical class names in pre-existing files
eliheuer May 7, 2026
7e5a95a
fix(app-mode): evict by createdSeq, not mutable zIndex
eliheuer May 7, 2026
6b9dfe8
fix(test): pass ComfyPage to reSaveAs instead of dereferencing Locator
eliheuer May 7, 2026
f357c57
fix(app-mode): spread graphNodes shallowRef on every assignment
eliheuer May 7, 2026
c668618
fix(app-mode): disable manual drag/resize on output windows in noZoom…
eliheuer May 7, 2026
4c140cb
fix(app-mode): don't silently rerun current graph when output has no …
eliheuer May 7, 2026
1a1025b
fix(app-mode): scope wheel-zoom to the workspace, leave panel scroll …
eliheuer May 7, 2026
c48d731
fix(app-mode): keep full-viewport backdrop hit-testable for pan/zoom
eliheuer May 7, 2026
5a31405
fix(app-mode): address 5 minor CodeRabbit findings
eliheuer May 7, 2026
2f7e90a
fix(app-mode): address 5 load-bearing CodeRabbit findings (round 2)
eliheuer May 8, 2026
7a5e375
docs(adr): add 0009 App Mode + Builder unification; format pass
eliheuer May 9, 2026
c997195
fix(app-mode): address round-3 CodeRabbit findings (5 follow-ons + 4 …
eliheuer May 9, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/assets/css/style.css
Comment thread
eliheuer marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,4 +1,39 @@
@import '@comfyorg/design-system/css/style.css';
@import '../../components/appMode/layout/design-tokens.css';

/* Panel chrome — surface treatment shared by FloatingPanel and the App
Builder toolbars so both read as the same floating surface. Matches
FloatingPanel's scoped values; intentional duplication kept in sync
via `--layout-color-cell-fill` + motion tokens above. */
.panel-chrome {
background-color: var(--layout-color-cell-fill);
border: 1px solid rgb(255 255 255 / 0.08);
border-radius: 10px;
box-shadow:
0 2px 4px rgb(0 0 0 / 0.4),
0 16px 48px rgb(0 0 0 / 0.45);
backdrop-filter: blur(8px);
}

/* Widget inputs inside floating panels read as recessed into the panel
surface, not popping out of it. Uses --layout-color-canvas (the same
dark the output-canvas background uses) so widgets + canvas share a
visual "depth layer" distinct from the panel chrome. Applies to both
App Mode (LayoutView → PanelBlockList → InputCell) and App Builder
(BuilderPanel → AppModeWidgetList) without either component opting
in — keeps the two surfaces WYSIWYG-coherent by default. */
.floating-panel textarea,
.floating-panel input {
background-color: var(--layout-color-canvas);
}
/* ScrubableNumberInput and other widget containers use the
component-node-widget-background token for their shell. Override
inside a panel so the ± buttons, center value, and container share
one continuous canvas-dark pill instead of a darker center bounded
by a lighter button strip. */
.floating-panel .bg-component-node-widget-background {
background-color: var(--layout-color-canvas);
}

/* Use 0.001ms instead of 0s so transitionend/animationend events still fire
and JS listeners aren't broken. */
Expand Down
7 changes: 4 additions & 3 deletions src/components/LiteGraphCanvasSplitterOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,10 @@ const { isSelectMode, isBuilderMode } = useAppMode()
const { activeSidebarTabId, activeSidebarTab } = storeToRefs(sidebarTabStore)
const { bottomPanelVisible } = storeToRefs(useBottomPanelStore())
const { isOpen: rightSidePanelVisible } = storeToRefs(rightSidePanelStore)
const showOffsideSplitter = computed(
() => rightSidePanelVisible.value || isSelectMode.value
)
/* Builder panel is now a FloatingPanel overlay (BuilderPanel.vue); it does
* not live in the splitter's offside slot anymore, so the splitter only
* force-opens when the graph-mode node-properties panel is visible. */
const showOffsideSplitter = computed(() => rightSidePanelVisible.value)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

const sidebarPanelVisible = computed(
() => activeSidebarTab.value !== null && !isBuilderMode.value
Expand Down
207 changes: 207 additions & 0 deletions src/components/appMode/layout/LayoutGrid.vue
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a really nice setup, love it!

Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
<script setup lang="ts">
/**
* LayoutGrid — grid layout primitive for App Mode.
*
* Renders cells on a 12-column responsive grid where 1×1 cells are square
* (row height = column width). Empty cells are invisible at runtime; only
* cells with content render as visible containers.
*
* Cells snap to integer column/row positions and integer span values.
*/
import { computed, useTemplateRef } from 'vue'
import { useElementSize } from '@vueuse/core'

export interface LayoutCellPlacement {
/** Stable identifier for the cell. */
id: string
/** 1-indexed grid column. */
col: number
/** 1-indexed grid row. */
row: number
/** Number of columns the cell spans. Default 1. */
colSpan?: number
/** Number of rows the cell spans. Default 1. */
rowSpan?: number
/** Optional semantic kind, surfaced as a data attribute for testing. */
kind?: string
}

const props = withDefaults(
defineProps<{
/** 1×1 cell side length (px). Fixed — cells never resize. */
cellSize?: number
/** Cell placements. Each cell's <slot> name is its id.
* col/row accept negative values as CSS Grid end-anchored indices
* (-1 = last track, -2 = second-to-last, etc.). */
cells: LayoutCellPlacement[]
/** Outer margin around the grid (px). Fixed — stays consistent at every viewport. */
outerPadding?: number
/** Minimum gap between cells (px). Actual gap grows from this floor
* to absorb whatever slack the viewport has — so cells stay aligned
* to the outer margin on all sides. */
minGap?: number
/** Prototype-only: render a ghost cell at every unoccupied grid
* position so the whole grid is visible. Remove when real
* content populates the canvas. */
fillEmpty?: boolean
}>(),
{
cellSize: 48,
outerPadding: 16,
minGap: 8,
fillEmpty: false
}
)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

const gridEl = useTemplateRef<HTMLElement>('gridEl')
const { width, height } = useElementSize(gridEl)

// useElementSize defaults to 'content-box' measurement — the reported
// width/height already exclude the element's padding. So `available`
// IS the usable track area; no further subtraction.

// Max track count that fits given min gap (tightest packing).
const trackCount = (available: number) => {
if (available < props.cellSize) return 1
// N * cellSize + (N - 1) * minGap <= available
return Math.max(
1,
Math.floor((available + props.minGap) / (props.cellSize + props.minGap))
)
}

// Actual gap distributes remaining slack evenly between tracks so the
// grid snaps to the outer margin on all sides — no slack piles up at
// the bottom or right edge.
const axisGap = (available: number, trackN: number) => {
if (trackN <= 1) return props.minGap
const cellsTotal = trackN * props.cellSize
return (available - cellsTotal) / (trackN - 1)
}

const cols = computed(() => trackCount(width.value))
const rows = computed(() => trackCount(height.value))
const columnGap = computed(() => axisGap(width.value, cols.value))
const rowGap = computed(() => axisGap(height.value, rows.value))

const gridStyle = computed(() => ({
padding: `${props.outerPadding}px`,
columnGap: `${columnGap.value}px`,
rowGap: `${rowGap.value}px`,
gridTemplateColumns: `repeat(${cols.value}, ${props.cellSize}px)`,
gridTemplateRows: `repeat(${rows.value}, ${props.cellSize}px)`
}))

// Resolve negative CSS Grid indices (-1, -2, ...) to 1-indexed positions
// based on the current track count. CSS line -k = line (N + 2 - k) for
// N tracks, so the track starting at that line has number (N + 2 - k).
function resolvePos(v: number, total: number): number {
if (v > 0) return v
return total + 2 + v
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

// Ghost cells fill every unoccupied grid position — prototype visual
// so the full grid structure is visible before real content lands.
const ghostCells = computed<LayoutCellPlacement[]>(() => {
if (!props.fillEmpty || cols.value < 1 || rows.value < 1) return []

const occupied = new Set<string>()
for (const cell of props.cells) {
const c0 = resolvePos(cell.col, cols.value)
const r0 = resolvePos(cell.row, rows.value)
const cSpan = cell.colSpan ?? 1
const rSpan = cell.rowSpan ?? 1
for (let r = r0; r < r0 + rSpan; r++) {
for (let c = c0; c < c0 + cSpan; c++) {
occupied.add(`${c},${r}`)
}
}
}

const ghosts: LayoutCellPlacement[] = []
for (let r = 1; r <= rows.value; r++) {
for (let c = 1; c <= cols.value; c++) {
if (!occupied.has(`${c},${r}`)) {
ghosts.push({ id: `__ghost-${c}-${r}`, col: c, row: r, kind: 'ghost' })
}
}
}
return ghosts
})

function cellStyle(cell: LayoutCellPlacement) {
const colSpan = cell.colSpan ?? 1
const rowSpan = cell.rowSpan ?? 1
return {
gridColumn: `${cell.col} / span ${colSpan}`,
gridRow: `${cell.row} / span ${rowSpan}`
}
}
</script>

<template>
<div
ref="gridEl"
class="layout-grid"
:style="gridStyle"
data-testid="layout-grid"
>
<!-- Ghost cells (fillEmpty=true) render beneath real cells, showing
the grid structure. aria-hidden so they don't pollute the a11y tree. -->
<div
v-for="ghost in ghostCells"
:key="ghost.id"
class="layout-cell layout-cell--ghost"
:style="cellStyle(ghost)"
aria-hidden="true"
:data-cell-id="ghost.id"
/>
<div
v-for="cell in cells"
:key="cell.id"
class="layout-cell"
:style="cellStyle(cell)"
:data-cell-id="cell.id"
:data-cell-kind="cell.kind"
>
<slot :name="cell.id" :cell="cell" />
</div>
</div>
</template>

<style scoped>
.layout-grid {
/* Absolute fill eliminates width/height-inheritance ambiguity through
nested Vue components. Parent must be position: relative (or absolute). */
position: absolute;
inset: 0;
display: grid;
box-sizing: border-box;
background-color: var(--layout-color-canvas);
overflow: hidden;
}

.layout-cell {
/* Subtle dark-on-darker fill matches mockup. Cells with no slot content
stay empty (no background) so the canvas reads as composed, not gridded. */
display: flex;
min-width: 0;
min-height: 0;
}

/* Real cells with rendered slot content get the subtle fill.
Truly empty cells (no slot content) have no children → no background,
keeping the runtime canvas composed rather than gridded. */
.layout-cell:has(> *) {
background-color: var(--layout-color-cell-fill);
border-radius: var(--layout-cell-radius);
}

/* Ghost cells (fillEmpty prototype) always show the fill so the
grid structure is visible regardless of slot content. */
.layout-cell--ghost {
background-color: var(--layout-color-cell-fill);
border-radius: var(--layout-cell-radius);
opacity: 0.6;
}
</style>
Loading
Loading