minimized tof for overlay

ari-party · Jul 11, 2024 · de9590c · de9590c
1 parent ed743c1
commit de9590c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/packages/mtc-artillery/src/components/organisms/configuration/TimeOfFlight.tsx b/packages/mtc-artillery/src/components/organisms/configuration/TimeOfFlight.tsx
@@ -10,13 +10,22 @@ import useElevation from '@/hooks/data/useElevation';
 import useProjectile from '@/hooks/data/useProjectile';
 import { calculateTimeOfFlight } from '@/utils/math';
 
-export default function TimeOfFlightValue() {
+export default function TimeOfFlightValue({
+  minimized = false,
+}: {
+  minimized?: boolean;
+}) {
   const t = useTranslations();
 
   const { velocity } = useProjectile();
   const [lowArc, highArc] = useElevation();
   const distance = useDistanceWithHeight();
 
+  const lowArcTof = todec(
+    Math.max(0, calculateTimeOfFlight(lowArc, velocity, distance)),
+  );
+  const highArcTof = todec(calculateTimeOfFlight(highArc, velocity, distance));
+
   return (
     <DataContainer>
       <Typography level="title-md">{t('typography.timeOfFlight')}</Typography>
@@ -31,24 +40,20 @@ export default function TimeOfFlightValue() {
       >
         {lowArc ? (
           <>
-            <Typography>
-              {todec(
-                Math.max(0, calculateTimeOfFlight(lowArc, velocity, distance)),
-              )}
-            </Typography>
+            <Typography>{lowArcTof}</Typography>
 
             {!!highArc && (
               <>
                 <Typography component="b" level="body-sm">
-                  {t('typography.or')}
+                  {minimized ? '/' : t('typography.or')}
                 </Typography>
 
                 <Typography>
-                  {t('units.second', {
-                    value: todec(
-                      calculateTimeOfFlight(highArc, velocity, distance),
-                    ),
-                  })}
+                  {minimized
+                    ? highArcTof
+                    : t('units.second', {
+                        value: highArcTof,
+                      })}
                 </Typography>
               </>
             )}

diff --git a/packages/mtc-artillery/src/views/Overlay.tsx b/packages/mtc-artillery/src/views/Overlay.tsx
@@ -8,6 +8,7 @@ import DistanceValue from '@/components/organisms/configuration/Distance';
 import ElevationValue from '@/components/organisms/configuration/Elevation';
 import MapSelection from '@/components/organisms/configuration/Map';
 import ProjectileSelection from '@/components/organisms/configuration/Projectile';
+import TimeOfFlightValue from '@/components/organisms/configuration/TimeOfFlight';
 import Canvas from '@/components/templates/Canvas';
 import RowContainer from '@tauri/atoms/RowContainer';
 import Navigation from '@tauri/templates/Navigation';
@@ -110,6 +111,7 @@ export default function OverlayView() {
 
             <RowContainer>
               <DistanceValue />
+              <TimeOfFlightValue minimized />
             </RowContainer>
           </ColumnContainer>