some drop down styles

This commit is contained in:
tresabhi committed 2026-10-31 16:08:27 -05:00
1 parent db210a431b
commit 4245ae4b7b
6 files changed
+104 -42

No files matched your search

@@ -1,3 +1,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0" /> -->
<meta
name="viewport"
content="initial-scale=1, maximum-scale=1, user-scalable=no"
/>
<link rel="sitemap" href="/sitemap-index.xml" /> <link rel="sitemap" href="/sitemap-index.xml" />
@@ -22,7 +22,7 @@ import "@fontsource-variable/roboto-flex";
--radius-max: var(--max-size); --radius-max: var(--max-size);
--font-size-regular: 1rem; --font-size-regular: 1rem;
--font-size-minor: 0.75rem; --font-size-minor: 0.85rem;
--font-size-major: 1.25rem; --font-size-major: 1.25rem;
--font-size-heading-1: 3rem; --font-size-heading-1: 3rem;
@@ -1,38 +1,75 @@
.Content { .Content {
--gutter: var(--space-5);
min-width: min(calc(100dvw - 2 * var(--space-4)), 16rem);
z-index: 1;
background-color: var(--gray-2);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: var(--space-4); margin-top: var(--space-3);
background-color: var(--gray-3); box-shadow: var(--shadow-subtle);
box-shadow: var(--shadow-aggressive);
outline: var(--outline-interactive); outline: var(--outline-interactive);
border-radius: var(--space-3); border-radius: var(--space-3);
} overflow: hidden;
.Separator { outline: var(--outline-interactive) !important;
background-color: var(--gray-6);
margin: var(--space-4) var(--space-3); .Separator {
height: var(--space-3);
}
height: var(--space-0); .Item,
} .CheckboxItem {
position: relative;
.Item, background-color: var(--gray-3);
.CheckboxItem {
border-radius: var(--space-2);
padding: var(--space-3) var(--space-4);
cursor: pointer; padding: var(--space-3);
padding-left: var(--gutter);
display: flex; cursor: pointer;
align-items: center;
gap: var(--space-3);
&:focus { display: flex;
outline: none; align-items: center;
gap: var(--space-3);
background-color: var(--accent-9); font-size: var(--font-size-minor);
&:focus {
outline: none;
background-color: var(--gray-5);
}
& + & {
border-top: var(--space-1) solid var(--gray-2);
}
img,
svg {
&:last-child {
margin-left: auto;
}
}
.ItemIndicator {
position: absolute;
left: 0;
top: 50%;
display: flex;
transform: translate(calc(-50% + var(--gutter) / 2), -50%);
img,
svg {
width: 1em;
height: 1em;
}
}
} }
} }
@@ -2,4 +2,6 @@ import { DropdownMenu as _ } from "radix-ui";
import { composeRadixComponents } from "../../ui/compose"; import { composeRadixComponents } from "../../ui/compose";
import styles from "./index.module.css"; import styles from "./index.module.css";
export const DropdownMenu = composeRadixComponents(_, styles); export const DropdownMenu = composeRadixComponents(_, styles, {
Content: { align: "start" },
});
@@ -4,6 +4,7 @@ import { literals } from "@blitzkit/i18n";
import locales from "@blitzkit/i18n/locales.json"; import locales from "@blitzkit/i18n/locales.json";
import { ShellType, TankType } from "@blitzkit/protos"; import { ShellType, TankType } from "@blitzkit/protos";
import { import {
CheckIcon,
LockClosedIcon, LockClosedIcon,
LockOpen2Icon, LockOpen2Icon,
ResetIcon, ResetIcon,
@@ -233,6 +234,10 @@ function TiersFilter() {
checked={selected} checked={selected}
key={tier} key={tier}
> >
<DropdownMenu.ItemIndicator>
<CheckIcon />
</DropdownMenu.ItemIndicator>
{literals(strings.website.common.tank_search.tier, { {literals(strings.website.common.tank_search.tier, {
tier: romanize(tier), tier: romanize(tier),
})} })}
@@ -252,8 +257,8 @@ function TiersFilter() {
}); });
}} }}
> >
<TrashIcon />
{strings.website.common.tank_search.clear} {strings.website.common.tank_search.clear}
<TrashIcon />
</DropdownMenu.Item> </DropdownMenu.Item>
</DropdownMenu.Content> </DropdownMenu.Content>
</DropdownMenu.Root> </DropdownMenu.Root>
+31 -17
View File
@@ -1,35 +1,49 @@
import type { FC } from "react"; import type { ComponentProps, ComponentType } from "react";
import { classNames } from "./classNames"; import { classNames } from "./classNames";
function composeRadixComponent<Props>( function composeRadixComponent<Props extends object>(
Component: FC<Props>, Component: ComponentType<Props>,
style: CSSModuleClasses[string], style: CSSModuleClasses[string],
_props?: Partial<Props>,
) { ) {
return function (props: Props & { className?: string }) { return function (props: Props & { className?: string }) {
return ( return (
<Component {...props} className={classNames(style, props.className)} /> <Component
{..._props}
{...props}
className={classNames(style, props.className)}
/>
); );
}; };
} }
export function composeRadixComponents< type ComponentKeys<T> = {
Components extends Record<string, unknown>, [K in keyof T]: T[K] extends ComponentType<any> ? K : never;
>(components: Components, styles: CSSModuleClasses) { }[keyof T];
const mapped: Partial<Components> = {};
type PickComponents<T> = Pick<T, ComponentKeys<T>>;
export function composeRadixComponents<Module extends Record<string, unknown>>(
components: Module,
styles: CSSModuleClasses,
props: Partial<{
[C in ComponentKeys<Module>]: ComponentProps<
Extract<Module[C], ComponentType<any>>
>;
}> = {},
) {
const mapped: Record<string, unknown> = {};
const propsByName = props as Record<string, object | undefined>;
for (const key in components) { for (const key in components) {
const isMethod = key[0].toLowerCase() === key[0]; if (key[0].toLowerCase() === key[0]) continue;
if (isMethod) {
mapped[key] = components[key];
continue;
}
mapped[key] = composeRadixComponent( mapped[key] = composeRadixComponent(
components[key] as FC, components[key] as ComponentType<any>,
styles[key], styles[key],
) as Components[Extract<keyof Components, string>]; propsByName[key],
);
} }
return mapped as Components; return mapped as PickComponents<Module>;
} }