score formatting: truncate optionally

franciscoBSalgueiro · May 15, 2024 · 4fa9e87 · 4fa9e87
1 parent a4bc707
commit 4fa9e87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/components/boards/EvalBar.tsx b/src/components/boards/EvalBar.tsx
@@ -78,7 +78,7 @@ function EvalBar({
     <Tooltip
       position="right"
       color={score && score.value < 0 ? "dark" : undefined}
-      label={score ? formatScore(score) : undefined}
+      label={score ? formatScore(score, false) : undefined}
       disabled={!score}
     >
       <Box

diff --git a/src/components/common/EvalChart.tsx b/src/components/common/EvalChart.tsx
@@ -77,7 +77,7 @@ function EvalChart(props: EvalChartProps) {
   function getEvalText(node: TreeNode, type: "cp" | "wdl"): string {
     if (node.score) {
       if (type === "cp") {
-        return `Advantage: ${formatScore(node.score.value)}`;
+        return `Advantage: ${formatScore(node.score.value, false)}`;
       }
       if (type === "wdl" && node.score.wdl) {
         return `

diff --git a/src/components/panels/analysis/ScoreBubble.tsx b/src/components/panels/analysis/ScoreBubble.tsx
@@ -74,7 +74,7 @@ function ScoreBubble({
       <Tooltip
         position="left"
         color={score.value.value < 0 ? "dark" : undefined}
-        label={formatScore(score.value)}
+        label={formatScore(score.value, false)}
       >
         <Text
           fw={700}

diff --git a/src/utils/score.ts b/src/utils/score.ts
@@ -14,12 +14,17 @@ export const INITIAL_SCORE: Score = {
 
 const CP_CEILING = 1000;
 
-export function formatScore(score: ScoreValue): string {
+export function formatScore(score: ScoreValue, truncate = true): string {
   let scoreText = match(score.type)
-    // yoinked from: https://github.com/lichess-org/lila/blob/e110605c138c1f6fec417ab9317968b32a928a16/ui/ceval/src/util.ts#L8
-    .with("cp", () =>
-      Math.min(Math.round(Math.abs(score.value) / 10) / 10, 99).toFixed(1),
-    )
+    .with("cp", () => {
+      const absScore = Math.abs(score.value);
+      return (
+        truncate
+          ? // idea from: https://github.com/lichess-org/lila/blob/e110605c138c1f6fec417ab9317968b32a928a16/ui/ceval/src/util.ts#L8
+            Math.min(Math.round(absScore / 10) / 10, 99).toFixed(1)
+          : (absScore / 100).toFixed(2)
+      ).toString();
+    })
     .with("mate", () => `M${Math.abs(score.value)}`)
     .with("dtz", () => `DTZ${Math.abs(score.value)}`)
     .exhaustive();