From 2aca93ecf6a8c29d2a6dc2b5ccb30b455a5d01aa Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 14 Sep 2020 11:12:44 +0100
Subject: [PATCH 1/5] Event Modal - set padding to zero

---
 packages/builder/package.json                                   | 2 +-
 .../userInterface/EventsEditor/EventPropertyControl.svelte      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index 599baf4536..e8ac78617f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.32.0",
+    "@budibase/bbui": "^1.32.2",
     "@budibase/client": "^0.1.19",
     "@budibase/colorpicker": "^1.0.1",
     "@sentry/browser": "5.19.1",
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
index c27d1aaa3d..52986b0efd 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte
@@ -12,7 +12,7 @@
 
 <Button secondary small on:click={eventsModal.show}>Define Actions</Button>
 
-<Modal bind:this={eventsModal} maxWidth="100vw" hideCloseButton>
+<Modal bind:this={eventsModal} maxWidth="100vw" hideCloseButton padding="0">
   <EventEditorModal
     event={value}
     eventType={name}

From 7fe7c9b2869c40000ad95dcd1e307bfaebb9b252 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 14 Sep 2020 12:32:10 +0100
Subject: [PATCH 2/5] fix: re-exposing store in component api, as form depends
 on it

---
 packages/client/src/state/bbComponentApi.js | 1 +
 packages/client/src/state/store.js          | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/packages/client/src/state/bbComponentApi.js b/packages/client/src/state/bbComponentApi.js
index d055d4a05b..99503bb2b9 100644
--- a/packages/client/src/state/bbComponentApi.js
+++ b/packages/client/src/state/bbComponentApi.js
@@ -47,6 +47,7 @@ export const bbFactory = ({
       setBinding: setBindableComponentProp(treeNode),
       api,
       parent,
+      store: store.getStore(treeNode.contextStoreKey),
       // these parameters are populated by screenRouter
       routeParams: () => store.getState()["##routeParams"],
     }
diff --git a/packages/client/src/state/store.js b/packages/client/src/state/store.js
index 5b1ac54375..7895700cd0 100644
--- a/packages/client/src/state/store.js
+++ b/packages/client/src/state/store.js
@@ -94,6 +94,9 @@ const set = (value, dataProviderId, childIndex) =>
 const getState = contextStoreKey =>
   contextStoreKey ? contextStores[contextStoreKey].state : rootState
 
+const getStore = contextStoreKey =>
+  contextStoreKey ? contextStores[contextStoreKey] : rootStore
+
 export default {
   subscribe,
   update,
@@ -101,4 +104,5 @@ export default {
   getState,
   create,
   contextStoreKey,
+  getStore,
 }

From ade5527bd7f48e06dc6c83492675da778cee38c5 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 14 Sep 2020 12:32:44 +0100
Subject: [PATCH 3/5] NavigateTo action: use DataList, so URLs are configurable

---
 .../userInterface/EventsEditor/actions/NavigateTo.svelte    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte
index f3ab468ccc..659fb954eb 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/NavigateTo.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Select, Label } from "@budibase/bbui"
+  import { DataList, Label } from "@budibase/bbui"
   import { store } from "builderStore"
 
   export let parameters
@@ -7,12 +7,12 @@
 
 <div class="root">
   <Label size="m" color="dark">Screen</Label>
-  <Select secondary bind:value={parameters.url}>
+  <DataList secondary bind:value={parameters.url}>
     <option value="" />
     {#each $store.screens as screen}
       <option value={screen.route}>{screen.props._instanceName}</option>
     {/each}
-  </Select>
+  </DataList>
 </div>
 
 <style>

From 4d56b4873c77fb4b95d4d8a9d1c4cb4ece5a8b7a Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 14 Sep 2020 12:34:46 +0100
Subject: [PATCH 4/5] updated BBUI

---
 packages/builder/package.json | 2 +-
 packages/builder/yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index e8ac78617f..132b7b7782 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.32.2",
+    "@budibase/bbui": "^1.33.0",
     "@budibase/client": "^0.1.19",
     "@budibase/colorpicker": "^1.0.1",
     "@sentry/browser": "5.19.1",
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 77a3a8c356..5b23480449 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -688,9 +688,10 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.32.0":
-  version "1.32.0"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.32.0.tgz#4b099e51cf8aebfc963a763bb9687994a2ee26a8"
+"@budibase/bbui@^1.33.0":
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.33.0.tgz#216b24dd815f45880e9795e66b04848329b0390f"
+  integrity sha512-Rrt5eLbea014TIfAbT40kP0D0AWNUi8Q0kDr3UZO6Aq4UXgjc0f53ZuJ7Kb66YRDWrqiucjf1FtvOUs3/YaD6g==
   dependencies:
     sirv-cli "^0.4.6"
     svelte-flatpickr "^2.4.0"

From cacd735961d818a70c9995472faeb01236ba7088 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 14 Sep 2020 12:46:49 +0100
Subject: [PATCH 5/5] fix: override client context store on create

---
 packages/client/src/state/store.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/state/store.js b/packages/client/src/state/store.js
index 7895700cd0..6464589b03 100644
--- a/packages/client/src/state/store.js
+++ b/packages/client/src/state/store.js
@@ -11,6 +11,7 @@ const contextStoreKey = (dataProviderId, childIndex) =>
   `${dataProviderId}${childIndex >= 0 ? ":" + childIndex : ""}`
 
 // creates a store for a datacontext (e.g. each item in a list component)
+// overrides store if already exists
 const create = (data, dataProviderId, childIndex, parentContextStoreId) => {
   const key = contextStoreKey(dataProviderId, childIndex)
   const state = { data }
@@ -22,14 +23,13 @@ const create = (data, dataProviderId, childIndex, parentContextStoreId) => {
     ? contextStores[parentContextStoreId].state
     : rootState
 
-  if (!contextStores[key]) {
-    contextStores[key] = {
-      store: writable(state),
-      subscriberCount: 0,
-      state,
-      parentContextStoreId,
-    }
+  contextStores[key] = {
+    store: writable(state),
+    subscriberCount: 0,
+    state,
+    parentContextStoreId,
   }
+
   return key
 }