From 5b085d0640ec14ede2a8de0ad7af0229852bdc6d Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 1 Jun 2020 11:04:32 +0100
Subject: [PATCH] few bugfixes

---
 .../builder/src/builderStore/store/index.js     |  2 +-
 .../userInterface/ComponentDropdownMenu.svelte  | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
index 6755bc0a7c..a034114b02 100644
--- a/packages/builder/src/builderStore/store/index.js
+++ b/packages/builder/src/builderStore/store/index.js
@@ -347,7 +347,7 @@ const addChildComponent = store => (componentToAdd, presetName) => {
       return state
     }
 
-    const component = getComponentDefinition(componentToAdd)
+    const component = getComponentDefinition(state, componentToAdd)
 
     const presetProps = presetName ? component.presets[presetName] : {}
 
diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
index e2f8943d9e..5672ea6f4c 100644
--- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
@@ -11,13 +11,15 @@ export let component
 let confirmDeleteDialog
 let dropdownEl
 
-$: dropdown = UIkit.dropdown(dropdownEl, { mode: "click", offset: 0, pos: "bottom-right" });
+$: dropdown = UIkit.dropdown(dropdownEl, { mode: "click", offset: 0, pos: "bottom-right", "delay-hide": 0, animation: false });
+$: dropdown && UIkit.util.on(dropdown, "shown", () => hidden = false)
 $: noChildrenAllowed = !component || getComponentDefinition($store, component._component).children === false
 $: noPaste = !$store.componentToPaste || $store.componentToPaste._id === component._id
 
 const lastPartOfName = c => (c ? last(c._component.split("/")) : "")
-const showDropdown = () => {
-  dropdown.show()
+
+const hideDropdown = () => {
+  dropdown.hide()
 }
 
 </script>
@@ -26,7 +28,7 @@ const showDropdown = () => {
   <button>
     <MoreIcon />
   </button>
-  <ul class="menu" bind:this={dropdownEl} on:mouseout={() => dropdown.hide()} on:click={() => dropdown.hide()}>
+  <ul class="menu"  bind:this={dropdownEl} on:click={hideDropdown}>
     <li on:click={() => confirmDeleteDialog.show()}>Delete</li>
     <li on:click={() => store.moveUpComponent(component)}>Move up</li>
     <li on:click={() => store.moveDownComponent(component)}>Move down</li>
@@ -56,13 +58,18 @@ const showDropdown = () => {
   z-index:9;
 }
 
+.hidden {
+  display: none;
+}
+
 .root button {
   border-style: none;
   border-radius: 2px;
   padding: 5px;
   background: transparent;
   cursor: pointer;
-  color: var(--button-text)
+  color: var(--button-text);
+  outline: none;
 }
 
 .menu {