From af9824c2ae95851d0efd891d5fa9942048f4a2e0 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 22 Jan 2024 12:35:23 +0000
Subject: [PATCH 1/3] Revert old picker styling from 2.10

---
 packages/bbui/src/Actions/position_dropdown.js | 3 +--
 packages/bbui/src/Form/Core/Multiselect.svelte | 4 ----
 packages/bbui/src/Form/Core/Picker.svelte      | 4 ----
 packages/bbui/src/Form/Core/Select.svelte      | 4 ----
 packages/bbui/src/Popover/Popover.svelte       | 2 --
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index f2018272f6..cc169eac09 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -18,7 +18,6 @@ export default function positionDropdown(element, opts) {
       useAnchorWidth,
       offset = 5,
       customUpdate,
-      offsetBelow,
     } = opts
     if (!anchor) {
       return
@@ -48,7 +47,7 @@ export default function positionDropdown(element, opts) {
         styles.top = anchorBounds.top - elementBounds.height - offset
         styles.maxHeight = maxHeight || 240
       } else {
-        styles.top = anchorBounds.bottom + (offsetBelow || offset)
+        styles.top = anchorBounds.bottom + offset
         styles.maxHeight =
           maxHeight || window.innerHeight - anchorBounds.bottom - 20
       }
diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index d5d6515d2d..2243570cd5 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -15,8 +15,6 @@
   export let autoWidth = false
   export let searchTerm = null
   export let customPopoverHeight
-  export let customPopoverOffsetBelow
-  export let customPopoverMaxHeight
   export let open = false
   export let loading
 
@@ -98,7 +96,5 @@
   {sort}
   {autoWidth}
   {customPopoverHeight}
-  {customPopoverOffsetBelow}
-  {customPopoverMaxHeight}
   {loading}
 />
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 94fbe73cf2..cfb1654403 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -37,8 +37,6 @@
   export let sort = false
   export let searchTerm = null
   export let customPopoverHeight
-  export let customPopoverOffsetBelow
-  export let customPopoverMaxHeight
   export let align = "left"
   export let footer = null
   export let customAnchor = null
@@ -156,9 +154,7 @@
   on:close={() => (open = false)}
   useAnchorWidth={!autoWidth}
   maxWidth={autoWidth ? 400 : null}
-  maxHeight={customPopoverMaxHeight}
   customHeight={customPopoverHeight}
-  offsetBelow={customPopoverOffsetBelow}
 >
   <div
     class="popover-content"
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index be22000f0b..128c523a8f 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -23,8 +23,6 @@
   export let footer = null
   export let open = false
   export let tag = null
-  export let customPopoverOffsetBelow
-  export let customPopoverMaxHeight
   export let searchTerm = null
   export let loading
 
@@ -90,8 +88,6 @@
   {autocomplete}
   {sort}
   {tag}
-  {customPopoverOffsetBelow}
-  {customPopoverMaxHeight}
   isPlaceholder={value == null || value === ""}
   placeholderOption={placeholder === false ? null : placeholder}
   isOptionSelected={option => option === value}
diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte
index a68430e973..5066e3aa05 100644
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@@ -18,7 +18,6 @@
   export let useAnchorWidth = false
   export let dismissible = true
   export let offset = 5
-  export let offsetBelow
   export let customHeight
   export let animate = true
   export let customZindex
@@ -89,7 +88,6 @@
         maxWidth,
         useAnchorWidth,
         offset,
-        offsetBelow,
         customUpdate: handlePostionUpdate,
       }}
       use:clickOutside={{

From a11a99cd09ca2e27dd2e557f1cf922289e1443b8 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 22 Jan 2024 12:45:31 +0000
Subject: [PATCH 2/3] Remove unused customPopoverMaxHeight prop

---
 .../client/src/components/app/forms/RelationshipField.svelte     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index af48183c20..6782bcfca6 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -236,7 +236,6 @@
       bind:searchTerm
       loading={$fetch.loading}
       bind:open
-      customPopoverMaxHeight={400}
     />
   {/if}
 </Field>

From 381e98a2583cf8fe20c5348d00717abd319fd7c7 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 24 Jan 2024 12:50:58 +0000
Subject: [PATCH 3/3] update pro submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index ce7722ed44..0e4c5f95bd 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit ce7722ed4474718596b465dcfd49bef36cab2e42
+Subproject commit 0e4c5f95bda6af126a5cddeef01b8cf551f236be