Merge branch 'main' into dev

src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx

@@ -343,7 +343,7 @@ export function Characteristics() {
             {stats.dispersion}
           </InfoWithDelta>
           <InfoWithDelta
-            prefix="+ "
+            prefix="+"
             decimals={3}
             indent
             name="Moving"
@@ -353,7 +353,7 @@ export function Characteristics() {
           </InfoWithDelta>
           <InfoWithDelta
             decimals={3}
-            prefix="+ "
+            prefix="+"
             indent
             name="Hull traversing"
             deltaType="lowerIsBetter"
@@ -362,7 +362,7 @@ export function Characteristics() {
           </InfoWithDelta>
           <InfoWithDelta
             decimals={3}
-            prefix="+ "
+            prefix="+"
             indent
             name="Turret traversing"
             deltaType="lowerIsBetter"
@@ -371,7 +371,7 @@ export function Characteristics() {
           </InfoWithDelta>
           <InfoWithDelta
             decimals={3}
-            prefix="+ "
+            prefix="+"
             indent
             name="After shooting"
             deltaType="lowerIsBetter"
@@ -502,7 +502,7 @@ export function Characteristics() {
       <Flex direction="column" gap="8" style={{ flex: 1 }}>
         <Flex direction="column" gap="2">
           <Heading size="5">Maneuverability</Heading>
-          <Info name="Speed" unit="km/hr" />
+          <Info name="Speed" unit="kph" />
           <InfoWithDelta decimals={0} indent name="Forwards">
             {stats.speedForwards}
           </InfoWithDelta>

src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx

@@ -55,8 +55,11 @@ export function HeroSection() {
               height: '100%',
             }}
           >
-            <Heading size={wideFormat ? '9' : '8'}>
-              {protagonistTank.name}
+            <Heading
+              size={wideFormat ? '9' : '8'}
+              align={wideFormat ? undefined : 'center'}
+            >
+              {protagonistTank.nameFull ?? protagonistTank.name}
             </Heading>
 
             <Text color="gray">

src/app/tools/tankopedia/components/FilterControl.tsx

@@ -0,0 +1,300 @@
+import { ReloadIcon } from '@radix-ui/react-icons';
+import { Box, Flex, IconButton, Text } from '@radix-ui/themes';
+import { times } from 'lodash';
+import { use } from 'react';
+import { classIcons } from '../../../../components/ClassIcon';
+import { ExperimentIcon } from '../../../../components/ExperimentIcon';
+import { ResearchedIcon } from '../../../../components/ResearchedIcon';
+import { ScienceIcon } from '../../../../components/ScienceIcon';
+import { ScienceOffIcon } from '../../../../components/ScienceOffIcon';
+import { TANK_CLASSES } from '../../../../components/Tanks/components/Item/constants';
+import { asset } from '../../../../core/blitzkit/asset';
+import { gameDefinitions } from '../../../../core/blitzkit/gameDefinitions';
+import { Tier } from '../../../../core/blitzkit/tankDefinitions';
+import { TIER_ROMAN_NUMERALS } from '../../../../core/blitzkit/tankDefinitions/constants';
+import {
+  mutateTankopediaFilters,
+  useTankopediaFilters,
+} from '../../../../stores/tankopediaFilters';
+
+interface FilterControlProps {
+  compact?: boolean;
+}
+
+export function FilterControl({ compact }: FilterControlProps) {
+  const awaitedGameDefinitions = use(gameDefinitions);
+  const filters = useTankopediaFilters();
+
+  return (
+    <Flex height="fit-content" gap="2" align="start" justify="center">
+      <Flex
+        direction={compact ? 'row' : { initial: 'row', sm: 'column' }}
+        overflow="hidden"
+        style={{ borderRadius: 'var(--radius-5)' }}
+      >
+        <Flex direction={compact ? 'column' : { sm: 'row', initial: 'column' }}>
+          {times(5, (index) => {
+            const tier = (index + 1) as Tier;
+            const selected = filters.tier === tier;
+
+            return (
+              <IconButton
+                key={tier}
+                variant={selected ? 'solid' : 'soft'}
+                radius="none"
+                color={selected ? undefined : 'gray'}
+                highContrast
+                onClick={() =>
+                  mutateTankopediaFilters((draft) => {
+                    draft.tier = draft.tier === tier ? undefined : tier;
+                  })
+                }
+              >
+                <Text size="2">{TIER_ROMAN_NUMERALS[tier]}</Text>
+              </IconButton>
+            );
+          })}
+        </Flex>
+        <Flex direction={compact ? 'column' : { sm: 'row', initial: 'column' }}>
+          {times(5, (index) => {
+            const tier = (index + 6) as Tier;
+            const selected = filters.tier === tier;
+
+            return (
+              <IconButton
+                key={tier}
+                variant={selected ? 'solid' : 'soft'}
+                radius="none"
+                color={selected ? undefined : 'gray'}
+                highContrast
+                onClick={() =>
+                  mutateTankopediaFilters((draft) => {
+                    draft.tier = draft.tier === tier ? undefined : tier;
+                  })
+                }
+              >
+                <Text size="2">{TIER_ROMAN_NUMERALS[tier]}</Text>
+              </IconButton>
+            );
+          })}
+        </Flex>
+      </Flex>
+
+      <Flex
+        direction={compact ? 'row' : { initial: 'row', sm: 'column' }}
+        overflow="hidden"
+        style={{ borderRadius: 'var(--radius-5)' }}
+      >
+        <Flex direction={compact ? 'column' : { sm: 'row', initial: 'column' }}>
+          {awaitedGameDefinitions.nations
+            .slice(0, Math.ceil(awaitedGameDefinitions.nations.length / 2))
+            .map((nation) => {
+              const selected = filters.nation === nation;
+
+              return (
+                <IconButton
+                  key={nation}
+                  variant={selected ? 'solid' : 'soft'}
+                  color={selected ? undefined : 'gray'}
+                  highContrast
+                  radius="none"
+                  onClick={() =>
+                    mutateTankopediaFilters((draft) => {
+                      draft.nation =
+                        draft.nation === nation ? undefined : nation;
+                    })
+                  }
+                >
+                  <img
+                    style={{ width: '1em', height: '1em' }}
+                    src={asset(`flags/circle/${nation}.webp`)}
+                  />
+                </IconButton>
+              );
+            })}
+        </Flex>
+        <Flex direction={compact ? 'column' : { sm: 'row', initial: 'column' }}>
+          {awaitedGameDefinitions.nations
+            .slice(Math.ceil(awaitedGameDefinitions.nations.length / 2))
+            .map((nation) => {
+              const selected = filters.nation === nation;
+
+              return (
+                <IconButton
+                  key={nation}
+                  style={{ flex: 1 }}
+                  variant={selected ? 'solid' : 'soft'}
+                  color={selected ? undefined : 'gray'}
+                  highContrast
+                  radius="none"
+                  onClick={() =>
+                    mutateTankopediaFilters((draft) => {
+                      draft.nation =
+                        draft.nation === nation ? undefined : nation;
+                    })
+                  }
+                >
+                  <img
+                    style={{ width: '1em', height: '1em' }}
+                    src={asset(`flags/circle/${nation}.webp`)}
+                  />
+                </IconButton>
+              );
+            })}
+        </Flex>
+      </Flex>
+
+      <Flex
+        overflow="hidden"
+        style={{ borderRadius: 'var(--radius-full)' }}
+        direction={compact ? 'column' : { sm: 'row', initial: 'column' }}
+      >
+        {TANK_CLASSES.map((tankClass) => {
+          const Icon = classIcons[tankClass];
+          const selected = filters.class === tankClass;
+
+          return (
+            <IconButton
+              key={tankClass}
+              variant={selected ? 'solid' : 'soft'}
+              radius="none"
+              color={selected ? undefined : 'gray'}
+              highContrast
+              onClick={() =>
+                mutateTankopediaFilters((draft) => {
+                  draft.class =
+                    draft.class === tankClass ? undefined : tankClass;
+                })
+              }
+            >
+              <Icon style={{ width: '1em', height: '1em' }} />
+            </IconButton>
+          );
+        })}
+      </Flex>
+
+      <Flex
+        overflow="hidden"
+        style={{ borderRadius: 'var(--radius-full)' }}
+        direction={compact ? 'column' : { sm: 'row', initial: 'column' }}
+      >
+        <IconButton
+          variant={filters.type === 'researchable' ? 'solid' : 'soft'}
+          radius="none"
+          color={filters.type === 'researchable' ? undefined : 'gray'}
+          highContrast
+          onClick={() =>
+            mutateTankopediaFilters((draft) => {
+              draft.type =
+                draft.type === 'researchable' ? undefined : 'researchable';
+            })
+          }
+        >
+          <ResearchedIcon style={{ width: '1em', height: '1em' }} />
+        </IconButton>
+        <IconButton
+          variant={filters.type === 'premium' ? 'solid' : 'soft'}
+          radius="none"
+          color={filters.type === 'premium' ? 'amber' : 'gray'}
+          highContrast
+          onClick={() =>
+            mutateTankopediaFilters((draft) => {
+              draft.type = draft.type === 'premium' ? undefined : 'premium';
+            })
+          }
+        >
+          <Text
+            color={filters.type === 'premium' ? undefined : 'amber'}
+            style={{ display: 'flex', justifyContent: 'center' }}
+          >
+            <ResearchedIcon style={{ width: '1em', height: '1em' }} />
+          </Text>
+        </IconButton>
+        <IconButton
+          variant={filters.type === 'collector' ? 'solid' : 'soft'}
+          radius="none"
+          color={filters.type === 'collector' ? 'blue' : 'gray'}
+          highContrast
+          onClick={() =>
+            mutateTankopediaFilters((draft) => {
+              draft.type = draft.type === 'collector' ? undefined : 'collector';
+            })
+          }
+        >
+          <Text
+            color={filters.type === 'collector' ? undefined : 'blue'}
+            style={{ display: 'flex', justifyContent: 'center' }}
+          >
+            <ResearchedIcon style={{ width: '1em', height: '1em' }} />
+          </Text>
+        </IconButton>
+      </Flex>
+
+      <Flex
+        overflow="hidden"
+        style={{ borderRadius: 'var(--radius-full)' }}
+        direction={compact ? 'column' : { sm: 'row', initial: 'column' }}
+      >
+        <IconButton
+          variant={filters.testing === 'include' ? 'solid' : 'soft'}
+          radius="none"
+          color={filters.testing === 'include' ? undefined : 'gray'}
+          highContrast
+          onClick={() =>
+            mutateTankopediaFilters((draft) => {
+              draft.testing = 'include';
+            })
+          }
+        >
+          <ExperimentIcon
+            style={{ width: '1em', height: '1em', color: 'currentColor' }}
+          />
+        </IconButton>
+        <IconButton
+          variant={filters.testing === 'exclude' ? 'solid' : 'soft'}
+          radius="none"
+          color={filters.testing === 'exclude' ? undefined : 'gray'}
+          highContrast
+          onClick={() =>
+            mutateTankopediaFilters((draft) => {
+              draft.testing = 'exclude';
+            })
+          }
+        >
+          <ScienceOffIcon
+            style={{ width: '1em', height: '1em', color: 'currentColor' }}
+          />
+        </IconButton>
+        <IconButton
+          variant={filters.testing === 'only' ? 'solid' : 'soft'}
+          radius="none"
+          color={filters.testing === 'only' ? undefined : 'gray'}
+          highContrast
+          onClick={() =>
+            mutateTankopediaFilters((draft) => {
+              draft.testing = 'only';
+            })
+          }
+        >
+          <ScienceIcon
+            style={{ width: '1em', height: '1em', color: 'currentColor' }}
+          />
+        </IconButton>
+      </Flex>
+
+      <Box>
+        <IconButton
+          color="red"
+          onClick={() =>
+            useTankopediaFilters.setState(
+              useTankopediaFilters.getInitialState(),
+              true,
+            )
+          }
+        >
+          <ReloadIcon />
+        </IconButton>
+      </Box>
+    </Flex>
+  );
+}

src/app/tools/tankopedia/components/NoResults.tsx

@@ -0,0 +1,30 @@
+import { Flex, Link, Text } from '@radix-ui/themes';
+import { useTankopediaFilters } from '../../../../stores/tankopediaFilters';
+
+interface NoResultsProps {
+  type?: 'filters' | 'search';
+}
+
+export function NoResults({ type = 'filters' }: NoResultsProps) {
+  return (
+    <Flex flexGrow="1" align="center" justify="center">
+      <Text color="gray">
+        No tanks found.{' '}
+        <Link
+          href="#"
+          underline="always"
+          color="red"
+          onClick={() =>
+            useTankopediaFilters.setState(
+              useTankopediaFilters.getInitialState(),
+              true,
+            )
+          }
+        >
+          {type === 'filters' ? 'Try clearing filters' : 'Try searching again'}
+        </Link>
+        .
+      </Text>
+    </Flex>
+  );
+}

src/app/tools/tankopedia/components/QuickLink.tsx

@@ -0,0 +1,25 @@
+import { CaretRightIcon } from '@radix-ui/react-icons';
+import { Button, Link, TextField } from '@radix-ui/themes';
+import { TankDefinition } from '../../../../core/blitzkit/tankDefinitions';
+import { useTankopediaFilters } from '../../../../stores/tankopediaFilters';
+
+interface QuickLinkProps {
+  topResult?: TankDefinition;
+}
+
+export function QuickLink({ topResult }: QuickLinkProps) {
+  const search = useTankopediaFilters((state) => state.search);
+  const searching = useTankopediaFilters((state) => state.searching);
+
+  if (!search || !topResult || searching) return null;
+
+  return (
+    <TextField.Slot>
+      <Link href={`/tools/tankopedia/${topResult.id}`}>
+        <Button variant="ghost">
+          {topResult.name} <CaretRightIcon />
+        </Button>
+      </Link>
+    </TextField.Slot>
+  );
+}

src/app/tools/tankopedia/components/SearchBar.tsx

@@ -0,0 +1,71 @@
+import { MagnifyingGlassIcon } from '@radix-ui/react-icons';
+import { Flex, Spinner, TextField } from '@radix-ui/themes';
+import { debounce } from 'lodash';
+import { useRouter } from 'next/navigation';
+import { KeyboardEventHandler, useCallback, useRef } from 'react';
+import { TankDefinition } from '../../../../core/blitzkit/tankDefinitions';
+import { useTankopediaFilters } from '../../../../stores/tankopediaFilters';
+import { QuickLink } from './QuickLink';
+import { Sort } from './Sort';
+
+interface SearchBarProps {
+  topResult?: TankDefinition;
+}
+
+export function SearchBar({ topResult }: SearchBarProps) {
+  const router = useRouter();
+  const input = useRef<HTMLInputElement>(null);
+  const searching = useTankopediaFilters((state) => state.searching);
+  const performSearch = useCallback(
+    debounce(() => {
+      useTankopediaFilters.setState({ searching: false });
+
+      if (!input.current) return;
+
+      const sanitized = input.current.value.trim();
+
+      useTankopediaFilters.setState({
+        search: sanitized.length === 0 ? undefined : sanitized,
+      });
+    }, 500),
+    [],
+  );
+  const handleChange = useCallback(() => {
+    if (!useTankopediaFilters.getState().searching) {
+      useTankopediaFilters.setState({ searching: true });
+    }
+
+    performSearch();
+  }, []);
+  const handleKeyDown = useCallback<KeyboardEventHandler>(
+    (event) => {
+      if (event.key !== 'Enter' || !topResult || searching) return;
+
+      event.preventDefault();
+      router.push(`/tools/tankopedia/${topResult.id}`);
+    },
+    [topResult],
+  );
+
+  return (
+    <Flex justify="center">
+      <Flex gap="2" flexGrow="1">
+        <TextField.Root
+          style={{ flex: 1 }}
+          ref={input}
+          placeholder="Search tanks..."
+          onChange={handleChange}
+          onKeyDown={handleKeyDown}
+        >
+          <TextField.Slot>
+            {searching ? <Spinner /> : <MagnifyingGlassIcon />}
+          </TextField.Slot>
+
+          <QuickLink topResult={topResult} />
+        </TextField.Root>
+
+        <Sort />
+      </Flex>
+    </Flex>
+  );
+}

src/app/tools/tankopedia/components/SkeletonTankCard.tsx

@@ -0,0 +1,10 @@
+import { Flex, Skeleton } from '@radix-ui/themes';
+
+export function SkeletonTankCard() {
+  return (
+    <Flex direction="column" gap="2">
+      <Skeleton height="64px" />
+      <Skeleton height="1em" />
+    </Flex>
+  );
+}

src/app/tools/tankopedia/components/Sort.tsx

@@ -1,49 +1,36 @@
 import { CaretDownIcon } from '@radix-ui/react-icons';
 import { Button, DropdownMenu } from '@radix-ui/themes';
-import mutateTankopediaPersistent, {
-  TankopediaSortDirection,
-  useTankopediaPersistent,
-} from '../../../../../../stores/tankopedia';
+import { TankopediaSortDirection } from '../../../../stores/tankopedia';
+import {
+  mutateTankopediaFilters,
+  useTankopediaFilters,
+} from '../../../../stores/tankopediaFilters';
 
 export function Sort() {
-  const sort = useTankopediaPersistent((state) => state.sort);
+  const sort = useTankopediaFilters((state) => state.sort);
 
   return (
-    <DropdownMenu.Root>
+    <DropdownMenu.Root modal={false}>
       <DropdownMenu.Trigger>
-        <Button variant="soft" color="gray">
+        <Button variant="surface" color="gray">
           Sort
           <CaretDownIcon />
         </Button>
       </DropdownMenu.Trigger>
-      <DropdownMenu.Content>
-        <DropdownMenu.Label>By</DropdownMenu.Label>
 
-        <DropdownMenu.Sub>
-          <DropdownMenu.SubTrigger>Meta</DropdownMenu.SubTrigger>
-          <DropdownMenu.SubContent>
-            <DropdownMenu.CheckboxItem
-              checked={sort.by === 'meta.tier'}
-              onClick={() => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.sort.by = 'meta.tier';
-                });
-              }}
-            >
-              Tier
-            </DropdownMenu.CheckboxItem>
-            <DropdownMenu.CheckboxItem
-              checked={sort.by === 'meta.name'}
-              onClick={() => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.sort.by = 'meta.name';
-                });
-              }}
-            >
-              Name
-            </DropdownMenu.CheckboxItem>
-          </DropdownMenu.SubContent>
-        </DropdownMenu.Sub>
+      <DropdownMenu.Content align="end">
+        <DropdownMenu.CheckboxItem
+          checked={sort.by === 'meta.none'}
+          onClick={() => {
+            mutateTankopediaFilters((draft) => {
+              draft.sort.by = 'meta.none';
+            });
+          }}
+        >
+          No sort
+        </DropdownMenu.CheckboxItem>
+
+        <DropdownMenu.Label>Sort by</DropdownMenu.Label>
 
         <DropdownMenu.Sub>
           <DropdownMenu.SubTrigger>Fire</DropdownMenu.SubTrigger>
@@ -51,7 +38,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.dpm'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.dpm';
                 });
               }}
@@ -61,7 +48,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.reload'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.reload';
                 });
               }}
@@ -71,7 +58,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.caliber'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.caliber';
                 });
               }}
@@ -81,7 +68,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.standardPenetration'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.standardPenetration';
                 });
               }}
@@ -91,7 +78,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.premiumPenetration'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.premiumPenetration';
                 });
               }}
@@ -101,7 +88,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.damage'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.damage';
                 });
               }}
@@ -111,7 +98,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.shellVelocity'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.shellVelocity';
                 });
               }}
@@ -121,7 +108,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.aimTime'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.aimTime';
                 });
               }}
@@ -131,7 +118,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.dispersionStill'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.dispersionStill';
                 });
               }}
@@ -141,7 +128,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.dispersionMoving'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.dispersionMoving';
                 });
               }}
@@ -151,7 +138,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.gunDepression'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.gunDepression';
                 });
               }}
@@ -161,7 +148,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'fire.gunElevation'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'fire.gunElevation';
                 });
               }}
@@ -177,7 +164,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'maneuverability.forwardsSpeed'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'maneuverability.forwardsSpeed';
                 });
               }}
@@ -187,7 +174,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'maneuverability.backwardsSpeed'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'maneuverability.backwardsSpeed';
                 });
               }}
@@ -197,7 +184,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'maneuverability.power'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'maneuverability.power';
                 });
               }}
@@ -207,7 +194,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'maneuverability.powerToWeight'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'maneuverability.powerToWeight';
                 });
               }}
@@ -217,7 +204,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'maneuverability.weight'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'maneuverability.weight';
                 });
               }}
@@ -227,7 +214,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'maneuverability.traverseSpeed'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'maneuverability.traverseSpeed';
                 });
               }}
@@ -243,7 +230,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.health'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.health';
                 });
               }}
@@ -253,7 +240,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.viewRange'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.viewRange';
                 });
               }}
@@ -263,7 +250,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.camouflageStill'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.camouflageStill';
                 });
               }}
@@ -273,7 +260,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.camouflageMoving'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.camouflageMoving';
                 });
               }}
@@ -283,7 +270,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.camouflageShooting'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.camouflageShooting';
                 });
               }}
@@ -293,7 +280,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.volume'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.volume';
                 });
               }}
@@ -303,7 +290,7 @@ export function Sort() {
             <DropdownMenu.CheckboxItem
               checked={sort.by === 'survivability.length'}
               onClick={() => {
-                mutateTankopediaPersistent((draft) => {
+                mutateTankopediaFilters((draft) => {
                   draft.sort.by = 'survivability.length';
                 });
               }}
@@ -313,13 +300,11 @@ export function Sort() {
           </DropdownMenu.SubContent>
         </DropdownMenu.Sub>
 
-        <DropdownMenu.Separator />
-
         <DropdownMenu.Label>Direction</DropdownMenu.Label>
         <DropdownMenu.RadioGroup
           value={sort.direction}
           onValueChange={(value) =>
-            mutateTankopediaPersistent((draft) => {
+            mutateTankopediaFilters((draft) => {
               draft.sort.direction = value as TankopediaSortDirection;
             })
           }

src/app/tools/tankopedia/components/TankCard.css.ts

@@ -0,0 +1,32 @@
+import { createVar, style } from '@vanilla-extract/css';
+
+export const cardBackgroundVar = createVar();
+
+export const card = style({
+  cursor: 'pointer',
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  gap: 'var(--space-2)',
+  background: cardBackgroundVar,
+});
+
+export const image = style({
+  height: 64,
+  width: '100%',
+  objectPosition: 'center right',
+  objectFit: 'contain',
+});
+
+export const classIcon = style({
+  width: '1em',
+  height: '1em',
+  minWidth: '1em',
+  minHeight: '1em',
+});
+
+export const name = style({
+  whiteSpace: 'nowrap',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+});

src/app/tools/tankopedia/components/TankCard.tsx

@@ -0,0 +1,185 @@
+import { Flex, Text } from '@radix-ui/themes';
+import { assignInlineVars } from '@vanilla-extract/dynamic';
+import { use, useMemo } from 'react';
+import { classIcons } from '../../../../components/ClassIcon';
+import { Link } from '../../../../components/Link';
+import { resolveNearPenetration } from '../../../../core/blitz/resolveNearPenetration';
+import { asset } from '../../../../core/blitzkit/asset';
+import { modelDefinitions } from '../../../../core/blitzkit/modelDefinitions';
+import { normalizeBoundingBox } from '../../../../core/blitzkit/normalizeBoundingBox';
+import { resolveDpm } from '../../../../core/blitzkit/resolveDpm';
+import { resolveReload } from '../../../../core/blitzkit/resolveReload';
+import { TankDefinition } from '../../../../core/blitzkit/tankDefinitions';
+import { tankIcon } from '../../../../core/blitzkit/tankIcon';
+import { unionBoundingBox } from '../../../../core/blitzkit/unionBoundingBox';
+import { useTankopediaFilters } from '../../../../stores/tankopediaFilters';
+import * as styles from './TankCard.css';
+
+interface TankCardProps {
+  tank: TankDefinition;
+  onSelect?: (tank: TankDefinition) => void;
+}
+
+export function TankCard({ tank, onSelect }: TankCardProps) {
+  const awaitedModelDefinitions = use(modelDefinitions);
+  const Icon = classIcons[tank.class];
+  // const link = useRef<HTMLAnchorElement>(null);
+  const sortBy = useTankopediaFilters((state) => state.sort.by);
+  const discriminator = useMemo(() => {
+    if (sortBy.startsWith('meta')) return undefined;
+
+    const turret = tank.turrets.at(-1)!;
+    const gun = turret.guns.at(-1)!;
+    const shell0 = gun.shells[0];
+    const shell1 = gun.shells[1];
+    const tracks = tank.tracks.at(-1)!;
+    const engine = tank.engines.at(-1)!;
+    const tankModelDefinition = awaitedModelDefinitions[tank.id];
+    const turretModelDefinition = tankModelDefinition.turrets[turret.id];
+    const gunModelDefinition = turretModelDefinition.guns[gun.id];
+
+    switch (sortBy) {
+      case 'fire.aimTime':
+        return gun.aimTime.toFixed(2);
+      case 'fire.caliber':
+        return shell0.caliber.toFixed(0);
+      case 'fire.damage':
+        return shell0.damage.armor.toFixed(0);
+      case 'fire.dispersionMoving':
+        return tracks.dispersion.move.toFixed(3);
+      case 'fire.dispersionStill':
+        return gun.dispersion.base.toFixed(3);
+      case 'fire.dpm':
+        return resolveDpm(gun, shell0).toFixed(0);
+      case 'fire.reload':
+        return resolveReload(gun).toFixed(2);
+      case 'fire.standardPenetration':
+        return resolveNearPenetration(shell0.penetration).toFixed(0);
+      case 'fire.premiumPenetration':
+        return shell1
+          ? resolveNearPenetration(shell1.penetration).toFixed(0)
+          : '--';
+      case 'fire.shellVelocity':
+        return shell0.speed.toFixed(0);
+      case 'fire.gunDepression':
+        return (
+          gunModelDefinition.pitch.max +
+          (tankModelDefinition.turretRotation?.pitch ?? 0)
+        ).toFixed(1);
+      case 'fire.gunElevation':
+        return (
+          -gunModelDefinition.pitch.min -
+          (tankModelDefinition.turretRotation?.pitch ?? 0)
+        ).toFixed(1);
+      case 'maneuverability.forwardsSpeed':
+        return tank.speed.forwards.toFixed(0);
+      case 'maneuverability.backwardsSpeed':
+        return tank.speed.backwards.toFixed(0);
+      case 'maneuverability.power':
+        return engine.power.toFixed(0);
+      case 'maneuverability.powerToWeight':
+        return (
+          (1000 * engine.power) /
+          (tank.weight +
+            engine.weight +
+            tracks.weight +
+            turret.weight +
+            gun.weight)
+        ).toFixed(1);
+      case 'maneuverability.weight':
+        return (
+          (tank.weight +
+            engine.weight +
+            tracks.weight +
+            turret.weight +
+            gun.weight) /
+          1000
+        ).toFixed(1);
+      case 'maneuverability.traverseSpeed':
+        return tracks.traverseSpeed.toFixed(1);
+      case 'survivability.health':
+        return (tank.health + turret.health).toFixed(0);
+      case 'survivability.viewRange':
+        return turret.viewRange.toFixed(0);
+      case 'survivability.camouflageStill':
+        return (tank.camouflage.still * 100).toFixed(0);
+      case 'survivability.camouflageMoving':
+        return (tank.camouflage.moving * 100).toFixed(0);
+      case 'survivability.camouflageShooting':
+        return (tank.camouflage.still * gun.camouflageLoss * 100).toFixed(0);
+      case 'survivability.volume': {
+        const dimensions = normalizeBoundingBox(
+          unionBoundingBox(
+            tankModelDefinition.boundingBox,
+            turretModelDefinition.boundingBox,
+          ),
+        );
+
+        return (dimensions[0] * dimensions[1] * dimensions[2]).toFixed(0);
+      }
+
+      case 'survivability.length':
+        return Math.max(
+          ...normalizeBoundingBox(
+            unionBoundingBox(
+              tankModelDefinition.boundingBox,
+              turretModelDefinition.boundingBox,
+            ),
+          ),
+        ).toFixed(0);
+    }
+  }, [sortBy]);
+
+  return (
+    <Link
+      tabIndex={onSelect ? 0 : undefined}
+      size="1"
+      color={
+        tank.treeType === 'collector'
+          ? 'blue'
+          : tank.treeType === 'premium'
+            ? 'amber'
+            : 'gray'
+      }
+      highContrast={tank.treeType === 'researchable'}
+      underline="hover"
+      href={onSelect ? undefined : `/tools/tankopedia/${tank.id}`}
+      onClick={onSelect ? () => onSelect(tank) : undefined}
+      className={styles.card}
+      style={assignInlineVars({
+        [styles.cardBackgroundVar]: `top left / contain no-repeat url(${asset(`flags/scratched/${tank.nation}.webp`)})`,
+      })}
+    >
+      <img alt={tank.name} src={tankIcon(tank.id)} className={styles.image} />
+
+      <Flex
+        justify="center"
+        gap="1"
+        align="center"
+        overflow="hidden"
+        width="100%"
+        maxWidth="100%"
+      >
+        <Icon className={styles.classIcon} />
+        <Text align="center" className={styles.name}>
+          {tank.name}
+        </Text>
+      </Flex>
+
+      {discriminator && (
+        <Text
+          mt="-2"
+          color="gray"
+          align="center"
+          style={{
+            whiteSpace: 'nowrap',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}
+        >
+          {discriminator}
+        </Text>
+      )}
+    </Link>
+  );
+}

src/app/tools/tankopedia/components/TankCardWrapper.tsx

@@ -0,0 +1,14 @@
+import { Grid, GridProps } from '@radix-ui/themes';
+
+export function TankCardWrapper(props: GridProps) {
+  return (
+    <Grid
+      py="4"
+      columns="repeat(auto-fill, minmax(100px, 1fr))"
+      flow="dense"
+      gap="2"
+      gapY="6"
+      {...props}
+    />
+  );
+}

src/app/tools/tankopedia/components/TankSearch/components/CompactSearchResultRow.tsx

@@ -1,51 +0,0 @@
-import { Button, Flex, Text } from '@radix-ui/themes';
-import { SmallTankIcon } from '../../../../../../components/SmallTankIcon';
-import { TankDefinition } from '../../../../../../core/blitzkit/tankDefinitions';
-import { TIER_ROMAN_NUMERALS } from '../../../../../../core/blitzkit/tankDefinitions/constants';
-
-interface CompactSearchResultRowProps {
-  tanks: TankDefinition[];
-  onSelect?: (tank: TankDefinition) => void;
-}
-
-export function CompactSearchResultRow({
-  tanks,
-  onSelect = () => {},
-}: CompactSearchResultRowProps) {
-  return (
-    <Flex justify="center">
-      <Flex direction="column" gap="2" align="start">
-        {tanks.map((tank) => (
-          <Button
-            key={tank.id}
-            variant="ghost"
-            style={{ width: '100%' }}
-            onClick={() => onSelect(tank)}
-          >
-            <Flex gap="2" align="start" style={{ width: '100%' }}>
-              <Text align="right" color="gray" style={{ width: 24 }}>
-                {TIER_ROMAN_NUMERALS[tank.tier]}
-              </Text>
-
-              <Text color={tank.treeType === 'collector' ? 'blue' : 'amber'}>
-                <Flex gap="2" align="center">
-                  <SmallTankIcon id={tank.id} size={16} />
-
-                  <div
-                    style={{
-                      display: 'block',
-                      color:
-                        tank.treeType === 'researchable' ? 'white' : undefined,
-                    }}
-                  >
-                    {tank.name}
-                  </div>
-                </Flex>
-              </Text>
-            </Flex>
-          </Button>
-        ))}
-      </Flex>
-    </Flex>
-  );
-}

src/app/tools/tankopedia/components/TankSearch/components/Options/index.css.ts

@@ -1,17 +0,0 @@
-import { style } from '@vanilla-extract/css';
-
-export const splitFilters = style({
-  '@media': {
-    'screen and (min-width: 513px)': {
-      display: 'none',
-    },
-  },
-});
-
-export const oneLineFilters = style({
-  '@media': {
-    'screen and (max-width: 512px)': {
-      display: 'none',
-    },
-  },
-});

src/app/tools/tankopedia/components/TankSearch/components/Options/index.tsx

@@ -1,341 +0,0 @@
-'use client';
-
-import { CaretDownIcon } from '@radix-ui/react-icons';
-import { Button, DropdownMenu, Flex } from '@radix-ui/themes';
-import { use } from 'react';
-import { Flag } from '../../../../../../../components/Flag';
-import {} from '../../../../../../../components/Tanks';
-import {
-  TANK_CLASSES,
-  TREE_TYPES,
-  TREE_TYPE_ICONS,
-  TREE_TYPE_IMAGES,
-} from '../../../../../../../components/Tanks/components/Item/constants';
-import { NATIONS } from '../../../../../../../core/blitzkit/tankDefinitions';
-import {
-  TIERS,
-  TIER_ROMAN_NUMERALS,
-} from '../../../../../../../core/blitzkit/tankDefinitions/constants';
-import mutateTankopediaPersistent, {
-  TankopediaTestTankDisplay,
-  useTankopediaPersistent,
-} from '../../../../../../../stores/tankopedia';
-import * as styles from './index.css';
-
-export function Options() {
-  const nations = use(NATIONS);
-  const filters = useTankopediaPersistent((state) => state.filters);
-
-  return (
-    <Flex gap="2" wrap="wrap" justify="center">
-      <Flex>
-        {TREE_TYPES.map((type, index) => (
-          <Button
-            key={type}
-            color={filters.treeTypes.includes(type) ? undefined : 'gray'}
-            variant={filters.treeTypes.includes(type) ? 'surface' : 'soft'}
-            style={{
-              flex: 1,
-              margin: -0.5,
-              borderTopLeftRadius: index === 0 ? undefined : 0,
-              borderBottomLeftRadius: index === 0 ? undefined : 0,
-              borderTopRightRadius:
-                index === TREE_TYPES.length - 1 ? undefined : 0,
-              borderBottomRightRadius:
-                index === TREE_TYPES.length - 1 ? undefined : 0,
-            }}
-            onClick={() =>
-              mutateTankopediaPersistent((draft) => {
-                if (draft.filters.treeTypes.includes(type)) {
-                  draft.filters.treeTypes = draft.filters.treeTypes.filter(
-                    (preexistingType) => preexistingType !== type,
-                  );
-                } else {
-                  draft.filters.treeTypes.push(type);
-                }
-              })
-            }
-          >
-            <img
-              alt={type}
-              src={TREE_TYPE_IMAGES[type]}
-              style={{ width: '1em', height: '1em' }}
-            />
-          </Button>
-        ))}
-      </Flex>
-      <Flex className={styles.oneLineFilters}>
-        {nations.map((nation, index) => (
-          <Button
-            key={nation}
-            color={filters.nations.includes(nation) ? undefined : 'gray'}
-            variant={filters.nations.includes(nation) ? 'surface' : 'soft'}
-            style={{
-              flex: 1,
-              margin: -0.5,
-              borderTopLeftRadius: index === 0 ? undefined : 0,
-              borderBottomLeftRadius: index === 0 ? undefined : 0,
-              borderTopRightRadius:
-                index === nations.length - 1 ? undefined : 0,
-              borderBottomRightRadius:
-                index === nations.length - 1 ? undefined : 0,
-            }}
-            onClick={() =>
-              mutateTankopediaPersistent((draft) => {
-                if (draft.filters.nations.includes(nation)) {
-                  draft.filters.nations = draft.filters.nations.filter(
-                    (preexistingType) => preexistingType !== nation,
-                  );
-                } else {
-                  draft.filters.nations.push(nation);
-                }
-              })
-            }
-          >
-            <Flag nation={nation} />
-          </Button>
-        ))}
-      </Flex>
-      <Flex>
-        {[...TANK_CLASSES].map((type, index) => (
-          <Button
-            key={type}
-            color={filters.types.includes(type) ? undefined : 'gray'}
-            variant={filters.types.includes(type) ? 'surface' : 'soft'}
-            style={{
-              flex: 1,
-              margin: -0.5,
-              borderTopLeftRadius: index === 0 ? undefined : 0,
-              borderBottomLeftRadius: index === 0 ? undefined : 0,
-              borderTopRightRadius:
-                index === TANK_CLASSES.length - 1 ? undefined : 0,
-              borderBottomRightRadius:
-                index === TANK_CLASSES.length - 1 ? undefined : 0,
-            }}
-            onClick={() =>
-              mutateTankopediaPersistent((draft) => {
-                if (draft.filters.types.includes(type)) {
-                  draft.filters.types = draft.filters.types.filter(
-                    (preexistingType) => preexistingType !== type,
-                  );
-                } else {
-                  draft.filters.types.push(type);
-                }
-              })
-            }
-          >
-            <img
-              alt={type}
-              src={TREE_TYPE_ICONS.researchable[type]}
-              style={{ width: '1em', height: '1em' }}
-            />
-          </Button>
-        ))}
-      </Flex>
-      <Flex className={styles.oneLineFilters}>
-        {[...TIERS].map((tier, index) => (
-          <Button
-            key={tier}
-            color={filters.tiers.includes(tier) ? undefined : 'gray'}
-            variant={filters.tiers.includes(tier) ? 'surface' : 'soft'}
-            style={{
-              flex: 1,
-              margin: -0.5,
-              borderTopLeftRadius: index === 0 ? undefined : 0,
-              borderBottomLeftRadius: index === 0 ? undefined : 0,
-              borderTopRightRadius: index === TIERS.length - 1 ? undefined : 0,
-              borderBottomRightRadius:
-                index === TIERS.length - 1 ? undefined : 0,
-            }}
-            onClick={() =>
-              mutateTankopediaPersistent((draft) => {
-                if (draft.filters.tiers.includes(tier)) {
-                  draft.filters.tiers = draft.filters.tiers.filter(
-                    (preexistingTier) => preexistingTier !== tier,
-                  );
-                } else {
-                  draft.filters.tiers.push(tier);
-                }
-              })
-            }
-          >
-            {TIER_ROMAN_NUMERALS[tier]}
-          </Button>
-        ))}
-      </Flex>{' '}
-      <Flex
-        direction="column"
-        className={styles.splitFilters}
-        style={{ width: '100%' }}
-      >
-        <Flex>
-          {[...TIERS].slice(0, 5).map((tier, index) => (
-            <Button
-              key={tier}
-              color={filters.tiers.includes(tier) ? undefined : 'gray'}
-              variant={filters.tiers.includes(tier) ? 'surface' : 'soft'}
-              style={{
-                flex: 1,
-                margin: -0.5,
-                borderTopLeftRadius: index === 0 ? 16 : 0,
-                borderBottomLeftRadius: 0,
-                borderTopRightRadius:
-                  index === TIERS.length - Math.round(TIERS.length / 2) - 1
-                    ? 16
-                    : 0,
-                borderBottomRightRadius: 0,
-              }}
-              onClick={() =>
-                mutateTankopediaPersistent((draft) => {
-                  if (draft.filters.tiers.includes(tier)) {
-                    draft.filters.tiers = draft.filters.tiers.filter(
-                      (preexistingTier) => preexistingTier !== tier,
-                    );
-                  } else {
-                    draft.filters.tiers.push(tier);
-                  }
-                })
-              }
-            >
-              {TIER_ROMAN_NUMERALS[tier]}
-            </Button>
-          ))}
-        </Flex>
-        <Flex>
-          {[...TIERS].slice(5).map((tier, index) => (
-            <Button
-              key={tier}
-              color={filters.tiers.includes(tier) ? undefined : 'gray'}
-              variant={filters.tiers.includes(tier) ? 'surface' : 'soft'}
-              style={{
-                flex: 1,
-                margin: -0.5,
-                borderTopLeftRadius: 0,
-                borderBottomLeftRadius: index === 0 ? 16 : 0,
-                borderTopRightRadius: 0,
-                borderBottomRightRadius:
-                  index === TIERS.length - Math.round(TIERS.length / 2) - 1
-                    ? 16
-                    : 0,
-              }}
-              onClick={() =>
-                mutateTankopediaPersistent((draft) => {
-                  if (draft.filters.tiers.includes(tier)) {
-                    draft.filters.tiers = draft.filters.tiers.filter(
-                      (preexistingTier) => preexistingTier !== tier,
-                    );
-                  } else {
-                    draft.filters.tiers.push(tier);
-                  }
-                })
-              }
-            >
-              {TIER_ROMAN_NUMERALS[tier]}
-            </Button>
-          ))}
-        </Flex>
-      </Flex>
-      <Flex
-        direction="column"
-        className={styles.splitFilters}
-        style={{ width: '100%' }}
-      >
-        <Flex>
-          {nations.slice(0, 5).map((nation, index) => (
-            <Button
-              key={nation}
-              color={filters.nations.includes(nation) ? undefined : 'gray'}
-              variant={filters.nations.includes(nation) ? 'surface' : 'soft'}
-              style={{
-                flex: 1,
-                margin: -0.5,
-                borderTopLeftRadius: index === 0 ? 16 : 0,
-                borderBottomLeftRadius: 0,
-                borderTopRightRadius:
-                  index === nations.length - Math.round(nations.length / 2)
-                    ? 16
-                    : 0,
-                borderBottomRightRadius:
-                  index === nations.length - 1 ? undefined : 0,
-              }}
-              onClick={() =>
-                mutateTankopediaPersistent((draft) => {
-                  if (draft.filters.nations.includes(nation)) {
-                    draft.filters.nations = draft.filters.nations.filter(
-                      (preexistingType) => preexistingType !== nation,
-                    );
-                  } else {
-                    draft.filters.nations.push(nation);
-                  }
-                })
-              }
-            >
-              <Flag nation={nation} />
-            </Button>
-          ))}
-        </Flex>
-
-        <Flex>
-          {nations.slice(5).map((nation, index) => (
-            <Button
-              key={nation}
-              color={filters.nations.includes(nation) ? undefined : 'gray'}
-              variant={filters.nations.includes(nation) ? 'surface' : 'soft'}
-              style={{
-                flex: 1,
-                margin: -0.5,
-                borderTopLeftRadius: 0,
-                borderBottomLeftRadius: index === 0 ? 16 : 0,
-                borderTopRightRadius:
-                  index === nations.length - 1 ? undefined : 0,
-                borderBottomRightRadius:
-                  index === nations.length - Math.round(nations.length / 2) - 1
-                    ? 16
-                    : 0,
-              }}
-              onClick={() =>
-                mutateTankopediaPersistent((draft) => {
-                  if (draft.filters.nations.includes(nation)) {
-                    draft.filters.nations = draft.filters.nations.filter(
-                      (preexistingType) => preexistingType !== nation,
-                    );
-                  } else {
-                    draft.filters.nations.push(nation);
-                  }
-                })
-              }
-            >
-              <Flag nation={nation} />
-            </Button>
-          ))}
-        </Flex>
-      </Flex>
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <Button variant="soft" color="gray">
-            Test tanks
-            <CaretDownIcon />
-          </Button>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content>
-          <DropdownMenu.RadioGroup
-            value={filters.test}
-            onValueChange={(value) =>
-              mutateTankopediaPersistent((draft) => {
-                draft.filters.test = value as TankopediaTestTankDisplay;
-              })
-            }
-          >
-            <DropdownMenu.RadioItem value="include">
-              Include
-            </DropdownMenu.RadioItem>
-            <DropdownMenu.RadioItem value="exclude">
-              Exclude
-            </DropdownMenu.RadioItem>
-            <DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
-          </DropdownMenu.RadioGroup>
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </Flex>
-  );
-}

src/app/tools/tankopedia/components/TankSearch/components/Results.tsx

@@ -1,175 +0,0 @@
-import { slateDark } from '@radix-ui/colors';
-import { Card, Flex, Inset, Link, Text } from '@radix-ui/themes';
-import { asset } from '../../../../../../core/blitzkit/asset';
-import { TankDefinition } from '../../../../../../core/blitzkit/tankDefinitions';
-import {
-  TANK_ICONS,
-  TANK_ICONS_COLLECTOR,
-  TANK_ICONS_PREMIUM,
-  TIER_ROMAN_NUMERALS,
-} from '../../../../../../core/blitzkit/tankDefinitions/constants';
-import { tankIcon } from '../../../../../../core/blitzkit/tankIcon';
-import { theme } from '../../../../../../stitches.config';
-import * as styles from '../../../page.css';
-import { CompactSearchResultRow } from './CompactSearchResultRow';
-
-interface ResultsProps {
-  compact?: boolean;
-  results: TankDefinition[];
-  onSelect?: (tank: TankDefinition) => void;
-}
-
-export function Results({ compact, results, onSelect }: ResultsProps) {
-  const firstChunk = compact
-    ? results.slice(0, Math.ceil(results.length / 2))
-    : [];
-  const secondChunk = compact
-    ? results.slice(Math.ceil(results.length / 2))
-    : [];
-
-  return (
-    <Flex
-      wrap="wrap"
-      gap="2"
-      style={{
-        justifyContent:
-          compact && firstChunk.length > 0 && secondChunk.length > 0
-            ? 'space-around'
-            : 'center',
-      }}
-    >
-      {!compact &&
-        results.map((tank) => (
-          <Link
-            key={tank.id}
-            className={styles.listing}
-            href={`/tools/tankopedia/${tank.id}`}
-            style={{
-              flex: 1,
-              minWidth: 256,
-            }}
-          >
-            <Card
-              key={tank.id}
-              style={{
-                cursor: 'pointer',
-                height: 64,
-                width: '100%',
-              }}
-            >
-              <Inset
-                key={tank.id}
-                style={{
-                  minHeight: 64,
-                  position: 'relative',
-                  display: 'flex',
-                }}
-              >
-                <img
-                  alt={tank.name}
-                  className={styles.flag}
-                  src={asset(`flags/scratched/${tank.nation}.webp`)}
-                  style={{
-                    width: '100%',
-                    height: '100%',
-                    objectFit: 'contain',
-                    position: 'absolute',
-                  }}
-                />
-
-                <div
-                  className={styles.listingShadow}
-                  style={{
-                    width: '100%',
-                    height: '100%',
-                    position: 'absolute',
-                    transition: `box-shadow ${theme.durations.regular}`,
-                  }}
-                />
-
-                <div
-                  style={{
-                    width: 256,
-                    height: 128,
-                  }}
-                  className={styles.listingImage}
-                >
-                  <img
-                    alt={tank.name}
-                    src={tankIcon(tank.id)}
-                    style={{
-                      objectFit: 'contain',
-                      objectPosition: 'left center',
-                    }}
-                  />
-                </div>
-
-                <Flex
-                  align="center"
-                  justify="between"
-                  className={styles.listingLabel}
-                  style={{
-                    position: 'absolute',
-                    bottom: 8,
-                    padding: '0 12px',
-                    width: '100%',
-                    boxSizing: 'border-box',
-                  }}
-                >
-                  <Flex align="center" justify="center" gap="1">
-                    <img
-                      alt={tank.name}
-                      src={
-                        (tank.treeType === 'collector'
-                          ? TANK_ICONS_COLLECTOR
-                          : tank.treeType === 'premium'
-                            ? TANK_ICONS_PREMIUM
-                            : TANK_ICONS)[tank.class]
-                      }
-                      style={{ width: '1em', height: '1em' }}
-                    />
-                    <Text
-                      size="4"
-                      color={
-                        tank.treeType === 'collector'
-                          ? 'blue'
-                          : tank.treeType === 'premium'
-                            ? 'amber'
-                            : undefined
-                      }
-                      weight="medium"
-                      style={{
-                        color:
-                          tank.treeType === 'researchable'
-                            ? slateDark.slate12
-                            : undefined,
-                        whiteSpace: 'nowrap',
-                        maxWidth: 160,
-                        display: 'block',
-                        textOverflow: 'ellipsis',
-                        overflow: 'hidden',
-                      }}
-                    >
-                      {tank.name}
-                    </Text>
-                  </Flex>
-
-                  <Text size="4" color="gray" highContrast={false}>
-                    {TIER_ROMAN_NUMERALS[tank.tier]}
-                  </Text>
-                </Flex>
-              </Inset>
-            </Card>
-          </Link>
-        ))}
-
-      {compact && firstChunk.length > 0 && (
-        <CompactSearchResultRow tanks={firstChunk} onSelect={onSelect} />
-      )}
-
-      {compact && secondChunk.length > 0 && (
-        <CompactSearchResultRow tanks={secondChunk} onSelect={onSelect} />
-      )}
-    </Flex>
-  );
-}

src/app/tools/tankopedia/components/TankSearch/constants.tsx

@@ -0,0 +1,7 @@
+import { TreeType } from '../../../../../components/Tanks';
+
+export const treeTypeOrder: TreeType[] = [
+  'researchable',
+  'premium',
+  'collector',
+];

src/app/tools/tankopedia/components/TankSearch/index.tsx

@@ -1,554 +1,444 @@
-import {
-  CaretRightIcon,
-  MagnifyingGlassIcon,
-  TrashIcon,
-} from '@radix-ui/react-icons';
-import {
-  AlertDialog,
-  Button,
-  Flex,
-  Spinner,
-  Text,
-  TextField,
-} from '@radix-ui/themes';
+import { Callout, Flex, FlexProps, Link, Text } from '@radix-ui/themes';
 import { go } from 'fuzzysort';
-import { use, useEffect, useMemo, useRef, useState } from 'react';
-import { isMobileOnly } from 'react-device-detect';
-import { TreeType } from '../../../../../components/Tanks';
+import { times } from 'lodash';
+import { memo, use, useMemo } from 'react';
+import { AdMidSectionResponsive } from '../../../../../components/AdMidSectionResponsive';
+import { ExperimentIcon } from '../../../../../components/ExperimentIcon';
 import { TANK_CLASSES } from '../../../../../components/Tanks/components/Item/constants';
 import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
+import { gameDefinitions } from '../../../../../core/blitzkit/gameDefinitions';
 import { modelDefinitions } from '../../../../../core/blitzkit/modelDefinitions';
 import { normalizeBoundingBox } from '../../../../../core/blitzkit/normalizeBoundingBox';
 import { resolveDpm } from '../../../../../core/blitzkit/resolveDpm';
 import { resolveReload } from '../../../../../core/blitzkit/resolveReload';
 import {
-  NATIONS,
   TankDefinition,
+  tankDefinitions,
+  tankNames,
   tanksDefinitionsArray,
 } from '../../../../../core/blitzkit/tankDefinitions';
+import { tankopediaFilterTank } from '../../../../../core/blitzkit/tankopediaFilterTank';
 import { unionBoundingBox } from '../../../../../core/blitzkit/unionBoundingBox';
-import mutateTankopediaPersistent, {
-  SORT_NAMES,
-  useTankopediaPersistent,
-} from '../../../../../stores/tankopedia';
-import { PageTurner } from '../PageTurner';
-import { Options } from './components/Options';
-import { Results } from './components/Results';
-import { Sort } from './components/Sort';
+import { useAdExempt } from '../../../../../hooks/useAdExempt';
+import { SORT_NAMES, SORT_UNITS } from '../../../../../stores/tankopedia';
+import { useTankopediaFilters } from '../../../../../stores/tankopediaFilters';
+import { FilterControl } from '../FilterControl';
+import { NoResults } from '../NoResults';
+import { SearchBar } from '../SearchBar';
+import { SkeletonTankCard } from '../SkeletonTankCard';
+import { TankCard } from '../TankCard';
+import { TankCardWrapper } from '../TankCardWrapper';
+import { treeTypeOrder } from './constants';
 
-interface TankSearchProps {
+type TankSearchProps = Omit<FlexProps, 'onSelect'> & {
   compact?: boolean;
   onSelect?: (tank: TankDefinition) => void;
   onSelectAll?: (tanks: TankDefinition[]) => void;
-}
+};
 
-const treeTypeOrder: TreeType[] = ['researchable', 'premium', 'collector'];
-
-export function TankSearch({
-  compact,
-  onSelect = () => {},
-  onSelectAll,
-}: TankSearchProps) {
-  const tanksPerPage = (compact ? 16 : 96) * (isMobileOnly ? 0.5 : 1);
-  const nations = use(NATIONS);
-  const filters = useTankopediaPersistent((state) => state.filters);
-  const sort = useTankopediaPersistent((state) => state.sort);
-  const awaitedTanks = use(tanksDefinitionsArray);
-  const awaitedModelDefinitions = use(modelDefinitions);
-  const [loaded, setLoaded] = useState(false);
-  const defaultSortedTanks = useMemo(
-    () =>
-      awaitedTanks
-        .sort(
-          (a, b) =>
-            (treeTypeOrder.indexOf(a.treeType) -
-              treeTypeOrder.indexOf(b.treeType)) *
-            (sort.direction === 'descending' ? -1 : 1),
-        )
-        .sort(
-          (a, b) =>
-            (TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class)) *
-            (sort.direction === 'descending' ? -1 : 1),
-        )
-        .sort(
-          (a, b) =>
-            (nations.indexOf(a.nation) - nations.indexOf(b.nation)) *
-            (sort.direction === 'descending' ? -1 : 1),
-        ),
-    [],
-  );
-  const input = useRef<HTMLInputElement>(null);
-  const searchableTanks = useMemo(() => {
-    const filtered = defaultSortedTanks.filter(
-      (tank) =>
-        (filters.tiers.length === 0
-          ? true
-          : filters.tiers.includes(tank.tier)) &&
-        (filters.types.length === 0
-          ? true
-          : filters.types.includes(tank.class)) &&
-        (filters.treeTypes.length === 0
-          ? true
-          : filters.treeTypes.includes(tank.treeType)) &&
-        (filters.nations.length === 0
-          ? true
-          : filters.nations.includes(tank.nation)) &&
-        (filters.test === 'include'
-          ? true
-          : filters.test === 'exclude'
-            ? !tank.testing
-            : tank.testing),
-    );
-    let sorted: TankDefinition[] = [];
-
-    switch (sort.by) {
-      case 'meta.tier':
-        sorted = filtered.sort((a, b) => a.tier - b.tier);
-        break;
-
-      case 'meta.name':
-        sorted = filtered.sort((a, b) => a.name?.localeCompare(b.name));
-        break;
-
-      case 'survivability.health': {
-        sorted = filtered.sort((a, b) => {
-          const aHealth = a.health + a.turrets.at(-1)!.health;
-          const bHealth = b.health + b.turrets.at(-1)!.health;
-
-          return aHealth - bHealth;
-        });
-        break;
-      }
-
-      case 'survivability.viewRange':
-        sorted = filtered.sort(
-          (a, b) => a.turrets.at(-1)!.viewRange - b.turrets.at(-1)!.viewRange,
+export const TankSearch = memo<TankSearchProps>(
+  ({ compact, onSelect, onSelectAll, ...props }) => {
+    const exempt = useAdExempt();
+    const awaitedGameDefinitions = use(gameDefinitions);
+    const awaitedModelDefinitions = use(modelDefinitions);
+    const awaitedTankDefinitions = use(tankDefinitions);
+    const awaitedTanksDefinitionsArray = use(tanksDefinitionsArray);
+    const awaitedTankNames = use(tankNames);
+    const filters = useTankopediaFilters();
+    const tanks = useMemo(() => {
+      if (filters.search === undefined) {
+        const filtered = awaitedTanksDefinitionsArray.filter((tank) =>
+          tankopediaFilterTank(filters, tank),
         );
-        break;
+        let sorted: TankDefinition[];
 
-      case 'survivability.camouflageStill':
-        sorted = filtered.sort(
-          (a, b) => a.camouflage.still - b.camouflage.still,
-        );
-        break;
+        switch (filters.sort.by) {
+          case 'meta.none':
+            sorted = filtered
+              .sort((a, b) => b.tier - a.tier)
+              .sort(
+                (a, b) =>
+                  treeTypeOrder.indexOf(b.treeType) -
+                  treeTypeOrder.indexOf(a.treeType),
+              )
+              .sort(
+                (a, b) =>
+                  TANK_CLASSES.indexOf(b.class) - TANK_CLASSES.indexOf(a.class),
+              )
+              .sort(
+                (a, b) =>
+                  awaitedGameDefinitions.nations.indexOf(b.nation) -
+                  awaitedGameDefinitions.nations.indexOf(a.nation),
+              );
+            break;
 
-      case 'survivability.camouflageMoving':
-        sorted = filtered.sort(
-          (a, b) => a.camouflage.moving - b.camouflage.moving,
-        );
-        break;
+          case 'survivability.health': {
+            sorted = filtered.sort((a, b) => {
+              const aHealth = a.health + a.turrets.at(-1)!.health;
+              const bHealth = b.health + b.turrets.at(-1)!.health;
 
-      case 'survivability.camouflageShooting':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.turrets.at(-1)!.guns.at(-1)!.camouflageLoss -
-            b.turrets.at(-1)!.guns.at(-1)!.camouflageLoss,
-        );
-        break;
+              return aHealth - bHealth;
+            });
+            break;
+          }
 
-      case 'survivability.volume':
-        sorted = filtered.sort((a, b) => {
-          const aTankModelDefinition = awaitedModelDefinitions[a.id];
-          const bTankModelDefinition = awaitedModelDefinitions[b.id];
-          const aTurretModelDefinition =
-            aTankModelDefinition.turrets[a.turrets.at(-1)!.id];
-          const bTurretModelDefinition =
-            bTankModelDefinition.turrets[b.turrets.at(-1)!.id];
-          const aSize = normalizeBoundingBox(
-            unionBoundingBox(
-              aTankModelDefinition.boundingBox,
-              aTurretModelDefinition.boundingBox,
-            ),
-          );
-          const bSize = normalizeBoundingBox(
-            unionBoundingBox(
-              bTankModelDefinition.boundingBox,
-              bTurretModelDefinition.boundingBox,
-            ),
-          );
-          const aVolume = aSize[0] * aSize[1] * aSize[2];
-          const bVolume = bSize[0] * bSize[1] * bSize[2];
+          case 'survivability.viewRange':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.viewRange - b.turrets.at(-1)!.viewRange,
+            );
+            break;
 
-          return aVolume - bVolume;
-        });
-        break;
+          case 'survivability.camouflageStill':
+            sorted = filtered.sort(
+              (a, b) => a.camouflage.still - b.camouflage.still,
+            );
+            break;
 
-      case 'survivability.length':
-        sorted = filtered.sort((a, b) => {
-          const aTankModelDefinition = awaitedModelDefinitions[a.id];
-          const bTankModelDefinition = awaitedModelDefinitions[b.id];
-          const aTurretModelDefinition =
-            aTankModelDefinition.turrets[a.turrets.at(-1)!.id];
-          const bTurretModelDefinition =
-            bTankModelDefinition.turrets[b.turrets.at(-1)!.id];
-          const aSize = normalizeBoundingBox(
-            unionBoundingBox(
-              aTankModelDefinition.boundingBox,
-              aTurretModelDefinition.boundingBox,
-            ),
-          );
-          const bSize = normalizeBoundingBox(
-            unionBoundingBox(
-              bTankModelDefinition.boundingBox,
-              bTurretModelDefinition.boundingBox,
-            ),
-          );
-          const aLength = Math.max(aSize[0], aSize[1], aSize[2]);
-          const bLength = Math.max(bSize[0], bSize[1], bSize[2]);
+          case 'survivability.camouflageMoving':
+            sorted = filtered.sort(
+              (a, b) => a.camouflage.moving - b.camouflage.moving,
+            );
+            break;
 
-          return aLength - bLength;
-        });
-        break;
+          case 'survivability.camouflageShooting':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.camouflage.still *
+                  a.turrets.at(-1)!.guns.at(-1)!.camouflageLoss -
+                b.camouflage.still *
+                  b.turrets.at(-1)!.guns.at(-1)!.camouflageLoss,
+            );
+            break;
 
-      case 'fire.dpm':
-        sorted = filtered.sort(
-          (a, b) =>
-            resolveDpm(
-              a.turrets.at(-1)!.guns.at(-1)!,
-              a.turrets.at(-1)!.guns.at(-1)!.shells[0],
-            ) -
-            resolveDpm(
-              b.turrets.at(-1)!.guns.at(-1)!,
-              b.turrets.at(-1)!.guns.at(-1)!.shells[0],
-            ),
-        );
-        break;
+          case 'survivability.volume':
+            sorted = filtered.sort((a, b) => {
+              const aTankModelDefinition = awaitedModelDefinitions[a.id];
+              const bTankModelDefinition = awaitedModelDefinitions[b.id];
+              const aTurretModelDefinition =
+                aTankModelDefinition.turrets[a.turrets.at(-1)!.id];
+              const bTurretModelDefinition =
+                bTankModelDefinition.turrets[b.turrets.at(-1)!.id];
+              const aSize = normalizeBoundingBox(
+                unionBoundingBox(
+                  aTankModelDefinition.boundingBox,
+                  aTurretModelDefinition.boundingBox,
+                ),
+              );
+              const bSize = normalizeBoundingBox(
+                unionBoundingBox(
+                  bTankModelDefinition.boundingBox,
+                  bTurretModelDefinition.boundingBox,
+                ),
+              );
+              const aVolume = aSize[0] * aSize[1] * aSize[2];
+              const bVolume = bSize[0] * bSize[1] * bSize[2];
 
-      case 'fire.reload':
-        sorted = filtered.sort(
-          (a, b) =>
-            resolveReload(a.turrets.at(-1)!.guns.at(-1)!) -
-            resolveReload(b.turrets.at(-1)!.guns.at(-1)!),
-        );
-        break;
+              return aVolume - bVolume;
+            });
+            break;
 
-      case 'fire.caliber':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.turrets.at(-1)!.guns.at(-1)!.shells[0].caliber -
-            b.turrets.at(-1)!.guns.at(-1)!.shells[0].caliber,
-        );
-        break;
+          case 'survivability.length':
+            sorted = filtered.sort((a, b) => {
+              const aTankModelDefinition = awaitedModelDefinitions[a.id];
+              const bTankModelDefinition = awaitedModelDefinitions[b.id];
+              const aTurretModelDefinition =
+                aTankModelDefinition.turrets[a.turrets.at(-1)!.id];
+              const bTurretModelDefinition =
+                bTankModelDefinition.turrets[b.turrets.at(-1)!.id];
+              const aSize = normalizeBoundingBox(
+                unionBoundingBox(
+                  aTankModelDefinition.boundingBox,
+                  aTurretModelDefinition.boundingBox,
+                ),
+              );
+              const bSize = normalizeBoundingBox(
+                unionBoundingBox(
+                  bTankModelDefinition.boundingBox,
+                  bTurretModelDefinition.boundingBox,
+                ),
+              );
+              const aLength = Math.max(aSize[0], aSize[1], aSize[2]);
+              const bLength = Math.max(bSize[0], bSize[1], bSize[2]);
 
-      case 'fire.standardPenetration':
-        sorted = filtered.sort(
-          (a, b) =>
-            resolveNearPenetration(
-              a.turrets.at(-1)!.guns.at(-1)!.shells[0].penetration,
-            ) -
-            resolveNearPenetration(
-              b.turrets.at(-1)!.guns.at(-1)!.shells[0].penetration,
-            ),
-        );
-        break;
+              return aLength - bLength;
+            });
+            break;
 
-      case 'fire.premiumPenetration':
-        sorted = filtered.sort(
-          (a, b) =>
-            resolveNearPenetration(
-              (
-                a.turrets.at(-1)!.guns.at(-1)!.shells[1] ??
-                a.turrets.at(-1)!.guns.at(-1)!.shells[0]
-              ).penetration,
-            ) -
-            resolveNearPenetration(
-              (
-                b.turrets.at(-1)!.guns.at(-1)!.shells[1] ??
-                b.turrets.at(-1)!.guns.at(-1)!.shells[0]
-              ).penetration,
-            ),
-        );
-        break;
+          case 'fire.dpm':
+            sorted = filtered.sort(
+              (a, b) =>
+                resolveDpm(
+                  a.turrets.at(-1)!.guns.at(-1)!,
+                  a.turrets.at(-1)!.guns.at(-1)!.shells[0],
+                ) -
+                resolveDpm(
+                  b.turrets.at(-1)!.guns.at(-1)!,
+                  b.turrets.at(-1)!.guns.at(-1)!.shells[0],
+                ),
+            );
+            break;
 
-      case 'fire.damage':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.turrets.at(-1)!.guns.at(-1)!.shells[0].damage.armor -
-            b.turrets.at(-1)!.guns.at(-1)!.shells[0].damage.armor,
-        );
-        break;
+          case 'fire.reload':
+            sorted = filtered.sort(
+              (a, b) =>
+                resolveReload(a.turrets.at(-1)!.guns.at(-1)!) -
+                resolveReload(b.turrets.at(-1)!.guns.at(-1)!),
+            );
+            break;
 
-      case 'fire.shellVelocity':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.turrets.at(-1)!.guns.at(-1)!.shells[0].speed -
-            b.turrets.at(-1)!.guns.at(-1)!.shells[0].speed,
-        );
-        break;
+          case 'fire.caliber':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.guns.at(-1)!.shells[0].caliber -
+                b.turrets.at(-1)!.guns.at(-1)!.shells[0].caliber,
+            );
+            break;
 
-      case 'fire.aimTime':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.turrets.at(-1)!.guns.at(-1)!.aimTime -
-            b.turrets.at(-1)!.guns.at(-1)!.aimTime,
-        );
-        break;
+          case 'fire.standardPenetration':
+            sorted = filtered.sort(
+              (a, b) =>
+                resolveNearPenetration(
+                  a.turrets.at(-1)!.guns.at(-1)!.shells[0].penetration,
+                ) -
+                resolveNearPenetration(
+                  b.turrets.at(-1)!.guns.at(-1)!.shells[0].penetration,
+                ),
+            );
+            break;
 
-      case 'fire.dispersionStill':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.turrets.at(-1)!.guns.at(-1)!.dispersion.base -
-            b.turrets.at(-1)!.guns.at(-1)!.dispersion.base,
-        );
-        break;
+          case 'fire.premiumPenetration':
+            sorted = filtered.sort(
+              (a, b) =>
+                resolveNearPenetration(
+                  a.turrets.at(-1)!.guns.at(-1)!.shells[1]?.penetration ?? 0,
+                ) -
+                resolveNearPenetration(
+                  b.turrets.at(-1)!.guns.at(-1)!.shells[1]?.penetration ?? 0,
+                ),
+            );
+            break;
 
-      case 'fire.dispersionMoving':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.tracks.at(-1)!.dispersion.move - b.tracks.at(-1)!.dispersion.move,
-        );
-        break;
+          case 'fire.damage':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.guns.at(-1)!.shells[0].damage.armor -
+                b.turrets.at(-1)!.guns.at(-1)!.shells[0].damage.armor,
+            );
+            break;
 
-      case 'fire.gunDepression':
-        sorted = filtered.sort(
-          (a, b) =>
-            awaitedModelDefinitions[a.id].turrets[a.turrets.at(-1)!.id].guns[
-              a.turrets.at(-1)!.guns.at(-1)!.id
-            ].pitch.max -
-            awaitedModelDefinitions[b.id].turrets[b.turrets.at(-1)!.id].guns[
-              b.turrets.at(-1)!.guns.at(-1)!.id
-            ].pitch.max,
-        );
-        break;
+          case 'fire.shellVelocity':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.guns.at(-1)!.shells[0].speed -
+                b.turrets.at(-1)!.guns.at(-1)!.shells[0].speed,
+            );
+            break;
 
-      case 'fire.gunElevation':
-        sorted = filtered.sort(
-          (a, b) =>
-            // reversed because of negative values
-            awaitedModelDefinitions[b.id].turrets[b.turrets.at(-1)!.id].guns[
-              b.turrets.at(-1)!.guns.at(-1)!.id
-            ].pitch.min -
-            awaitedModelDefinitions[a.id].turrets[a.turrets.at(-1)!.id].guns[
-              a.turrets.at(-1)!.guns.at(-1)!.id
-            ].pitch.min,
-        );
-        break;
+          case 'fire.aimTime':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.guns.at(-1)!.aimTime -
+                b.turrets.at(-1)!.guns.at(-1)!.aimTime,
+            );
+            break;
 
-      case 'maneuverability.forwardsSpeed':
-        sorted = filtered.sort((a, b) => a.speed.forwards - b.speed.forwards);
-        break;
+          case 'fire.dispersionStill':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.turrets.at(-1)!.guns.at(-1)!.dispersion.base -
+                b.turrets.at(-1)!.guns.at(-1)!.dispersion.base,
+            );
+            break;
 
-      case 'maneuverability.backwardsSpeed':
-        sorted = filtered.sort((a, b) => a.speed.backwards - b.speed.backwards);
-        break;
+          case 'fire.dispersionMoving':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.tracks.at(-1)!.dispersion.move -
+                b.tracks.at(-1)!.dispersion.move,
+            );
+            break;
 
-      case 'maneuverability.power':
-        sorted = filtered.sort(
-          (a, b) => a.engines.at(-1)!.power - b.engines.at(-1)!.power,
-        );
-        break;
+          case 'fire.gunDepression':
+            sorted = filtered.sort(
+              (a, b) =>
+                awaitedModelDefinitions[a.id].turrets[a.turrets.at(-1)!.id]
+                  .guns[a.turrets.at(-1)!.guns.at(-1)!.id].pitch.max +
+                (awaitedModelDefinitions[a.id].turretRotation?.pitch ?? 0) -
+                awaitedModelDefinitions[b.id].turrets[b.turrets.at(-1)!.id]
+                  .guns[b.turrets.at(-1)!.guns.at(-1)!.id].pitch.max -
+                (awaitedModelDefinitions[b.id].turretRotation?.pitch ?? 0),
+            );
+            break;
 
-      case 'maneuverability.powerToWeight':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.engines.at(-1)!.power /
-              (a.weight +
+          case 'fire.gunElevation':
+            sorted = filtered.sort(
+              (a, b) =>
+                awaitedModelDefinitions[b.id].turrets[b.turrets.at(-1)!.id]
+                  .guns[b.turrets.at(-1)!.guns.at(-1)!.id].pitch.min +
+                (awaitedModelDefinitions[b.id].turretRotation?.pitch ?? 0) -
+                awaitedModelDefinitions[a.id].turrets[a.turrets.at(-1)!.id]
+                  .guns[a.turrets.at(-1)!.guns.at(-1)!.id].pitch.min -
+                (awaitedModelDefinitions[a.id].turretRotation?.pitch ?? 0),
+            );
+            break;
+
+          case 'maneuverability.forwardsSpeed':
+            sorted = filtered.sort(
+              (a, b) => a.speed.forwards - b.speed.forwards,
+            );
+            break;
+
+          case 'maneuverability.backwardsSpeed':
+            sorted = filtered.sort(
+              (a, b) => a.speed.backwards - b.speed.backwards,
+            );
+            break;
+
+          case 'maneuverability.power':
+            sorted = filtered.sort(
+              (a, b) => a.engines.at(-1)!.power - b.engines.at(-1)!.power,
+            );
+            break;
+
+          case 'maneuverability.powerToWeight':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.engines.at(-1)!.power /
+                  (a.weight +
+                    a.engines.at(-1)!.weight +
+                    a.tracks.at(-1)!.weight +
+                    a.turrets.at(-1)!.weight +
+                    a.turrets.at(-1)!.guns.at(-1)!.weight) -
+                b.engines.at(-1)!.power /
+                  (b.weight +
+                    b.engines.at(-1)!.weight +
+                    b.tracks.at(-1)!.weight +
+                    b.turrets.at(-1)!.weight +
+                    b.turrets.at(-1)!.guns.at(-1)!.weight),
+            );
+            break;
+
+          case 'maneuverability.weight':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.weight +
                 a.engines.at(-1)!.weight +
                 a.tracks.at(-1)!.weight +
                 a.turrets.at(-1)!.weight +
-                a.turrets.at(-1)!.guns.at(-1)!.weight) -
-            b.engines.at(-1)!.power /
-              (b.weight +
-                b.engines.at(-1)!.weight +
-                b.tracks.at(-1)!.weight +
-                b.turrets.at(-1)!.weight +
-                b.turrets.at(-1)!.guns.at(-1)!.weight),
+                a.turrets.at(-1)!.guns.at(-1)!.weight -
+                (b.weight +
+                  b.engines.at(-1)!.weight +
+                  b.tracks.at(-1)!.weight +
+                  b.turrets.at(-1)!.weight +
+                  b.turrets.at(-1)!.guns.at(-1)!.weight),
+            );
+            break;
+
+          case 'maneuverability.traverseSpeed':
+            sorted = filtered.sort(
+              (a, b) =>
+                a.tracks.at(-1)!.traverseSpeed - b.tracks.at(-1)!.traverseSpeed,
+            );
+            break;
+        }
+
+        return filters.sort.direction === 'ascending'
+          ? sorted
+          : sorted.reverse();
+      } else {
+        const searchedRaw = go(filters.search, awaitedTankNames, {
+          key: 'combined',
+          limit: 25,
+        });
+        const searchedTanks = searchedRaw.map(
+          (result) => awaitedTankDefinitions[result.obj.id],
         );
-        break;
+        return searchedTanks;
+      }
+    }, [filters]);
 
-      case 'maneuverability.weight':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.weight +
-            a.engines.at(-1)!.weight +
-            a.tracks.at(-1)!.weight +
-            a.turrets.at(-1)!.weight +
-            a.turrets.at(-1)!.guns.at(-1)!.weight -
-            (b.weight +
-              b.engines.at(-1)!.weight +
-              b.tracks.at(-1)!.weight +
-              b.turrets.at(-1)!.weight +
-              b.turrets.at(-1)!.guns.at(-1)!.weight),
-        );
-        break;
-
-      case 'maneuverability.traverseSpeed':
-        sorted = filtered.sort(
-          (a, b) =>
-            a.tracks.at(-1)!.traverseSpeed - b.tracks.at(-1)!.traverseSpeed,
-        );
-        break;
-    }
-
-    return sort.direction === 'ascending' ? sorted : sorted.reverse();
-  }, [
-    sort,
-    ...Object.entries(filters)
-      .filter(([name]) => name !== 'page')
-      .map(([, value]) => value),
-  ]);
-  const [searchQuery, setSearchQuery] = useState('');
-  const searchResults = useMemo(
-    () =>
-      go(searchQuery, searchableTanks, {
-        keys: ['name', 'nameFull', 'id'] satisfies (keyof TankDefinition)[],
-        all: true,
-      }).map(({ obj }) => obj),
-    [searchQuery, searchableTanks],
-  );
-  const page = useTankopediaPersistent((state) => state.filters.page);
-  const searchResultsPageSlice = searchResults.slice(
-    page * tanksPerPage,
-    (page + 1) * tanksPerPage,
-  );
-
-  useEffect(() => {
-    mutateTankopediaPersistent((draft) => {
-      draft.filters.page = Math.min(
-        Math.max(0, page),
-        Math.ceil(searchResults.length / tanksPerPage) - 1,
-      );
-    });
-  }, [searchResults]);
-
-  useEffect(() => {
-    setLoaded(true);
-  }, []);
-
-  if (!loaded) {
     return (
-      <Flex justify="center">
-        <Spinner />
+      <Flex direction="column" gap="4" flexGrow="1" {...props}>
+        <SearchBar topResult={tanks?.[0]} />
+
+        {!filters.search && !filters.searching && (
+          <FilterControl compact={compact} />
+        )}
+
+        {(filters.sort.by !== 'meta.none' || onSelectAll) && (
+          <Flex
+            py="2"
+            mt="2"
+            direction="column"
+            align="center"
+            justify="center"
+          >
+            {filters.sort.by !== 'meta.none' && (
+              <Text color="gray">
+                Sorting by {SORT_NAMES[filters.sort.by]}
+                {SORT_UNITS[filters.sort.by] === undefined
+                  ? ''
+                  : ` (${SORT_UNITS[filters.sort.by]})`}
+                , {filters.sort.direction}
+              </Text>
+            )}
+
+            {onSelectAll && (
+              <Link
+                underline="always"
+                href="#"
+                onClick={() => onSelectAll(tanks)}
+              >
+                Select all {tanks.length} tanks
+              </Link>
+            )}
+          </Flex>
+        )}
+
+        {filters.testing === 'only' && (
+          <Flex justify="center" mt="4">
+            <Callout.Root color="amber">
+              <Callout.Icon>
+                <ExperimentIcon style={{ width: '1em', height: '1em' }} />
+              </Callout.Icon>
+              <Callout.Text>
+                Tanks in testing are subject to change and many not represent
+                the final product.
+              </Callout.Text>
+            </Callout.Root>
+          </Flex>
+        )}
+
+        {!filters.searching && (
+          <>
+            {tanks.length > 0 && (
+              <TankCardWrapper>
+                {tanks.map((tank, index) => (
+                  <>
+                    <TankCard onSelect={onSelect} key={tank.id} tank={tank} />
+                    {!exempt &&
+                      (index + 16) % 32 === 0 &&
+                      index !== tanks.length - 1 && (
+                        <AdMidSectionResponsive gridColumn="1 / -1" />
+                      )}
+                  </>
+                ))}
+              </TankCardWrapper>
+            )}
+
+            {tanks.length === 0 && <NoResults type="search" />}
+          </>
+        )}
+
+        {filters.searching && (
+          <TankCardWrapper>
+            {times(Math.round(10 + 10 * Math.random()), (index) => (
+              <SkeletonTankCard key={index} />
+            ))}
+          </TankCardWrapper>
+        )}
       </Flex>
     );
-  }
-
-  return (
-    <>
-      <Flex direction="column" gap="4">
-        <Flex gap="2">
-          <TextField.Root
-            style={{ flex: 1 }}
-            ref={input}
-            placeholder="Search tanks..."
-            onChange={(event) => {
-              setSearchQuery(event.target.value);
-            }}
-            onKeyDown={(event) => {
-              if (event.key === 'Enter') {
-                if (
-                  searchResults.length > 0 &&
-                  input.current &&
-                  input.current.value.length > 0
-                ) {
-                  onSelect(searchResults[0]);
-                }
-              }
-            }}
-          >
-            <TextField.Slot>
-              <MagnifyingGlassIcon height="16" width="16" />
-            </TextField.Slot>
-
-            {searchResults.length > 0 &&
-              input.current &&
-              input.current.value.length > 0 && (
-                <TextField.Slot>
-                  <Button
-                    variant="ghost"
-                    onClick={() => onSelect(searchResults[0])}
-                  >
-                    {searchResults[0].name} <CaretRightIcon />
-                  </Button>
-                </TextField.Slot>
-              )}
-          </TextField.Root>
-
-          <Sort />
-
-          <Button
-            color="red"
-            variant="soft"
-            onClick={() =>
-              useTankopediaPersistent.setState({
-                filters: {
-                  nations: [],
-                  tiers: [],
-                  treeTypes: [],
-                  types: [],
-                  test: 'include',
-                  page: 0,
-                },
-                sort: {
-                  by: 'meta.tier',
-                  direction: 'descending',
-                },
-              })
-            }
-          >
-            <TrashIcon />
-          </Button>
-        </Flex>
-
-        <Options />
-      </Flex>
-
-      <Flex justify="center" gap="4" align="center">
-        <Text color="gray">
-          Sorting: {SORT_NAMES[sort.by]}, {sort.direction}
-        </Text>
-
-        {onSelectAll && searchResults.length <= 8 && (
-          <Button variant="ghost" onClick={() => onSelectAll(searchResults)}>
-            Select all
-          </Button>
-        )}
-        {onSelectAll && searchResults.length > 8 && (
-          <AlertDialog.Root>
-            <AlertDialog.Trigger>
-              <Button variant="ghost">Select all</Button>
-            </AlertDialog.Trigger>
-
-            <AlertDialog.Content>
-              <AlertDialog.Title>
-                Woah! That's a lot of tanks.
-              </AlertDialog.Title>
-              <AlertDialog.Description>
-                Would you like to select{' '}
-                <Text color="red">all {searchResults.length} tanks</Text>?
-              </AlertDialog.Description>
-
-              <Flex gap="2" justify="end">
-                <AlertDialog.Cancel>
-                  <Button variant="soft" color="gray">
-                    Cancel
-                  </Button>
-                </AlertDialog.Cancel>
-
-                <AlertDialog.Action onClick={() => onSelectAll(searchResults)}>
-                  <Button variant="solid" color="red">
-                    Select {searchResults.length} tanks
-                  </Button>
-                </AlertDialog.Action>
-              </Flex>
-            </AlertDialog.Content>
-          </AlertDialog.Root>
-        )}
-      </Flex>
-
-      {!compact && (
-        <PageTurner tanksPerPage={tanksPerPage} searchedList={searchResults} />
-      )}
-
-      <Results
-        compact={compact}
-        results={searchResultsPageSlice}
-        onSelect={onSelect}
-      />
-
-      {searchResultsPageSlice.length > tanksPerPage / 4 && (
-        <PageTurner tanksPerPage={tanksPerPage} searchedList={searchResults} />
-      )}
-    </>
-  );
-}
+  },
+);

src/app/tools/tankopedia/components/TierFilter.tsx

@@ -0,0 +1,49 @@
+import { Flex, IconButton, Text } from '@radix-ui/themes';
+import { times } from 'lodash';
+import { memo } from 'react';
+import { Tier } from '../../../../core/blitzkit/tankDefinitions';
+import { TIER_ROMAN_NUMERALS } from '../../../../core/blitzkit/tankDefinitions/constants';
+import {
+  mutateTankopediaFilters,
+  useTankopediaFilters,
+} from '../../../../stores/tankopediaFilters';
+
+export const TierFilter = memo(() => {
+  const tierFilter = useTankopediaFilters((state) => state.tier);
+  const sort = useTankopediaFilters((state) => state.sort);
+  const search = useTankopediaFilters((state) => state.search);
+
+  if (sort.by !== 'meta.none' || search) return null;
+
+  return (
+    <Flex justify="center">
+      <Flex
+        direction="row"
+        overflow="hidden"
+        style={{ borderRadius: 'var(--radius-full)' }}
+      >
+        {times(10, (index) => {
+          const tier = (10 - index) as Tier;
+          const selected = tierFilter === tier;
+
+          return (
+            <IconButton
+              key={tier}
+              variant={selected ? 'solid' : 'soft'}
+              radius="none"
+              color={selected ? undefined : 'gray'}
+              highContrast
+              onClick={() =>
+                mutateTankopediaFilters((draft) => {
+                  draft.tier = tier;
+                })
+              }
+            >
+              <Text size="2">{TIER_ROMAN_NUMERALS[tier]}</Text>
+            </IconButton>
+          );
+        })}
+      </Flex>
+    </Flex>
+  );
+});

src/app/tools/tankopedia/page.tsx

@@ -1,32 +1,17 @@
 'use client';
 
-import { Flex } from '@radix-ui/themes';
-import { times } from 'lodash';
-import { useRouter } from 'next/navigation';
-import { Ad, AdType } from '../../../components/Ad';
+import { AdMidSectionResponsive } from '../../../components/AdMidSectionResponsive';
 import PageWrapper from '../../../components/PageWrapper';
 import { useAdExempt } from '../../../hooks/useAdExempt';
 import { TankSearch } from './components/TankSearch';
 
 export default function Page() {
-  const router = useRouter();
   const exempt = useAdExempt();
 
   return (
-    <PageWrapper size={1200} color="purple">
-      <TankSearch
-        onSelect={(tank) => {
-          router.push(`./tankopedia/${tank.id}`);
-        }}
-      />
-
-      {!exempt && (
-        <Flex justify="center" wrap="wrap">
-          {times(2, (index) => (
-            <Ad key={index} type={AdType.MediumRectangleHorizontalPurple} />
-          ))}
-        </Flex>
-      )}
+    <PageWrapper color="purple" size={1028}>
+      <TankSearch />
+      {!exempt && <AdMidSectionResponsive />}
     </PageWrapper>
   );
 }