From 68ed9e9f320f9fb1002d036f38d59c5fb3f831e6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 9 Dec 2020 11:37:09 +0000 Subject: [PATCH] Fix crash when having a screen selected that was deleted --- packages/builder/src/builderStore/store/frontend.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 7be4f68f25..ea00a461fb 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -86,13 +86,16 @@ export const getFrontendStore = () => { select: async screenId => { let promise store.update(state => { - const screen = get(allScreens).find(screen => screen._id === screenId) + const screens = get(allScreens) + let selectedScreen = screens.find(screen => screen._id === screenId) + if (!selectedScreen) { + selectedScreen = screens[0] + } state.currentFrontEndType = FrontendTypes.SCREEN - state.currentAssetId = screenId + state.currentAssetId = selectedScreen._id state.currentView = "detail" - - promise = store.actions.screens.regenerateCss(screen) - state.selectedComponentId = screen.props._id + promise = store.actions.screens.regenerateCss(selectedScreen) + state.selectedComponentId = selectedScreen.props._id return state }) await promise