MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into slim-down-integration-tests

This commit is contained in:
Sam Rose 2024-04-11 16:23:00 +01:00 committed by GitHub
parent 9b4cca88e5 a1d8a803e8
commit c5edfea51b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/budibase_ci.yml vendored
View File

@ -64,10 +64,11 @@ jobs:
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
# Run build all the projects # Run build all the projects
- name: Build - name: Build OSS
run: | run: yarn build:oss
yarn build:oss - name: Build account portal
yarn build:account-portal run: yarn build:account-portal
if: inputs.run_as_oss != true
# Check the types of the projects built via esbuild # Check the types of the projects built via esbuild
- name: Check types - name: Check types
run: | run: |

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.23.3", "version": "2.23.4",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

6
packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
View File

@ -137,8 +137,12 @@
const activeTag = document.activeElement?.tagName.toLowerCase() const activeTag = document.activeElement?.tagName.toLowerCase()
const inCodeEditor = const inCodeEditor =
document.activeElement?.classList?.contains("cm-content") document.activeElement?.classList?.contains("cm-content")
const inPosthogSurvey =
document.activeElement?.classList?.[0]?.startsWith("PostHogSurvey")
if ( if (
(inCodeEditor || ["input", "textarea"].indexOf(activeTag) !== -1) && (inCodeEditor ||
inPosthogSurvey ||
["input", "textarea"].indexOf(activeTag) !== -1) &&
e.key !== "Escape" e.key !== "Escape"
) { ) {
return return