This commit is contained in:
zkldi
2022-02-09 02:58:06 +00:00
parent 7a9bad1d05
commit f5d15e581a
2 changed files with 5 additions and 4 deletions
@@ -15,6 +15,7 @@ import TachiTable, { Header } from "../components/TachiTable";
import { usePBState } from "../components/UseScoreState";
import PBDropdown from "../dropdowns/PBDropdown";
import ScoreCoreCells from "../game-core-cells/ScoreCoreCells";
import ChartHeader from "../headers/ChartHeader";
import { GetGPTCoreHeaders } from "../headers/GameHeaders";
import { FolderIndicatorHeader } from "../headers/IndicatorHeader";
@@ -32,7 +33,7 @@ export default function FolderTable<I extends IDStrings = IDStrings>({
const [rating, setRating] = useState(defaultRating);
const headers: Header<FolderDataset[0]>[] = [
["Chart", "Chart", NumericSOV(x => x.levelNum)],
ChartHeader<FolderDataset>(game, playtype, k => k),
FolderIndicatorHeader,
["Song", "Song", StrSOV(x => x.__related.song.title)],
...GetGPTCoreHeaders<FolderDataset>(game, playtype, rating, setRating, x => x.__related.pb),
@@ -1,8 +1,8 @@
import { ZTableSortFn } from "components/util/table/useZTable";
import { ChartDocument, Game } from "tachi-common";
import { FolderDataset, PBDataset, ScoreDataset } from "types/tables";
import { Playtype } from "types/tachi";
import { IsNotNullish } from "util/misc";
import { NumericSOV } from "util/sorts";
import { Header } from "../components/TachiTable";
function CascadingTierlistValue(
@@ -23,7 +23,7 @@ export default function ChartHeader<D extends ScoreDataset | FolderDataset | PBD
playtype: Playtype,
chartGetter: (k: D[0]) => ChartDocument
): Header<D[0]> {
let sortFn: ZTableSortFn<D[0]> = k => chartGetter(k).levelNum;
let sortFn: (d: D[0]) => number = k => chartGetter(k).levelNum;
if (game === "iidx") {
sortFn = k => CascadingTierlistValue(chartGetter(k), "kt-HC", "kt-NC");
@@ -31,5 +31,5 @@ export default function ChartHeader<D extends ScoreDataset | FolderDataset | PBD
sortFn = k => CascadingTierlistValue(chartGetter(k), "sgl-HC", "sgl-EC");
}
return ["Chart", "Chart", sortFn];
return ["Chart", "Chart", NumericSOV(sortFn)];
}