diff --git a/lerna.json b/lerna.json index 0abab04b41..0f0631f77f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.2", + "version": "2.5.6-alpha.3", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index cf63eaf3e0..92e0847b1c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.2", + "version": "2.5.6-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.2", + "@budibase/types": "2.5.6-alpha.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7fb0466dcd..4945807bd3 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.2", + "version": "2.5.6-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.2", - "@budibase/string-templates": "2.5.6-alpha.2", + "@budibase/shared-core": "2.5.6-alpha.3", + "@budibase/string-templates": "2.5.6-alpha.3", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js index ecbb5747c4..2cb681670b 100644 --- a/packages/bbui/src/Actions/position_dropdown.js +++ b/packages/bbui/src/Actions/position_dropdown.js @@ -10,7 +10,14 @@ export default function positionDropdown(element, opts) { // Updates the position of the dropdown const updatePosition = opts => { - const { anchor, align, maxWidth, useAnchorWidth, offset = 5 } = opts + const { + anchor, + align, + maxHeight, + maxWidth, + useAnchorWidth, + offset = 5, + } = opts if (!anchor) { return } @@ -31,10 +38,11 @@ export default function positionDropdown(element, opts) { styles.top = anchorBounds.top } else if (window.innerHeight - anchorBounds.bottom < 100) { styles.top = anchorBounds.top - elementBounds.height - offset - styles.maxHeight = 240 + styles.maxHeight = maxHeight || 240 } else { styles.top = anchorBounds.bottom + offset - styles.maxHeight = window.innerHeight - anchorBounds.bottom - 20 + styles.maxHeight = + maxHeight || window.innerHeight - anchorBounds.bottom - 20 } // Determine horizontal styles diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index 69da250a2b..9f951a6a7e 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -14,6 +14,7 @@ export let align = "right" export let portalTarget export let maxWidth + export let maxHeight export let open = false export let useAnchorWidth = false export let dismissible = true @@ -65,6 +66,7 @@ use:positionDropdown={{ anchor, align, + maxHeight, maxWidth, useAnchorWidth, offset, diff --git a/packages/builder/package.json b/packages/builder/package.json index 0483aef7e2..0570682929 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.2", + "version": "2.5.6-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.2", - "@budibase/client": "2.5.6-alpha.2", - "@budibase/frontend-core": "2.5.6-alpha.2", - "@budibase/shared-core": "2.5.6-alpha.2", - "@budibase/string-templates": "2.5.6-alpha.2", + "@budibase/bbui": "2.5.6-alpha.3", + "@budibase/client": "2.5.6-alpha.3", + "@budibase/frontend-core": "2.5.6-alpha.3", + "@budibase/shared-core": "2.5.6-alpha.3", + "@budibase/string-templates": "2.5.6-alpha.3", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte index 75c53f0ca5..274565b255 100644 --- a/packages/builder/src/components/common/HelpMenu.svelte +++ b/packages/builder/src/components/common/HelpMenu.svelte @@ -13,12 +13,7 @@