From 58871883f95ac8c6b2765fff65d3b0619bec9ba0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sun, 3 May 2020 11:33:20 +0100 Subject: [PATCH] screenslots working again --- .../builder/src/builderStore/store/index.js | 5 +- .../AppPreview/CurrentItemPreview.svelte | 51 ++++--------------- .../AppPreview/iframeTemplate.js | 48 +++++++++++++++++ .../userInterface/pagesParsing/createProps.js | 19 ++----- .../userInterface/temporaryPanelStructure.js | 10 ++++ packages/server/api/controllers/static.js | 27 +++++++--- 6 files changed, 93 insertions(+), 67 deletions(-) create mode 100644 packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js index 1783f5d983..efd079ae5e 100644 --- a/packages/builder/src/builderStore/store/index.js +++ b/packages/builder/src/builderStore/store/index.js @@ -9,7 +9,6 @@ import { import { getExactComponent } from "components/userInterface/pagesParsing/searchComponents" import { rename } from "components/userInterface/pagesParsing/renameScreen" import { - // getNewScreen, createProps, makePropsSafe, getBuiltin, @@ -353,8 +352,10 @@ const addChildComponent = store => (componentToAdd, presetName) => { store.update(state => { function findSlot(component_array) { for (let i = 0; i < component_array.length; i += 1) { - if (component_array[i]._component === "##builtin/screenslot") + if (component_array[i]._component === "##builtin/screenslot") { return true + } + if (component_array[i]._children) findSlot(component_array[i]) } diff --git a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte index 129a76c103..e5f06f9d77 100644 --- a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte +++ b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte @@ -1,8 +1,10 @@