CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 02:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

release: Merge branch 'develop' into rc/v11.0.0

Browse Source
This commit is contained in:
Christopher Allen
2023-12-23 22:47:47 +00:00
parent 4dcf4064f2 fe0dc8694f
commit 511ee08bb4
3 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/appengine_deploy.yml vendored
View File

@@ -24,7 +24,7 @@ jobs:
npm run prepareDemos
- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: appengine_files
path: _deploy/
@@ -36,13 +36,13 @@ jobs:
needs: prepare
steps:
- name: Download prepared files
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: appengine_files
path: _deploy/
- name: Deploy to App Engine
uses: google-github-actions/deploy-appengine@v1.2.7
uses: google-github-actions/deploy-appengine@v2.0.0
# For parameters see:
# https://github.com/google-github-actions/deploy-appengine#inputs
with:

24
core/flyout_base.ts
View File

@@ -988,16 +988,32 @@ export abstract class Flyout
),
);
this.listeners.push(
browserEvents.bind(root, 'pointerenter', block, block.addSelect),
browserEvents.bind(root, 'pointerenter', block, () => {
if (!this.targetWorkspace.isDragging()) {
block.addSelect();
}
}),
);
this.listeners.push(
browserEvents.bind(root, 'pointerleave', block, block.removeSelect),
browserEvents.bind(root, 'pointerleave', block, () => {
if (!this.targetWorkspace.isDragging()) {
block.removeSelect();
}
}),
);
this.listeners.push(
browserEvents.bind(rect, 'pointerenter', block, block.addSelect),
browserEvents.bind(rect, 'pointerenter', block, () => {
if (!this.targetWorkspace.isDragging()) {
block.addSelect();
}
}),
);
this.listeners.push(
browserEvents.bind(rect, 'pointerleave', block, block.removeSelect),
browserEvents.bind(rect, 'pointerleave', block, () => {
if (!this.targetWorkspace.isDragging()) {
block.removeSelect();
}
}),
);
}

94
package-lock.json generated
View File

@@ -75,9 +75,9 @@
}
},
"node_modules/@blockly/block-test": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-5.0.3.tgz",
"integrity": "sha512-iY8aIh+rTJGZMT/mvEeqjRXAlN7jOso/kQsQ5BrdyH+8UEQ+K4IJdjyFou18ydktnfpeXnBkqw6P4wzc/0jtcA==",
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-5.0.4.tgz",
"integrity": "sha512-3u7z9Xd+W1eCcknqVsmUYnDvS2FIzce2IdGuRC1lst2XIQQ59q2wkUqGg4+Z2Arr3hk/TpIlHn2YLrGPkvqkug==",
"dev": true,
"engines": {
"node": ">=8.17.0"
@@ -87,16 +87,16 @@
}
},
"node_modules/@blockly/dev-tools": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-7.1.3.tgz",
"integrity": "sha512-KdC9ZUwnuzqYNaxAHgj2pFEgtCMhf/w8u5wNHUScReLWXPqc9wQSIUCq6QsDbN1EiT6BaL8dYwqcHoLl+fgUXA==",
"version": "7.1.5",
"resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-7.1.5.tgz",
"integrity": "sha512-eNpi+yknoR2RXzYUOE4Owp5XiY9Qm/FH+BOGhd5WrDyK3/LGQ4Yp0NOBO1tWN+Kbjxe19k6yhA50kX7YkDad/w==",
"dev": true,
"dependencies": {
"@blockly/block-test": "^5.0.3",
"@blockly/theme-dark": "^6.0.4",
"@blockly/theme-deuteranopia": "^5.0.4",
"@blockly/theme-highcontrast": "^5.0.4",
"@blockly/theme-tritanopia": "^5.0.4",
"@blockly/block-test": "^5.0.4",
"@blockly/theme-dark": "^6.0.5",
"@blockly/theme-deuteranopia": "^5.0.5",
"@blockly/theme-highcontrast": "^5.0.5",
"@blockly/theme-tritanopia": "^5.0.5",
"chai": "^4.2.0",
"dat.gui": "^0.7.7",
"lodash.assign": "^4.2.0",
@@ -112,9 +112,9 @@
}
},
"node_modules/@blockly/theme-dark": {
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-6.0.4.tgz",
"integrity": "sha512-G0A+9cMlMiv0/H6/FjQTK+tsqXLmR/FGAfO4gByaTt/ocBmOFeoSlQZdTI23L9ZEvnfO11ZaqH6pqUxY0GSusw==",
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-6.0.5.tgz",
"integrity": "sha512-6vftqOY4ZfwqiAUh2lR12TL16t+7UcmiGVYOBSs4dj1emP89UEO7EMaj0RQ+m0BsV9IHsf2fN6iKZu1gWkmnnA==",
"dev": true,
"engines": {
"node": ">=8.17.0"
@@ -124,9 +124,9 @@
}
},
"node_modules/@blockly/theme-deuteranopia": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-5.0.4.tgz",
"integrity": "sha512-QzJN/2MFtXAdeGFT77fVnQAHYVAn3+HBPI9UPvzhu2l6Tod9v6pnrQ51+8Xiw/wGTklFeZzModJkajCnb6RDCg==",
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-5.0.5.tgz",
"integrity": "sha512-Eqr3JbIch4Uyi3awWXq0vtGy5LL4cknkBH4VjUi73w9Xdiytt1LgoWJD23NBtKcP4M31iDWV+8fdPK4R1tUVcg==",
"dev": true,
"engines": {
"node": ">=8.17.0"
@@ -136,9 +136,9 @@
}
},
"node_modules/@blockly/theme-highcontrast": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-5.0.4.tgz",
"integrity": "sha512-JFSYmEzGeh3KdUqZLScktdFRTxgYoTqLWIeBLOWEU1AFoFMUbKN8G2ChW3Rzq5snbu3pHNBsisswMEp/vuRbUw==",
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-5.0.5.tgz",
"integrity": "sha512-5pi7urLW7UNZhAoDbsb7C0vqFGHEeWi7pp1+OyFSmB+xMNkcVv1Es4X35QQCuUmM6FXfCFeqoDH+N/DYNDHHjg==",
"dev": true,
"engines": {
"node": ">=8.17.0"
@@ -160,9 +160,9 @@
}
},
"node_modules/@blockly/theme-tritanopia": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-5.0.4.tgz",
"integrity": "sha512-ex4WlFLidLNY0Zpvf18ZOnBrQ7HRnupvumpajVmpEVhnm1O7h6H6IdHCgBvL4hFb72q+7/xKxAkxG0+lSfih1w==",
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-5.0.5.tgz",
"integrity": "sha512-vVFMwvdreQoPDR8y6/5ymOoVYK/kE7zcH3Ra0NCEG4w/CBOlEYMYpNnCkpmM8HTjQj4fvDSTwh2HybiHMlfLrQ==",
"dev": true,
"engines": {
"node": ">=8.17.0"
@@ -233,9 +233,9 @@
}
},
"node_modules/@eslint/js": {
"version": "8.55.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
"integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
"version": "8.56.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
"integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -536,14 +536,14 @@
}
},
"node_modules/@microsoft/api-documenter": {
"version": "7.23.12",
"resolved": "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.23.12.tgz",
"integrity": "sha512-ZFQGHNs8fSe3KoSCNa+jt/HLTN8IdTRGd0TZqmSeHpz2cSvUYHJeyQKhv8s7yi2flr1LezBq5/ig65ITZPSSqw==",
"version": "7.23.14",
"resolved": "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.23.14.tgz",
"integrity": "sha512-D9cX3sS/6xN8SFbrR6I1ZTKvGl5UIPFZKYqTLg8YBUKJtFbUSDLrzRLWOcjxwxjnu+gCHAHyaNpG4G//CQivLw==",
"dev": true,
"dependencies": {
"@microsoft/api-extractor-model": "7.28.2",
"@microsoft/api-extractor-model": "7.28.3",
"@microsoft/tsdoc": "0.14.2",
"@rushstack/node-core-library": "3.61.0",
"@rushstack/node-core-library": "3.62.0",
"@rushstack/ts-command-line": "4.17.1",
"colors": "~1.2.1",
"js-yaml": "~3.13.1",
@@ -576,15 +576,15 @@
}
},
"node_modules/@microsoft/api-extractor": {
"version": "7.38.3",
"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.38.3.tgz",
"integrity": "sha512-xt9iYyC5f39281j77JTA9C3ISJpW1XWkCcnw+2vM78CPnro6KhPfwQdPDfwS5JCPNuq0grm8cMdPUOPvrchDWw==",
"version": "7.38.5",
"resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.38.5.tgz",
"integrity": "sha512-c/w2zfqBcBJxaCzpJNvFoouWewcYrUOfeu5ZkWCCIXTF9a/gXM85RGevEzlMAIEGM/kssAAZSXRJIZ3Q5vLFow==",
"dev": true,
"dependencies": {
"@microsoft/api-extractor-model": "7.28.2",
"@microsoft/api-extractor-model": "7.28.3",
"@microsoft/tsdoc": "0.14.2",
"@microsoft/tsdoc-config": "~0.16.1",
"@rushstack/node-core-library": "3.61.0",
"@rushstack/node-core-library": "3.62.0",
"@rushstack/rig-package": "0.5.1",
"@rushstack/ts-command-line": "4.17.1",
"colors": "~1.2.1",
@@ -599,14 +599,14 @@
}
},
"node_modules/@microsoft/api-extractor-model": {
"version": "7.28.2",
"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.28.2.tgz",
"integrity": "sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig==",
"version": "7.28.3",
"resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.28.3.tgz",
"integrity": "sha512-wT/kB2oDbdZXITyDh2SQLzaWwTOFbV326fP0pUwNW00WeliARs0qjmXBWmGWardEzp2U3/axkO3Lboqun6vrig==",
"dev": true,
"dependencies": {
"@microsoft/tsdoc": "0.14.2",
"@microsoft/tsdoc-config": "~0.16.1",
"@rushstack/node-core-library": "3.61.0"
"@rushstack/node-core-library": "3.62.0"
}
},
"node_modules/@microsoft/api-extractor/node_modules/source-map": {
@@ -769,9 +769,9 @@
}
},
"node_modules/@rushstack/node-core-library": {
"version": "3.61.0",
"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.61.0.tgz",
"integrity": "sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ==",
"version": "3.62.0",
"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.62.0.tgz",
"integrity": "sha512-88aJn2h8UpSvdwuDXBv1/v1heM6GnBf3RjEy6ZPP7UnzHNCqOHA2Ut+ScYUbXcqIdfew9JlTAe3g+cnX9xQ/Aw==",
"dev": true,
"dependencies": {
"colors": "~1.2.1",
@@ -3697,15 +3697,15 @@
}
},
"node_modules/eslint": {
"version": "8.55.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
"integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
"version": "8.56.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
"integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.6.1",
"@eslint/eslintrc": "^2.1.4",
"@eslint/js": "8.55.0",
"@eslint/js": "8.56.0",
"@humanwhocodes/config-array": "^0.11.13",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",