fix: Pass the topRight offset value to fixedZoomDrawerOffsetAutoCenter

mbta · Nov 20, 2023 · b8089c4 · b8089c4
1 parent ac3118f
commit b8089c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/assets/src/components/map/follower.tsx b/assets/src/components/map/follower.tsx
@@ -223,9 +223,8 @@ export const drawerOffsetAutoCenter =
     }
   }
 
-export const fixedZoomDrawerOffsetAutoCenter = drawerOffsetAutoCenter(
-  false,
-  [0, 0]
-)
+export const fixedZoomDrawerOffsetAutoCenter = (
+  topLeft: PointExpression | undefined
+) => drawerOffsetAutoCenter(false, topLeft || [0, 0])
 
 // #endregion Follower Update Functions
diff --git a/assets/src/components/mapPage/mapDisplay.tsx b/assets/src/components/mapPage/mapDisplay.tsx
@@ -178,9 +178,10 @@ const useLiveSelectedEntity = (
 const MapElementsNoSelection = () => {
   const followerState = useFollowingStateWithSelectionLogic(null, null)
 
+  const { paddingTopLeft } = useContext(MapSafeAreaContext)
   return (
     <RecenterControlWithInterruptibleFollower
-      onUpdate={fixedZoomDrawerOffsetAutoCenter}
+      onUpdate={fixedZoomDrawerOffsetAutoCenter(paddingTopLeft)}
       positions={[]}
       {...followerState}
     />
@@ -365,6 +366,7 @@ const SelectedRouteDataLayers = ({
     (selectedRoutePattern?.shape?.stops || []).map((s) => s.id)
   )
 
+  const { paddingTopLeft } = useContext(MapSafeAreaContext)
   return (
     <>
       {selectedRoutePattern && (
@@ -379,7 +381,7 @@ const SelectedRouteDataLayers = ({
         onVehicleSelect={selectVehicle}
       />
       <RecenterControlWithInterruptibleFollower
-        onUpdate={fixedZoomDrawerOffsetAutoCenter}
+        onUpdate={fixedZoomDrawerOffsetAutoCenter(paddingTopLeft)}
         positions={routeShapePositions}
         {...followerState}
       />
@@ -397,11 +399,12 @@ const SelectedLocationDataLayer = ({
 }) => {
   const followerState = useInteractiveFollowerState()
 
+  const { paddingTopLeft } = useContext(MapSafeAreaContext)
   return (
     <>
       <LocationMarker location={location} selected={true} />
       <RecenterControlWithInterruptibleFollower
-        onUpdate={fixedZoomDrawerOffsetAutoCenter}
+        onUpdate={fixedZoomDrawerOffsetAutoCenter(paddingTopLeft)}
         positions={[Leaflet.latLng(location.latitude, location.longitude)]}
         {...followerState}
       />