pierrejeambrun commented on code in PR #64748: URL: https://github.com/apache/airflow/pull/64748#discussion_r3046244412
########## airflow-core/src/airflow/ui/src/context/colorMode/useMonacoTheme.ts: ########## @@ -0,0 +1,126 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import type { Monaco } from "@monaco-editor/react"; +import { useCallback } from "react"; + +import { useColorMode } from "./useColorMode"; + +const LIGHT_THEME_NAME = "airflow-light"; +const DARK_THEME_NAME = "airflow-dark"; + +let themesRegistered = false; + +// Convert any CSS color (including modern color spaces like OKLCH that Chakra +// UI uses) to a #rrggbb string that Monaco's `defineTheme` accepts. +// +// We rasterize a single pixel and read back its sRGB bytes via `getImageData`. +// `ctx.fillStyle` readback does NOT work for this: starting in Chrome 111, it +// preserves the original OKLCH string instead of converting to hex, which +// Monaco would silently ignore. +const cssVarToHex = (ctx: CanvasRenderingContext2D, cssVar: string): string => { + const value = getComputedStyle(document.documentElement).getPropertyValue(cssVar).trim(); + + if (value === "") { + return "#000000"; + } + + ctx.fillStyle = value; + ctx.clearRect(0, 0, 1, 1); + ctx.fillRect(0, 0, 1, 1); + const [red, green, blue] = ctx.getImageData(0, 0, 1, 1).data; + + return `#${[red, green, blue].map((channel) => (channel ?? 0).toString(16).padStart(2, "0")).join("")}`; +}; + +const defineAirflowMonacoThemes = (monaco: Monaco) => { + if (themesRegistered) { + return; + } + + const canvas = document.createElement("canvas"); + + canvas.width = 1; + canvas.height = 1; + const ctx = canvas.getContext("2d"); + + if (!ctx) { + return; + } + + const toHex = (cssVar: string) => cssVarToHex(ctx, cssVar); + + monaco.editor.defineTheme(LIGHT_THEME_NAME, { + base: "vs", + colors: { + "editor.background": toHex("--chakra-colors-gray-50"), + "editor.foreground": toHex("--chakra-colors-gray-900"), + "editor.inactiveSelectionBackground": toHex("--chakra-colors-gray-200"), + "editor.lineHighlightBackground": toHex("--chakra-colors-gray-100"), + "editor.selectionBackground": toHex("--chakra-colors-brand-200"), + "editorGutter.background": toHex("--chakra-colors-gray-50"), + "editorLineNumber.activeForeground": toHex("--chakra-colors-gray-700"), + "editorLineNumber.foreground": toHex("--chakra-colors-gray-400"), + "editorSuggestWidget.background": toHex("--chakra-colors-gray-50"), + "editorWidget.background": toHex("--chakra-colors-gray-50"), + "editorWidget.border": toHex("--chakra-colors-gray-300"), + "scrollbarSlider.activeBackground": `${toHex("--chakra-colors-gray-500")}c0`, + "scrollbarSlider.background": `${toHex("--chakra-colors-gray-300")}80`, + "scrollbarSlider.hoverBackground": `${toHex("--chakra-colors-gray-400")}a0`, + }, + inherit: true, + rules: [], + }); + + monaco.editor.defineTheme(DARK_THEME_NAME, { + base: "vs-dark", + colors: { + "editor.background": toHex("--chakra-colors-gray-900"), + "editor.foreground": toHex("--chakra-colors-gray-100"), + "editor.inactiveSelectionBackground": toHex("--chakra-colors-gray-800"), + "editor.lineHighlightBackground": toHex("--chakra-colors-gray-800"), + "editor.selectionBackground": toHex("--chakra-colors-brand-800"), + "editorGutter.background": toHex("--chakra-colors-gray-900"), + "editorLineNumber.activeForeground": toHex("--chakra-colors-gray-300"), + "editorLineNumber.foreground": toHex("--chakra-colors-gray-600"), + "editorSuggestWidget.background": toHex("--chakra-colors-gray-900"), + "editorWidget.background": toHex("--chakra-colors-gray-900"), + "editorWidget.border": toHex("--chakra-colors-gray-700"), + "scrollbarSlider.activeBackground": `${toHex("--chakra-colors-gray-500")}c0`, + "scrollbarSlider.background": `${toHex("--chakra-colors-gray-700")}80`, + "scrollbarSlider.hoverBackground": `${toHex("--chakra-colors-gray-600")}a0`, + }, + inherit: true, + rules: [], + }); + + themesRegistered = true; +}; + +export const useMonacoTheme = () => { + const { colorMode } = useColorMode(); + + const beforeMount = useCallback((monaco: Monaco) => { + defineAirflowMonacoThemes(monaco); + }, []); + Review Comment: I believe React Compiler handles memoization. The empty deps array and the wrapper function that just delegates to defineAirflowMonacoThemes add nothing. This could just be: ``` return { beforeMount: defineAirflowMonacoThemes, theme: colorMode === "dark" ? DARK_THEME_NAME : LIGHT_THEME_NAME, }; ``` Can you try and see if that breaks anything? ########## airflow-core/src/airflow/ui/src/context/colorMode/useMonacoTheme.ts: ########## @@ -0,0 +1,126 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import type { Monaco } from "@monaco-editor/react"; +import { useCallback } from "react"; + +import { useColorMode } from "./useColorMode"; + +const LIGHT_THEME_NAME = "airflow-light"; +const DARK_THEME_NAME = "airflow-dark"; + +let themesRegistered = false; + Review Comment: Yes I would keep that flag. I'll try to think about other approaches on how to do that, but that's no trivial. What's nice with this is that it will actually handle custom themes added in 3.2.0 which is cool. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
