Skip to content

[pull] master from monkeytypegame:master #851

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
pull merged 4 commits into from
Mar 30, 2026
+3 −10
Merged

[pull] master from monkeytypegame:master #851

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
c273f0f
fix(screenshot): remove spacer causing layout jump (@byseif21) (#7750)
byseif21 Mar 30, 2026
cd95ae5
fix(dev): monkeytype doesn't load with firefox in development (@Leona…
Leonabcd123 Mar 30, 2026
11f8b4c
fix: test config placement in firefox
Miodec Mar 30, 2026
82bf095
fix: dropdown buttons obscuring tooltips on the activity calendar (@b…
byseif21 Mar 30, 2026
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 frontend/src/ts/components/pages/test/TestConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function TestConfig(): JSXElement {
class={cn(
variables,
"group relative mb-8 hidden w-max grid-cols-[1fr_auto_1fr] justify-center place-self-center [font-size:var(--font-size)] sm:grid",
"transition-opacity duration-125",
"mx-auto transition-opacity duration-125",
getFocus() || getResultVisible()
? "pointer-events-none opacity-0"
: "",
Expand Down
6 changes: 1 addition & 5 deletions frontend/src/ts/components/ui/SlimSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,7 @@ export default function SlimSelect(props: SlimSelectProps): JSXElement {
ref={(el) => (containerRef = el)}
class="relative [&>.ss-content]:top-full! [&>.ss-content]:left-0! [&>.ss-content]:w-full!"
>
<select
ref={(el) => (selectRef = el)}
multiple={props.multiple}
class="z-10000"
>
<select ref={(el) => (selectRef = el)} multiple={props.multiple}>
{props.children}
</select>
</div>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/ts/dev/signal-tracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ function getCallerInfo(): { isUserCode: boolean; source: string } {
}

for (const frame of frames.toReversed()) {
if (frame === "") continue;
if (frame.includes("signal-tracker")) continue;
if (frame.includes("solid-js")) continue;
if (frame.includes("@solid-refresh")) continue;
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/ts/test/test-screenshot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ function revert(): void {
hideLoaderBar();
qs("#ad-result-wrapper")?.show();
qs("#ad-result-small-wrapper")?.show();
qs(".pageTest .screenshotSpacer")?.remove();
qs(".pageTest .ssWatermark")?.hide();
qs(".pageTest .ssWatermark")?.setText("monkeytype.com"); // Reset watermark text
qs(".pageTest .buttons")?.show();
Expand Down Expand Up @@ -96,9 +95,6 @@ async function generateCanvas(): Promise<HTMLCanvasElement | null> {
qs("#nocss")?.hide();
qs("#ad-result-wrapper")?.hide();
qs("#ad-result-small-wrapper")?.hide();
// Ensure spacer is removed before adding a new one if function is called rapidly
qs(".pageTest .screenshotSpacer")?.remove();
qs(".page.pageTest")?.prependHtml("<div class='screenshotSpacer'></div>");
qs("#result")?.addClass("noBalloons");
qs(".wordInputHighlight")?.hide();
qsa(".highlightContainer")?.hide();
Expand Down
Loading