Skip to content

feat: auto confirm a move on subsequent action #437

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

Closed
microbit-matt-hillsdon wants to merge 1 commit into from
Closed

feat: auto confirm a move on subsequent action #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 37 additions & 0 deletions src/actions/move.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ const createSerializedKey = ShortcutRegistry.registry.createSerializedKey.bind(
* Actions for moving blocks with keyboard shortcuts.
*/
export class MoveActions {
/**
* Stored to enable us to restore monkey patch.
*/
private oldShortcutRegistryOnKeyDown:
| typeof ShortcutRegistry.registry.onKeyDown
| null = null;

constructor(private mover: Mover) {}

private shortcuts: ShortcutRegistry.KeyboardShortcut[] = [
Expand Down Expand Up @@ -154,6 +161,32 @@ export class MoveActions {
for (const menuItem of this.menuItems) {
ContextMenuRegistry.registry.register(menuItem);
}

// Monkey patch shortcut registry to finish any in-progress move for all
// non-move-related actions.
this.oldShortcutRegistryOnKeyDown = ShortcutRegistry.registry.onKeyDown;
ShortcutRegistry.registry.onKeyDown = (workspace, e) => {
if (!this.oldShortcutRegistryOnKeyDown) return false;
// @ts-expect-error private method
const key = ShortcutRegistry.registry.serializeKeyEvent(e);
const moveShortcutNames =
ShortcutRegistry.registry.getShortcutNamesByKeyCode(key);
if (
!this.shortcuts.some((shortcut) =>
moveShortcutNames?.includes(shortcut.name),
)
) {
if (this.mover.isMoving(workspace)) {
this.mover.finishMove(workspace);
}
}

return this.oldShortcutRegistryOnKeyDown.call(
ShortcutRegistry.registry,
workspace,
e,
);
};
}

/**
Expand All @@ -166,5 +199,9 @@ export class MoveActions {
for (const menuItem of this.menuItems) {
ContextMenuRegistry.registry.unregister(menuItem.id);
}

if (this.oldShortcutRegistryOnKeyDown) {
ShortcutRegistry.registry.onKeyDown = this.oldShortcutRegistryOnKeyDown;
}
}
}