Skip to content

fix: Make navigation direction align with arrow keys in RTL. #460

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
gonfunko merged 1 commit into from
Apr 22, 2025
Merged

fix: Make navigation direction align with arrow keys in RTL. #460

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
124 changes: 70 additions & 54 deletions src/actions/arrow_navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,70 @@ export class ArrowNavigation {
* Adds all arrow key navigation shortcuts to the registry.
*/
install() {
const navigateIn = (
workspace: WorkspaceSvg,
e: Event,
shortcut: ShortcutRegistry.KeyboardShortcut,
): boolean => {
const toolbox = workspace.getToolbox() as Toolbox;
let isHandled = false;
switch (this.navigation.getState(workspace)) {
case Constants.STATE.WORKSPACE:
isHandled = this.fieldShortcutHandler(workspace, shortcut);
if (!isHandled && workspace) {
if (
!this.navigation.defaultWorkspaceCursorPositionIfNeeded(workspace)
) {
workspace.getCursor()?.in();
}
isHandled = true;
}
return isHandled;
case Constants.STATE.TOOLBOX:
isHandled =
toolbox && typeof toolbox.onShortcut === 'function'
? toolbox.onShortcut(shortcut)
: false;
if (!isHandled) {
this.navigation.focusFlyout(workspace);
}
return true;
default:
return false;
}
};

const navigateOut = (
workspace: WorkspaceSvg,
e: Event,
shortcut: ShortcutRegistry.KeyboardShortcut,
): boolean => {
const toolbox = workspace.getToolbox() as Toolbox;
let isHandled = false;
switch (this.navigation.getState(workspace)) {
case Constants.STATE.WORKSPACE:
isHandled = this.fieldShortcutHandler(workspace, shortcut);
if (!isHandled && workspace) {
if (
!this.navigation.defaultWorkspaceCursorPositionIfNeeded(workspace)
) {
workspace.getCursor()?.out();
}
isHandled = true;
}
return isHandled;
case Constants.STATE.FLYOUT:
this.navigation.focusToolbox(workspace);
return true;
case Constants.STATE.TOOLBOX:
return toolbox && typeof toolbox.onShortcut === 'function'
? toolbox.onShortcut(shortcut)
: false;
default:
return false;
}
};

const shortcuts: {
[name: string]: ShortcutRegistry.KeyboardShortcut;
} = {
Expand All @@ -56,34 +120,9 @@ export class ArrowNavigation {
preconditionFn: (workspace) =>
this.navigation.canCurrentlyNavigate(workspace),
callback: (workspace, e, shortcut) => {
const toolbox = workspace.getToolbox() as Toolbox;
let isHandled = false;
switch (this.navigation.getState(workspace)) {
case Constants.STATE.WORKSPACE:
isHandled = this.fieldShortcutHandler(workspace, shortcut);
if (!isHandled && workspace) {
if (
!this.navigation.defaultWorkspaceCursorPositionIfNeeded(
workspace,
)
) {
workspace.getCursor()?.in();
}
isHandled = true;
}
return isHandled;
case Constants.STATE.TOOLBOX:
isHandled =
toolbox && typeof toolbox.onShortcut === 'function'
? toolbox.onShortcut(shortcut)
: false;
if (!isHandled) {
this.navigation.focusFlyout(workspace);
}
return true;
default:
return false;
}
return workspace.RTL
? navigateOut(workspace, e, shortcut)
: navigateIn(workspace, e, shortcut);
},
keyCodes: [KeyCodes.RIGHT],
},
Expand All @@ -94,32 +133,9 @@ export class ArrowNavigation {
preconditionFn: (workspace) =>
this.navigation.canCurrentlyNavigate(workspace),
callback: (workspace, e, shortcut) => {
const toolbox = workspace.getToolbox() as Toolbox;
let isHandled = false;
switch (this.navigation.getState(workspace)) {
case Constants.STATE.WORKSPACE:
isHandled = this.fieldShortcutHandler(workspace, shortcut);
if (!isHandled && workspace) {
if (
!this.navigation.defaultWorkspaceCursorPositionIfNeeded(
workspace,
)
) {
workspace.getCursor()?.out();
}
isHandled = true;
}
return isHandled;
case Constants.STATE.FLYOUT:
this.navigation.focusToolbox(workspace);
return true;
case Constants.STATE.TOOLBOX:
return toolbox && typeof toolbox.onShortcut === 'function'
? toolbox.onShortcut(shortcut)
: false;
default:
return false;
}
return workspace.RTL
? navigateIn(workspace, e, shortcut)
: navigateOut(workspace, e, shortcut);
},
keyCodes: [KeyCodes.LEFT],
},
Expand Down
Loading