From 0d6ee860dfc7df09af8eff854704bcc78e25cd29 Mon Sep 17 00:00:00 2001
From: Conor_Mack <cmckeown101@gmail.com>
Date: Wed, 3 Jun 2020 22:05:02 +0100
Subject: [PATCH] Fixes for screen and page props

---
 .../ComponentPropertiesPanel.svelte           | 26 +++++++------------
 .../userInterface/SettingsView.svelte         |  4 ++-
 .../userInterface/propertyCategories.js       |  3 +--
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 62a3c91c3e..690426a034 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -31,7 +31,6 @@
   let selectedCategory = categories[0]
 
   $: components = $store.components
-  $: componentInstance = $store.currentComponentInfo
   $: componentDefinition = $store.components[componentInstance._component]
   $: componentPropDefinition =
     flattenedPanel.find(
@@ -39,40 +38,35 @@
       c => c._component === componentInstance._component
     ) || {}
 
-  $: panelDefinition = componentPropDefinition.properties
-    ? componentPropDefinition.properties[selectedCategory.value]
-    : {}
   
-  let panelDefNew = {}
+  let panelDefinition = {}
 
   $: {
     if(componentPropDefinition.properties) {
       if(selectedCategory.value === "design") {
-        panelDefNew = componentPropDefinition.properties["design"]
+        panelDefinition = componentPropDefinition.properties["design"]
       }else{
         let panelDef = componentPropDefinition.properties["settings"]
         if($store.currentFrontEndType === "page") {
-          panelDefNew = [...page,...panelDef]
+          panelDefinition = [...page,...panelDef]
         }else if($store.currentFrontEndType === "screen" && $store.currentView !== "component") {
-          panelDefNew = [...screen, ...panelDef]
+          panelDefinition = [...screen, ...panelDef]
         }else {
-          panelDefNew = panelDef
+          panelDefinition = panelDef
         }
       }
     }
   }
 
-  let componentInstanceNew = {}
+  let componentInstance = {}
   $: {
      if(($store.currentFrontEndType === "screen" || $store.currentFrontEndType === "page") && $store.currentView !== "component") {
-       componentInstanceNew = {...$store.currentPreviewItem, ...$store.currentComponentInfo}
+       componentInstance = {...$store.currentPreviewItem, ...$store.currentComponentInfo}
      }else {
-       componentInstanceNew = $store.currentComponentInfo
+       componentInstance = $store.currentComponentInfo
      }
   }
 
-  $: console.log("COMP INSTA NEW", componentInstanceNew)
-
   const onStyleChanged = store.setComponentStyle
 
   function onPropChanged(key, value) {
@@ -120,10 +114,10 @@
 
   <div class="component-props-container">
     {#if selectedCategory.value === 'design'}
-      <DesignView panelDefinition={panelDefNew} {componentInstance} {onStyleChanged} />
+      <DesignView {panelDefinition} {componentInstance} {onStyleChanged} />
     {:else if selectedCategory.value === 'settings'}
       <SettingsView
-        panelDefinition={panelDefNew}
+        {panelDefinition}
         {componentInstance}
         {componentDefinition}
         onChange={onPropChanged} />
diff --git a/packages/builder/src/components/userInterface/SettingsView.svelte b/packages/builder/src/components/userInterface/SettingsView.svelte
index 86a70d0a25..133a495198 100644
--- a/packages/builder/src/components/userInterface/SettingsView.svelte
+++ b/packages/builder/src/components/userInterface/SettingsView.svelte
@@ -9,7 +9,9 @@
   export let componentInstance = {}
   export let onChange = () => {}
 
-  let pageScreenProps = ["name", "favicon", "description", "route"]
+  $: console.log("SET COMP INSTANCE",componentInstance)
+
+  let pageScreenProps = ["title","favicon", "description", "route"]
   
   const propExistsOnComponentDef = prop => pageScreenProps.includes(prop) || prop in componentDefinition.props
 
diff --git a/packages/builder/src/components/userInterface/propertyCategories.js b/packages/builder/src/components/userInterface/propertyCategories.js
index 18572ea6ba..7b88547fbb 100644
--- a/packages/builder/src/components/userInterface/propertyCategories.js
+++ b/packages/builder/src/components/userInterface/propertyCategories.js
@@ -5,13 +5,12 @@ import FlatButtonGroup from "./FlatButtonGroup.svelte"
 
 
 export const screen = [
-  { label: "Name", key: "name", control: Input },
   { label: "Description", key: "description", control: Input },
   { label: "Route", key: "route", control: Input },
 ]
 
 export const page = [
-  { label: "Name", key: "name", control: Input },
+  { label: "Title", key: "title", control: Input },
   { label: "Favicon", key: "favicon", control: Input },
 ]