public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature: Instant Theme Change, without refresh [Booking Pages Only] (#1807) 

* Avoid Theme Flicker. Render Server Side

* Add back isReady implementation

* Use shorter syntax for Tag

* Listen to changes in pref-color-scheme and act

* Uglify Theme Applier code

* Resolve conflicts

* Add comments

* Appropriate function name

* Move uglify-js to dependencies

* Remove uglify-js

* Fix commnt

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
pull/1874/head
hariombalhara 2022-02-16 21:23:26 +05:30 committed by GitHub
parent 34c5360a4d
commit 4693cbba4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/extensions.json vendored
View File

@ -7,6 +7,6 @@
"bradlc.vscode-tailwindcss", // hinting / autocompletion for tailwind "bradlc.vscode-tailwindcss", // hinting / autocompletion for tailwind
"ban.spellright", // Spell check for docs "ban.spellright", // Spell check for docs
"stripe.vscode-stripe", // stripe VSCode extension "stripe.vscode-stripe", // stripe VSCode extension
"Prisma.prisma" // syntax|format|completion for prisma "Prisma.prisma" // syntax|format|completion for prisma
] ]
} }

40
apps/web/lib/hooks/useTheme.tsx
View File

@ -3,28 +3,42 @@ import { useEffect, useState } from "react";
import { Maybe } from "@trpc/server"; import { Maybe } from "@trpc/server";
// This method is stringified and executed only on client. So,
// - Pass all the params explicitly to this method. Don't use closure
function applyThemeAndAddListener(theme: string) {
const mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)");
const applyTheme = function (theme: string, darkMatch: boolean) {
if (!theme) {
if (darkMatch) {
document.documentElement.classList.add("dark");
} else {
document.documentElement.classList.remove("dark");
}
} else {
document.documentElement.classList.add(theme);
}
};
mediaQueryList.onchange = function (e) {
applyTheme(theme, e.matches);
};
applyTheme(theme, mediaQueryList.matches);
}
// makes sure the ui doesn't flash // makes sure the ui doesn't flash
export default function useTheme(theme?: Maybe<string>) { export default function useTheme(theme?: Maybe<string>) {
const [isReady, setIsReady] = useState(false); const [isReady, setIsReady] = useState(false);
useEffect(() => { useEffect(() => {
// TODO: isReady doesn't seem required now. This is also impacting PSI Score for pages which are using isReady.
setIsReady(true); setIsReady(true);
}, []); }, []);
function Theme() { function Theme() {
const themeString = theme ? `"${theme}"` : null; const code = applyThemeAndAddListener.toString();
const themeStr = theme ? `"${theme}"` : null;
return ( return (
<Head> <Head>
<script <script dangerouslySetInnerHTML={{ __html: `(${code})(${themeStr})` }}></script>
dangerouslySetInnerHTML={{
__html: `(function (theme) {
if (!theme && window.matchMedia("(prefers-color-scheme: dark)").matches) {
document.documentElement.classList.add("dark");
} else if (!theme) {
/** Uncovered case */
} else {
document.documentElement.classList.add(theme);
}
})(${themeString})`,
}}></script>
</Head> </Head>
); );
} }