Compare commits

..

4 Commits

Author SHA1 Message Date
MasterGordon 52ee48bd86 fixed preview 2025-09-16 16:22:00 +02:00
MasterGordon aa7b8569d7 updated pixijs 2025-09-16 16:03:36 +02:00
MasterGordon ac318f51f2 more updates 2025-09-16 01:59:46 +02:00
MasterGordon c7f353f657 updated some deps 2025-09-16 01:45:35 +02:00
12 changed files with 375 additions and 177 deletions

View File

@ -18,13 +18,12 @@ export type Endpoint<TInputSchema extends ZodType, TResponse> = {
) => Promise<TResponse>; ) => Promise<TResponse>;
}; };
export const createEndpoint = < export const createEndpoint = <TInputSchema extends ZodType, TResponse>(
TInputSchema extends ZodType,
TResponse,
TInput = z.infer<TInputSchema>,
>(
validate: TInputSchema, validate: TInputSchema,
handler: (input: TInput, context: RequestContext) => Promise<TResponse>, handler: (
input: z.infer<TInputSchema>,
context: RequestContext,
) => Promise<TResponse>,
): Endpoint<TInputSchema, TResponse> => { ): Endpoint<TInputSchema, TResponse> => {
return { validate, handler }; return { validate, handler };
}; };

BIN
bun.lockb

Binary file not shown.

View File

@ -28,6 +28,7 @@ export default [
"react/react-in-jsx-scope": "off", "react/react-in-jsx-scope": "off",
"react/prop-types": "off", "react/prop-types": "off",
"react/display-name": "off", "react/display-name": "off",
"react/no-unknown-property": "off",
}, },
}, },
{ {

View File

@ -15,60 +15,60 @@
"nukedb": "rm sqlite.db && bun run backend/migrate.ts" "nukedb": "rm sqlite.db && bun run backend/migrate.ts"
}, },
"dependencies": { "dependencies": {
"@msgpack/msgpack": "^3.0.0-beta2", "@msgpack/msgpack": "^3.1.2",
"@pixi/canvas-display": "^7.4.2", "@pixi/canvas-display": "^7.4.3",
"@pixi/canvas-renderer": "^7.4.2", "@pixi/canvas-renderer": "^7.4.3",
"@pixi/react": "^7.1.2", "@pixi/react": "^8.0.3",
"@radix-ui/react-dialog": "^1.1.2", "@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.2", "@radix-ui/react-dropdown-menu": "^2.1.16",
"@radix-ui/react-popover": "^1.1.2", "@radix-ui/react-popover": "^1.1.15",
"@radix-ui/react-switch": "^1.1.1", "@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-tooltip": "^1.2.7", "@radix-ui/react-tooltip": "^1.2.8",
"@tanstack/react-query": "^5.59.11", "@tanstack/react-query": "^5.87.4",
"@tanstack/react-query-devtools": "^5.59.11", "@tanstack/react-query-devtools": "^5.87.4",
"@tsparticles/engine": "^3.5.0", "@tsparticles/engine": "^3.9.1",
"@tsparticles/preset-sea-anemone": "^3.1.0", "@tsparticles/preset-sea-anemone": "^3.2.0",
"@tsparticles/react": "^3.0.0", "@tsparticles/react": "^3.0.0",
"@tsparticles/slim": "^3.5.0", "@tsparticles/slim": "^3.9.1",
"@uidotdev/usehooks": "^2.4.1", "@uidotdev/usehooks": "^2.4.1",
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"dayjs": "^1.11.13", "dayjs": "^1.11.18",
"drizzle-orm": "0.33.0", "drizzle-orm": "0.44.5",
"jotai": "^2.10.0", "jotai": "^2.14.0",
"lucide-react": "^0.452.0", "lucide-react": "^0.544.0",
"motion": "^12.18.1", "motion": "^12.23.12",
"pixi-viewport": "^5.0.3", "pixi-viewport": "^6.0.3",
"pixi.js": "^7.0.0", "pixi.js": "^8.13.2",
"pixi.js-legacy": "^7.4.2", "pixi.js-legacy": "^7.4.3",
"prom-client": "^15.1.3", "prom-client": "^15.1.3",
"random-seed": "^0.3.0", "random-seed": "^0.3.0",
"react": "^18.3.1", "react": "^19.1.1",
"react-confetti-boom": "^1.0.0", "react-confetti-boom": "^2.0.1",
"react-dom": "^18.3.1", "react-dom": "^19.1.1",
"tailwind-merge": "^2.5.3", "tailwind-merge": "^3.3.1",
"wouter": "^3.3.5", "wouter": "^3.7.1",
"zod": "^3.23.8" "zod": "^4.1.8"
}, },
"devDependencies": { "devDependencies": {
"@eslint/compat": "^1.2.0", "@eslint/compat": "^1.3.2",
"@eslint/js": "^9.12.0", "@eslint/js": "^9.35.0",
"@tailwindcss/vite": "next", "@tailwindcss/vite": "next",
"@types/bun": "latest", "@types/bun": "latest",
"@types/random-seed": "^0.3.5", "@types/random-seed": "^0.3.5",
"@types/react": "^18.3.11", "@types/react": "^19.1.13",
"@types/react-dom": "^18.3.1", "@types/react-dom": "^19.1.9",
"@vitejs/plugin-react-swc": "^3.7.1", "@vitejs/plugin-react-swc": "^4.0.1",
"drizzle-kit": "0.24.2", "drizzle-kit": "0.31.4",
"eslint": "^9.12.0", "eslint": "^9.35.0",
"eslint-plugin-react": "^7.37.1", "eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "5.0.0", "eslint-plugin-react-hooks": "5.2.0",
"globals": "^15.11.0", "globals": "^16.4.0",
"tailwindcss": "^4.0.0-alpha.26", "tailwindcss": "^4.1.13",
"typescript": "^5.6.3", "typescript": "^5.9.2",
"typescript-eslint": "^8.8.1", "typescript-eslint": "^8.44.0",
"vite": "^5.4.8", "vite": "^7.1.5",
"vite-bundle-analyzer": "^0.22.3", "vite-bundle-analyzer": "^1.2.3",
"vite-imagetools": "^7.0.4" "vite-imagetools": "^8.0.0"
} }
} }

View File

@ -12,9 +12,10 @@ import {
type Theme, type Theme,
} from "../themes/Theme"; } from "../themes/Theme";
import { useTheme } from "../themes/useTheme"; import { useTheme } from "../themes/useTheme";
import { Container, Sprite, Stage, useTick } from "@pixi/react"; import { extend, useTick, Application } from "@pixi/react";
import Viewport from "./pixi/PixiViewport"; import Viewport from "./pixi/PixiViewport";
import type { Viewport as PixiViewport } from "pixi-viewport"; import type { Viewport as PixiViewport } from "pixi-viewport";
import { Container, FederatedPointerEvent, Sprite, Texture } from "pixi.js";
import { import {
type ClientGame, type ClientGame,
getValue, getValue,
@ -22,7 +23,6 @@ import {
type ServerGame, type ServerGame,
} from "../../shared/game"; } from "../../shared/game";
import { useWSQuery } from "../hooks"; import { useWSQuery } from "../hooks";
import { Texture } from "pixi.js";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { cursorXAtom, cursorYAtom } from "../atoms"; import { cursorXAtom, cursorYAtom } from "../atoms";
import Coords from "./Coords"; import Coords from "./Coords";
@ -46,6 +46,11 @@ import { weightedPickRandom } from "../../shared/utils";
import gen from "random-seed"; import gen from "random-seed";
import type { UserSettings } from "../../shared/user-settings"; import type { UserSettings } from "../../shared/user-settings";
extend({
Container,
Sprite,
});
interface BoardProps { interface BoardProps {
className?: string; className?: string;
game: ServerGame | ClientGame; game: ServerGame | ClientGame;
@ -157,6 +162,26 @@ const Board: React.FC<BoardProps> = (props) => {
}; };
}, []); }, []);
const clamp = useMemo(
() =>
theme &&
(props.width || props.height
? { left: 0, right: boardWidth, top: 0, bottom: boardHeight }
: {
left: -theme.size,
right: boardWidth + theme.size,
top: -theme.size,
bottom: boardHeight + theme.size,
}),
[boardHeight, boardWidth, props.height, props.width, theme],
);
const clampZoom = useMemo(
() => ({
minScale: 1,
}),
[],
);
return ( return (
<div className="flex flex-col w-full"> <div className="flex flex-col w-full">
<div <div
@ -199,11 +224,13 @@ const Board: React.FC<BoardProps> = (props) => {
)} )}
</div> </div>
{theme && ( {theme && (
<Stage <Application
options={{ hello: true, forceCanvas: !!props.width }} hello
forceFallbackAdapter={!!props.width}
width={width} width={width}
height={height} height={height}
className="select-none" className="select-none"
preference="webgl"
> >
<Viewport <Viewport
viewportRef={viewportRef} viewportRef={viewportRef}
@ -211,19 +238,8 @@ const Board: React.FC<BoardProps> = (props) => {
worldHeight={boardHeight} worldHeight={boardHeight}
width={width} width={width}
height={height} height={height}
clamp={ clamp={clamp}
props.width || props.height clampZoom={clampZoom}
? { left: 0, right: boardWidth, top: 0, bottom: boardHeight }
: {
left: -theme.size,
right: boardWidth + theme.size,
top: -theme.size,
bottom: boardHeight + theme.size,
}
}
clampZoom={{
minScale: 1,
}}
onViewportChange={onViewportChange} onViewportChange={onViewportChange}
> >
{Array.from({ length: game.width }).map((_, i) => { {Array.from({ length: game.width }).map((_, i) => {
@ -254,7 +270,7 @@ const Board: React.FC<BoardProps> = (props) => {
}); });
})} })}
</Viewport> </Viewport>
</Stage> </Application>
)} )}
</div> </div>
{!props.width && !props.height && <Coords />} {!props.width && !props.height && <Coords />}
@ -311,13 +327,14 @@ const Tile = ({
const isQuestionMark = game.isQuestionMark[i][j]; const isQuestionMark = game.isQuestionMark[i][j];
const base = const base =
isRevealed || (isMine && !isFlagged) ? ( isRevealed || (isMine && !isFlagged) ? (
<Sprite key="b" texture={resolveSprite(theme.revealed)} /> <pixiSprite key="b" texture={resolveSprite(theme.revealed)} />
) : ( ) : (
<Sprite key="b" texture={resolveSprite(theme.tile)} /> <pixiSprite key="b" texture={resolveSprite(theme.tile)} />
); );
const extra = isLastPos ? ( const extra = isLastPos ? (
<Sprite key="e" texture={resolveSprite(theme.lastPos)} /> <pixiSprite key="e" texture={resolveSprite(theme.lastPos)} />
) : null; ) : null;
const touchStart = useRef<number>(0); const touchStart = useRef<number>(0);
const isMove = useRef<boolean>(false); const isMove = useRef<boolean>(false);
const startX = useRef<number>(0); const startX = useRef<number>(0);
@ -334,13 +351,16 @@ const Tile = ({
setDoTick(true); setDoTick(true);
} }
}, [isMine, isRevealed, userSettings?.showRevealAnimation, value]); }, [isMine, isRevealed, userSettings?.showRevealAnimation, value]);
useTick((delta) => { useTick({
frame.current += delta * 0.1; callback: (delta) => {
if (frame.current > 3) { frame.current += delta.count * 0.1;
setDoTick(false); if (frame.current > 3) {
} setDoTick(false);
setScale(Math.max(1, -2 * Math.pow(frame.current - 0.5, 2) + 1.2)); }
}, doTick); setScale(Math.max(1, -2 * Math.pow(frame.current - 0.5, 2) + 1.2));
},
isEnabled: doTick,
});
const baseProps = useMemo( const baseProps = useMemo(
() => ({ () => ({
scale, scale,
@ -353,18 +373,18 @@ const Tile = ({
let content: ReactNode = null; let content: ReactNode = null;
if (isFlagged) { if (isFlagged) {
content = ( content = (
<Sprite key="c" texture={resolveSprite(theme.flag)} {...baseProps} /> <pixiSprite key="c" texture={resolveSprite(theme.flag)} {...baseProps} />
); );
} else if (isMine) { } else if (isMine) {
content = ( content = (
<Sprite key="c" texture={resolveSprite(theme.mine)} {...baseProps} /> <pixiSprite key="c" texture={resolveSprite(theme.mine)} {...baseProps} />
); );
} else if (value !== -1 && isRevealed) { } else if (value !== -1 && isRevealed) {
const img = theme[value.toString() as keyof Theme] as Texture; const img = theme[value.toString() as keyof Theme] as Texture;
content = img ? <Sprite key="c" texture={img} {...baseProps} /> : null; content = img ? <pixiSprite key="c" texture={img} {...baseProps} /> : null;
} else if (isQuestionMark) { } else if (isQuestionMark) {
content = ( content = (
<Sprite <pixiSprite
key="c" key="c"
texture={resolveSprite(theme.questionMark)} texture={resolveSprite(theme.questionMark)}
{...baseProps} {...baseProps}
@ -375,16 +395,16 @@ const Tile = ({
const [, setCursorY] = useAtom(cursorYAtom); const [, setCursorY] = useAtom(cursorYAtom);
return ( return (
<Container <pixiContainer
eventMode="static" eventMode="static"
interactive interactive
x={i * theme.size} x={i * theme.size}
y={j * theme.size} y={j * theme.size}
key={`${i},${j}`} key={`${i},${j}`}
onrightup={() => { onRightUp={() => {
onRightClick(i, j); onRightClick(i, j);
}} }}
onpointerup={(e) => { onPointerUp={(e: FederatedPointerEvent) => {
if (e.button !== 0) return; if (e.button !== 0) return;
if (isMove.current) return; if (isMove.current) return;
if (Date.now() - touchStart.current > 300) { if (Date.now() - touchStart.current > 300) {
@ -393,17 +413,17 @@ const Tile = ({
onLeftClick(i, j); onLeftClick(i, j);
} }
}} }}
onpointerdown={(e) => { onPointerDown={(e: FederatedPointerEvent) => {
isMove.current = false; isMove.current = false;
touchStart.current = Date.now(); touchStart.current = Date.now();
startX.current = e.global.x; startX.current = e.global.x;
startY.current = e.global.y; startY.current = e.global.y;
}} }}
onpointerenter={() => { onPointerEnter={() => {
setCursorX(i); setCursorX(i);
setCursorY(j); setCursorY(j);
}} }}
onpointermove={(e) => { onPointerMove={(e: FederatedPointerEvent) => {
if ( if (
Math.abs(startX.current - e.global.x) > 10 || Math.abs(startX.current - e.global.x) > 10 ||
Math.abs(startY.current - e.global.y) > 10 Math.abs(startY.current - e.global.y) > 10
@ -415,7 +435,7 @@ const Tile = ({
{base} {base}
{content} {content}
{extra} {extra}
</Container> </pixiContainer>
); );
}; };

View File

@ -0,0 +1,167 @@
import { useEffect, useState } from "react";
import { Application, Container, Sprite, Texture } from "pixi.js";
import type { ServerGame, ClientGame } from "../../shared/game";
import { useTheme } from "../themes/useTheme";
import { themes } from "../themes";
import { getValue, isServerGame } from "../../shared/game";
import type { LoadedTexture, LoadedTheme } from "../themes/Theme";
import { weightedPickRandom } from "../../shared/utils";
import gen from "random-seed";
// Cache for static board previews with size limit
const MAX_CACHE_SIZE = 250;
const previewCache = new Map<string, string>();
// Helper function to manage cache size
const addToCache = (key: string, value: string) => {
// If cache is at max size, remove the oldest entry
if (previewCache.size >= MAX_CACHE_SIZE) {
const firstKey = previewCache.keys().next().value;
if (firstKey) {
previewCache.delete(firstKey);
}
}
previewCache.set(key, value);
};
interface StaticBoardPreviewProps {
game: ServerGame | ClientGame;
width: number;
height: number;
className?: string;
}
const StaticBoardPreview: React.FC<StaticBoardPreviewProps> = ({
game,
width,
height,
className,
}) => {
const [imageUrl, setImageUrl] = useState<string | null>(null);
const theme = useTheme(themes.find((t) => t.id === game.theme)!.theme);
useEffect(() => {
if (!theme) return;
// Generate a cache key based on game state and dimensions
const cacheKey = `${game.theme}-${game.uuid}-${width}x${height}`;
// Check if we have a cached image
const cachedImage = previewCache.get(cacheKey);
if (cachedImage) {
setImageUrl(cachedImage);
return;
}
const generateStaticImage = async () => {
// Create a temporary Pixi application for rendering
const app = new Application();
await app.init({
width,
height,
backgroundAlpha: 0,
preference: "webgl",
});
const container = new Container();
app.stage.addChild(container);
// Helper function to resolve sprites
const resolveSprite = (lt: LoadedTexture, x: number, y: number) => {
if (Array.isArray(lt)) {
const rng = gen.create(game.uuid + ";" + x + ";" + y);
return weightedPickRandom(
lt,
(i) => i.weight,
(tw) => rng.floatBetween(0, tw),
).sprite;
}
return lt;
};
// Render all tiles
for (let i = 0; i < game.width; i++) {
for (let j = 0; j < game.height; j++) {
const isRevealed = game.isRevealed[i][j];
const value = isServerGame(game)
? getValue(game.mines, i, j)
: game.values[i][j];
const isMine = isServerGame(game) ? game.mines[i][j] : false;
const isFlagged = game.isFlagged[i][j];
const isQuestionMark = game.isQuestionMark[i][j];
// Base tile
const baseTexture =
isRevealed || (isMine && !isFlagged)
? resolveSprite(theme.revealed, i, j)
: resolveSprite(theme.tile, i, j);
const baseSprite = new Sprite(baseTexture);
baseSprite.x = i * theme.size;
baseSprite.y = j * theme.size;
container.addChild(baseSprite);
// Content overlay
let contentTexture: Texture | null = null;
if (isFlagged) {
contentTexture = resolveSprite(theme.flag, i, j);
} else if (isMine) {
contentTexture = resolveSprite(theme.mine, i, j);
} else if (value !== -1 && isRevealed) {
const numberTexture = theme[
value.toString() as keyof LoadedTheme
] as Texture;
if (numberTexture) {
contentTexture = numberTexture;
}
} else if (isQuestionMark) {
contentTexture = resolveSprite(theme.questionMark, i, j);
}
if (contentTexture) {
const contentSprite = new Sprite(contentTexture);
contentSprite.x = i * theme.size + theme.size * 0.5;
contentSprite.y = j * theme.size + theme.size * 0.5;
contentSprite.anchor.set(0.5);
container.addChild(contentSprite);
}
}
}
// Render to canvas and create data URL
app.renderer.render(container);
const canvas = app.canvas;
const dataUrl = canvas.toDataURL();
// Cache the generated image
addToCache(cacheKey, dataUrl);
setImageUrl(dataUrl);
// Clean up
app.destroy(true);
};
generateStaticImage().catch(console.error);
}, [game, theme, width, height]);
if (!imageUrl) {
return (
<div
className={className}
style={{ width, height, backgroundColor: "#1a1a1a" }}
/>
);
}
return (
<img
src={imageUrl}
alt="Board preview"
className={className}
style={{ width, height, imageRendering: "pixelated" }}
/>
);
};
export default StaticBoardPreview;

View File

@ -1,14 +1,18 @@
import React from "react"; import React, { useLayoutEffect } from "react";
import type { Application } from "pixi.js"; import { type IClampZoomOptions, Viewport } from "pixi-viewport";
import { import { extend, useApplication } from "@pixi/react";
type IClampZoomOptions,
Viewport as PixiViewport,
} from "pixi-viewport";
import { PixiComponent, useApp } from "@pixi/react";
import { BaseTexture, SCALE_MODES } from "pixi.js";
BaseTexture.defaultOptions.scaleMode = SCALE_MODES.NEAREST;
export interface ViewportProps { extend({ Viewport });
import { type PixiReactElementProps } from "@pixi/react";
declare module "@pixi/react" {
interface PixiElements {
pixiViewport: PixiReactElementProps<typeof Viewport>;
}
}
interface ViewportProps {
width: number; width: number;
height: number; height: number;
worldWidth: number; worldWidth: number;
@ -21,26 +25,18 @@ export interface ViewportProps {
bottom: number; bottom: number;
}; };
clampZoom?: IClampZoomOptions; clampZoom?: IClampZoomOptions;
onViewportChange?: (viewport: PixiViewport) => void; onViewportChange?: (viewport: Viewport) => void;
viewportRef?: React.RefObject<PixiViewport>; viewportRef?: React.RefObject<Viewport | null>;
} }
export interface PixiComponentViewportProps extends ViewportProps { const PixiViewport = (props: ViewportProps) => {
app: Application; const { app } = useApplication();
} const ref = React.useRef<Viewport | null>(null);
const { clamp, clampZoom, onViewportChange, viewportRef } = props;
const PixiComponentViewport = PixiComponent("Viewport", { useLayoutEffect(() => {
create: (props: PixiComponentViewportProps) => { void app.renderer;
const viewport = new PixiViewport({ const viewport = ref.current;
screenWidth: props.width, if (!viewport) return () => {};
screenHeight: props.height,
worldWidth: props.worldWidth,
worldHeight: props.worldHeight,
ticker: props.app.ticker,
events: props.app.renderer.events,
disableOnContextMenu: true,
allowPreserveDragOutside: true,
});
viewport viewport
.drag({ .drag({
ignoreKeyToPressOnTouch: true, ignoreKeyToPressOnTouch: true,
@ -48,53 +44,43 @@ const PixiComponentViewport = PixiComponent("Viewport", {
}) })
.pinch() .pinch()
.wheel(); .wheel();
if (props.clamp) { if (clamp) {
viewport.clamp(props.clamp); viewport.clamp(clamp);
} }
if (props.clampZoom) { if (clampZoom) {
viewport.clampZoom(props.clampZoom); viewport.clampZoom(clampZoom);
} }
viewport.on("moved", () => { viewport.on("moved", () => {
props.onViewportChange?.(viewport); onViewportChange?.(viewport);
}); });
viewport.on("zoomed-end", () => { viewport.on("zoomed-end", () => {
props.onViewportChange?.(viewport); onViewportChange?.(viewport);
}); });
if (props.viewportRef) { if (viewportRef) {
// @ts-expect-error We dont care since this is internal api viewportRef.current = viewport;
props.viewportRef.current = viewport;
} }
return () => {
return viewport; viewport.off("moved");
}, viewport.off("zoomed-end");
applyProps: ( };
viewport: PixiViewport, }, [clamp, clampZoom, onViewportChange, viewportRef, app.renderer]);
oldProps: ViewportProps, if (!app.renderer) return null;
newProps: ViewportProps, return (
) => { <pixiViewport
if ( ref={ref}
oldProps.width !== newProps.width || screenWidth={props.width}
oldProps.height !== newProps.height || screenHeight={props.height}
oldProps.worldWidth !== newProps.worldWidth || worldWidth={props.worldWidth}
oldProps.worldHeight !== newProps.worldHeight worldHeight={props.worldHeight}
) { ticker={app.ticker}
viewport.resize( events={app.renderer.events}
newProps.width, disableOnContextMenu
newProps.height, allowPreserveDragOutside
newProps.worldWidth, >
newProps.worldHeight, {props.children}
); </pixiViewport>
} );
if (oldProps.clamp !== newProps.clamp) {
viewport.clamp(newProps.clamp);
}
},
});
const Viewport = (props: ViewportProps) => {
const app = useApp();
return <PixiComponentViewport app={app} {...props} />;
}; };
export default Viewport; export default PixiViewport;

View File

@ -23,6 +23,7 @@ export const useWSQuery = <
// @ts-expect-error We dont care since this is internal api // @ts-expect-error We dont care since this is internal api
Awaited<ReturnType<Routes[TController][TAction]["handler"]>> Awaited<ReturnType<Routes[TController][TAction]["handler"]>>
> => { > => {
// @ts-expect-error We dont care since this is internal api
return useQuery({ return useQuery({
queryKey: [action, payload], queryKey: [action, payload],
queryFn: async () => { queryFn: async () => {

View File

@ -1,4 +1,4 @@
import { Assets } from "pixi.js"; import { Assets, Texture } from "pixi.js";
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import type { Theme, LoadedTheme, WeightedLazySprites } from "./Theme"; import type { Theme, LoadedTheme, WeightedLazySprites } from "./Theme";
@ -12,14 +12,20 @@ export const useTheme = (theme: Theme) => {
Object.entries(theme).map(async ([key, value]) => { Object.entries(theme).map(async ([key, value]) => {
let loaded = value; let loaded = value;
if (typeof value === "function") { if (typeof value === "function") {
loaded = await Assets.load((await value()).default); const texture = await Assets.load<Texture>((await value()).default);
texture.source.scaleMode = "nearest";
loaded = texture;
} }
if (Array.isArray(value)) { if (Array.isArray(value)) {
loaded = await Promise.all( loaded = await Promise.all(
loaded.map(async (sprite: WeightedLazySprites) => { loaded.map(async (sprite: WeightedLazySprites) => {
const texture = await Assets.load<Texture>(
(await sprite.sprite()).default,
);
texture.source.scaleMode = "nearest";
return { return {
weight: sprite.weight, weight: sprite.weight,
sprite: await Assets.load((await sprite.sprite()).default), sprite: texture,
}; };
}), }),
); );

View File

@ -1,6 +1,7 @@
import { Ellipsis } from "lucide-react"; import { Ellipsis } from "lucide-react";
import { testBoard } from "../../../shared/testBoard"; import { testBoard } from "../../../shared/testBoard";
import { Board } from "../../components/LazyBoard"; import { Board } from "../../components/LazyBoard";
import StaticBoardPreview from "../../components/StaticBoardPreview";
import { Button } from "../../components/Button"; import { Button } from "../../components/Button";
import { themes } from "../../themes"; import { themes } from "../../themes";
import { import {
@ -11,7 +12,7 @@ import {
} from "../../components/DropdownMenu"; } from "../../components/DropdownMenu";
import { cn } from "../../lib/utils"; import { cn } from "../../lib/utils";
import { useWSMutation, useWSQuery } from "../../hooks"; import { useWSMutation, useWSQuery } from "../../hooks";
import { Suspense } from "react"; import { Suspense, useState } from "react";
const Collection = () => { const Collection = () => {
const { data: collection, refetch } = useWSQuery( const { data: collection, refetch } = useWSQuery(
@ -20,6 +21,7 @@ const Collection = () => {
); );
const mutateSelected = useWSMutation("user.selectCollectionEntry"); const mutateSelected = useWSMutation("user.selectCollectionEntry");
const mutateShuffle = useWSMutation("user.addCollectionEntryToShuffle"); const mutateShuffle = useWSMutation("user.addCollectionEntryToShuffle");
const [hoveredTheme, setHoveredTheme] = useState<string | null>(null);
return ( return (
<div className="flex flex-col gap-4 w-full"> <div className="flex flex-col gap-4 w-full">
@ -76,19 +78,35 @@ const Collection = () => {
</DropdownMenu> </DropdownMenu>
)} )}
</div> </div>
<Suspense> <div
<Board onMouseEnter={() => setHoveredTheme(theme.id)}
game={testBoard(theme.id)} onMouseLeave={() => setHoveredTheme(null)}
onLeftClick={() => {}} >
restartGame={() => {}} {hoveredTheme === theme.id ? (
onRightClick={() => {}} <Suspense>
width={11 * 32} <Board
height={4 * 32} game={testBoard(theme.id)}
className={cn( onLeftClick={() => {}}
selected && "outline-primary outline-4 rounded-md", restartGame={() => {}}
)} onRightClick={() => {}}
/> width={11 * 32}
</Suspense> height={4 * 32}
className={cn(
selected && "outline-primary outline-4 rounded-md",
)}
/>
</Suspense>
) : (
<StaticBoardPreview
game={testBoard(theme.id)}
width={11 * 32}
height={4 * 32}
className={cn(
selected && "outline-primary outline-4 rounded-md",
)}
/>
)}
</div>
</div> </div>
); );
})} })}

View File

@ -20,7 +20,7 @@ const TouchTooltip = ({
}) => { }) => {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [isTouchDevice, setIsTouchDevice] = useState(false); const [isTouchDevice, setIsTouchDevice] = useState(false);
const timeoutRef = useRef<Timer>(); const timeoutRef = useRef<Timer | null>(null);
useEffect(() => { useEffect(() => {
// Detect if device supports touch // Detect if device supports touch

View File

@ -146,7 +146,7 @@ const createWSClient = () => {
>( >(
action: `${TController}.${TAction}`, action: `${TController}.${TAction}`,
// @ts-expect-error We dont care since this is internal api // @ts-expect-error We dont care since this is internal api
payload: Routes[TController][TAction]["validate"]["_input"], payload: z.input<Routes[TController][TAction]["validate"]>,
// @ts-expect-error We dont care since this is internal api // @ts-expect-error We dont care since this is internal api
): Promise<Awaited<ReturnType<Routes[TController][TAction]["handler"]>>> => { ): Promise<Awaited<ReturnType<Routes[TController][TAction]["handler"]>>> => {
if (ws.readyState !== WebSocket.OPEN) { if (ws.readyState !== WebSocket.OPEN) {