Skip to content

Commit f446ad4

Browse files
committed
Merge branch 'master' of github.com:google/blockly-samples into nesky_comment_2
2 parents 2ef38e5 + bb8904e commit f446ad4

File tree

7 files changed

+28
-9
lines changed

7 files changed

+28
-9
lines changed

plugins/field-colour-hsv-sliders/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.0.14](https://github.com/google/blockly-samples/compare/@blockly/[email protected]...@blockly/[email protected]) (2025-01-23)
7+
8+
**Note:** Version bump only for package @blockly/field-colour-hsv-sliders
9+
10+
11+
12+
13+
614
## [5.0.13](https://github.com/google/blockly-samples/compare/@blockly/[email protected]...@blockly/[email protected]) (2024-12-19)
715

816
**Note:** Version bump only for package @blockly/field-colour-hsv-sliders

plugins/field-colour-hsv-sliders/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/field-colour-hsv-sliders/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@blockly/field-colour-hsv-sliders",
3-
"version": "5.0.13",
3+
"version": "5.0.14",
44
"description": "A Blockly colour field using HSV sliders.",
55
"scripts": {
66
"audit:fix": "blockly-scripts auditFix",
@@ -41,7 +41,7 @@
4141
"src"
4242
],
4343
"dependencies": {
44-
"@blockly/field-colour": "^5.0.13"
44+
"@blockly/field-colour": "^5.0.14"
4545
},
4646
"devDependencies": {
4747
"@blockly/dev-scripts": "^4.0.7",

plugins/field-colour/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.0.14](https://github.com/google/blockly-samples/compare/@blockly/[email protected]...@blockly/[email protected]) (2025-01-23)
7+
8+
9+
### Bug Fixes
10+
11+
* Fix bug that prevented keyboard navigation of color swatches. ([#2479](https://github.com/google/blockly-samples/issues/2479)) ([5945e7c](https://github.com/google/blockly-samples/commit/5945e7c0412faedc08c422f9f538ef22193cc659))
12+
13+
14+
15+
16+
617
## [5.0.13](https://github.com/google/blockly-samples/compare/@blockly/[email protected]...@blockly/[email protected]) (2024-12-19)
718

819
**Note:** Version bump only for package @blockly/field-colour

plugins/field-colour/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/field-colour/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@blockly/field-colour",
3-
"version": "5.0.13",
3+
"version": "5.0.14",
44
"description": "A Blockly colour field.",
55
"scripts": {
66
"audit:fix": "blockly-scripts auditFix",

plugins/field-colour/src/field_colour.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ export class FieldColour extends Blockly.Field<string> {
475475
* @param dy Change of y.
476476
*/
477477
private moveHighlightBy(dx: number, dy: number) {
478-
if (!this.highlightedIndex) {
478+
if (this.highlightedIndex === null) {
479479
return;
480480
}
481481

@@ -564,7 +564,7 @@ export class FieldColour extends Blockly.Field<string> {
564564
* @returns Highlighted item (null if none).
565565
*/
566566
private getHighlighted(): HTMLElement | null {
567-
if (!this.highlightedIndex) {
567+
if (this.highlightedIndex === null) {
568568
return null;
569569
}
570570

0 commit comments

Comments
 (0)