Skip to content

Moving blocks bugfixes #684

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

Merged
lawsie merged 2 commits into from
Jun 18, 2026
Merged

Moving blocks bugfixes #684

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
05068ba
Re-add paste to workspace context menu
lawsie Jun 18, 2026
a0aeed4
Fix greyed out blocks on move
lawsie Jun 18, 2026
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
33 changes: 29 additions & 4 deletions main/blocklyinit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2422,6 +2422,7 @@ export function createBlocklyWorkspace() {
(function registerClipboardContextMenuItems() {
const registry = Blockly.ContextMenuRegistry.registry;
const BLOCK = Blockly.ContextMenuRegistry.ScopeType.BLOCK;
const WORKSPACE = Blockly.ContextMenuRegistry.ScopeType.WORKSPACE;

const notInFlyout = (scope) => (scope.block?.isInFlyout ? 'hidden' : 'enabled');
const hasCopiedData = () => !!Blockly.clipboard?.getLastCopiedData?.();
Expand Down Expand Up @@ -2473,6 +2474,30 @@ export function createBlocklyWorkspace() {
},
scopeType: BLOCK,
});

registry.register({
id: 'workspacePaste',
weight: 3,
displayText: () => Blockly.Msg['PASTE_SHORTCUT'] || 'Paste',
preconditionFn: () => (hasCopiedData() ? 'enabled' : 'disabled'),
callback: (scope) => {
const data = Blockly.clipboard?.getLastCopiedData?.();
if (!data) return;
const ws = scope?.workspace ?? mainWs;
if (!ws) return;
pasteAsChildOrHere(null, ws, data);
},
scopeType: WORKSPACE,
});

if (!registry.getItem?.('flock_ws_sep_after_paste')) {
registry.register({
id: 'flock_ws_sep_after_paste',
weight: 3.5,
separator: true,
scopeType: WORKSPACE,
});
}
})();

// Add separators to the block context menu to group related items.
Expand Down Expand Up @@ -2857,7 +2882,8 @@ export function createBlocklyWorkspace() {
const tbRect = blockToolbar.getBoundingClientRect();
let adj = 0;
if (tbRect.left < margin) adj = margin - tbRect.left;
else if (tbRect.right > window.innerWidth - margin) adj = window.innerWidth - margin - tbRect.right;
else if (tbRect.right > window.innerWidth - margin)
adj = window.innerWidth - margin - tbRect.right;
if (adj !== 0) {
blockToolbar.style.left = `${blockCenterX + adj}px`;
blockToolbar.style.setProperty('--caret-shift', `${-adj}px`);
Expand All @@ -2876,7 +2902,7 @@ export function createBlocklyWorkspace() {
} catch {
/* scene not ready */
}
viewBtn.style.display = (!mesh || mesh.name === 'ground') ? 'none' : '';
viewBtn.style.display = !mesh || mesh.name === 'ground' ? 'none' : '';
positionBlockToolbar();
blockToolbar.classList.add('visible');
}
Expand All @@ -2888,8 +2914,7 @@ export function createBlocklyWorkspace() {
blockToolbar.classList.remove('visible');
}

const isToolbarBlock = (block) =>
block && !block.isInFlyout && !block.isShadow();
const isToolbarBlock = (block) => block && !block.isInFlyout && !block.isShadow();

workspace.addChangeListener((e) => {
if (e.type === Blockly.Events.SELECTED) {
Expand Down
12 changes: 6 additions & 6 deletions main/themes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,8 @@ function getThemeBaseStyles(themeName) {
flyoutForegroundColour: "#000000",
flyoutOpacity: 1,
scrollbarColour: "#000000",
insertionMarkerColour: "#FF0000",
insertionMarkerOpacity: 1,
insertionMarkerColour: "#FFFFFF",
insertionMarkerOpacity: 0.3,
markerColour: "#FF0000",
cursorColour: "#FF0000",
},
Expand Down Expand Up @@ -601,8 +601,8 @@ function getThemeBaseStyles(themeName) {
flyoutForegroundColour: "#000000",
flyoutOpacity: 1,
scrollbarColour: "#000000",
insertionMarkerColour: "#FF0000",
insertionMarkerOpacity: 1,
insertionMarkerColour: "#FFFFFF",
insertionMarkerOpacity: 0.3,
markerColour: "#FF0000",
cursorColour: "#FF0000",
},
Expand Down Expand Up @@ -691,8 +691,8 @@ function getThemeBaseStyles(themeName) {
flyoutForegroundColour: "#CFCFCF",
flyoutOpacity: 1,
scrollbarColour: "#E0E0E0",
insertionMarkerColour: "#E0E0E0",
insertionMarkerOpacity: 1,
insertionMarkerColour: "#000000",
insertionMarkerOpacity: 0.3,
markerColour: "#E0E0E0",
cursorColour: "#E0E0E0",
fieldColour: "#1E1E1E",
Expand Down
22 changes: 10 additions & 12 deletions style/blockly.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@
--color-toolbox-focus: #fc3;
}

[data-theme='dark-contrast'] .blocklyInsertionMarker path {
fill: grey !important;
}

[data-theme='low-vision'] .blocklyInsertionMarker path {
fill: #e0e0e0 !important;
}

[data-theme='contrast'] .blocklyInsertionMarker path {
fill: grey !important;
}

/* Only target text inputs with cursor: text */
.blocklyEditableText[style*='cursor: text'] > rect {
fill: var(--color-bg) !important;
Expand Down Expand Up @@ -496,6 +484,16 @@ body[data-theme='low-vision'] {
color: var(--color-menu-item-text) !important;
}

/* Disabled menu items (e.g. Paste with an empty clipboard). Blockly's default
greying targets .blocklyMenuItemDisabled, but the !important colour rule above
keeps the content at full strength — so grey the content explicitly here. */
.blocklyDropDownDiv .blocklyMenuItemDisabled .goog-menuitem-content,
.blocklyWidgetDiv .blocklyMenuItemDisabled .goog-menuitem-content,
.blocklyDropDownDiv .blocklyMenuItemDisabled .blocklyMenuItemContent,
.blocklyWidgetDiv .blocklyMenuItemDisabled .blocklyMenuItemContent {
opacity: 0.45 !important;
}

/* Make blocklyFieldGridContainer the offsetParent for grid items so the
keyboard-scroll logic in GridItem.focus() targets the right element. */
.blocklyFieldGridContainer {
Expand Down
Loading