Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump pxt-core and some other changes and fixes #1043

Merged
merged 8 commits into from
Feb 2, 2024
Merged

Bump pxt-core and some other changes and fixes #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b19bd1
fix-info-method-for-ambient-ref-mods
THEb0nny Nov 12, 2023
08dd250
bump-pxt-9.3.5
THEb0nny Nov 12, 2023
695551f
bump-pxt-core-and-common-packages
THEb0nny Dec 13, 2023
ea59c49
height-of-field-motors-btn-is-same-for-everyone
THEb0nny Dec 13, 2023
3a59919
typescipt-bump-4.8.3
THEb0nny Dec 21, 2023
809919e
bump-pxt-9.3.10
THEb0nny Jan 5, 2024
5a15af0
bump-pxt-9.3.11
THEb0nny Jan 7, 2024
5e4ad3f
pxt-core-and-common-packages-bump
THEb0nny Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions fieldeditors/field_motors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export class FieldMotors extends pxtblockly.FieldImages implements Blockly.Field
// Store a data attribute on all possible click targets so we can match it to the icon.
button.setAttribute('data-value', value);
buttonImg.setAttribute('data-value', value);
buttonImg.style.height = 'auto';
button.appendChild(buttonImg);
if (this.addLabel_) {
const buttonText = this.createTextNode_(content.alt);
Expand All @@ -106,6 +107,8 @@ export class FieldMotors extends pxtblockly.FieldImages implements Blockly.Field
contentDiv.appendChild(button);
}
contentDiv.style.width = (this as any).width_ + 'px';
contentDiv.style.display = 'flex';
contentDiv.style.alignItems = 'stretch';
dropdownDiv.appendChild(contentDiv);

Blockly.DropDownDiv.setColour(sourceBlock.getColour(), sourceBlock.getColourTertiary());
Expand Down
2 changes: 1 addition & 1 deletion libs/color-sensor/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ namespace sensors {
"brown"][this._query()[0]]];
case ColorSensorMode.AmbientLightIntensity:
case ColorSensorMode.ReflectedLightIntensity:
return [`${this._query()}%`];
return [`${this._query()[0]}%`];
case ColorSensorMode.RgbRaw:
return this._query().map(number => number.toString());
default:
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"react": "16.8.3",
"react-dom": "16.11.0",
"semantic-ui-less": "2.4.1",
"typescript": "^4.2.3"
"typescript": "4.8.3"
},
"dependencies": {
"pxt-common-packages": "11.1.2",
"pxt-core": "9.1.23"
"pxt-common-packages": "11.1.6",
"pxt-core": "9.3.13"
},
"scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis"
Expand Down
Loading