Skip to content

Fix conflict when using field-grid-dropdown with field-colour #2595

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix conflict when using field-grid-dropdown with field-colour #2595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d75a604
refactor: FieldGridDropdown registration
berkerozer Sep 6, 2025
c8a9d51
refactor:register field-grid-dropdown safely to prevent duplicate reg…
berkerozer Sep 6, 2025
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
2 changes: 2 additions & 0 deletions plugins/field-colour/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

import {registerFieldGridDropdown} from '@blockly/field-grid-dropdown';
registerFieldGridDropdown();
export * from './field_colour';

import * as colourPicker from './blocks/colourPicker';
Expand Down
9 changes: 7 additions & 2 deletions plugins/field-grid-dropdown/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ in Blockly core. The config object bag passed into this field accepts additional

```js
import * as Blockly from 'blockly';
import {FieldGridDropdown} from '@blockly/field-grid-dropdown';
import {
FieldGridDropdown,
registerFieldGridDropdown,
} from '@blockly/field-grid-dropdown';
registerFieldGridDropdown();
Blockly.Blocks['test_field_grid_dropdown'] = {
init: function () {
this.appendDummyInput()
Expand All @@ -62,7 +66,8 @@ Blockly.Blocks['test_field_grid_dropdown'] = {

```js
import * as Blockly from 'blockly';
import '@blockly/field-grid-dropdown';
import {registerFieldGridDropdown} from '@blockly/field-grid-dropdown';
registerFieldGridDropdown();
Blockly.defineBlocksWithJsonArray([
{
type: 'test_field_grid_dropdown',
Expand Down
5 changes: 4 additions & 1 deletion plugins/field-grid-dropdown/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,10 @@ export class FieldGridDropdown extends Blockly.FieldDropdown {
}
}

Blockly.fieldRegistry.register('field_grid_dropdown', FieldGridDropdown);
/** Register the field and any dependencies. */
export function registerFieldGridDropdown() {
Blockly.fieldRegistry.register('field_grid_dropdown', FieldGridDropdown);
}

/**
* CSS for grid field.
Expand Down