Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(dify-ui): align invalid and disabled control styles (#43767)
yyhfddcb2525014
diff --git a/packages/dify-ui/docs/styling.md b/packages/dify-ui/docs/styling.mdindex a0db9db9253..9e704eb24ce 100644--- a/packages/dify-ui/docs/styling.md+++ b/packages/dify-ui/docs/styling.md@@ -6,6 +6,12 @@ Prefer the primitive's data attributes for state styling, such as `data-checked:`data-disabled:`. Use its CSS variables for exposed dynamic values, such as popup anchor widthand available height. Do not mirror primitive state in React solely to style it.+Field validity has three states: `data-valid`, `data-invalid`, or neither before validation.+`not-data-invalid` includes the unvalidated state; it is not equivalent to `data-valid`. Preserve+existing interaction variants when adding error styles so call-site overrides keep merging.+Disabled surfaces take precedence over invalid and read-only appearance. Keep invalid state and+error associations intact while limiting error colors to enabled controls.+Where supported by the upstream part, `className(state)` and `style(state)` read that part's state.At call sites, before using a callback or React state to calculate styles, check whether data attributes or CSSvariables already express the requirement. When direct state access is needed, add a short commentdiff --git a/packages/dify-ui/src/autocomplete/index.tsx b/packages/dify-ui/src/autocomplete/index.tsxindex dcddbf47527..1f35fe799b4 100644--- a/packages/dify-ui/src/autocomplete/index.tsx+++ b/packages/dify-ui/src/autocomplete/index.tsx@@ -123,7 +123,7 @@ const autocompleteInputVariants = cva('w-0 min-w-0 flex-1 appearance-none border-0 bg-transparent text-components-input-text-filled caret-primary-600 outline-hidden','placeholder:text-components-input-text-placeholder','disabled:cursor-not-allowed disabled:text-components-input-text-filled-disabled disabled:placeholder:text-components-input-text-disabled',- 'data-readonly:cursor-default',+ 'enabled:data-readonly:cursor-default',],{variants: {diff --git a/packages/dify-ui/src/combobox/index.stories.tsx b/packages/dify-ui/src/combobox/index.stories.tsxindex 2fb667f135b..8260eb6ade7 100644--- a/packages/dify-ui/src/combobox/index.stories.tsx+++ b/packages/dify-ui/src/combobox/index.stories.tsx@@ -774,6 +774,9 @@ export const InlineInPopover: Story = {await userEvent.click(canvas.getByRole('button', { name: 'Choose reviewer' }))const reopenedPopover = await body.findByRole('dialog', { name: 'Choose reviewer' })+ await waitFor(async () => {+ await expect(reopenedPopover).toBeVisible()+ })await expect(within(reopenedPopover).getByRole('combobox', { name: 'Search reviewers' }),).toHaveValue('')diff --git a/packages/dify-ui/src/combobox/index.tsx b/packages/dify-ui/src/combobox/index.tsxindex 319e905ef88..80e25b46982 100644--- a/packages/dify-ui/src/combobox/index.tsx+++ b/packages/dify-ui/src/combobox/index.tsx@@ -140,7 +140,7 @@ const comboboxInputVariants = cva('w-0 min-w-0 flex-1 appearance-none border-0 bg-transparent text-components-input-text-filled caret-primary-600 outline-hidden','placeholder:text-components-input-text-placeholder','disabled:cursor-not-allowed disabled:text-components-input-text-filled-disabled disabled:placeholder:text-components-input-text-disabled',- 'data-readonly:cursor-default',+ 'enabled:data-readonly:cursor-default',],{variants: {diff --git a/packages/dify-ui/src/date-time/internal/picker-parts.tsx b/packages/dify-ui/src/date-time/internal/picker-parts.tsxindex c31ca9eb39c..d860cc3b390 100644--- a/packages/dify-ui/src/date-time/internal/picker-parts.tsx+++ b/packages/dify-ui/src/date-time/internal/picker-parts.tsx@@ -282,7 +282,9 @@ function PickerTrigger({className={(state) =>cn('flex h-8 w-63 max-w-full items-center justify-between gap-0.5 rounded-lg bg-components-input-bg-normal ps-3 pe-2 text-start system-sm-regular text-components-input-text-filled',- 'hover:bg-state-base-hover-alt data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-popup-open:bg-state-base-hover-alt',+ 'hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt',+ 'aria-invalid:not-data-disabled:bg-components-input-bg-destructive aria-invalid:not-data-disabled:inset-ring-1 aria-invalid:not-data-disabled:inset-ring-components-input-border-destructive',+ 'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled',!field.serializedValue && 'text-text-tertiary in-data-[theme=dark]:text-text-secondary',resolveClassName(className, state),)diff --git a/packages/dify-ui/src/form-control-shared.ts b/packages/dify-ui/src/form-control-shared.tsindex 8eedfbda990..a0f40f04e4a 100644--- a/packages/dify-ui/src/form-control-shared.ts+++ b/packages/dify-ui/src/form-control-shared.ts@@ -16,7 +16,7 @@ export const textControlClassName = ['placeholder:text-components-input-text-placeholder','hover:border-components-input-border-hover hover:bg-components-input-bg-hover','focus:border-transparent focus:bg-components-input-bg-active focus:ring-2 focus:ring-state-accent-solid focus:transition-none',- 'data-invalid:border-components-input-border-destructive data-invalid:bg-components-input-bg-destructive',+ 'enabled:data-invalid:border-components-input-border-destructive enabled:data-invalid:bg-components-input-bg-destructive','read-only:cursor-default enabled:read-only:not-data-invalid:hover:border-transparent enabled:read-only:not-data-invalid:hover:bg-components-input-bg-normal enabled:read-only:not-data-invalid:focus:bg-components-input-bg-normal','disabled:cursor-not-allowed disabled:bg-components-input-bg-disabled disabled:text-components-input-text-filled-disabled','disabled:hover:border-transparent disabled:hover:bg-components-input-bg-disabled',@@ -29,10 +29,8 @@ export const textControlGroupClassName = ['flex w-full min-w-0 border border-transparent bg-components-input-bg-normal text-components-input-text-filled transition-[background-color,border-color]','hover:border-components-input-border-hover hover:bg-components-input-bg-hover','has-[input:focus]:border-transparent has-[input:focus]:bg-components-input-bg-active has-[input:focus]:ring-2 has-[input:focus]:ring-state-accent-solid has-[input:focus]:transition-none',- 'data-invalid:border-components-input-border-destructive data-invalid:bg-components-input-bg-destructive',- // The focus rule outranks a single data attribute, so an invalid group restates its colors while focused.- 'data-invalid:has-[input:focus]:border-components-input-border-destructive data-invalid:has-[input:focus]:bg-components-input-bg-destructive',- 'data-readonly:not-data-disabled:not-data-invalid:hover:border-transparent data-readonly:not-data-disabled:not-data-invalid:hover:bg-components-input-bg-normal data-readonly:not-data-invalid:has-[input:focus]:bg-components-input-bg-normal',+ 'data-invalid:not-data-disabled:border-components-input-border-destructive data-invalid:not-data-disabled:bg-components-input-bg-destructive',+ 'data-readonly:not-data-disabled:not-data-invalid:hover:border-transparent data-readonly:not-data-disabled:not-data-invalid:hover:bg-components-input-bg-normal data-readonly:not-data-disabled:not-data-invalid:has-[input:focus]:bg-components-input-bg-normal','data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled','data-disabled:hover:border-transparent data-disabled:hover:bg-components-input-bg-disabled','motion-reduce:transition-none',diff --git a/packages/dify-ui/src/input-group/index.tsx b/packages/dify-ui/src/input-group/index.tsxindex 695ae846134..20bbbb7aeed 100644--- a/packages/dify-ui/src/input-group/index.tsx+++ b/packages/dify-ui/src/input-group/index.tsx@@ -23,10 +23,10 @@ function InputGroup({ className, onMouseDown, ...props }: InputGroupProps) {'flex min-h-8 w-full min-w-0 items-center rounded-lg border border-transparent bg-components-input-bg-normal transition-[background-color,border-color]','has-[>input:enabled:not(:focus)]:not-has-[>input:is([readonly],[data-invalid])]:hover:border-components-input-border-hover has-[>input:enabled:not(:focus)]:not-has-[>input:is([readonly],[data-invalid])]:hover:bg-components-input-bg-hover','has-[>input:focus]:ring-2 has-[>input:focus]:ring-state-accent-solid has-[>input:focus]:transition-none has-[>input:focus]:not-has-[>input:is([readonly],[data-invalid])]:bg-components-input-bg-active',- 'has-[>input[data-invalid]]:border-components-input-border-destructive has-[>input[data-invalid]]:bg-components-input-bg-destructive',- 'has-[>input[data-disabled]]:cursor-not-allowed has-[>input[data-disabled]]:border-transparent has-[>input[data-disabled]]:bg-components-input-bg-disabled has-[>input[data-disabled]]:text-components-input-text-filled-disabled',- 'has-[>input[data-disabled]]:*:data-align:cursor-not-allowed has-[>input[data-disabled]]:*:data-align:text-components-input-text-filled-disabled',- 'has-[>input[readonly]]:cursor-default has-[>input[readonly]]:*:data-align:cursor-default',+ 'has-[>input:enabled[data-invalid]]:border-components-input-border-destructive has-[>input:enabled[data-invalid]]:bg-components-input-bg-destructive',+ 'has-[>input:disabled]:cursor-not-allowed has-[>input:disabled]:border-transparent has-[>input:disabled]:bg-components-input-bg-disabled has-[>input:disabled]:text-components-input-text-filled-disabled',+ 'has-[>input:disabled]:*:data-align:cursor-not-allowed has-[>input:disabled]:*:data-align:text-components-input-text-filled-disabled',+ 'has-[>input:enabled[readonly]]:cursor-default has-[>input:enabled[readonly]]:*:data-align:cursor-default','has-[>[data-align=inline-start]]:[&>input]:ps-0','has-[>[data-align=inline-end]]:[&>input]:pe-0','motion-reduce:transition-none',diff --git a/packages/dify-ui/src/input/index.stories.tsx b/packages/dify-ui/src/input/index.stories.tsxindex 560bad85856..59f26858f7d 100644--- a/packages/dify-ui/src/input/index.stories.tsx+++ b/packages/dify-ui/src/input/index.stories.tsx@@ -81,6 +81,16 @@ export const States: Story = {<FieldError match>Enter a full URL including https://.</FieldError></Field></div>+ <Field name="readonlyRepositoryUrl" invalid>+ <FieldLabel>Read-only invalid</FieldLabel>+ <Input readOnly defaultValue="github.com/langgenius" />+ <FieldError match>Enter a full URL including https://.</FieldError>+ </Field>+ <Field name="disabledRepositoryUrl" invalid>+ <FieldLabel>Disabled invalid</FieldLabel>+ <Input disabled defaultValue="github.com/langgenius" />+ <FieldError match>Enter a full URL including https://.</FieldError>+ </Field><div className="grid gap-1"><label className="system-sm-medium text-text-secondary" htmlFor="disabled-state">Disableddiff --git a/packages/dify-ui/src/number-field/index.tsx b/packages/dify-ui/src/number-field/index.tsxindex 28da2fde34e..94dccfcacce 100644--- a/packages/dify-ui/src/number-field/index.tsx+++ b/packages/dify-ui/src/number-field/index.tsx@@ -46,7 +46,7 @@ const numberFieldInputVariants = cva('w-0 min-w-0 flex-1 appearance-none border-0 bg-transparent text-components-input-text-filled caret-primary-600 outline-hidden','placeholder:text-components-input-text-placeholder','disabled:cursor-not-allowed disabled:text-components-input-text-filled-disabled disabled:placeholder:text-components-input-text-disabled',- 'data-readonly:cursor-default',+ 'enabled:data-readonly:cursor-default',],{variants: {diff --git a/packages/dify-ui/src/select/index.stories.tsx b/packages/dify-ui/src/select/index.stories.tsxindex d596732f4c4..1aeac930b0a 100644--- a/packages/dify-ui/src/select/index.stories.tsx+++ b/packages/dify-ui/src/select/index.stories.tsx@@ -15,7 +15,7 @@ import {SelectValue,} from '.'import { Button } from '../button'-import { Field, FieldDescription } from '../field'+import { Field, FieldError } from '../field'import { Form } from '../form'const triggerWidth = 'w-64'@@ -27,6 +27,12 @@ const cityItems = [{ label: 'Paris', value: 'paris' },]+const timezoneItems = [+ { label: 'UTC', value: 'utc' },+ { label: 'Pacific (PST)', value: 'pst' },+ { label: 'Japan (JST)', value: 'jst' },+]+const deploymentRegionItems = [{ label: 'US East', value: 'us-east' },{ label: 'Europe West', value: 'eu-west' },@@ -298,6 +304,37 @@ export const ReadOnly: Story = {),}+export const Invalid: Story = {+ render: () => (+ <React.Fragment>+ {(['Editable', 'Read only', 'Disabled'] as const).map((state) => (+ <Field key={state} invalid>+ <Select+ items={cityItems}+ defaultValue="seattle"+ readOnly={state === 'Read only'}+ disabled={state === 'Disabled'}+ >+ <SelectLabel>{state}</SelectLabel>+ <SelectTrigger>+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ {cityItems.map((item) => (+ <SelectItem key={item.value} value={item.value}>+ <SelectItemText>{item.label}</SelectItemText>+ <SelectItemIndicator />+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <FieldError match>This city is no longer available.</FieldError>+ </Field>+ ))}+ </React.Fragment>+ ),+}+function ControlledDemo() {const [value, setValue] = React.useState<string | null>('balanced')@@ -399,30 +436,27 @@ export const MultipleControlled: Story = {}export const InForm: Story = {+ parameters: {+ docs: { story: { autoplay: false } },+ },render: () => (<Form aria-label="Timezone form" className="grid w-72 gap-3" onFormSubmit={() => undefined}><Field name="timezone">- <Select name="timezone" defaultValue="utc">+ <Select items={timezoneItems} required><SelectLabel>Timezone</SelectLabel><SelectTrigger>- <SelectValue />+ <SelectValue placeholder="Choose a timezone" /></SelectTrigger><SelectContent>- <SelectItem value="utc">- <SelectItemText>UTC</SelectItemText>- <SelectItemIndicator />- </SelectItem>- <SelectItem value="pst">- <SelectItemText>Pacific (PST)</SelectItemText>- <SelectItemIndicator />- </SelectItem>- <SelectItem value="jst">- <SelectItemText>Japan (JST)</SelectItemText>- <SelectItemIndicator />- </SelectItem>+ {timezoneItems.map((item) => (+ <SelectItem key={item.value} value={item.value}>+ <SelectItemText>{item.label}</SelectItemText>+ <SelectItemIndicator />+ </SelectItem>+ ))}</SelectContent></Select>- <FieldDescription>Used to schedule workflow runs.</FieldDescription>+ <FieldError match="valueMissing">Timezone is required.</FieldError></Field><div className="flex justify-end"><Button type="submit" variant="primary">@@ -431,4 +465,27 @@ export const InForm: Story = {</div></Form>),+ play: async ({ canvas, canvasElement, userEvent }) => {+ const trigger = canvas.getByRole('combobox', { name: 'Timezone' })+ const body = within(canvasElement.ownerDocument.body)++ await expect(trigger).not.toHaveAttribute('data-invalid')+ await expect(trigger).not.toHaveAttribute('data-valid')+ await userEvent.click(canvas.getByRole('button', { name: 'Save' }))++ await expect(await canvas.findByText('Timezone is required.')).toBeVisible()+ await expect(trigger).toHaveAttribute('data-invalid')+ await expect(trigger).toHaveAttribute('aria-invalid', 'true')++ trigger.focus()+ await userEvent.keyboard('{ArrowDown}')+ await userEvent.click(await body.findByRole('option', { name: 'UTC' }))++ await expect(trigger).toHaveTextContent('UTC')+ await waitFor(async () => {+ await expect(trigger).not.toHaveAttribute('data-invalid')+ await expect(trigger).toHaveAttribute('data-valid')+ await expect(canvas.queryByText('Timezone is required.')).not.toBeInTheDocument()+ })+ },}diff --git a/packages/dify-ui/src/select/index.tsx b/packages/dify-ui/src/select/index.tsxindex cb0c4eb8fb0..6dbcf2146c7 100644--- a/packages/dify-ui/src/select/index.tsx+++ b/packages/dify-ui/src/select/index.tsx@@ -70,8 +70,9 @@ const selectTriggerVariants = cva('group/select-trigger flex w-full items-center border-0 bg-components-input-bg-normal text-start text-components-input-text-filled outline-hidden','hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt','focus-visible:ring-2 focus-visible:ring-state-accent-solid',+ 'data-invalid:not-data-disabled:bg-components-input-bg-destructive data-invalid:not-data-disabled:inset-ring-1 data-invalid:not-data-disabled:inset-ring-components-input-border-destructive','data-placeholder:text-components-input-text-placeholder',- 'data-readonly:cursor-default data-readonly:bg-components-input-bg-normal data-readonly:hover:bg-components-input-bg-normal',+ 'data-readonly:not-data-disabled:cursor-default data-readonly:not-data-disabled:not-data-invalid:bg-components-input-bg-normal data-readonly:not-data-disabled:not-data-invalid:hover:bg-components-input-bg-normal','data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled','data-disabled:data-placeholder:text-components-input-text-disabled',],diff --git a/web/app/components/header/account-setting/members-page/invite-modal/email-recipients-field.tsx b/web/app/components/header/account-setting/members-page/invite-modal/email-recipients-field.tsxindex 0d12692eb5b..9e3b58b182c 100644--- a/web/app/components/header/account-setting/members-page/invite-modal/email-recipients-field.tsx+++ b/web/app/components/header/account-setting/members-page/invite-modal/email-recipients-field.tsx@@ -261,7 +261,7 @@ export function EmailRecipientsField({}value={draft}className={cn(- 'h-6 w-0 flex-1 rounded-none border-0 bg-transparent p-0 shadow-none hover:border-transparent hover:bg-transparent focus:border-transparent focus:bg-transparent focus:ring-0 disabled:bg-transparent disabled:hover:bg-transparent data-invalid:border-transparent data-invalid:bg-transparent',+ 'h-6 w-0 flex-1 rounded-none border-0 bg-transparent p-0 shadow-none hover:border-transparent hover:bg-transparent focus:border-transparent focus:bg-transparent focus:ring-0 disabled:bg-transparent disabled:hover:bg-transparent enabled:data-invalid:border-transparent enabled:data-invalid:bg-transparent',recipients.length > 0 ? 'min-w-12' : 'min-w-40',)}onChange={(event) => {