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

release: v10.2.1

Browse Source 
Merge pull request #7567 from google/rc/v10.2.1
This commit is contained in:
Rachel Fenichel
2023-10-02 13:27:07 -07:00
committed by GitHub
parent 2308da84b5 f380159e35
commit ead46e7403
4 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/field_colour.ts
View File

@@ -262,28 +262,20 @@ export class FieldColour extends Field<string> {
*/
protected updateSize_(margin?: number) {
const constants = this.getConstants();
const xOffset =
margin !== undefined
? margin
: !this.isFullBlockField()
? constants!.FIELD_BORDER_RECT_X_PADDING
: 0;
let totalWidth = xOffset * 2;
let contentWidth = 0;
if (!this.isFullBlockField()) {
contentWidth = constants!.FIELD_COLOUR_DEFAULT_WIDTH;
totalWidth += contentWidth;
}
let totalHeight = constants!.FIELD_TEXT_HEIGHT;
if (!this.isFullBlockField()) {
totalHeight = Math.max(totalHeight, constants!.FIELD_BORDER_RECT_HEIGHT);
let totalWidth;
let totalHeight;
if (this.isFullBlockField()) {
const xOffset = margin ?? 0;
totalWidth = xOffset * 2;
totalHeight = constants!.FIELD_TEXT_HEIGHT;
} else {
totalWidth = constants!.FIELD_COLOUR_DEFAULT_WIDTH;
totalHeight = constants!.FIELD_COLOUR_DEFAULT_HEIGHT;
}
this.size_.height = totalHeight;
this.size_.width = totalWidth;
this.positionTextElement_(xOffset, contentWidth);
this.positionBorderRect_();
}

4
core/renderers/zelos/constants.ts
View File

@@ -217,9 +217,9 @@ export class ConstantProvider extends BaseConstantProvider {
this.FIELD_DROPDOWN_SVG_ARROW_PADDING = this.FIELD_BORDER_RECT_X_PADDING;
this.FIELD_COLOUR_DEFAULT_WIDTH = 2 * this.GRID_UNIT;
this.FIELD_COLOUR_DEFAULT_WIDTH = 6 * this.GRID_UNIT;
this.FIELD_COLOUR_DEFAULT_HEIGHT = 4 * this.GRID_UNIT;
this.FIELD_COLOUR_DEFAULT_HEIGHT = 8 * this.GRID_UNIT;
this.FIELD_CHECKBOX_X_OFFSET = 1 * this.GRID_UNIT;

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "blockly",
"version": "10.2.0",
"version": "10.2.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "blockly",
"version": "10.2.0",
"version": "10.2.1",
"hasInstallScript": true,
"license": "Apache-2.0",
"dependencies": {

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "blockly",
"version": "10.2.0",
"version": "10.2.1",
"description": "Blockly is a library for building visual programming editors.",
"keywords": [
"blockly"