diff --git a/bun.lockb b/bun.lockb index ea33bd3..b3491d9 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index d928716..d01e95e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@astrojs/check": "^0.9.4", "@astrojs/node": "^8.3.4", "@astrojs/preact": "^3.5.3", - "@fontsource-variable/material-symbols-outlined": "^5.0.23", + "@fontsource-variable/material-symbols-outlined": "^5.1.1", "@fontsource/iosevka": "^5.0.11", "@fontsource/mononoki": "^5.0.11", "@fontsource/open-sans": "^5.0.24", diff --git a/src/client/ComboBox.tsx b/src/client/ComboBox.tsx index 0333d52..81c65fe 100644 --- a/src/client/ComboBox.tsx +++ b/src/client/ComboBox.tsx @@ -1,5 +1,6 @@ -import { createContext, type ComponentChildren, type JSX } from 'preact' +import { type ComponentChildren } from 'preact' import { useState, useRef, useEffect } from 'preact/hooks' +import { clsx } from './lib/util' export const ComboBox = ({ value, @@ -39,7 +40,7 @@ export const ComboBox = ({ {open && (
el && setItemWidth(el.offsetWidth)} > {Object.keys(children).map(key => ( diff --git a/src/client/UtentiPage.tsx b/src/client/UtentiPage.tsx index 4dd333f..7fe7345 100644 --- a/src/client/UtentiPage.tsx +++ b/src/client/UtentiPage.tsx @@ -122,7 +122,7 @@ export const UtentiPage = () => {
{$searchResults.value ? ( - + {poissonUser => (
diff --git a/src/client/lib/util.ts b/src/client/lib/util.ts index 94997ee..e9d5b60 100644 --- a/src/client/lib/util.ts +++ b/src/client/lib/util.ts @@ -32,3 +32,23 @@ export const trottleDebounce = ( return lastResult } } + +type ClassValue = string | ClassValue[] | Record | false | undefined + +export function clsx(...args: ClassValue[]): string { + return args + .flatMap(arg => { + if (typeof arg === 'string') { + return arg + } else if (Array.isArray(arg)) { + return clsx(...arg) + } else if (typeof arg === 'boolean') { + return [] + } else if (typeof arg === 'object') { + return Object.entries(arg).flatMap(([key, value]) => (value ? key : [])) + } else { + return [] + } + }) + .join(' ') +} diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index 5169a60..e4657eb 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -7,6 +7,8 @@ import '@fontsource/source-code-pro/latin.css' import '@fontsource/space-mono/latin.css' import '@fontsource/iosevka/latin.css' +import '@fontsource-variable/material-symbols-outlined/full.css' + import '../styles/main.scss' type Props = { @@ -32,10 +34,6 @@ const { title, description, thumbnail, pageTags } = Astro.props {thumbnail && } -