mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-09 15:10:17 +00:00
## Summary Remove Tailwind `@apply` from Vue styles across `src/` and `apps/desktop-ui/src/` to align with Tailwind v4 guidance, replacing usages with template utilities or native CSS while preserving behavior. ## Changes - **What**: - Batch 1: migrated low-risk template/style utility bundles out of `@apply`. - Batch 2: converted PrimeVue/`:deep()` override `@apply` blocks to native CSS declarations. - Batch 3: converted `src/components/node/NodeHelpContent.vue` markdown styling from `@apply` to native CSS/token-based declarations. - Batch 4: converted final desktop pseudo-element `@apply` styles and removed stale `@reference` directives no longer required. - Verified `rg -n "^\s*@apply\b" src apps -g "*.vue"` has no real CSS `@apply` directives remaining (only known template false-positive event binding in `NodeSearchContent.vue`). ## Review Focus - Visual parity in components that previously depended on `@apply` in `:deep()` selectors and markdown content: - topbar tabs/popovers, dialogs, breadcrumb, terminal overrides - desktop install/dialog/update/maintenance surfaces - node help markdown rendering - Confirm no regressions from removal of now-unneeded `@reference` directives. ## Screenshots (if applicable) - No new screenshots included in this PR. - Screenshot Playwright suite was run with `--grep="@screenshot"` and reports baseline diffs in this environment (164 passed, 39 failed, 3 skipped) plus a teardown `EPERM` restore error on local path `C:\Users\DrJKL\ComfyUI\LTXV\user`. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9146-fix-eradicate-tailwind-apply-usage-in-vue-styles-3116d73d3650813d8642e0bada13df32) by [Unito](https://www.unito.io) --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
135 lines
3.7 KiB
Vue
135 lines
3.7 KiB
Vue
<!-- A generalized form item for rendering in a form. -->
|
|
<template>
|
|
<div class="flex flex-row items-center gap-2">
|
|
<div class="form-label flex grow items-center">
|
|
<span
|
|
:id="`${props.id}-label`"
|
|
class="text-muted"
|
|
:class="props.labelClass"
|
|
>
|
|
<slot name="name-prefix" />
|
|
{{ props.item.name }}
|
|
<i
|
|
v-if="props.item.tooltip"
|
|
v-tooltip="props.item.tooltip"
|
|
class="pi pi-info-circle bg-transparent"
|
|
/>
|
|
<slot name="name-suffix" />
|
|
</span>
|
|
</div>
|
|
<div class="form-input flex justify-end">
|
|
<component
|
|
:is="markRaw(getFormComponent(props.item))"
|
|
:id="props.id"
|
|
v-model:model-value="formValue"
|
|
:aria-labelledby="`${props.id}-label`"
|
|
v-bind="getFormAttrs(props.item)"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import InputNumber from 'primevue/inputnumber'
|
|
import InputText from 'primevue/inputtext'
|
|
import Select from 'primevue/select'
|
|
import ToggleSwitch from 'primevue/toggleswitch'
|
|
import { markRaw } from 'vue'
|
|
import type { Component } from 'vue'
|
|
|
|
import BackgroundImageUpload from '@/components/common/BackgroundImageUpload.vue'
|
|
import CustomFormValue from '@/components/common/CustomFormValue.vue'
|
|
import FormColorPicker from '@/components/common/FormColorPicker.vue'
|
|
import FormImageUpload from '@/components/common/FormImageUpload.vue'
|
|
import FormRadioGroup from '@/components/common/FormRadioGroup.vue'
|
|
import InputKnob from '@/components/common/InputKnob.vue'
|
|
import InputSlider from '@/components/common/InputSlider.vue'
|
|
import UrlInput from '@/components/common/UrlInput.vue'
|
|
import type { FormItem } from '@/platform/settings/types'
|
|
|
|
const formValue = defineModel<unknown>('formValue')
|
|
const props = defineProps<{
|
|
item: FormItem
|
|
id?: string
|
|
labelClass?: string | Record<string, boolean>
|
|
}>()
|
|
|
|
function getFormAttrs(item: FormItem) {
|
|
const attrs = { ...(item.attrs || {}) }
|
|
const inputType = item.type
|
|
if (typeof inputType === 'function') {
|
|
attrs['renderFunction'] = () =>
|
|
inputType(
|
|
props.item.name,
|
|
(v: unknown) => (formValue.value = v),
|
|
formValue.value,
|
|
item.attrs
|
|
)
|
|
}
|
|
switch (item.type) {
|
|
case 'combo':
|
|
case 'radio':
|
|
attrs['options'] =
|
|
typeof item.options === 'function'
|
|
? // @ts-expect-error: Audit and deprecate usage of legacy options type:
|
|
// (value) => [string | {text: string, value: string}]
|
|
item.options(formValue.value)
|
|
: item.options
|
|
|
|
if (typeof item.options?.[0] !== 'string') {
|
|
attrs['optionLabel'] = 'text'
|
|
attrs['optionValue'] = 'value'
|
|
}
|
|
break
|
|
}
|
|
return attrs
|
|
}
|
|
|
|
function getFormComponent(item: FormItem): Component {
|
|
if (typeof item.type === 'function') {
|
|
return CustomFormValue
|
|
}
|
|
switch (item.type) {
|
|
case 'boolean':
|
|
return ToggleSwitch
|
|
case 'number':
|
|
return InputNumber
|
|
case 'slider':
|
|
return InputSlider
|
|
case 'knob':
|
|
return InputKnob
|
|
case 'combo':
|
|
return Select
|
|
case 'radio':
|
|
return FormRadioGroup
|
|
case 'image':
|
|
return FormImageUpload
|
|
case 'color':
|
|
return FormColorPicker
|
|
case 'url':
|
|
return UrlInput
|
|
case 'backgroundImage':
|
|
return BackgroundImageUpload
|
|
default:
|
|
return InputText
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<style scoped>
|
|
.form-input :deep(.input-slider) .p-inputnumber input,
|
|
.form-input :deep(.input-slider) .slider-part {
|
|
width: 5rem;
|
|
}
|
|
|
|
.form-input :deep(.input-knob) .p-inputnumber input,
|
|
.form-input :deep(.input-knob) .knob-part {
|
|
width: 8rem;
|
|
}
|
|
|
|
.form-input :deep(.p-inputtext),
|
|
.form-input :deep(.p-select) {
|
|
width: 11rem;
|
|
}
|
|
</style>
|