Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Refactor theming (#497)
1ilit3ea88314ebbc
diff --git a/src/App.jsx b/src/App.jsxindex 0678c6a5..fcb09811 100644--- a/src/App.jsx+++ b/src/App.jsx@@ -5,7 +5,6 @@ import BugReport from "./pages/BugReport";import Templates from "./pages/Templates";import LandingPage from "./pages/LandingPage";import SettingsContextProvider from "./context/SettingsContext";-import { useSettings } from "./hooks";import NotFound from "./pages/NotFound";export default function App() {@@ -15,22 +14,8 @@ export default function App() {<RestoreScroll /><Routes><Route path="/" element={<LandingPage />} />- <Route- path="/editor"- element={- <ThemedPage>- <Editor />- </ThemedPage>- }- />- <Route- path="/bug-report"- element={- <ThemedPage>- <BugReport />- </ThemedPage>- }- />+ <Route path="/editor" element={<Editor />} />+ <Route path="/bug-report" element={<BugReport />} /><Route path="/templates" element={<Templates />} /><Route path="*" element={<NotFound />} /></Routes>@@ -39,29 +24,6 @@ export default function App() {);}-function ThemedPage({ children }) {- const { setSettings } = useSettings();-- useLayoutEffect(() => {- const theme = localStorage.getItem("theme");- if (theme === "dark") {- setSettings((prev) => ({ ...prev, mode: "dark" }));- const body = document.body;- if (body.hasAttribute("theme-mode")) {- body.setAttribute("theme-mode", "dark");- }- } else {- setSettings((prev) => ({ ...prev, mode: "light" }));- const body = document.body;- if (body.hasAttribute("theme-mode")) {- body.setAttribute("theme-mode", "light");- }- }- }, [setSettings]);-- return children;-}-function RestoreScroll() {const location = useLocation();useLayoutEffect(() => {diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsxindex fb45870b..c9e4d0eb 100644--- a/src/components/EditorCanvas/Canvas.jsx+++ b/src/components/EditorCanvas/Canvas.jsx@@ -708,15 +708,13 @@ export default function Canvas() {{ passive: false },);- const theme = localStorage.getItem("theme");-return (<div className="grow h-full touch-none" id="canvas"><divclassName="w-full h-full"style={{cursor: pointer.style,- backgroundColor: theme === "dark" ? darkBgTheme : "white",+ backgroundColor: settings.mode === "dark" ? darkBgTheme : "white",}}><svgdiff --git a/src/components/EditorCanvas/Relationship.jsx b/src/components/EditorCanvas/Relationship.jsxindex cca57535..2793f68e 100644--- a/src/components/EditorCanvas/Relationship.jsx+++ b/src/components/EditorCanvas/Relationship.jsx@@ -36,8 +36,6 @@ export default function Relationship({ data }) {};}, [tables, data]);- const theme = localStorage.getItem("theme");-const pathRef = useRef();const labelRef = useRef();@@ -134,14 +132,14 @@ export default function Relationship({ data }) {<rectx={labelX - 2}y={labelY - labelFontSize}- fill={theme === "dark" ? darkBgTheme : "white"}+ fill={settings.mode === "dark" ? darkBgTheme : "white"}width={labelWidth + 4}height={labelHeight}/><textx={labelX}y={labelY}- fill={theme === "dark" ? "lightgrey" : "#333"}+ fill={settings.mode === "dark" ? "lightgrey" : "#333"}fontSize={labelFontSize}fontWeight={500}ref={labelRef}diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsxindex 2537173b..657b86b0 100644--- a/src/components/EditorHeader/ControlPanel.jsx+++ b/src/components/EditorHeader/ControlPanel.jsx@@ -1357,25 +1357,11 @@ export default function ControlPanel({children: [{name: t("light"),- function: () => {- const body = document.body;- if (body.hasAttribute("theme-mode")) {- body.setAttribute("theme-mode", "light");- }- localStorage.setItem("theme", "light");- setSettings((prev) => ({ ...prev, mode: "light" }));- },+ function: () => setSettings((prev) => ({ ...prev, mode: "light" })),},{name: t("dark"),- function: () => {- const body = document.body;- if (body.hasAttribute("theme-mode")) {- body.setAttribute("theme-mode", "dark");- }- localStorage.setItem("theme", "dark");- setSettings((prev) => ({ ...prev, mode: "dark" }));- },+ function: () => setSettings((prev) => ({ ...prev, mode: "dark" })),},],function: () => {},diff --git a/src/context/SettingsContext.jsx b/src/context/SettingsContext.jsxindex 9bd224a1..0ad31bda 100644--- a/src/context/SettingsContext.jsx+++ b/src/context/SettingsContext.jsx@@ -28,6 +28,10 @@ export default function SettingsContextProvider({ children }) {}}, []);+ useEffect(() => {+ document.body.setAttribute("theme-mode", settings.mode);+ }, [settings.mode]);+useEffect(() => {localStorage.setItem("settings", JSON.stringify(settings));}, [settings]);diff --git a/src/hooks/index.js b/src/hooks/index.jsindex e21eee15..d24b45c7 100644--- a/src/hooks/index.js+++ b/src/hooks/index.js@@ -12,3 +12,4 @@ export { default as useTransform } from "./useTransform";export { default as useTypes } from "./useTypes";export { default as useUndoRedo } from "./useUndoRedo";export { default as useEnums } from "./useEnums";+export { default as useThemedPage } from "./useThemedPage";diff --git a/src/hooks/useThemedPage.js b/src/hooks/useThemedPage.jsnew file mode 100644index 00000000..e92f8e5b--- /dev/null+++ b/src/hooks/useThemedPage.js@@ -0,0 +1,13 @@+import { useLayoutEffect } from "react";+import useSettings from "./useSettings";++/**+ * Adds the `theme-mode` attribute to the body element for semi-ui dark theme+ */+export default function useThemedPage() {+ const { settings } = useSettings();++ useLayoutEffect(() => {+ document.body.setAttribute("theme-mode", settings.mode);+ }, [settings]);+}diff --git a/src/pages/BugReport.jsx b/src/pages/BugReport.jsxindex 9d76dc58..20a6a56c 100644--- a/src/pages/BugReport.jsx+++ b/src/pages/BugReport.jsx@@ -12,6 +12,7 @@ import { CLEAR_EDITOR_COMMAND } from "lexical";import { Link } from "react-router-dom";import { socials } from "../data/socials";import { send } from "../api/email";+import { useSettings, useThemedPage } from "../hooks";function Form({ theme }) {const [editor] = useLexicalComposerContext();@@ -85,7 +86,7 @@ function Form({ theme }) {value={data.title}onChange={(v) => setData((prev) => ({ ...prev, title: v }))}/>- <RichEditor theme={theme} placeholder={"Describe the bug"} />+ <RichEditor theme={theme} placeholder="Describe the bug" /><Uploadaction="#"ref={uploadRef}@@ -123,13 +124,16 @@ function Form({ theme }) {}export default function BugReport() {- const [theme, setTheme] = useState("");+ const {+ settings: { mode: theme },+ } = useSettings();useEffect(() => {- setTheme(localStorage.getItem("theme"));document.title = "Report a bug | drawDB";document.body.setAttribute("class", "theme");- }, [setTheme]);+ }, []);++ useThemedPage();return (<>diff --git a/src/pages/Editor.jsx b/src/pages/Editor.jsxindex 000a50de..24b5afef 100644--- a/src/pages/Editor.jsx+++ b/src/pages/Editor.jsx@@ -10,8 +10,11 @@ import TasksContextProvider from "../context/TasksContext";import SaveStateContextProvider from "../context/SaveStateContext";import EnumsContextProvider from "../context/EnumsContext";import WorkSpace from "../components/Workspace";+import { useThemedPage } from "../hooks";export default function Editor() {+ useThemedPage();+return (<LayoutContextProvider><TransformContextProvider>