fix: make route viewer clearer by hiding other elements when it's shown

opentripplanner · Oct 19, 2021 · 4d31217 · 4d31217
1 parent 76d0de2
commit 4d31217
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/lib/components/map/connected-endpoints-overlay.js b/lib/components/map/connected-endpoints-overlay.js
@@ -12,6 +12,11 @@ import { getActiveSearch, getShowUserSettings } from '../../util/state'
 // connect to the redux store
 
 const mapStateToProps = (state, ownProps) => {
+  // If trip viewer is not active, do not show trip on map
+  if (state.otp.ui.mainPanelContent !== null) {
+    return {}
+  }
+
   // Use query from active search (if a search has been made) or default to
   // current query is no search is available.
   const activeSearch = getActiveSearch(state)

diff --git a/lib/components/map/connected-transitive-overlay.js b/lib/components/map/connected-transitive-overlay.js
@@ -7,6 +7,12 @@ import { getTransitiveData } from '../../util/state'
 
 const mapStateToProps = (state, ownProps) => {
   const { labeledModes, styles } = state.otp.config.map.transitive || {}
+
+  // If trip viewer is not active, do not show trip on map
+  if (state.otp.ui.mainPanelContent !== null) {
+    return {tripData: null}
+  }
+
   return {
     labeledModes,
     styles,

diff --git a/lib/components/viewers/viewer-container.js b/lib/components/viewers/viewer-container.js
@@ -19,7 +19,7 @@ class ViewerContainer extends Component {
 
     // check for main panel content
     if (uiState.mainPanelContent === MainPanelContent.ROUTE_VIEWER) {
-      return <RouteViewer />
+      return <RouteViewer hideBackButton />
     }
 
     // check for stop viewer