Skip to content

Add RTL support #51376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 9, 2025
Merged

Add RTL support #51376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
151d392
Add rtl support
guan404ming Jun 9, 2025
b96ad2a
Upgrade Chakra ui and fix select indicator position
guan404ming Jun 9, 2025
ba2434f
Support mirrored navbar
guan404ming Jun 9, 2025
b284d25
Fix dynamic lang change
guan404ming Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en" style="height: 100%">
<html style="height: 100%">
<head>
<meta charset="UTF-8" />
<base href="{{ backend_server_base_url }}" />
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"@chakra-ui/anatomy": "^2.3.4",
"@chakra-ui/react": "^3.17.0",
"@chakra-ui/react": "^3.20.0",
"@codemirror/lang-json": "^6.0.1",
"@emotion/react": "^11.14.0",
"@tanstack/react-query": "^5.75.1",
Expand Down
1,203 changes: 615 additions & 588 deletions airflow-core/src/airflow/ui/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion airflow-core/src/airflow/ui/src/components/ui/Select/Trigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const Trigger = forwardRef<HTMLButtonElement, Props>((props, ref) => {
return (
<ChakraSelect.Control {...rest}>
<ChakraSelect.Trigger ref={ref}>{children}</ChakraSelect.Trigger>
<ChakraSelect.IndicatorGroup>
<ChakraSelect.IndicatorGroup _rtl={{ bottom: 0, left: 0, right: "auto", top: 0 }}>
{clearable ? (
<ChakraSelect.ClearTrigger asChild>
<CloseButton
Expand Down
10 changes: 6 additions & 4 deletions airflow-core/src/airflow/ui/src/layouts/BaseLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Box } from "@chakra-ui/react";
import { Box, LocaleProvider } from "@chakra-ui/react";
import type { PropsWithChildren } from "react";
import { useTranslation } from "react-i18next";
import { Outlet } from "react-router-dom";

import { useConfig } from "src/queries/useConfig";
Expand All @@ -26,17 +27,18 @@ import { Nav } from "./Nav";

export const BaseLayout = ({ children }: PropsWithChildren) => {
const instanceName = useConfig("instance_name");
const { i18n } = useTranslation();

if (typeof instanceName === "string") {
document.title = instanceName;
}

return (
<>
<LocaleProvider locale={i18n.language}>
<Nav />
<Box display="flex" flexDirection="column" h="100vh" ml={20} p={3}>
<Box _ltr={{ ml: 20 }} _rtl={{ mr: 20 }} display="flex" flexDirection="column" h="100vh" p={3}>
{children ?? <Outlet />}
</Box>
</>
</LocaleProvider>
);
};
9 changes: 8 additions & 1 deletion airflow-core/src/airflow/ui/src/layouts/Nav/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,18 @@ export const Nav = () => {

return (
<VStack
_ltr={{
left: 0,
right: "auto",
}}
_rtl={{
left: "auto",
right: 0,
}}
alignItems="center"
bg="blue.muted"
height="100%"
justifyContent="space-between"
left={0}
position="fixed"
py={3}
top={0}
Expand Down
11 changes: 10 additions & 1 deletion airflow-core/src/airflow/ui/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,19 @@ axios.interceptors.response.use(

axios.interceptors.request.use(tokenHandler);

const html = document.documentElement;
const updateHtml = (lng: string) => {
html.setAttribute("dir", i18n.dir(lng));
html.setAttribute("lang", lng);
};

updateHtml(i18n.language);
i18n.on("languageChanged", updateHtml);

createRoot(document.querySelector("#root") as HTMLDivElement).render(
<StrictMode>
<I18nextProvider i18n={i18n}>
<ChakraProvider value={system}>
<ChakraProvider i18nIsDynamicList={true} value={system}>
<ColorModeProvider>
<QueryClientProvider client={client}>
<TimezoneProvider>
Expand Down
3 changes: 1 addition & 2 deletions airflow-core/src/airflow/ui/src/pages/Dashboard/Health/HealthBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,13 @@ export const HealthBadge = ({
{": "}
{translate(`health.${status}`)}
</Text>
<Text>
<Text hidden={latestHeartbeat === undefined}>
{translate("health.lastHeartbeat")}
{": "}
<Time datetime={latestHeartbeat} />
</Text>
</div>
}
disabled={!Boolean(latestHeartbeat)}
>
<StateBadge size="lg" state={state} variant="surface">
{title}
Expand Down