Skip to content

The open alternative to Salesforce, designed for AI.

Complete RTL behavior in retained UI components (#26805)

Raphaël Bosia160036773dc
diff --git a/packages/twenty-docs/ui/primitives/layout/text-direction-provider.mdx b/packages/twenty-docs/ui/primitives/layout/text-direction-provider.mdx
index 307bf60bae2..d623323ff20 100644
--- a/packages/twenty-docs/ui/primitives/layout/text-direction-provider.mdx
+++ b/packages/twenty-docs/ui/primitives/layout/text-direction-provider.mdx
@@ -44,6 +44,16 @@ The host application supplies translated labels and chooses the direction. Direc
Place one provider around the controls that share a direction. Nested providers can override the direction for a subtree; pair each override with a matching `dir` attribute. `direction` is a required application-owned prop, with no uncontrolled mode. The provider does not translate content or choose direction from the locale automatically.
+## Portals and layout
+
+Menu, Dropdown, Popover, Tooltip, Select, Dialog, and Toast portals carry the provider direction even when their container is outside the element with `dir`. Without a provider they inherit the direction of their container. Keep the provider direction and the trigger's HTML direction consistent. A scoped `ThemeProvider` continues to own the default portal container.
+
+Submenus open toward `inline-end`. ArrowRight opens a submenu in LTR; ArrowLeft opens it in RTL. The opposite key returns to the parent. Explicit `left` and `right` popup placement still mean physical sides. Collision handling can move a popup when space is limited.
+
+Text, indentation, attached button corners, and directional disclosure icons follow reading direction. Supplied icons retain their orientation. `AvatarGroup.overlap` still names a physical edge; the outer avatar does not extend beyond that edge in either direction.
+
+<StoryEmbed storyId="ui-layout-textdirectionprovider--reading-directions" title="Light and dark reading directions" height={1500} />
+
## Props
<TextDirectionProviderReference />
diff --git a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiReadingDirections.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiReadingDirections.stories.tsx
new file mode 100644
index 00000000000..7221cc4c682
--- /dev/null
+++ b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiReadingDirections.stories.tsx
@@ -0,0 +1,55 @@
+import { type Meta } from '@storybook/react-vite';
+
+import {
+ FRONT_COMPONENT_STORY_DEFAULT_ARGS,
+ resetFrontComponentStoryMocks,
+} from '@/__stories__/shared/test-utils/createFrontComponentStoryMeta';
+import { type TwentyUiGalleryStory as Story } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryStory';
+import { createGalleryStory } from '@/__stories__/twenty-ui-gallery/utils/createGalleryStory';
+import { readingDirectionsTest } from '@/__stories__/twenty-ui-gallery/utils/readingDirectionsTest';
+import { FrontComponentRenderer } from '@/host/components/FrontComponentRenderer';
+
+const meta: Meta<typeof FrontComponentRenderer> = {
+ title: 'FrontComponent/Twenty UI Reading Directions',
+ component: FrontComponentRenderer,
+ args: FRONT_COMPONENT_STORY_DEFAULT_ARGS,
+ beforeEach: resetFrontComponentStoryMocks,
+};
+
+export default meta;
+
+export const ReadingDirectionsReact: Story = createGalleryStory({
+ frontComponentBundleName: 'twenty-ui-reading-directions',
+ runtime: 'react',
+ play: readingDirectionsTest,
+});
+
+export const ReadingDirectionsPreact: Story = createGalleryStory({
+ frontComponentBundleName: 'twenty-ui-reading-directions',
+ runtime: 'preact',
+ play: readingDirectionsTest,
+});
+
+export const ReadingDirectionsReactDark: Story = {
+ ...ReadingDirectionsReact,
+ args: {
+ ...ReadingDirectionsReact.args,
+ colorScheme: 'dark',
+ executionContext: {
+ ...FRONT_COMPONENT_STORY_DEFAULT_ARGS.executionContext!,
+ colorScheme: 'dark',
+ },
+ },
+};
+
+export const ReadingDirectionsPreactDark: Story = {
+ ...ReadingDirectionsPreact,
+ args: {
+ ...ReadingDirectionsPreact.args,
+ colorScheme: 'dark',
+ executionContext: {
+ ...FRONT_COMPONENT_STORY_DEFAULT_ARGS.executionContext!,
+ colorScheme: 'dark',
+ },
+ },
+};
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md
index 1c76d368f23..3ff373007b5 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/README.md
@@ -26,9 +26,13 @@ error and can allow additional known errors without requiring them to occur.
| `twenty-ui-switch` | Switch (interaction coverage in addition to the original input gallery) |
| `twenty-ui-tooltip` | Tooltip (convenience and compound APIs) |
| `twenty-ui-responsive-hooks` | useIsMobile, useIsTouchDevice, Button hotkeys |
+| `twenty-ui-reading-directions` | Callout, ColorSchemePicker, ButtonGroup, Button, AvatarGroup, ListItem, JsonTree in LTR and RTL side by side (`TwentyUiReadingDirections.stories.tsx`) |
The focused fixtures import public twenty-ui entry points and use
`TwentyUiGalleryCard` for the light theme, mount marker, and `twenty-ui/style.css`.
+`twenty-ui-reading-directions` imports the stylesheet directly instead: its dark
+stories rely on the provider-less CSS-variable theme, and its two directions do
+not fit the card's width.
The story builder resolves that stylesheet to the individual build's CSS so
class names match the JavaScript used by the sandbox. Importing CSS through the
shared card also exercises the SDK's CSS injection and the renderer's style bridge.
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-reading-directions.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-reading-directions.front-component.tsx
new file mode 100644
index 00000000000..ca25e373e6a
--- /dev/null
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-reading-directions.front-component.tsx
@@ -0,0 +1,113 @@
+import { useState } from 'react';
+
+import {
+ AvatarGroup,
+ Callout,
+ ColorSchemePicker,
+ JsonTree,
+} from 'twenty-ui/components';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
+import { ListItem } from 'twenty-ui/primitives/navigation';
+import { Text } from 'twenty-ui/primitives/typography';
+
+import { TextDirectionProvider } from 'twenty-ui/primitives/layout';
+import { defineFrontComponent } from 'twenty-sdk/define';
+import 'twenty-ui/style.css';
+
+const DirectionalLayoutExample = ({
+ direction,
+}: {
+ direction: 'ltr' | 'rtl';
+}) => {
+ const [colorScheme, setColorScheme] = useState<'Light' | 'Dark' | 'System'>(
+ 'System',
+ );
+
+ return (
+ <TextDirectionProvider direction={direction}>
+ <div
+ dir={direction}
+ data-testid={`layout-${direction}`}
+ style={{
+ display: 'grid',
+ gap: 20,
+ width: 520,
+ padding: 20,
+ background: 'var(--t-background-primary)',
+ color: 'var(--t-font-color-primary)',
+ }}
+ >
+ <Text>{direction.toUpperCase()}</Text>
+ <Callout
+ variant="info"
+ title="Account details"
+ description="Review the information before continuing."
+ />
+ <ColorSchemePicker
+ value={colorScheme}
+ onChange={setColorScheme}
+ lightLabel="Light"
+ darkLabel="Dark"
+ systemLabel="System"
+ />
+ <ButtonGroup aria-label="Record actions">
+ <Button>First action</Button>
+ <Button>Last action</Button>
+ </ButtonGroup>
+ <Button soon style={{ width: 240 }}>
+ Upcoming action
+ </Button>
+ {(['left', 'right'] as const).map((overlap) => (
+ <div
+ key={overlap}
+ data-testid={`avatars-${overlap}`}
+ style={{ width: 'fit-content' }}
+ >
+ <AvatarGroup
+ overlap={overlap}
+ avatars={['Ada', 'Bea', 'Cam'].map((name) => (
+ <Avatar key={name} name={name} size="lg" />
+ ))}
+ overflowCount={2}
+ />
+ </div>
+ ))}
+ <ListItem
+ hasSubmenu
+ description="Details"
+ descriptionPlacement="end"
+ style={{ width: 240 }}
+ >
+ A very long account name that must truncate
+ </ListItem>
+ <JsonTree
+ value={{ account: { name: 'Ada' } }}
+ emptyStringLabel="Empty text"
+ emptyArrayLabel="Empty array"
+ emptyObjectLabel="Empty object"
+ arrowButtonCollapsedLabel="Expand node"
+ arrowButtonExpandedLabel="Collapse node"
+ shouldExpandNodeInitially={() => true}
+ />
+ </div>
+ </TextDirectionProvider>
+ );
+};
+
+const ReadingDirections = () => (
+ <div
+ style={{ display: 'grid', gridTemplateColumns: 'repeat(2, max-content)' }}
+ >
+ {(['ltr', 'rtl'] as const).map((direction) => (
+ <DirectionalLayoutExample key={direction} direction={direction} />
+ ))}
+ </div>
+);
+
+export default defineFrontComponent({
+ universalIdentifier: '65a35b56-bc38-4d19-aac9-979838a573cd',
+ name: 'twenty-ui-reading-directions',
+ description: 'Reading direction layout and interactions',
+ component: ReadingDirections,
+});
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/readingDirectionsTest.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/readingDirectionsTest.ts
new file mode 100644
index 00000000000..cad2e3585cb
--- /dev/null
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/readingDirectionsTest.ts
@@ -0,0 +1,90 @@
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import { errorHandler } from '@/__stories__/shared/test-utils/createFrontComponentStoryMeta';
+import { MOUNT_TIMEOUT } from '@/__stories__/shared/test-utils/timeouts';
+import { type TwentyUiGalleryPlayFunction } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryPlayFunction';
+
+export const readingDirectionsTest: TwentyUiGalleryPlayFunction = async ({
+ canvasElement,
+}) => {
+ const canvas = within(canvasElement);
+ for (const direction of ['ltr', 'rtl']) {
+ const scope = await canvas.findByTestId(
+ `layout-${direction}`,
+ {},
+ { timeout: MOUNT_TIMEOUT },
+ );
+ const content = within(scope);
+ const first = content.getByRole('button', { name: 'First action' });
+ const last = content.getByRole('button', { name: 'Last action' });
+ expect(getComputedStyle(scope).direction).toBe(direction);
+ expect(
+ first.getBoundingClientRect().left > last.getBoundingClientRect().left,
+ ).toBe(direction === 'rtl');
+ expect(getComputedStyle(first).borderStartEndRadius).toBe('0px');
+ const title = content.getByText('Account details');
+ const description = content.getByText(
+ 'Review the information before continuing.',
+ );
+ await waitFor(() => {
+ const titleBox = title.getBoundingClientRect();
+ const descriptionBox = description.getBoundingClientRect();
+ expect(Math.abs(descriptionBox.left - titleBox.left)).toBeLessThan(1);
+ expect(Math.abs(descriptionBox.right - titleBox.right)).toBeLessThan(1);
+ });
+ await userEvent.click(content.getByRole('button', { name: 'Dark' }));
+ for (const variant of ['Light', 'Dark', 'System']) {
+ const badge = content.getByRole('button', {
+ name: variant,
+ }).nextElementSibling!;
+ await waitFor(() =>
+ expect(getComputedStyle(badge).visibility).toBe(
+ variant === 'Dark' ? 'visible' : 'hidden',
+ ),
+ );
+ }
+ const row = content
+ .getByText('A very long account name that must truncate')
+ .closest('[data-indicator]')!;
+ expect(getComputedStyle(row.querySelector(':scope > svg')!).transform).toBe(
+ direction === 'rtl' ? 'matrix(-1, 0, 0, 1, 0, 0)' : 'none',
+ );
+ for (const overlap of ['left', 'right']) {
+ const group = content.getByTestId(
+ `avatars-${overlap}`,
+ ).firstElementChild!;
+ const groupBox = group.getBoundingClientRect();
+ const physicalBoxes = Array.from(group.children)
+ .map((child) => child.getBoundingClientRect())
+ .sort((firstBox, secondBox) => firstBox.left - secondBox.left);
+ for (let index = 1; index < physicalBoxes.length; index++) {
+ expect(
+ Math.round(
+ physicalBoxes[index - 1]!.right - physicalBoxes[index]!.left,
+ ),
+ ).toBe(3);
+ }
+ expect(Math.abs(physicalBoxes[0]!.left - groupBox.left)).toBeLessThan(1);
+ expect(
+ Math.abs(
+ Math.max(...physicalBoxes.map((box) => box.right)) - groupBox.right,
+ ),
+ ).toBeLessThan(1);
+ }
+ const collapse = content.getAllByRole('button', {
+ name: 'Collapse node',
+ })[0];
+ await userEvent.click(collapse);
+ const expand = await content.findByRole('button', { name: 'Expand node' });
+ await waitFor(() =>
+ expect(
+ getComputedStyle(expand.querySelector('svg')!.parentElement!).transform,
+ ).toBe(
+ direction === 'rtl'
+ ? 'matrix(0, 1, -1, 0, 0, 0)'
+ : 'matrix(0, -1, 1, 0, 0, 0)',
+ ),
+ );
+ }
+ expect(errorHandler).not.toHaveBeenCalled();
+};
diff --git a/packages/twenty-front-component-renderer/src/constants/AllowedHtmlElements.ts b/packages/twenty-front-component-renderer/src/constants/AllowedHtmlElements.ts
index 08b2eb5d7b8..4b719ed074f 100644
--- a/packages/twenty-front-component-renderer/src/constants/AllowedHtmlElements.ts
+++ b/packages/twenty-front-component-renderer/src/constants/AllowedHtmlElements.ts
@@ -286,13 +286,7 @@ export const ALLOWED_HTML_ELEMENTS: AllowedHtmlElement[] = [
{ tag: 'html-var', name: 'HtmlVar', properties: {} },
{ tag: 'html-dfn', name: 'HtmlDfn', properties: {} },
{ tag: 'html-bdi', name: 'HtmlBdi', properties: {} },
- {
- tag: 'html-bdo',
- name: 'HtmlBdo',
- properties: {
- dir: { type: 'string', optional: true },
- },
- },
+ { tag: 'html-bdo', name: 'HtmlBdo', properties: {} },
{
tag: 'html-data',
name: 'HtmlData',
diff --git a/packages/twenty-front-component-renderer/src/constants/HtmlCommonProperties.ts b/packages/twenty-front-component-renderer/src/constants/HtmlCommonProperties.ts
index d78ae5c0b8a..afa6e1a0b64 100644
--- a/packages/twenty-front-component-renderer/src/constants/HtmlCommonProperties.ts
+++ b/packages/twenty-front-component-renderer/src/constants/HtmlCommonProperties.ts
@@ -2,6 +2,7 @@ import { type PropertySchema } from '@/types/PropertySchema';
export const HTML_COMMON_PROPERTIES: Record<string, PropertySchema> = {
id: { type: 'string', optional: true },
+ dir: { type: 'string', optional: true },
className: { type: 'string', optional: true },
style: { type: 'string', optional: true },
title: { type: 'string', optional: true },
diff --git a/packages/twenty-front-component-renderer/src/remote/generated/remote-elements.ts b/packages/twenty-front-component-renderer/src/remote/generated/remote-elements.ts
index 0caab8756e5..91532db9abb 100644
--- a/packages/twenty-front-component-renderer/src/remote/generated/remote-elements.ts
+++ b/packages/twenty-front-component-renderer/src/remote/generated/remote-elements.ts
@@ -12,6 +12,7 @@ import { type SerializedEventData } from '@/types/SerializedEventData';
export type HtmlCommonProperties = {
id?: string;
+ dir?: string;
className?: string;
style?: string;
title?: string;
@@ -144,6 +145,7 @@ const HTML_COMMON_EVENTS_CONFIG = Object.fromEntries(
) as RemoteElementEventListenersDefinition<HtmlCommonEvents>;
const HTML_COMMON_PROPERTIES_CONFIG = {
id: { type: String },
+ dir: { type: String },
className: { type: String },
style: { type: String },
title: { type: String },
@@ -1182,21 +1184,13 @@ export const HtmlBdiElement = createRemoteElement<
...HTML_COMMON_EVENTS_CONFIG,
},
});
-
-export type HtmlBdoProperties = HtmlCommonProperties & {
- dir?: string;
-};
-
export const HtmlBdoElement = createRemoteElement<
- HtmlBdoProperties,
+ HtmlCommonProperties,
Record<string, never>,
Record<string, never>,
HtmlCommonEvents
>({
- properties: {
- ...HTML_COMMON_PROPERTIES_CONFIG,
- dir: { type: String },
- },
+ properties: HTML_COMMON_PROPERTIES_CONFIG,
events: {
...HTML_COMMON_EVENTS_CONFIG,
},
diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
index f57985b54e7..eb6a9879836 100644
--- a/packages/twenty-front/package.json
+++ b/packages/twenty-front/package.json
@@ -182,6 +182,7 @@
"jest": "29.7.0",
"jest-environment-jsdom": "30.0.0-beta.3",
"jest-fetch-mock": "^3.0.3",
+ "lightningcss": "^1.32.0",
"monaco-editor": "0.52.2",
"monaco-editor-auto-typings": "^0.4.5",
"monaco-graphql": "1.8.0",
diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts
index 9ff93efa9ad..bd6837cc575 100644
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -3,6 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import react from '@vitejs/plugin-react-swc';
import wyw from '@wyw-in-js/vite';
import fs from 'fs';
+import { Features } from 'lightningcss';
import path from 'path';
import { visualizer } from 'rollup-plugin-visualizer';
import {
@@ -270,6 +271,9 @@ export default defineConfig(({ mode }) => {
modules: {
localsConvention: 'camelCaseOnly',
},
+ lightningcss: {
+ exclude: Features.DirSelector,
+ },
},
resolve: {
tsconfigPaths: true,
diff --git a/packages/twenty-ui/CHANGELOG.md b/packages/twenty-ui/CHANGELOG.md
index a2cc640fa7e..88604cd23e8 100644
--- a/packages/twenty-ui/CHANGELOG.md
+++ b/packages/twenty-ui/CHANGELOG.md
@@ -16,9 +16,15 @@
- Field displays, application links, placeholders, and feature animations are no longer package exports. External applications must own these integrations or compose supported primitives. Internal implementation parts are private.
- `Info` uses `href` and `render` in place of `to`. Replace `AnimatedEaseInOut` with `AnimatedExpandableContainer`.
- `SegmentedControl` is a radio group. Use `aria-label` or `aria-labelledby` (one is required), `value` or `defaultValue`, and `onValueChange(value, eventDetails)` in place of `ariaLabel`, `value`, and `onChange(value)`. Options take `startIcon` and `'aria-label'` in place of `Icon` and `ariaLabel`. `role` and `width` are removed: use `Tabs` for tab lists and `className` or `style` to size the control. Arrow keys select the next option, Enter no longer selects, and choosing the selected option again no longer calls `onValueChange`.
+- Dropdown submenu arrow keys follow `TextDirectionProvider` instead of the computed CSS direction. RTL content set only through `dir` or `direction` now uses LTR keys; wrap it in `TextDirectionProvider`. A Base UI `DirectionProvider` on its own no longer sets `dir` on Select, Dialog, AlertDialog, or Toaster portals; use `TextDirectionProvider`.
+- `Dropdown.Header` and `Dropdown.Back` no longer rotate caller-supplied icons in RTL. Pass an icon that already points the intended way.
Keep `twenty-ui`, `twenty-sdk`, and `twenty-client-sdk` versions aligned when upgrading Twenty apps.
+### Fixed
+
+- Reading-direction spacing, JSON disclosure arrows, theme picker corners, avatar overlap, and the Dropdown Back chevron now follow RTL layouts. Menu, Popover, Tooltip, Select, Dialog, AlertDialog, and Toaster portals set the `TextDirectionProvider` direction as `dir`, and inherit their container's direction when no provider is present. Pair the provider with the matching HTML `dir` attribute.
+
### Added
- `Callout.closeLabel` customizes the dismiss button name. `ListItem`, `Menu` items, and `Dropdown` items accept `hotkeysJoinLabel` (default `then`); the legacy `MenuItem` uses `hotKeysJoinLabel`. `ColorSchemePicker` uses its supplied visible labels as accessible names.
diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json
index 869e74012b7..f4fc648b0c5 100644
--- a/packages/twenty-ui/package.json
+++ b/packages/twenty-ui/package.json
@@ -53,6 +53,7 @@
"esbuild": "^0.28.1",
"glob": "^11.1.0",
"jsdom": "^30.0.1",
+ "lightningcss": "^1.32.0",
"monaco-editor": "0.52.2",
"prettier": "^3.1.1",
"react": "^19.2.0",
diff --git a/packages/twenty-ui/src/components/__stories__/reading-direction/DirectionalLayoutExample.tsx b/packages/twenty-ui/src/components/__stories__/reading-direction/DirectionalLayoutExample.tsx
new file mode 100644
index 00000000000..57b0fd20c93
--- /dev/null
+++ b/packages/twenty-ui/src/components/__stories__/reading-direction/DirectionalLayoutExample.tsx
@@ -0,0 +1,111 @@
+import { useState } from 'react';
+
+import {
+ AvatarGroup,
+ Callout,
+ CardPicker,
+ ColorSchemePicker,
+ JsonTree,
+} from '@ui/components';
+import { Avatar } from '@ui/primitives/data-display';
+import {
+ Button,
+ ButtonGroup,
+ RadioGroup,
+ SegmentedControl,
+} from '@ui/primitives/input';
+import { ListItem } from '@ui/primitives/navigation';
+import { Text } from '@ui/primitives/typography';
+
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
+
+export const DirectionalLayoutExample = ({
+ direction,
+}: {
+ direction: 'ltr' | 'rtl';
+}) => {
+ const [colorScheme, setColorScheme] = useState<'Light' | 'Dark' | 'System'>(
+ 'System',
+ );
+
+ return (
+ <TextDirectionProvider direction={direction}>
+ <div
+ dir={direction}
+ data-testid={`layout-${direction}`}
+ style={{
+ display: 'grid',
+ gap: 20,
+ width: 520,
+ padding: 20,
+ background: 'var(--t-background-primary)',
+ color: 'var(--t-font-color-primary)',
+ }}
+ >
+ <Text>{direction.toUpperCase()}</Text>
+ <Callout
+ variant="info"
+ title="Account details"
+ description="Review the information before continuing."
+ />
+ <ColorSchemePicker
+ value={colorScheme}
+ onChange={setColorScheme}
+ lightLabel="Light"
+ darkLabel="Dark"
+ systemLabel="System"
+ />
+ <RadioGroup aria-label="Plan" defaultValue="team">
+ <CardPicker value="team">Team plan</CardPicker>
+ </RadioGroup>
+ <ButtonGroup aria-label="Record actions">
+ <Button>First action</Button>
+ <Button>Last action</Button>
+ </ButtonGroup>
+ <Button soon style={{ width: 240 }}>
+ Upcoming action
+ </Button>
+ <SegmentedControl
+ aria-label="Billing"
+ defaultValue="annual"
+ options={[
+ { label: 'Annual', value: 'annual' },
+ { label: 'Monthly', value: 'monthly' },
+ ]}
+ />
+ {(['left', 'right'] as const).map((overlap) => (
+ <div
+ key={overlap}
+ data-testid={`avatars-${overlap}`}
+ style={{ width: 'fit-content' }}
+ >
+ <AvatarGroup
+ overlap={overlap}
+ avatars={['Ada', 'Bea', 'Cam'].map((name) => (
+ <Avatar key={name} name={name} size="lg" />
+ ))}
+ overflowCount={2}
+ />
+ </div>
+ ))}
+ <ListItem
+ hasSubmenu
+ description="Details"
+ descriptionPlacement="end"
+ style={{ width: 240 }}
+ >
+ A very long account name that must truncate
+ </ListItem>
+ <JsonTree
+ value={{ account: { name: 'Ada' } }}
+ emptyStringLabel="Empty text"
+ emptyArrayLabel="Empty array"
+ emptyObjectLabel="Empty object"
+ arrowButtonCollapsedLabel="Expand node"
+ arrowButtonExpandedLabel="Collapse node"
+ shouldExpandNodeInitially={() => true}
+ />
+ </div>
+ </TextDirectionProvider>
+ );
+};
diff --git a/packages/twenty-ui/src/components/__stories__/reading-direction/DirectionalMenusExample.tsx b/packages/twenty-ui/src/components/__stories__/reading-direction/DirectionalMenusExample.tsx
new file mode 100644
index 00000000000..c5756cb88c9
--- /dev/null
+++ b/packages/twenty-ui/src/components/__stories__/reading-direction/DirectionalMenusExample.tsx
@@ -0,0 +1,71 @@
+import { Dropdown } from '@ui/components';
+import { Button } from '@ui/primitives/input';
+import { IconInfoCircle } from '@ui/icon';
+import { Menu, Tooltip } from '@ui/primitives/surfaces';
+import { ThemeProvider } from '@ui/theme';
+
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
+
+export const DirectionalMenusExample = ({
+ direction,
+ scoped = true,
+}: {
+ direction: 'ltr' | 'rtl';
+ scoped?: boolean;
+}) => (
+ <TextDirectionProvider direction={direction}>
+ <ThemeProvider colorScheme="dark" applyToRoot={!scoped}>
+ <div
+ dir={direction}
+ data-testid="direction-scope"
+ style={{
+ display: 'flex',
+ gap: 24,
+ padding: '100px 300px',
+ minHeight: 300,
+ background: 'var(--t-background-primary)',
+ }}
+ >
+ <Menu.Root>
+ <Menu.Trigger render={<Button>Open menu</Button>} />
+ <Menu.Popup>
+ <Menu.SubmenuRoot>
+ <Menu.SubmenuTrigger>Menu export</Menu.SubmenuTrigger>
+ <Menu.Popup>
+ <Menu.Item>Menu CSV</Menu.Item>
+ </Menu.Popup>
+ </Menu.SubmenuRoot>
+ </Menu.Popup>
+ </Menu.Root>
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger render={<Button>Open dropdown</Button>} />
+ <Dropdown.Content>
+ <Dropdown.Header>
+ <IconInfoCircle data-testid="header-icon" />
+ <Dropdown.Title>Record options</Dropdown.Title>
+ </Dropdown.Header>
+ <Dropdown.Submenu>
+ <Dropdown.SubmenuTrigger>Dropdown export</Dropdown.SubmenuTrigger>
+ <Dropdown.Content aria-label="Dropdown export formats">
+ <Dropdown.ActionItem>Dropdown CSV</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Submenu>
+ <Dropdown.Page id="root">
+ <Dropdown.ActionItem page="details">
+ Details page
+ </Dropdown.ActionItem>
+ </Dropdown.Page>
+ <Dropdown.Page id="details">
+ <Dropdown.Back />
+ <Dropdown.ActionItem>Page action</Dropdown.ActionItem>
+ </Dropdown.Page>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ <Tooltip.Root>
+ <Tooltip.Trigger render={<Button>Tooltip target</Button>} />
+ <Tooltip.Popup>Directional tooltip</Tooltip.Popup>
+ </Tooltip.Root>
+ </div>
+ </ThemeProvider>
+ </TextDirectionProvider>
+);
diff --git a/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.interactions.stories.tsx b/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.interactions.stories.tsx
new file mode 100644
index 00000000000..f01779a6673
--- /dev/null
+++ b/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.interactions.stories.tsx
@@ -0,0 +1,120 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import { DirectionalMenusExample } from './DirectionalMenusExample';
+
+const meta: Meta<typeof DirectionalMenusExample> = {
+ title: 'UI/Layout/TextDirectionProvider/Interactions',
+ component: DirectionalMenusExample,
+ parameters: { layout: 'fullscreen' },
+};
+
+export default meta;
+type Story = StoryObj<typeof DirectionalMenusExample>;
+
+export const LeftToRight: Story = {
+ args: { direction: 'ltr' },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const forwardKey =
+ args.direction === 'rtl' ? '{ArrowLeft}' : '{ArrowRight}';
+ const backwardKey =
+ args.direction === 'rtl' ? '{ArrowRight}' : '{ArrowLeft}';
+
+ for (const family of ['Menu', 'Dropdown']) {
+ const trigger = canvas.getByRole('button', {
+ name: `Open ${family.toLowerCase()}`,
+ });
+ await userEvent.click(trigger);
+ const popup = await body.findByRole('menu', {
+ name: family === 'Menu' ? 'Open menu' : 'Record options',
+ });
+ expect(getComputedStyle(popup).direction).toBe(args.direction);
+ expect(canvasElement.contains(popup)).toBe(args.scoped !== false);
+ const submenuTrigger = within(popup).getByRole('menuitem', {
+ name: `${family} export`,
+ });
+ submenuTrigger.focus();
+ await userEvent.keyboard(forwardKey);
+ const submenu = await body.findByRole('menu', {
+ name: family === 'Menu' ? 'Menu export' : 'Dropdown export formats',
+ });
+ const item = within(submenu).getByRole('menuitem', {
+ name: `${family} CSV`,
+ });
+ await waitFor(() => expect(item).toHaveFocus());
+ expect(getComputedStyle(submenu).direction).toBe(args.direction);
+ await waitFor(() => {
+ const parentBox = submenuTrigger.getBoundingClientRect();
+ const childBox = submenu.getBoundingClientRect();
+ expect(
+ args.direction === 'rtl'
+ ? childBox.right <= parentBox.left + 2
+ : childBox.left >= parentBox.right - 2,
+ ).toBe(true);
+ });
+ await userEvent.keyboard(backwardKey);
+ await waitFor(() => expect(submenuTrigger).toHaveFocus());
+ await userEvent.keyboard('{Escape}');
+ await waitFor(() => expect(trigger).toHaveFocus());
+ await userEvent.click(trigger);
+ await userEvent.hover(
+ await body.findByRole('menuitem', { name: `${family} export` }),
+ );
+ await userEvent.click(
+ await body.findByRole('menuitem', { name: `${family} CSV` }),
+ );
+ await waitFor(() =>
+ expect(
+ body.queryByRole('menu', {
+ name: family === 'Menu' ? 'Open menu' : 'Record options',
+ }),
+ ).not.toBeInTheDocument(),
+ );
+ }
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Open dropdown' }),
+ );
+ expect(
+ getComputedStyle(await body.findByTestId('header-icon')).transform,
+ ).toBe('none');
+ await userEvent.click(
+ await body.findByRole('menuitem', { name: 'Details page' }),
+ );
+ const back = await body.findByRole('menuitem', { name: 'Back' });
+ expect(getComputedStyle(back.querySelector('svg')!).transform).toBe(
+ args.direction === 'rtl' ? 'matrix(-1, 0, 0, 1, 0, 0)' : 'none',
+ );
+ await userEvent.click(back);
+ expect(
+ await body.findByRole('menuitem', { name: 'Details page' }),
+ ).toBeVisible();
+ await userEvent.keyboard('{Escape}');
+ const tooltipTrigger = canvas.getByRole('button', {
+ name: 'Tooltip target',
+ });
+ await userEvent.hover(tooltipTrigger);
+ const tooltip = await body.findByRole('tooltip');
+ expect(getComputedStyle(tooltip).direction).toBe(args.direction);
+ expect(canvasElement.contains(tooltip)).toBe(args.scoped !== false);
+ await userEvent.unhover(tooltipTrigger);
+ await userEvent.keyboard('{Escape}');
+ },
+};
+
+export const RightToLeft: Story = {
+ ...LeftToRight,
+ args: { direction: 'rtl' },
+};
+export const RightToLeftBodyPortal: Story = {
+ ...LeftToRight,
+ args: { direction: 'rtl', scoped: false },
+ beforeEach: () => {
+ const previousRootClassName = document.documentElement.className;
+
+ return () => {
+ document.documentElement.className = previousRootClassName;
+ };
+ },
+};
diff --git a/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.layout.stories.tsx b/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.layout.stories.tsx
new file mode 100644
index 00000000000..e747bca5f5b
--- /dev/null
+++ b/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.layout.stories.tsx
@@ -0,0 +1,116 @@
+import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import { DirectionalLayoutExample } from './DirectionalLayoutExample';
+
+const meta: Meta<typeof DirectionalLayoutExample> = {
+ title: 'UI/Layout/TextDirectionProvider/Layout',
+ component: DirectionalLayoutExample,
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+};
+
+export default meta;
+type Story = StoryObj<typeof DirectionalLayoutExample>;
+
+export const LeftToRight: Story = {
+ args: { direction: 'ltr' },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const isRightToLeft = args.direction === 'rtl';
+ const first = canvas.getByRole('button', { name: 'First action' });
+ const last = canvas.getByRole('button', { name: 'Last action' });
+ expect(
+ first.getBoundingClientRect().left > last.getBoundingClientRect().left,
+ ).toBe(isRightToLeft);
+ expect(getComputedStyle(first).borderStartEndRadius).toBe('0px');
+ expect(getComputedStyle(last).borderStartStartRadius).toBe('0px');
+ const annual = canvas.getByRole('radio', { name: 'Annual' });
+ await userEvent.click(annual);
+ await userEvent.keyboard(isRightToLeft ? '{ArrowLeft}' : '{ArrowRight}');
+ await waitFor(() =>
+ expect(canvas.getByRole('radio', { name: 'Monthly' })).toBeChecked(),
+ );
+ expect(
+ getComputedStyle(
+ canvas.getByText('Team plan').closest('button') ??
+ canvas.getByText('Team plan'),
+ ).textAlign,
+ ).toBe('start');
+ const titleBox = canvas
+ .getByText('Account details')
+ .getBoundingClientRect();
+ const descriptionBox = canvas
+ .getByText('Review the information before continuing.')
+ .getBoundingClientRect();
+ expect(Math.abs(descriptionBox.left - titleBox.left)).toBeLessThan(1);
+ expect(Math.abs(descriptionBox.right - titleBox.right)).toBeLessThan(1);
+ const soon = canvas.getByText('Soon');
+ const upcoming = canvas.getByRole('button', { name: /Upcoming action/ });
+ expect(
+ soon.getBoundingClientRect().left <
+ upcoming.getBoundingClientRect().left +
+ upcoming.getBoundingClientRect().width / 2,
+ ).toBe(isRightToLeft);
+ const light = canvas.getByRole('button', { name: 'Light' });
+ const dark = canvas.getByRole('button', { name: 'Dark' });
+ expect(
+ light.getBoundingClientRect().left > dark.getBoundingClientRect().left,
+ ).toBe(isRightToLeft);
+ expect(
+ Math.abs(
+ light.getBoundingClientRect().left - dark.getBoundingClientRect().left,
+ ),
+ ).toBeGreaterThan(light.getBoundingClientRect().width);
+ await userEvent.click(dark);
+ for (const overlap of ['left', 'right']) {
+ const group = canvas.getByTestId(`avatars-${overlap}`).firstElementChild!;
+ const groupBox = group.getBoundingClientRect();
+ const physicalBoxes = [...group.children]
+ .map((child) => child.getBoundingClientRect())
+ .sort((firstBox, secondBox) => firstBox.left - secondBox.left);
+ for (let index = 1; index < physicalBoxes.length; index++) {
+ expect(
+ Math.round(
+ physicalBoxes[index - 1]!.right - physicalBoxes[index]!.left,
+ ),
+ ).toBe(3);
+ }
+ expect(Math.abs(physicalBoxes[0]!.left - groupBox.left)).toBeLessThan(1);
+ expect(
+ Math.abs(
+ Math.max(...physicalBoxes.map((box) => box.right)) - groupBox.right,
+ ),
+ ).toBeLessThan(1);
+ }
+ const collapsed = canvas.getAllByRole('button', {
+ name: 'Collapse node',
+ })[0]!;
+ await userEvent.click(collapsed);
+ const expanded = canvas.getByRole('button', { name: 'Expand node' });
+ await waitFor(() =>
+ expect(
+ getComputedStyle(expanded.querySelector('svg')!.parentElement!)
+ .transform,
+ ).toBe(
+ isRightToLeft
+ ? 'matrix(0, 1, -1, 0, 0, 0)'
+ : 'matrix(0, -1, 1, 0, 0, 0)',
+ ),
+ );
+ await userEvent.click(expanded);
+ const name = canvas.getByText('name');
+ expect(getComputedStyle(name.closest('ul')!).paddingInlineStart).toBe(
+ '32px',
+ );
+ const longLabel = canvas.getByText(
+ 'A very long account name that must truncate',
+ );
+ expect(longLabel.scrollWidth).toBeGreaterThan(longLabel.clientWidth);
+ },
+};
+
+export const RightToLeft: Story = {
+ ...LeftToRight,
+ args: { direction: 'rtl' },
+};
diff --git a/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.stories.tsx b/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.stories.tsx
new file mode 100644
index 00000000000..12b9b5152be
--- /dev/null
+++ b/packages/twenty-ui/src/components/__stories__/reading-direction/TextDirectionProvider.stories.tsx
@@ -0,0 +1,35 @@
+import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { ThemeProvider } from '@ui/theme';
+
+import { DirectionalLayoutExample } from './DirectionalLayoutExample';
+
+const meta: Meta<typeof DirectionalLayoutExample> = {
+ title: 'UI/Layout/TextDirectionProvider',
+ component: DirectionalLayoutExample,
+ parameters: { layout: 'fullscreen', a11y: A11Y_DEFER_COLOR_CONTRAST },
+};
+
+export default meta;
+type Story = StoryObj<typeof DirectionalLayoutExample>;
+
+export const ReadingDirections: Story = {
+ render: () => (
+ <div
+ style={{ display: 'grid', gridTemplateColumns: 'repeat(2, max-content)' }}
+ >
+ {(['light', 'dark'] as const).flatMap((colorScheme) =>
+ (['ltr', 'rtl'] as const).map((direction) => (
+ <ThemeProvider
+ key={`${colorScheme}-${direction}`}
+ colorScheme={colorScheme}
+ applyToRoot={false}
+ >
+ <DirectionalLayoutExample direction={direction} />
+ </ThemeProvider>
+ )),
+ )}
+ </div>
+ ),
+};
diff --git a/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss b/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss
index 69ba7e31482..268389aefa3 100644
--- a/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss
+++ b/packages/twenty-ui/src/components/data-display/AvatarGroup/AvatarGroup.module.scss
@@ -10,7 +10,8 @@
margin-right: calc(-1 * var(--avatar-group-overlap-offset));
}
- &[data-overlap='right']:last-child {
+ &[data-overlap='right']:dir(ltr):last-child,
+ &[data-overlap='right']:dir(rtl):first-child {
margin-right: 0;
}
@@ -18,7 +19,8 @@
margin-left: calc(-1 * var(--avatar-group-overlap-offset));
}
- &[data-overlap='left']:first-child {
+ &[data-overlap='left']:dir(ltr):first-child,
+ &[data-overlap='left']:dir(rtl):last-child {
margin-left: 0;
}
}
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss
index 3480e0bb4d6..81fb904b518 100644
--- a/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonArrow.module.scss
@@ -23,6 +23,10 @@
transform: rotate(-90deg);
transition: transform 0.3s ease;
+ &:dir(rtl) {
+ transform: rotate(90deg);
+ }
+
&[data-open] {
transform: rotate(0deg);
}
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss
index 2fe86fecc78..1a4186dc173 100644
--- a/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonList.module.scss
@@ -7,7 +7,7 @@
}
.nested {
- padding-left: var(--t-spacing-8);
+ padding-inline-start: var(--t-spacing-8);
> :first-of-type {
margin-top: var(--t-spacing-2);
diff --git a/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss
index f51bfc0e089..da78c672d93 100644
--- a/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss
+++ b/packages/twenty-ui/src/components/data-display/JsonTree/internal/JsonNestedNode.module.scss
@@ -42,7 +42,7 @@
}
.nested {
- padding-left: var(--t-spacing-8);
+ padding-inline-start: var(--t-spacing-8);
> :first-of-type {
margin-top: var(--t-spacing-2);
diff --git a/packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss b/packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss
index 895bc8e25fa..3259068e2e8 100644
--- a/packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss
+++ b/packages/twenty-ui/src/components/feedback/Callout/Callout.module.scss
@@ -95,7 +95,7 @@
display: flex;
align-self: stretch;
padding-bottom: var(--t-spacing-2);
- padding-left: var(--t-spacing-6);
+ padding-inline-start: var(--t-spacing-6);
}
.descriptionWrapperWithAction {
diff --git a/packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx b/packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx
index bfbade681e8..11176329273 100644
--- a/packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx
+++ b/packages/twenty-ui/src/components/feedback/Toaster/Toaster.tsx
@@ -1,8 +1,8 @@
-import { useDirection } from '@base-ui/react/direction-provider';
import { useRender } from '@base-ui/react/use-render';
import { clsx } from 'clsx';
import { createPortal } from 'react-dom';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { isDefined } from '@ui/utilities/utils/isDefined';
@@ -20,7 +20,7 @@ export const Toaster = ({
...props
}: ToasterProps) => {
const themeContainer = useThemeContainer();
- const direction = useDirection();
+ const direction = useProvidedTextDirection();
const target =
container === undefined
? (themeContainer ??
diff --git a/packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss b/packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss
index 706e4030199..b59fec34c61 100644
--- a/packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss
+++ b/packages/twenty-ui/src/components/input/CardPicker/CardPicker.module.scss
@@ -6,7 +6,7 @@
display: flex;
padding: 0;
position: relative;
- text-align: left;
+ text-align: start;
width: 100%;
}
diff --git a/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss b/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss
index f9e76a9d5fc..1a6b3c18a5b 100644
--- a/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/ColorSchemePicker.module.scss
@@ -4,7 +4,7 @@
width: 100%;
> * + * {
- margin-left: var(--t-spacing-4);
+ margin-inline-start: var(--t-spacing-4);
}
@include respond-to(mobile) {
diff --git a/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss
index dd07f90a2a7..949e6cd3412 100644
--- a/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.module.scss
@@ -11,7 +11,7 @@
width: 100%;
height: 80px;
padding-top: var(--t-spacing-6);
- padding-left: var(--t-spacing-6);
+ padding-inline-start: var(--t-spacing-6);
border: 1px solid var(--color-scheme-card-border-color);
border-radius: var(--t-border-radius-md);
background: var(--color-scheme-card-background);
@@ -25,10 +25,10 @@
box-sizing: border-box;
height: 56px;
padding-top: var(--t-spacing-2);
- padding-left: var(--t-spacing-2);
+ padding-inline-start: var(--t-spacing-2);
border-top: 1px solid var(--color-scheme-card-border-color);
- border-left: 1px solid var(--color-scheme-card-border-color);
- border-radius: var(--t-border-radius-md) 0px 0px 0px;
+ border-inline-start: 1px solid var(--color-scheme-card-border-color);
+ border-start-start-radius: var(--t-border-radius-md);
background: var(--color-scheme-card-content-background);
color: var(--color-scheme-card-content-color);
font-size: 20px;
@@ -56,7 +56,7 @@
.checkmarkContainer {
position: absolute;
- right: 0px;
+ inset-inline-end: 0px;
bottom: 0px;
padding: var(--t-spacing-2);
opacity: 0;
diff --git a/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx
index 6d79a9537e6..063521f4fc4 100644
--- a/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx
+++ b/packages/twenty-ui/src/components/input/ColorSchemePicker/internal/ColorSchemeCard/ColorSchemeCard.tsx
@@ -82,11 +82,11 @@ export const ColorSchemeCard = ({
const mixedSegments = (
<>
<ColorSchemeSegment
- style={{ borderTopRightRadius: 0, borderBottomRightRadius: 0 }}
+ style={{ borderStartEndRadius: 0, borderEndEndRadius: 0 }}
variant="Light"
/>
<ColorSchemeSegment
- style={{ borderTopLeftRadius: 0, borderBottomLeftRadius: 0 }}
+ style={{ borderStartStartRadius: 0, borderEndStartRadius: 0 }}
variant="Dark"
/>
</>
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss
index dde785e81ac..8bd167f4478 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss
@@ -46,10 +46,10 @@
font-weight: var(--t-font-weight-medium);
min-block-size: 33px;
padding-inline: var(--t-spacing-2);
+}
- &:dir(rtl) svg {
- transform: rotate(180deg);
- }
+.backIcon:dir(rtl) {
+ transform: scaleX(-1);
}
.searchContainer {
@@ -86,10 +86,6 @@
gap: var(--t-spacing-1);
min-block-size: 33px;
padding-inline: var(--t-spacing-2);
-
- &:dir(rtl) svg {
- transform: rotate(180deg);
- }
}
.title {
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss.d.ts b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss.d.ts
index e8d14f39389..75d05803304 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss.d.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss.d.ts
@@ -5,6 +5,7 @@ declare const classNames: {
readonly section: 'section';
readonly separator: 'separator';
readonly back: 'back';
+ readonly backIcon: 'backIcon';
readonly searchContainer: 'searchContainer';
readonly search: 'search';
readonly status: 'status';
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx
index 8e7cde12c56..a2fe1b3c6f1 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.menu.test.tsx
@@ -5,6 +5,7 @@ import { describe, expect, it, vi } from 'vitest';
import { LightIconButton } from '@ui/components/input/LightIconButton/LightIconButton';
import { IconDotsVertical } from '@ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
import { Dropdown } from '../Dropdown';
@@ -293,28 +294,25 @@ describe('Dropdown menu', () => {
const user = userEvent.setup();
render(
- <Dropdown.Root type="menu">
- <Dropdown.Trigger>Filters</Dropdown.Trigger>
- <Dropdown.Content aria-label="Filters" style={{ direction }}>
- <Dropdown.Submenu type="picker">
- <Dropdown.SubmenuTrigger style={{ direction }}>
- People
- </Dropdown.SubmenuTrigger>
- <Dropdown.Content
- aria-label="Choose person"
- style={{ direction }}
- >
- <Dropdown.Search
- aria-label="Search people"
- defaultValue="Ada"
- />
- <Dropdown.OptionItem selected={false}>
- Ada Lovelace
- </Dropdown.OptionItem>
- </Dropdown.Content>
- </Dropdown.Submenu>
- </Dropdown.Content>
- </Dropdown.Root>,
+ <TextDirectionProvider direction={direction}>
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Filters</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Filters">
+ <Dropdown.Submenu type="picker">
+ <Dropdown.SubmenuTrigger>People</Dropdown.SubmenuTrigger>
+ <Dropdown.Content aria-label="Choose person">
+ <Dropdown.Search
+ aria-label="Search people"
+ defaultValue="Ada"
+ />
+ <Dropdown.OptionItem selected={false}>
+ Ada Lovelace
+ </Dropdown.OptionItem>
+ </Dropdown.Content>
+ </Dropdown.Submenu>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ </TextDirectionProvider>,
);
await user.tab();
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.submenu.test.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.submenu.test.tsx
index 41f476e1d19..03e632cda54 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.submenu.test.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__tests__/Dropdown.submenu.test.tsx
@@ -2,6 +2,8 @@ import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it } from 'vitest';
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
+
import { Dropdown } from '../Dropdown';
describe('Dropdown submenu hover', () => {
@@ -15,23 +17,22 @@ describe('Dropdown submenu hover', () => {
const user = userEvent.setup();
render(
- <Dropdown.Root type="menu">
- <Dropdown.Trigger>Record actions</Dropdown.Trigger>
- <Dropdown.Content aria-label="Record actions" style={{ direction }}>
- <Dropdown.Submenu>
- <Dropdown.SubmenuTrigger delay={0} style={{ direction }}>
- Export
- </Dropdown.SubmenuTrigger>
- <Dropdown.Content
- aria-label="Export formats"
- style={{ direction }}
- >
- <Dropdown.ActionItem>CSV</Dropdown.ActionItem>
- <Dropdown.ActionItem>Excel</Dropdown.ActionItem>
- </Dropdown.Content>
- </Dropdown.Submenu>
- </Dropdown.Content>
- </Dropdown.Root>,
+ <TextDirectionProvider direction={direction}>
+ <Dropdown.Root type="menu">
+ <Dropdown.Trigger>Record actions</Dropdown.Trigger>
+ <Dropdown.Content aria-label="Record actions">
+ <Dropdown.Submenu>
+ <Dropdown.SubmenuTrigger delay={0}>
+ Export
+ </Dropdown.SubmenuTrigger>
+ <Dropdown.Content aria-label="Export formats">
+ <Dropdown.ActionItem>CSV</Dropdown.ActionItem>
+ <Dropdown.ActionItem>Excel</Dropdown.ActionItem>
+ </Dropdown.Content>
+ </Dropdown.Submenu>
+ </Dropdown.Content>
+ </Dropdown.Root>
+ </TextDirectionProvider>,
);
await user.tab();
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownBack.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownBack.tsx
index 07009f4bc96..a353ab4dfe5 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownBack.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownBack.tsx
@@ -21,7 +21,7 @@ export const DropdownBack = ({
className={clsx(styles.back, className)}
data-dropdown-back=""
disabled={props.disabled || !canGoBack}
- startIcon={<IconChevronLeft />}
+ startIcon={<IconChevronLeft className={styles.backIcon} />}
closeOnClick={false}
onClick={(event) => {
onClick?.(event);
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx
index 99715d22fd7..cdb5927ef4d 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownSubmenuTrigger.tsx
@@ -1,3 +1,4 @@
+import { useDirection } from '@base-ui/react/direction-provider';
import { useMergedRefs } from '@base-ui/utils/useMergedRefs';
import { useId } from 'react';
@@ -31,6 +32,7 @@ export const DropdownSubmenuTrigger = ({
ref,
...props
}: DropdownSubmenuTriggerProps) => {
+ const direction = useDirection();
const { type, parentType, open, setOpen, setFocusOnOpen, registerTrigger } =
useDropdownContext();
const generatedId = useId();
@@ -66,8 +68,7 @@ export const DropdownSubmenuTrigger = ({
return;
}
- const isRightToLeft =
- getComputedStyle(event.currentTarget).direction === 'rtl';
+ const isRightToLeft = direction === 'rtl';
const forwardKey = isRightToLeft ? 'ArrowLeft' : 'ArrowRight';
if (event.key === forwardKey) {
diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts
index 9fedc636066..d6afe0c9773 100644
--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts
+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/useDropdownKeyboardNavigation.ts
@@ -1,3 +1,4 @@
+import { useDirection } from '@base-ui/react/direction-provider';
import { useState, type KeyboardEvent } from 'react';
import { isDefined } from '@ui/utilities/utils/isDefined';
@@ -20,6 +21,7 @@ export const useDropdownKeyboardNavigation = ({
isSubmenu: boolean;
setOpen: (open: boolean) => void;
}) => {
+ const direction = useDirection();
const [typeahead, setTypeahead] = useState({ text: '', timestamp: 0 });
return (event: KeyboardEvent<HTMLDivElement>) => {
@@ -40,7 +42,7 @@ export const useDropdownKeyboardNavigation = ({
const isEditable = target.matches(
'input,textarea,select,[contenteditable="true"]',
);
- const isRightToLeft = getComputedStyle(content).direction === 'rtl';
+ const isRightToLeft = direction === 'rtl';
const backwardKey = isRightToLeft ? 'ArrowRight' : 'ArrowLeft';
const shouldCloseSubmenu =
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonSoon.module.scss b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonSoon.module.scss
index 57cd7cbad82..01f542d718a 100644
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonSoon.module.scss
+++ b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonSoon.module.scss
@@ -1,4 +1,4 @@
.soonPillContainer {
display: flex;
- margin-left: auto;
+ margin-inline-start: auto;
}
diff --git a/packages/twenty-ui/src/primitives/input/Select/__stories__/Select.portals.stories.tsx b/packages/twenty-ui/src/primitives/input/Select/__stories__/Select.portals.stories.tsx
index ce448fd892e..5280cba1be5 100644
--- a/packages/twenty-ui/src/primitives/input/Select/__stories__/Select.portals.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/Select/__stories__/Select.portals.stories.tsx
@@ -1,8 +1,8 @@
-import { DirectionProvider } from '@base-ui/react/direction-provider';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
import { ComponentDecorator } from '@ui/testing';
import { ThemeProvider } from '@ui/theme/ThemeProvider';
@@ -142,11 +142,11 @@ export const NullContainerWaits: Story = {
export const RightToLeft: Story = {
decorators: [ComponentDecorator],
render: () => (
- <DirectionProvider direction="rtl">
+ <TextDirectionProvider direction="rtl">
<div dir="rtl">
<SelectExample defaultValue="apple" />
</div>
- </DirectionProvider>
+ </TextDirectionProvider>
),
play: async ({ canvasElement }) => {
await userEvent.click(within(canvasElement).getByRole('combobox'));
diff --git a/packages/twenty-ui/src/primitives/input/Select/internal/SelectPopup.tsx b/packages/twenty-ui/src/primitives/input/Select/internal/SelectPopup.tsx
index eb7a411b955..e31c41ebb8f 100644
--- a/packages/twenty-ui/src/primitives/input/Select/internal/SelectPopup.tsx
+++ b/packages/twenty-ui/src/primitives/input/Select/internal/SelectPopup.tsx
@@ -1,6 +1,6 @@
-import { useDirection } from '@base-ui/react/direction-provider';
import { Select as SelectPrimitive } from '@base-ui/react/select';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
@@ -19,7 +19,7 @@ export const SelectPopup = ({
...props
}: SelectPopupProps) => {
const themeContainer = useThemeContainer();
- const direction = useDirection();
+ const direction = useProvidedTextDirection();
return (
<SelectPrimitive.Portal
diff --git a/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/TextDirectionProvider.tsx b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/TextDirectionProvider.tsx
index a1e230d8d6e..41ac8993fbb 100644
--- a/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/TextDirectionProvider.tsx
+++ b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/TextDirectionProvider.tsx
@@ -1,8 +1,11 @@
import { DirectionProvider } from '@base-ui/react/direction-provider';
import { type ReactNode } from 'react';
+import { TextDirectionContext } from './internal/TextDirectionContext';
+import { type TextDirection } from './internal/TextDirection';
+
type TextDirectionProviderProps = {
- direction: 'ltr' | 'rtl';
+ direction: TextDirection;
children: ReactNode;
};
@@ -13,5 +16,7 @@ export const TextDirectionProvider = ({
direction,
children,
}: TextDirectionProviderProps) => (
- <DirectionProvider direction={direction}>{children}</DirectionProvider>
+ <TextDirectionContext.Provider value={direction}>
+ <DirectionProvider direction={direction}>{children}</DirectionProvider>
+ </TextDirectionContext.Provider>
);
diff --git a/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/TextDirection.ts b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/TextDirection.ts
new file mode 100644
index 00000000000..0099293356c
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/TextDirection.ts
@@ -0,0 +1 @@
+export type TextDirection = 'ltr' | 'rtl';
diff --git a/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/TextDirectionContext.ts b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/TextDirectionContext.ts
new file mode 100644
index 00000000000..a59c0997f62
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/TextDirectionContext.ts
@@ -0,0 +1,7 @@
+import { createContext } from 'react';
+
+import { type TextDirection } from './TextDirection';
+
+export const TextDirectionContext = createContext<TextDirection | undefined>(
+ undefined,
+);
diff --git a/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection.ts b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection.ts
new file mode 100644
index 00000000000..f8d342d1de1
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection.ts
@@ -0,0 +1,5 @@
+import { useContext } from 'react';
+
+import { TextDirectionContext } from './TextDirectionContext';
+
+export const useProvidedTextDirection = () => useContext(TextDirectionContext);
diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
index bd29cbb2817..eb1a1a1c97f 100644
--- a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss
@@ -150,4 +150,8 @@
flex: none;
inline-size: calc(var(--t-icon-size-sm) * 1px);
stroke-width: var(--t-icon-stroke-md);
+
+ &:dir(rtl) {
+ transform: scaleX(-1);
+ }
}
diff --git a/packages/twenty-ui/src/primitives/surfaces/AlertDialog/__stories__/AlertDialog.portals.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/AlertDialog/__stories__/AlertDialog.portals.stories.tsx
index 2cb2f131e8a..4d58142500f 100644
--- a/packages/twenty-ui/src/primitives/surfaces/AlertDialog/__stories__/AlertDialog.portals.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/AlertDialog/__stories__/AlertDialog.portals.stories.tsx
@@ -1,8 +1,8 @@
-import { DirectionProvider } from '@base-ui/react/direction-provider';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useRef, useState } from 'react';
import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
import { ComponentDecorator } from '@ui/testing';
import { ThemeProvider } from '@ui/theme/ThemeProvider';
@@ -20,7 +20,7 @@ type Story = StoryObj<typeof AlertDialogExample>;
export const ScopedThemeAndDirection: Story = {
decorators: [ComponentDecorator],
render: () => (
- <DirectionProvider direction="rtl">
+ <TextDirectionProvider direction="rtl">
<ThemeProvider colorScheme="dark" applyToRoot={false}>
<div data-testid="theme-scope">
<div
@@ -30,7 +30,7 @@ export const ScopedThemeAndDirection: Story = {
<AlertDialogExample defaultOpen />
</div>
</ThemeProvider>
- </DirectionProvider>
+ </TextDirectionProvider>
),
play: async ({ canvasElement }) => {
const dialog = await waitForAlertDialog(canvasElement);
diff --git a/packages/twenty-ui/src/primitives/surfaces/AlertDialog/internal/AlertDialogPopup.tsx b/packages/twenty-ui/src/primitives/surfaces/AlertDialog/internal/AlertDialogPopup.tsx
index 93e2c761f93..4ee4794c3ad 100644
--- a/packages/twenty-ui/src/primitives/surfaces/AlertDialog/internal/AlertDialogPopup.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/AlertDialog/internal/AlertDialogPopup.tsx
@@ -1,6 +1,6 @@
import { AlertDialog as AlertDialogPrimitive } from '@base-ui/react/alert-dialog';
-import { useDirection } from '@base-ui/react/direction-provider';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
@@ -15,7 +15,7 @@ export const AlertDialogPopup = ({
...props
}: AlertDialogPopupProps) => {
const themeContainer = useThemeContainer();
- const direction = useDirection();
+ const direction = useProvidedTextDirection();
return (
<AlertDialogPrimitive.Portal
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.portals.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.portals.stories.tsx
index db317f307b4..730301d350c 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.portals.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.portals.stories.tsx
@@ -1,9 +1,9 @@
import { Button } from '@ui/primitives/input/Button/Button';
-import { DirectionProvider } from '@base-ui/react/direction-provider';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useRef, useState } from 'react';
import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { TextDirectionProvider } from '@ui/primitives/layout/TextDirectionProvider/TextDirectionProvider';
import { ComponentDecorator } from '@ui/testing';
import { ThemeProvider } from '@ui/theme/ThemeProvider';
@@ -21,7 +21,7 @@ type Story = StoryObj<typeof DialogExample>;
export const ScopedThemeAndDirection: Story = {
decorators: [ComponentDecorator],
render: () => (
- <DirectionProvider direction="rtl">
+ <TextDirectionProvider direction="rtl">
<ThemeProvider colorScheme="dark" applyToRoot={false}>
<div
data-testid="theme-scope"
@@ -34,7 +34,7 @@ export const ScopedThemeAndDirection: Story = {
<DialogExample defaultOpen />
</div>
</ThemeProvider>
- </DirectionProvider>
+ </TextDirectionProvider>
),
play: async ({ canvasElement }) => {
const dialog = await waitForDialog(canvasElement);
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogPopup.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogPopup.tsx
index d25034d0ce4..e5dfdd1115b 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogPopup.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogPopup.tsx
@@ -1,7 +1,7 @@
import { Dialog as DialogPrimitive } from '@base-ui/react/dialog';
import { isBoolean } from '@sniptt/guards';
-import { useDirection } from '@base-ui/react/direction-provider';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
@@ -18,7 +18,7 @@ export const DialogPopup = ({
...props
}: DialogPopupProps) => {
const themeContainer = useThemeContainer();
- const direction = useDirection();
+ const direction = useProvidedTextDirection();
const backdropProps = isBoolean(backdrop) ? {} : backdrop;
return (
diff --git a/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.portals.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.portals.stories.tsx
index 341ccec7fbb..b59ce73c645 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.portals.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.portals.stories.tsx
@@ -92,6 +92,25 @@ export const ScopedTheme: Story = {
},
};
+export const InheritedDirection: Story = {
+ render: () => (
+ <section aria-label="Right-to-left container" dir="rtl">
+ <ThemeProvider colorScheme="light" applyToRoot={false}>
+ <div style={{ width: 260, height: 240 }}>
+ <PortalMenu />
+ </div>
+ </ThemeProvider>
+ </section>
+ ),
+ play: async ({ canvasElement }) => {
+ const scope = within(canvasElement).getByRole('region', {
+ name: 'Right-to-left container',
+ });
+ const menu = await within(scope).findByRole('menu', { name: 'Options' });
+ expect(getComputedStyle(menu).direction).toBe('rtl');
+ },
+};
+
const DeferredContainerMenu = () => {
const [showContainer, setShowContainer] = useState(false);
const [container, setContainer] = useState<HTMLDivElement | null>(null);
diff --git a/packages/twenty-ui/src/primitives/surfaces/Menu/internal/MenuPopup.tsx b/packages/twenty-ui/src/primitives/surfaces/Menu/internal/MenuPopup.tsx
index 73d65474e0d..dbd7d2d744b 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Menu/internal/MenuPopup.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Menu/internal/MenuPopup.tsx
@@ -1,6 +1,7 @@
import { Menu as MenuPrimitive } from '@base-ui/react/menu';
import { useContext } from 'react';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
@@ -21,6 +22,7 @@ export const MenuPopup = ({
...props
}: MenuPopupProps) => {
const themeContainer = useThemeContainer();
+ const direction = useProvidedTextDirection();
const { container = themeContainer ?? undefined, ...popupProps } = props;
const isNested = useContext(MenuNestingContext);
const defaults = MENU_POPUP_POSITION_DEFAULTS[isNested ? 'submenu' : 'root'];
@@ -28,6 +30,7 @@ export const MenuPopup = ({
return (
<MenuPrimitive.Portal container={container} keepMounted={keepMounted}>
<MenuPrimitive.Positioner
+ dir={direction}
side={side ?? defaults.side}
align={align ?? defaults.align}
sideOffset={sideOffset ?? defaults.sideOffset}
diff --git a/packages/twenty-ui/src/primitives/surfaces/Popover/internal/PopoverPopup.tsx b/packages/twenty-ui/src/primitives/surfaces/Popover/internal/PopoverPopup.tsx
index 1205509caa0..a3c6e460c32 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Popover/internal/PopoverPopup.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Popover/internal/PopoverPopup.tsx
@@ -1,5 +1,6 @@
import { Popover as PopoverPrimitive } from '@base-ui/react/popover';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
@@ -20,6 +21,7 @@ export const PopoverPopup = ({
...props
}: PopoverPopupProps) => {
const themeContainer = useThemeContainer();
+ const direction = useProvidedTextDirection();
return (
<PopoverPrimitive.Portal
@@ -27,6 +29,7 @@ export const PopoverPopup = ({
keepMounted={keepMounted}
>
<PopoverPrimitive.Positioner
+ dir={direction}
side={side}
align={align}
sideOffset={sideOffset}
diff --git a/packages/twenty-ui/src/primitives/surfaces/Tooltip/internal/TooltipPopup.tsx b/packages/twenty-ui/src/primitives/surfaces/Tooltip/internal/TooltipPopup.tsx
index 2d15f023e0e..19828ba619c 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Tooltip/internal/TooltipPopup.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Tooltip/internal/TooltipPopup.tsx
@@ -1,6 +1,7 @@
import { Tooltip as TooltipPrimitive } from '@base-ui/react/tooltip';
import { isNumber, isString } from '@sniptt/guards';
+import { useProvidedTextDirection } from '@ui/primitives/layout/TextDirectionProvider/internal/useProvidedTextDirection';
import { useThemeContainer } from '@ui/theme';
import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
@@ -32,6 +33,7 @@ export const TooltipPopup = ({
...props
}: TooltipPopupProps) => {
const themeContainer = useThemeContainer();
+ const direction = useProvidedTextDirection();
const hasPlainTextContent = isString(children) || isNumber(children);
return (
@@ -40,6 +42,7 @@ export const TooltipPopup = ({
keepMounted={keepMounted}
>
<TooltipPrimitive.Positioner
+ dir={direction}
side={side}
align={align}
sideOffset={sideOffset}
diff --git a/packages/twenty-ui/vite.config.individual.ts b/packages/twenty-ui/vite.config.individual.ts
index abc5f70d768..177110b2d62 100644
--- a/packages/twenty-ui/vite.config.individual.ts
+++ b/packages/twenty-ui/vite.config.individual.ts
@@ -1,4 +1,5 @@
import react from '@vitejs/plugin-react-swc';
+import { Features } from 'lightningcss';
import * as path from 'path';
import { defineConfig } from 'vite';
import svgr from 'vite-plugin-svgr';
@@ -33,6 +34,9 @@ export default defineConfig(() => {
modules: {
localsConvention: 'camelCaseOnly',
},
+ lightningcss: {
+ exclude: Features.DirSelector,
+ },
preprocessorOptions: {
scss: {
api: 'modern-compiler',
diff --git a/packages/twenty-ui/vite.config.ts b/packages/twenty-ui/vite.config.ts
index 2f0b5205a0c..8a26f2e1872 100644
--- a/packages/twenty-ui/vite.config.ts
+++ b/packages/twenty-ui/vite.config.ts
@@ -1,5 +1,6 @@
import react from '@vitejs/plugin-react-swc';
import * as fs from 'fs';
+import { Features } from 'lightningcss';
import * as path from 'path';
import { defineConfig } from 'vite';
import checker from 'vite-plugin-checker';
@@ -62,6 +63,9 @@ export default defineConfig(({ command }) => {
modules: {
localsConvention: 'camelCaseOnly',
},
+ lightningcss: {
+ exclude: Features.DirSelector,
+ },
preprocessorOptions: {
scss: {
api: 'modern-compiler',
diff --git a/yarn.lock b/yarn.lock
index 1ec5d1e19ff..6ea2f3e18a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50503,6 +50503,7 @@ __metadata:
json-2-csv: "npm:^5.4.0"
json-logic-js: "npm:^2.0.5"
libphonenumber-js: "npm:^1.10.26"
+ lightningcss: "npm:^1.32.0"
linkify-react: "npm:^4.1.3"
linkifyjs: "npm:^4.1.3"
lodash.camelcase: "npm:^4.3.0"
@@ -50940,6 +50941,7 @@ __metadata:
esbuild: "npm:^0.28.1"
glob: "npm:^11.1.0"
jsdom: "npm:^30.0.1"
+ lightningcss: "npm:^1.32.0"
monaco-editor: "npm:0.52.2"
prettier: "npm:^3.1.1"
react: "npm:^19.2.0"