Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0a23f21
refactor: default Iconify icons to size-4
DrJKL Oct 25, 2026
ee5c6eb
fix: preserve intentional icon sizing exceptions
DrJKL Oct 26, 2026
78e50c4
refactor: normalize icon sizing exceptions
DrJKL Oct 26, 2026
42add94
[automated] Update screenshot expectations
invalid-email-address Oct 26, 2026
140eddc
refactor: normalize icon elements and prevent icon shrinking
DrJKL Oct 27, 2026
247082c
[automated] Update screenshot expectations
invalid-email-address Oct 27, 2026
90b4b25
test: fix agent icon selectors
DrJKL Oct 27, 2026
2e56c24
lint: require Iconify classes on i elements
DrJKL Oct 27, 2026
e674e82
fix: preserve category spacing and verify icon overrides
DrJKL Oct 27, 2026
fc96d72
fix: distinguish icon classes from comparison operands and other bind…
DrJKL Oct 27, 2026
bf82d38
fix: let selection toolbox icons use shared sizing
DrJKL Oct 27, 2026
4976dd2
fix: remove redundant icon layout declarations
DrJKL Oct 27, 2026
edf9daf
fix: keep credit badge icons square
DrJKL Oct 27, 2026
e128c87
[automated] Update screenshot expectations
invalid-email-address Oct 27, 2026
0e55d7a
Merge main into fix/default-icon-size
DrJKL Oct 27, 2026
1a713a5
[automated] Update screenshot expectations
invalid-email-address Oct 27, 2026
b844516
fix: reject redundant default icon utilities
DrJKL Oct 27, 2026
3db486c
Merge branch 'main' into fix/default-icon-size
DrJKL Oct 27, 2026
d53ede5
[automated] Update screenshot expectations
invalid-email-address Oct 27, 2026
0faacd7
fix: use shorthand bindings for top-up amount fields
DrJKL Oct 27, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 1 addition & 6 deletions apps/billing-web/src/components/auth/SignInEmailForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,7 @@ function submit(): void {
@click="revealed = !revealed"
>
<i
:class="
cn(
'size-4',
revealed ? 'icon-[lucide--eye-off]' : 'icon-[lucide--eye]'
)
"
:class="revealed ? 'icon-[lucide--eye-off]' : 'icon-[lucide--eye]'"
aria-hidden="true"
/>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const { t } = useI18n()
>
<template v-if="offer === 'canceling'">
<i
class="icon-[lucide--loader-circle] size-4 motion-safe:animate-spin"
class="icon-[lucide--loader-circle] motion-safe:animate-spin"
aria-hidden="true"
/>
{{ t('checkout.fullPage.phase.canceling') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ function act() {
<dd class="m-0 flex items-center gap-1.5 text-foreground tabular-nums">
<i
v-if="row.kind === 'added'"
class="icon-[lucide--coins] size-4 shrink-0"
class="icon-[lucide--coins]"
aria-hidden="true"
data-testid="checkout-ending-credits-icon"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const PRIMARY_BUTTON =
>
<i
v-if="loading"
class="icon-[lucide--loader-circle] size-4 motion-safe:animate-spin"
class="icon-[lucide--loader-circle] motion-safe:animate-spin"
aria-hidden="true"
/>
<span :class="cn(loading && 'sr-only')">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const SKELETON_BAR = 'block rounded-full bg-muted motion-safe:animate-pulse'
class="absolute -left-10 flex size-8 cursor-pointer items-center justify-center rounded-lg text-muted-foreground hover:bg-secondary hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none max-lg:static max-lg:mr-2 max-lg:size-10"
@click="emit('back')"
>
<i class="icon-[lucide--arrow-left] size-4" aria-hidden="true" />
<i class="icon-[lucide--arrow-left]" aria-hidden="true" />
</button>
<span
v-else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { useClipboard } from '@vueuse/core'
import { computed } from 'vue'
import { useI18n } from 'vue-i18n'

import { cn } from '@comfyorg/tailwind-utils'

const { label, code } = defineProps<{
label: string
code: string
Expand Down Expand Up @@ -40,12 +38,7 @@ const segments = computed(() => code.split(/(?<=[_-])/))
@click="copy(code)"
>
<i
:class="
cn(
'size-4',
copied ? 'icon-[lucide--check]' : 'icon-[lucide--copy]'
)
"
:class="copied ? 'icon-[lucide--check]' : 'icon-[lucide--copy]'"
aria-hidden="true"
/>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const credits = (count: number) =>
v-if="creditsAdded !== undefined"
class="m-0 flex items-center gap-1.5 text-sm text-muted-foreground"
>
<i class="icon-[lucide--coins] size-4 shrink-0" aria-hidden="true" />
<i class="icon-[lucide--coins]" aria-hidden="true" />
<span class="tabular-nums">
{{
t('checkout.fullPage.ending.receipt.creditsAddedLine', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ onMounted(() => {
class="flex flex-col gap-2 rounded-lg bg-muted p-4 text-sm/5 text-foreground focus-visible:outline-none"
>
<p class="m-0 flex items-center gap-2 font-medium">
<i
class="icon-[lucide--circle-alert] size-4 shrink-0 text-warning"
aria-hidden="true"
/>
<i class="icon-[lucide--circle-alert] text-warning" aria-hidden="true" />
{{ t(`checkout.fullPage.outcome.${outcome.kind}.title`) }}
</p>
<p class="m-0 text-muted-foreground">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ watch(
<p
class="m-0 flex items-center gap-2 text-sm/5 font-medium text-foreground"
>
<i
class="icon-[lucide--circle-alert] size-4 shrink-0 text-warning"
aria-hidden="true"
/>
<i class="icon-[lucide--circle-alert] text-warning" aria-hidden="true" />
{{ consent.copy.title }}
</p>
<p class="m-0 text-sm/5 text-muted-foreground">{{ consent.copy.body }}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const { t } = useI18n()
>
<p class="m-0 flex items-center gap-2 font-medium text-foreground">
<i
class="icon-[lucide--circle-alert] size-4 shrink-0 text-warning"
class="icon-[lucide--circle-alert] text-warning"
aria-hidden="true"
/>
{{ t(`checkout.fullPage.railFailed.${rail}.title`) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const TABS = [
"
@click="emit('select', tab)"
>
<i :class="cn(icon, 'size-4 shrink-0')" aria-hidden="true" />
<i :class="icon" aria-hidden="true" />
{{ t(`checkout.fullPage.tabs.${tab}`) }}
</button>
</div>
Expand Down
15 changes: 5 additions & 10 deletions apps/billing-web/src/components/fullPage/SavedMethodSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function partsOf(method: SavedPaymentMethod) {
class="m-0 flex h-10 w-full items-center gap-3 rounded-lg bg-background px-4 text-sm"
>
<i
:class="cn(partsOf(chosen).icon, 'size-4 shrink-0 text-muted-foreground')"
:class="cn(partsOf(chosen).icon, 'text-muted-foreground')"
aria-hidden="true"
/>
<span class="text-foreground capitalize">
Expand All @@ -83,9 +83,7 @@ function partsOf(method: SavedPaymentMethod) {
>
<template v-if="chosen">
<i
:class="
cn(partsOf(chosen).icon, 'size-4 shrink-0 text-muted-foreground')
"
:class="cn(partsOf(chosen).icon, 'text-muted-foreground')"
aria-hidden="true"
/>
<span class="text-foreground capitalize">
Expand All @@ -99,7 +97,7 @@ function partsOf(method: SavedPaymentMethod) {
</span>
</template>
<i
class="ml-auto icon-[lucide--chevron-down] size-4 shrink-0 text-muted-foreground"
class="ml-auto icon-[lucide--chevron-down] text-muted-foreground"
aria-hidden="true"
/>
</SelectTrigger>
Expand All @@ -120,10 +118,7 @@ function partsOf(method: SavedPaymentMethod) {
:class="selectItemVariants({ layout: 'single' })"
>
<SelectItemText class="flex items-center gap-3">
<i
:class="cn(partsOf(method).icon, 'size-4 shrink-0')"
aria-hidden="true"
/>
<i :class="partsOf(method).icon" aria-hidden="true" />
<span class="capitalize">{{ partsOf(method).name }}</span>
<span
v-if="partsOf(method).detail"
Expand All @@ -133,7 +128,7 @@ function partsOf(method: SavedPaymentMethod) {
</span>
</SelectItemText>
<SelectItemIndicator class="flex shrink-0 items-center">
<i class="icon-[lucide--check] size-4" aria-hidden="true" />
<i class="icon-[lucide--check]" aria-hidden="true" />
</SelectItemIndicator>
</SelectItem>
</SelectViewport>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const { t } = useI18n()
>
<i
v-if="ledger.headline.icon"
class="icon-[lucide--coins] size-5 shrink-0 self-center text-muted-foreground"
class="icon-[lucide--coins] size-5 self-center text-muted-foreground"
aria-hidden="true"
/>
{{ ledger.headline.amount }}
Expand All @@ -29,7 +29,7 @@ const { t } = useI18n()
</span>
</p>
<p v-if="ledger.credits" class="m-0 flex items-start gap-1.5 text-base">
<i class="mt-1 icon-[lucide--coins] size-4 shrink-0" aria-hidden="true" />
<i class="mt-1 icon-[lucide--coins]" aria-hidden="true" />
<span>
<span class="tabular-nums">{{ ledger.credits.count }}</span>
{{ ledger.credits.qualifier }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function edit(event: Event) {
class="flex size-8 cursor-pointer items-center justify-center rounded-lg hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-40 max-lg:size-10"
@click="emit('dismiss')"
>
<i class="icon-[lucide--x] size-4" aria-hidden="true" />
<i class="icon-[lucide--x]" aria-hidden="true" />
</button>
</div>
<p
Expand Down
4 changes: 1 addition & 3 deletions browser_tests/fixtures/agentConversationFixture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,6 @@ export class AgentConversationHarness {
)
.toBe(text)

// A finished turn folds its tool calls into one closed summary; the
// thinking rows it lists between them are not part of the recording.
const rows = expected.groups.flat()
await expect(this.summaries).toHaveCount(
before.summaries + (rows.length > 0 ? 1 : 0)
Expand All @@ -598,7 +596,7 @@ export class AgentConversationHarness {
for (const [at, row] of rows.entries()) {
const item = items.nth(at)
await expect(item.getByText(row.label, { exact: true })).toBeVisible()
const glyph = item.locator('span').first()
const glyph = item.locator('[class*="icon-["]')
if (row.failed) await expect(glyph).toHaveClass(FAILED_GLYPH)
else await expect(glyph).not.toHaveClass(FAILED_GLYPH)
if (row.count > 1) await expect(item).toContainText(`×${row.count}`)
Expand Down
2 changes: 1 addition & 1 deletion browser_tests/tests/agent/agentPanel.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => {
const longestItem = menu.getByRole('menuitem', {
name: enMessages.agent.addFromAssets
})
const icon = longestItem.locator('span').first()
const icon = longestItem.locator('[class*="icon-["]')
const label = longestItem.getByText(enMessages.agent.addFromAssets, {
exact: true
})
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions browser_tests/tests/designSystem/iconSizing.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import {
comfyExpect as expect,
comfyPageFixture as test
} from '@e2e/fixtures/ComfyPage'

test(
'Icon dimensions honor explicit utilities',
{ tag: '@ui' },
async ({ comfyPage }) => {
const sizes = await comfyPage.page.evaluate(() =>
['', 'size-3', 'size-6 shrink', 'w-8 h-5'].map((utilities) => {
const icon = document.createElement('i')
icon.className = `icon-[lucide--check] ${utilities}`
document.body.append(icon)
const style = getComputedStyle(icon)
const dimensions = [style.width, style.height, style.flexShrink]
icon.remove()
return dimensions
})
)

expect(sizes).toEqual([
['16px', '16px', '0'],
['12px', '12px', '0'],
['24px', '24px', '1'],
['32px', '20px', '0']
])
}
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks like there's an actual regression here, but from quick testing, I don't think it's caused by this PR. The dropdown arrow should have reduced visibility when no options exist.

Edit: From initial tests, it seems that this was never implemented.

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.

Not changed: the base version of WidgetSelectDefault already uses the same muted foreground for both disabled branches and does not dim the arrow when options are empty. This PR changes its dimensions, not that condition. I left the pre-existing empty-options behavior outside this sizing change.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions browser_tests/tests/nodeSearchBoxV2.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,26 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
})

test.describe('Category navigation', () => {
test('Leaf category labels align with expandable category labels', async ({
comfyPage
}) => {
const { searchBoxV2 } = comfyPage
await searchBoxV2.open()

const branch = searchBoxV2.categoryButton('model')
const leaf = searchBoxV2.categoryButton('logic')
await expect(branch).toHaveAttribute('aria-expanded', 'false')
await expect(leaf).not.toHaveAttribute('aria-expanded')
const branchLabel = await branch
.getByText('model', { exact: true })
.boundingBox()
const leafLabel = await leaf
.getByText('logic', { exact: true })
.boundingBox()
expect(branchLabel).not.toBeNull()
expect(leafLabel?.x).toBe(branchLabel?.x)
})

test('Bookmarked filter shows only bookmarked nodes', async ({
comfyPage
}) => {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions browser_tests/tests/selectionToolbox.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ test.describe('Selection Toolbox', { tag: ['@screenshot', '@ui'] }, () => {
test('color picker shows current color of selected nodes', async ({
comfyPage
}) => {
// Select multiple nodes
await comfyPage.nodeOps.selectNodes([
'KSampler',
'CLIP Text Encode (Prompt)'
Expand All @@ -193,17 +192,16 @@ test.describe('Selection Toolbox', { tag: ['@screenshot', '@ui'] }, () => {
const colorPickerButton = getColorPickerButton(comfyPage)
const colorPickerCurrentColor = getColorPickerCurrentColor(comfyPage)

// Initially should show default color
await expect(colorPickerButton).not.toHaveAttribute('color')
await expect(colorPickerCurrentColor).toHaveCSS('width', '16px')
await expect(colorPickerCurrentColor).toHaveCSS('height', '16px')

// Click color picker and select a color
await colorPickerButton.click()
const redColorOption = getColorPickerGroup(comfyPage).getByTestId(
TestIds.selectionToolbox.colorRed
)
await redColorOption.click()

// Button should now show the selected color
await expect(colorPickerCurrentColor).toHaveCSS('color', RED_COLOR)
})

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,13 @@ export default defineConfig([
// Difference in typecheck on CI vs Local
pluginVue.configs['flat/recommended'],
...tailwindConfigs,
{
files: ['**/*.vue'],
plugins: { 'template-classes': templateClasses },
rules: {
'template-classes/icon-element': 'error'
}
},
{
files: [
'src/**/*.vue',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
)
"
>
<i class="icon-[lucide--x] size-4" />
<i class="icon-[lucide--x]" />
</button>
</TagsInputItemDelete>
</TagsInputItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
>
<i
:class="
cn(
'size-4 shrink-0',
methods[0].type === 'alipay'
? 'icon-[lucide--wallet]'
: 'icon-[lucide--credit-card]'
)
methods[0].type === 'alipay'
? 'icon-[lucide--wallet]'
: 'icon-[lucide--credit-card]'
"
/>
<span class="text-sm text-foreground tabular-nums">
Expand Down Expand Up @@ -50,7 +47,6 @@ import { computed } from 'vue'

import type { SavedPaymentMethod } from '@comfyorg/account-core/billing'
import SingleSelect from '@comfyorg/design-system/single-select/SingleSelect'
import { cn } from '@comfyorg/tailwind-utils'

import CheckoutButton from './CheckoutButton.vue'
import type { CheckoutSavedMethodCopy } from './checkoutCopy'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{{ refillLabel }}
</span>
<div class="flex items-center gap-1">
<i class="icon-[lucide--coins] size-4 shrink-0 bg-credit" />
<i class="icon-[lucide--coins] bg-credit" />
<span class="font-bold text-foreground tabular-nums">
{{ refillCredits }}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</span>
</div>
<div class="flex items-center gap-1 text-muted-foreground">
<i class="icon-[lucide--coins] size-4 shrink-0 bg-credit" />
<i class="icon-[lucide--coins] bg-credit" />
<span class="tabular-nums">
{{ displayCredits }} {{ isYearly ? copy.perYear : copy.perMonth }}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="flex items-center justify-between">
<span class="text-foreground">{{ refillLabel }}</span>
<div class="flex items-center gap-1">
<i class="icon-[lucide--coins] size-4 shrink-0 bg-credit" />
<i class="icon-[lucide--coins] bg-credit" />
<span class="font-bold text-foreground tabular-nums">{{
refillCredits
}}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
class="flex items-start gap-3 rounded-xl bg-background/60 px-4 py-3 text-xs text-muted-foreground"
>
<i
class="mt-0.5 icon-[lucide--shield-check] size-4 shrink-0 text-(--success-foreground)"
class="mt-0.5 icon-[lucide--shield-check] text-(--success-foreground)"
/>
<p class="m-0">
{{ copy.alipayRenewalNote }}
Expand Down
Loading
Loading