Skip to content

armgit / dify

Public Imported from GitHub
0

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.

refactor(ui): rely on DirectionProvider for picker direction (#44755)

yyhc6726e2beb59
diff --git a/packages/dify-ui/src/date-time/README.md b/packages/dify-ui/src/date-time/README.md
index 8f4aa96c505..ad1c7abd67b 100644
--- a/packages/dify-ui/src/date-time/README.md
+++ b/packages/dify-ui/src/date-time/README.md
@@ -127,9 +127,10 @@ instant. Business rules can further restrict it through `isTimeUnavailable`.
DatePicker and DateTimePicker accept DayPicker locale objects; TimePicker accepts Intl locale
identifiers. Locale controls formatting and digits, not the calendar system or serialized values.
Action labels and validation copy have English defaults; consumers translate `labels`, field and
-clear labels, placeholders, `requiredLabel` and `validationMessage`. Direction inherits
-`DirectionProvider` or a local `direction` override and reaches the portaled popup independently of
-locale. Set HTML `dir` for the surrounding layout too.
+clear labels, placeholders, `requiredLabel` and `validationMessage`. Direction comes from the
+nearest `DirectionProvider`, independently of locale, and drives keyboard navigation and layout.
+Pickers do not write `dir`: globally the portaled popup inherits `<html dir>`; for a local RTL
+region, set `dir` on the wrapper and on the portaled content.
With `name`, the committed value participates in native FormData; an empty field submits `''`.
`form` can associate an external form. Required/invalid fields block native validated submission
diff --git a/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx b/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx
index 3aba8b25b90..bbdafb23ee5 100644
--- a/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx
+++ b/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx
@@ -390,9 +390,6 @@ it('localizes full dates and reverses horizontal calendar navigation in RTL', as
</DirectionProvider>,
)
await screen.getByRole('button', { name: /^Date / }).click()
- await expect
- .element(screen.getByRole('dialog', { name: 'Date', exact: true }))
- .toHaveAttribute('dir', 'rtl')
await userEvent.keyboard('{ArrowLeft}')
const nextLabel = 'الخميس، 16 جانفي 2025'
await expect.element(screen.getByRole('button', { name: nextLabel, exact: true })).toHaveFocus()
@@ -419,26 +416,6 @@ it('focuses the first invalid picker inside a native fieldset', async () => {
await expect.element(screen.getByRole('button', { name: 'Departure', exact: true })).toHaveFocus()
})
-it('lets a picker override inherited direction independently of its formatting locale', async () => {
- const screen = await render(
- <DirectionProvider direction="rtl">
- <DatePicker direction="ltr" locale={arTN} defaultValue="2025-01-15">
- <DatePickerLabel className="sr-only">Date</DatePickerLabel>
- <Parts />
- </DatePicker>
- </DirectionProvider>,
- )
- const trigger = screen.getByRole('button', { name: /^Date / })
- await expect.element(trigger).toHaveAttribute('dir', 'ltr')
- await trigger.click()
- await expect
- .element(screen.getByRole('dialog', { name: 'Date', exact: true }))
- .toHaveAttribute('dir', 'ltr')
- await userEvent.keyboard('{ArrowRight}')
- const nextLabel = 'الخميس، 16 جانفي 2025'
- await expect.element(screen.getByRole('button', { name: nextLabel, exact: true })).toHaveFocus()
-})
-
it('keeps Persian month labels in the Gregorian calendar used by the value', async () => {
const changed = vi.fn()
const screen = await render(
diff --git a/packages/dify-ui/src/date-time/date-picker/index.stories.tsx b/packages/dify-ui/src/date-time/date-picker/index.stories.tsx
index 979b5242bb1..7371e2cfd81 100644
--- a/packages/dify-ui/src/date-time/date-picker/index.stories.tsx
+++ b/packages/dify-ui/src/date-time/date-picker/index.stories.tsx
@@ -232,7 +232,7 @@ export const RTL: Story = {
docs: {
description: {
story:
- 'DirectionProvider supplies interaction direction; dir sets the surrounding HTML direction. The picker carries direction into its portaled popup. Calendar dates use the Arabic locale; action labels retain the English defaults.',
+ 'DirectionProvider supplies interaction direction; dir sets the surrounding HTML direction. For a local RTL region, set dir on the wrapper and on the portaled content; global direction is inherited from <html dir>. Calendar dates use the Arabic locale; action labels retain the English defaults.',
},
},
},
@@ -242,7 +242,7 @@ export const RTL: Story = {
<DatePicker locale={arTN} defaultValue="2025-01-15">
<DatePickerLabel className="sr-only">Start date</DatePickerLabel>
<DatePickerTrigger />
- <DatePickerContent />
+ <DatePickerContent dir="rtl" />
</DatePicker>
</DirectionProvider>
</div>
@@ -251,8 +251,7 @@ export const RTL: Story = {
const body = within(canvasElement.ownerDocument.body)
const trigger = within(canvasElement).getByRole('button', { name: /^Start date / })
await userEvent.click(trigger)
- const dialog = await body.findByRole('dialog', { name: 'Start date' })
- await expect(dialog).toHaveAttribute('dir', 'rtl')
+ await body.findByRole('dialog', { name: 'Start date' })
await waitFor(() =>
expect(body.getByRole('button', { name: /^الأربعاء، 15 جانفي 2025/ })).toHaveFocus(),
)
diff --git a/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx b/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx
index 92b7d5f7edf..459767f794c 100644
--- a/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx
@@ -1,6 +1,7 @@
import * as React from 'react'
import { page, userEvent } from 'vite-plus/test/browser'
import { render } from 'vitest-browser-react'
+import { DirectionProvider } from '../../../direction-provider'
import {
DateTimePicker,
DateTimePickerContent,
@@ -126,15 +127,13 @@ it.each(['ltr', 'rtl'] as const)(
'keeps focused time options visible after switching a height-limited %s popup',
async (direction) => {
const screen = await render(
- <DateTimePicker
- direction={direction}
- timeZone="UTC"
- defaultValue={new Date('2025-01-15T13:30:00Z')}
- >
- <DateTimePickerLabel className="sr-only">Meeting</DateTimePickerLabel>
- <DateTimePickerTrigger />
- <DateTimePickerContent style={{ maxHeight: 210 }} />
- </DateTimePicker>,
+ <DirectionProvider direction={direction}>
+ <DateTimePicker timeZone="UTC" defaultValue={new Date('2025-01-15T13:30:00Z')}>
+ <DateTimePickerLabel className="sr-only">Meeting</DateTimePickerLabel>
+ <DateTimePickerTrigger />
+ <DateTimePickerContent style={{ maxHeight: 210 }} />
+ </DateTimePicker>
+ </DirectionProvider>,
)
await screen.getByRole('button', { name: /^Meeting / }).click()
const calendarPopup = screen.getByRole('dialog', { name: 'Meeting', exact: true }).element()
diff --git a/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx b/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx
index b0cd3c05020..6cfaf6e8323 100644
--- a/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx
+++ b/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx
@@ -3,6 +3,7 @@ import { arTN } from '@daypicker/react/locale/ar-TN'
import { faIR } from '@daypicker/react/locale/fa-IR'
import * as React from 'react'
import { expect, waitFor, within } from 'storybook/test'
+import { DirectionProvider } from '../../direction-provider'
import {
DateTimePicker,
DateTimePickerClear,
@@ -72,31 +73,31 @@ export const RTL: Story = {
docs: {
description: {
story:
- 'A local direction override applies to both calendar and time views, including the portaled popup. Dates use Arabic formatting with English action labels. Changing views preserves the draft; Escape discards it.',
+ 'DirectionProvider controls keyboard navigation and layout in both calendar and time views. For a local RTL region, set dir on the wrapper and on the portaled content; global direction is inherited from <html dir>. Dates use Arabic formatting with English action labels. Changing views preserves the draft; Escape discards it.',
},
},
},
render: () => (
- <DateTimePicker
- direction="rtl"
- locale={arTN}
- timeZone="Asia/Shanghai"
- defaultValue={new Date('2025-01-15T13:30:00Z')}
- hourCycle={24}
- >
- <DateTimePickerLabel className="sr-only">Meeting time</DateTimePickerLabel>
- <DateTimePickerTrigger />
- <DateTimePickerContent />
- </DateTimePicker>
+ <div dir="rtl">
+ <DirectionProvider direction="rtl">
+ <DateTimePicker
+ locale={arTN}
+ timeZone="Asia/Shanghai"
+ defaultValue={new Date('2025-01-15T13:30:00Z')}
+ hourCycle={24}
+ >
+ <DateTimePickerLabel className="sr-only">Meeting time</DateTimePickerLabel>
+ <DateTimePickerTrigger />
+ <DateTimePickerContent dir="rtl" />
+ </DateTimePicker>
+ </DirectionProvider>
+ </div>
),
play: async ({ canvasElement, userEvent }) => {
const body = within(canvasElement.ownerDocument.body)
const trigger = within(canvasElement).getByRole('button', { name: /^Meeting time / })
await userEvent.click(trigger)
- await expect(await body.findByRole('dialog', { name: 'Meeting time' })).toHaveAttribute(
- 'dir',
- 'rtl',
- )
+ await body.findByRole('dialog', { name: 'Meeting time' })
await userEvent.click(body.getByRole('button', { name: /Pick Time:/ }))
const hours = await body.findByRole('listbox', { name: 'Hour' })
const minutes = body.getByRole('listbox', { name: 'Minute' })
@@ -204,19 +205,20 @@ export const PersianNumbers: Story = {
},
},
render: () => (
- <div dir="rtl" className="grid gap-1">
- <DateTimePicker
- locale={faIR}
- direction="rtl"
- timeZone="UTC"
- hourCycle={24}
- defaultValue={new Date('2025-01-15T10:05:00Z')}
- >
- <DateTimePickerLabel>Meeting</DateTimePickerLabel>
- <DateTimePickerTrigger />
- <DateTimePickerContent />
- </DateTimePicker>
- </div>
+ <DirectionProvider direction="rtl">
+ <div dir="rtl" className="grid gap-1">
+ <DateTimePicker
+ locale={faIR}
+ timeZone="UTC"
+ hourCycle={24}
+ defaultValue={new Date('2025-01-15T10:05:00Z')}
+ >
+ <DateTimePickerLabel>Meeting</DateTimePickerLabel>
+ <DateTimePickerTrigger />
+ <DateTimePickerContent dir="rtl" />
+ </DateTimePicker>
+ </div>
+ </DirectionProvider>
),
play: async ({ canvasElement, userEvent }) => {
const body = within(canvasElement.ownerDocument.body)
diff --git a/packages/dify-ui/src/date-time/internal/picker-parts.tsx b/packages/dify-ui/src/date-time/internal/picker-parts.tsx
index d98f566b4d2..a8fd75885cb 100644
--- a/packages/dify-ui/src/date-time/internal/picker-parts.tsx
+++ b/packages/dify-ui/src/date-time/internal/picker-parts.tsx
@@ -2,7 +2,6 @@
import type { Field } from '@base-ui/react/field'
import type { BaseUIComponentProps } from '@base-ui/react/internals/types'
-import type { TextDirection } from '../../direction-provider'
import type { IconButtonProps } from '../../icon-button'
import type {
PopoverActions,
@@ -35,7 +34,6 @@ import { useTimeout } from '@base-ui/utils/useTimeout'
import { visuallyHidden, visuallyHiddenInput } from '@base-ui/utils/visuallyHidden'
import * as React from 'react'
import { cn } from '../../cn'
-import { DirectionProvider, useDirection } from '../../direction-provider'
import { IconButton } from '../../icon-button'
import { formLabelClassName } from '../../internal/form-control'
import { resolveClassName } from '../../internal/resolve-class-name'
@@ -47,8 +45,6 @@ import { arePickerValuesEqual } from './use-picker-value'
type PickerOpenChangeDetails = Omit<PopoverChangeEventDetails, 'preventUnmountOnClose'>
type PickerFieldProps = Pick<PopoverProps, 'open' | 'defaultOpen'> & {
- /** Overrides DirectionProvider for this field and its popup; independent of locale. */
- direction?: TextDirection
placeholder?: string
disabled?: boolean
readOnly?: boolean
@@ -122,8 +118,6 @@ function PickerRoot({
onClear: (details: PickerChangeEventDetails) => boolean
onReset: (details: PickerChangeEventDetails) => boolean
}) {
- const inheritedDirection = useDirection()
- const direction = props.direction ?? inheritedDirection
const field = useFieldRootContext()
const { clearErrors, elementRef: formElementRef, formRef } = useFormContext()
const { labelId: fieldLabelId } = useLabelableContext()
@@ -284,122 +278,119 @@ function PickerRoot({
}, [props.form, formElementRef, resetPicker, resetTimeout])
return (
- <DirectionProvider direction={direction}>
- <PickerContext.Provider
- value={{
- ...props,
- disabled,
- direction,
- invalid,
- displayValue,
- serializedValue,
- triggerId,
- valueId: `${id}-value`,
- labelId:
- Array.from(new Set([fieldLabelId, labelId].filter(Boolean))).join(' ') || undefined,
- setLabelId,
- errorId: errorMessage ? `${id}-error` : '',
- requiredId: `${id}-required`,
- triggerRef,
- clearRef,
- popupRef,
- canEdit,
- focus,
- releaseFocus,
- blur,
- clear: (event) => {
- if (!canEdit()) return
- const details = createChangeEventDetails(
- 'clear-press',
- event.nativeEvent,
- event.currentTarget,
- )
- if (!onClear(details)) return
- triggerRef.current?.focus()
- actionsRef.current?.close()
- },
- close: () => actionsRef.current?.close(),
+ <PickerContext.Provider
+ value={{
+ ...props,
+ disabled,
+ invalid,
+ displayValue,
+ serializedValue,
+ triggerId,
+ valueId: `${id}-value`,
+ labelId:
+ Array.from(new Set([fieldLabelId, labelId].filter(Boolean))).join(' ') || undefined,
+ setLabelId,
+ errorId: errorMessage ? `${id}-error` : '',
+ requiredId: `${id}-required`,
+ triggerRef,
+ clearRef,
+ popupRef,
+ canEdit,
+ focus,
+ releaseFocus,
+ blur,
+ clear: (event) => {
+ if (!canEdit()) return
+ const details = createChangeEventDetails(
+ 'clear-press',
+ event.nativeEvent,
+ event.currentTarget,
+ )
+ if (!onClear(details)) return
+ triggerRef.current?.focus()
+ actionsRef.current?.close()
+ },
+ close: () => actionsRef.current?.close(),
+ }}
+ >
+ {props.required && (
+ <span id={`${id}-required`} style={visuallyHidden}>
+ {props.requiredLabel ?? 'Required'}
+ </span>
+ )}
+ <input
+ {...field.validation.getValidationProps(disabled)}
+ ref={mergedInputRef}
+ style={name ? visuallyHiddenInput : visuallyHidden}
+ aria-hidden="true"
+ tabIndex={-1}
+ type="text"
+ autoComplete="off"
+ name={name}
+ form={props.form}
+ value={serializedValue}
+ required={props.required}
+ disabled={disabled}
+ readOnly={props.readOnly}
+ onChange={() => {}}
+ onFocus={() => triggerRef.current?.focus({ focusVisible: true })}
+ onInvalid={(event) => {
+ event.preventDefault()
+ setValidationAttempted(true)
+ field.setTouched(true)
+ if (triggerId) formRef.current.fields.get(triggerId)?.validate()
+ const firstInvalid = inputRef.current?.form
+ ? Array.from(inputRef.current.form.elements).find((element) =>
+ element.matches('input:invalid, select:invalid, textarea:invalid'),
+ )
+ : undefined
+ if (!firstInvalid || firstInvalid === inputRef.current) triggerRef.current?.focus()
}}
- >
- {props.required && (
- <span id={`${id}-required`} style={visuallyHidden}>
- {props.requiredLabel ?? 'Required'}
- </span>
- )}
- <input
- {...field.validation.getValidationProps(disabled)}
- ref={mergedInputRef}
- style={name ? visuallyHiddenInput : visuallyHidden}
- aria-hidden="true"
- tabIndex={-1}
- type="text"
- autoComplete="off"
- name={name}
- form={props.form}
- value={serializedValue}
- required={props.required}
- disabled={disabled}
- readOnly={props.readOnly}
- onChange={() => {}}
- onFocus={() => triggerRef.current?.focus({ focusVisible: true })}
- onInvalid={(event) => {
- event.preventDefault()
- setValidationAttempted(true)
- field.setTouched(true)
- if (triggerId) formRef.current.fields.get(triggerId)?.validate()
- const firstInvalid = inputRef.current?.form
- ? Array.from(inputRef.current.form.elements).find((element) =>
- element.matches('input:invalid, select:invalid, textarea:invalid'),
+ />
+ <Popover
+ open={props.open}
+ defaultOpen={props.defaultOpen}
+ onOpenChange={(open, details) => {
+ if (open && !canEdit()) details.cancel()
+ props.onOpenChange?.(open, details)
+ if (
+ !details.isCanceled &&
+ !open &&
+ (details.reason === 'focus-out' || details.reason === 'outside-press')
+ ) {
+ if (details.reason === 'outside-press') {
+ const document = ownerDocument(inputRef.current)
+ const pressedLabel = [fieldLabelId, labelId].some((id) => {
+ const label = id ? document.getElementById(id) : null
+ return (
+ label &&
+ isLabelTextInteraction({
+ nativeEvent: details.event,
+ currentTarget: label,
+ })
)
- : undefined
- if (!firstInvalid || firstInvalid === inputRef.current) triggerRef.current?.focus()
- }}
- />
- <Popover
- open={props.open}
- defaultOpen={props.defaultOpen}
- onOpenChange={(open, details) => {
- if (open && !canEdit()) details.cancel()
- props.onOpenChange?.(open, details)
- if (
- !details.isCanceled &&
- !open &&
- (details.reason === 'focus-out' || details.reason === 'outside-press')
- ) {
- if (details.reason === 'outside-press') {
- const document = ownerDocument(inputRef.current)
- const pressedLabel = [fieldLabelId, labelId].some((id) => {
- const label = id ? document.getElementById(id) : null
- return (
- label &&
- isLabelTextInteraction({
- nativeEvent: details.event,
- currentTarget: label,
- })
- )
- })
- if (pressedLabel) return
- }
- const target =
- details.reason === 'outside-press'
- ? getTarget(details.event)
- : 'relatedTarget' in details.event
- ? details.event.relatedTarget
- : null
- blur(target instanceof ownerWindow(inputRef.current).Element ? target : null)
+ })
+ if (pressedLabel) return
}
- }}
- actionsRef={actionsRef}
- >
- {children}
- </Popover>
- {errorMessage && (
- <span id={`${id}-error`} role="alert" className="system-xs-regular text-text-destructive">
- {errorMessage}
- </span>
- )}
- </PickerContext.Provider>
- </DirectionProvider>
+ const target =
+ details.reason === 'outside-press'
+ ? getTarget(details.event)
+ : 'relatedTarget' in details.event
+ ? details.event.relatedTarget
+ : null
+ blur(target instanceof ownerWindow(inputRef.current).Element ? target : null)
+ }
+ }}
+ actionsRef={actionsRef}
+ >
+ {children}
+ </Popover>
+ {errorMessage && (
+ <span id={`${id}-error`} role="alert" className="system-xs-regular text-text-destructive">
+ {errorMessage}
+ </span>
+ )}
+ </PickerContext.Provider>
)
}
@@ -494,7 +485,6 @@ function PickerTrigger({
return (
<PopoverTrigger
id={triggerId}
- dir={field.direction}
aria-label={ariaLabel}
aria-labelledby={
labelId
@@ -624,7 +614,6 @@ function PickerContent({
...props
}: PickerContentProps & { children: React.ReactNode }) {
const { labelId, popupRef, focus, blur } = usePickerContext()
- const direction = useDirection()
const focusRef = usePickerFocusRef(popupRef)
const mergedRef = useMergedRefs(popupRef, ref, focusRef)
return (
@@ -633,7 +622,6 @@ function PickerContent({
align="start"
aria-label={ariaLabel}
aria-labelledby={ariaLabelledBy ?? (ariaLabel ? undefined : labelId)}
- dir={direction}
{...mergeProps(
{
onFocus: (event: React.FocusEvent<HTMLDivElement>) => focus(event.currentTarget),
diff --git a/packages/dify-ui/src/date-time/time-picker/__tests__/index.spec.tsx b/packages/dify-ui/src/date-time/time-picker/__tests__/index.spec.tsx
index 314bda76ef0..920513e0c40 100644
--- a/packages/dify-ui/src/date-time/time-picker/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/date-time/time-picker/__tests__/index.spec.tsx
@@ -272,14 +272,12 @@ it('preserves draft selection after focus leaves and does not select hovered opt
<TimePicker defaultValue="13:30" onValueChange={changed}>
<TimePickerLabel className="sr-only">Time</TimePickerLabel>
<TimePickerTrigger />
- <TimePickerContent />
+ <TimePickerContent dir="rtl" />
</TimePicker>
</DirectionProvider>,
)
await screen.getByRole('button', { name: 'Time 1:30 PM' }).click()
- await expect
- .element(screen.getByRole('dialog', { name: 'Time', exact: true }))
- .toHaveAttribute('dir', 'rtl')
+ await expect.element(screen.getByRole('dialog', { name: 'Time', exact: true })).toBeVisible()
const hours = screen.getByRole('listbox', { name: 'Hour' })
const minutes = screen.getByRole('listbox', { name: 'Minute' })
expect(hours.element().getBoundingClientRect().left).toBeGreaterThan(
diff --git a/packages/dify-ui/src/date-time/time-picker/index.stories.tsx b/packages/dify-ui/src/date-time/time-picker/index.stories.tsx
index a35ebc804bb..f898f3b4331 100644
--- a/packages/dify-ui/src/date-time/time-picker/index.stories.tsx
+++ b/packages/dify-ui/src/date-time/time-picker/index.stories.tsx
@@ -26,7 +26,7 @@ const meta = {
export default meta
type Story = StoryObj<typeof meta>
-function TimePickerDemo() {
+function TimePickerDemo({ dir }: { dir?: 'ltr' | 'rtl' }) {
const [value, setValue] = React.useState<string | null>('13:30')
return (
<div className="grid gap-1">
@@ -36,7 +36,7 @@ function TimePickerDemo() {
<TimePickerTrigger />
<TimePickerClear aria-label="Clear start time" />
</div>
- <TimePickerContent />
+ <TimePickerContent dir={dir} />
</TimePicker>
</div>
)
@@ -86,7 +86,7 @@ export const RTL: Story = {
render: () => (
<div dir="rtl">
<DirectionProvider direction="rtl">
- <TimePickerDemo />
+ <TimePickerDemo dir="rtl" />
</DirectionProvider>
</div>
),
@@ -94,10 +94,7 @@ export const RTL: Story = {
const body = within(canvasElement.ownerDocument.body)
const trigger = within(canvasElement).getByRole('button', { name: 'Start time 1:30 PM' })
await userEvent.click(trigger)
- await expect(await body.findByRole('dialog', { name: 'Start time' })).toHaveAttribute(
- 'dir',
- 'rtl',
- )
+ await body.findByRole('dialog', { name: 'Start time' })
const hours = body.getByRole('listbox', { name: 'Hour' })
const minutes = body.getByRole('listbox', { name: 'Minute' })
await waitFor(() => expect(within(hours).getByRole('option', { name: '1' })).toHaveFocus())
diff --git a/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx b/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx
index f1026b3a862..0c5a6c6261c 100644
--- a/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx
+++ b/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx
@@ -1,4 +1,3 @@
-import { DirectionProvider } from '@langgenius/dify-ui/direction-provider'
import { act, render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { createInstance } from 'i18next'
@@ -104,10 +103,9 @@ it('updates time formatting and popup labels from the application language witho
)
expect(screen.getByRole('option', { name: '۱' })).toHaveAttribute('aria-selected', 'true')
expect(screen.getByRole('option', { name: '۳۰' })).toHaveAttribute('aria-selected', 'true')
- expect(screen.getByRole('dialog')).toHaveAttribute('dir', 'rtl')
})
-it('inherits application direction and localizes the calendar while preserving label overrides', async () => {
+it('localizes the calendar from the application language while preserving label overrides', async () => {
const user = userEvent.setup()
const i18n = await createI18n('fa-IR')
render(
@@ -121,10 +119,7 @@ it('inherits application direction and localizes the calendar while preserving l
</I18nDirectionProvider>
</I18nextProvider>,
)
- const trigger = screen.getByRole('button', { name: /^Date / })
- expect(trigger).toHaveAttribute('dir', 'rtl')
- await user.click(trigger)
- expect(screen.getByRole('dialog', { name: 'Date' })).toHaveAttribute('dir', 'rtl')
+ await user.click(screen.getByRole('button', { name: /^Date / }))
expect(screen.getByRole('button', { name: 'Next billing month' })).toBeInTheDocument()
await user.click(
screen.getByRole('button', { name: new RegExp(fa['picker.chooseMonthAndYear']) }),
@@ -132,43 +127,6 @@ it('inherits application direction and localizes the calendar while preserving l
expect(screen.getByRole('option', { name: 'ژانویه' })).toHaveAttribute('aria-selected', 'true')
})
-it('inherits a local direction override independently of the application language', async () => {
- const user = userEvent.setup()
- const i18n = await createI18n('fa-IR')
- render(
- <I18nextProvider i18n={i18n}>
- <I18nDirectionProvider syncDocument>
- <DirectionProvider direction="ltr">
- <DatePicker>
- <DatePickerLabel>Date</DatePickerLabel>
- <DatePickerTrigger />
- <DatePickerContent />
- </DatePicker>
- <TimePicker>
- <TimePickerLabel>Time</TimePickerLabel>
- <TimePickerTrigger />
- </TimePicker>
- <DateTimePicker timeZone="UTC">
- <DateTimePickerLabel>Meeting</DateTimePickerLabel>
- <DateTimePickerTrigger />
- </DateTimePicker>
- <DatePicker direction="rtl">
- <DatePickerLabel>Explicit RTL</DatePickerLabel>
- <DatePickerTrigger />
- </DatePicker>
- </DirectionProvider>
- </I18nDirectionProvider>
- </I18nextProvider>,
- )
-
- for (const name of ['Date', 'Time', 'Meeting'])
- expect(screen.getByRole('button', { name })).toHaveAttribute('dir', 'ltr')
- expect(screen.getByRole('button', { name: 'Explicit RTL' })).toHaveAttribute('dir', 'rtl')
- await user.click(screen.getByRole('button', { name: 'Date' }))
- expect(screen.getByRole('dialog', { name: 'Date' })).toHaveAttribute('dir', 'ltr')
- expect(document.documentElement.dir).toBe('rtl')
-})
-
it.each([
['zh-Hans', '今天,2026年9月28日 星期一,已选择'],
[
diff --git a/web/app/components/provider/__tests__/i18n-direction.browser.spec.tsx b/web/app/components/provider/__tests__/i18n-direction.browser.spec.tsx
index 5f91389c3bb..db9ee8efeaa 100644
--- a/web/app/components/provider/__tests__/i18n-direction.browser.spec.tsx
+++ b/web/app/components/provider/__tests__/i18n-direction.browser.spec.tsx
@@ -65,7 +65,8 @@ it('keeps document layout, keyboard navigation and portaled pickers aligned when
await userEvent.keyboard('{ArrowLeft}')
await expect.element(second).toHaveFocus()
await screen.getByRole('button', { name: /^Date / }).click()
- await expect.element(page.getByRole('dialog')).toHaveAttribute('dir', 'rtl')
+ await expect.element(page.getByRole('dialog')).toBeVisible()
+ expect(getComputedStyle(page.getByRole('dialog').element()).direction).toBe('rtl')
await userEvent.keyboard('{Escape}')
await second.click()
await screen.getByRole('button', { name: 'English' }).click()