Refactorings for page and settings props

packages/builder/src/builderStore/store/index.js

@@ -295,6 +295,7 @@ const setCurrentPage = store => pageName => {
 
     state.currentFrontEndType = "page"
     state.currentPageName = pageName
+    state.currentView = "detail"
     state.screens = Array.isArray(current_screens)
       ? current_screens
       : Object.values(current_screens)
@@ -455,6 +456,7 @@ const setScreenType = store => type => {
 
     state.currentComponentInfo = pageOrScreen ? pageOrScreen.props : null
     state.currentPreviewItem = pageOrScreen
+    state.currentView = "detail"
     return state
   })
 }

packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte

@@ -58,25 +58,16 @@
     }
   }
 
-  let componentInstance = {}
+  $: componentInstance = $store.currentView !== "component" ? {...$store.currentPreviewItem, ...$store.currentComponentInfo} : $store.currentComponentInfo
-  $: {
-     if(($store.currentFrontEndType === "screen" || $store.currentFrontEndType === "page") && $store.currentView !== "component") {
-       componentInstance = {...$store.currentPreviewItem, ...$store.currentComponentInfo}
-     }else {
-       componentInstance = $store.currentComponentInfo
-     }
-  }
 
   const onStyleChanged = store.setComponentStyle
 
   function onPropChanged(key, value) {
-   if($store.currentFrontEndType === "page") {
+    if($store.currentView !== "component") {
-      store.editPageOrScreen(key, value)
-   }else if($store.currentFrontEndType === "screen" && $store.currentView !== "component") {
       store.editPageOrScreen(key, value)
-   }else {
+      return
-      store.setComponentProp(key, value)
     }
+    store.setComponentProp(key, value)
   }
 
   function walkProps(component, action) {

packages/builder/src/components/userInterface/FrontendNavigatePane.svelte

@@ -9,7 +9,6 @@
     newScreenPicker.show()
   }
 
-  $: console.log("STORE SCREENS", $store.screens)
   let newScreenPicker
 </script>