fix: app crash when switching to 3d

vicb · Jun 1, 2024 · c09e791 · vicb · Jun 2, 2024 · vicb
1 parent 0d737bd
commit c09e791
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/apps/fxc-front/src/app/components/ui/main-menu.ts b/apps/fxc-front/src/app/components/ui/main-menu.ts
@@ -7,7 +7,7 @@ import { when } from 'lit/directives/when.js';
 import { UnsubscribeHandle } from 'micro-typed-events';
 import { connect } from 'pwa-helpers';
 import { requestCurrentPosition } from '../../logic/geolocation';
-import { ParamNames, addUrlParamValues, pushCurrentState } from '../../logic/history';
+import { addUrlParamValues, getSearchParams, ParamNames, pushCurrentState } from '../../logic/history';
 import * as msg from '../../logic/messages';
 import { uploadTracks } from '../../logic/track';
 import { DistanceUnit, formatUnit } from '../../logic/units';
@@ -526,6 +526,9 @@ export class ViewItems extends connect(store)(LitElement) {
   private async handleSwitch() {
     store.dispatch(setApiLoading(true));
     await maybeHideSidePane();
+    if (sel.view2d(store.getState())){
+      window.open(`/3d?${getSearchParams().toString()}`, '_self');
+    }
   }
 
   protected createRenderRoot(): HTMLElement {

diff --git a/apps/fxc-front/src/app/redux/selectors.ts b/apps/fxc-front/src/app/redux/selectors.ts
@@ -14,6 +14,8 @@ export const currentTrack = (state: RootState): RuntimeTrack | undefined =>
 export const currentTrackId = (state: RootState): string | undefined => state.track.currentTrackId;
 export const numTracks = trackAdapterSelector.selectTotal;
 
+export const view2d = (state: RootState):boolean => !state.app.view3d;
+
 export const groupIds = (state: RootState): Set<number> =>
   new Set(state.track.tracks.ids.map((trackId) => extractGroupId(String(trackId))));