Skip to content

Changed Shortcut format for better accessibility #2465

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
merged 4 commits into from
Jun 5, 2024
Merged

Changed Shortcut format for better accessibility #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cca74b4
Changed shortcut format for better accessibility
Sheikh-JamirAlam Sep 20, 2023
9701191
Merge branch 'develop' into develop-Shortcuts
lindapaiste Sep 22, 2023
9824932
Test snapshot updated
Sheikh-JamirAlam Sep 23, 2023
16c3aa3
Merge branch 'develop' into develop-Shortcuts
raclim Jun 5, 2024
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
6 changes: 2 additions & 4 deletions client/modules/IDE/components/Header/Nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,7 @@ const ProjectMenu = () => {
<NavDropdownMenu id="edit" title={t('Nav.Edit.Title')}>
<NavMenuItem onClick={cmRef.current?.tidyCode}>
{t('Nav.Edit.TidyCode')}
<span className="nav__keyboard-shortcut">
{metaKeyName}+{'\u21E7'}+F
</span>
<span className="nav__keyboard-shortcut">{metaKeyName}+Shift+F</span>
</NavMenuItem>
<NavMenuItem onClick={cmRef.current?.showFind}>
{t('Nav.Edit.Find')}
Expand All @@ -233,7 +231,7 @@ const ProjectMenu = () => {
<NavMenuItem onClick={() => dispatch(stopSketch())}>
{t('Nav.Sketch.Stop')}
<span className="nav__keyboard-shortcut">
{'\u21E7'}+{metaKeyName}+Enter
Shift+{metaKeyName}+Enter
</span>
</NavMenuItem>
</NavDropdownMenu>
Expand Down
10 changes: 5 additions & 5 deletions client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ exports[`Nav renders editor version for desktop 1`] = `
<span
class="nav__keyboard-shortcut"
>
⌃+⇧+F
Ctrl+Shift+F
</span>
</button>
</li>
Expand All @@ -549,7 +549,7 @@ exports[`Nav renders editor version for desktop 1`] = `
<span
class="nav__keyboard-shortcut"
>
⌃+F
Ctrl+F
</span>
</button>
</li>
Expand All @@ -561,7 +561,7 @@ exports[`Nav renders editor version for desktop 1`] = `
<span
class="nav__keyboard-shortcut"
>
⌃+H
Ctrl+H
</span>
</button>
</li>
Expand Down Expand Up @@ -607,7 +607,7 @@ exports[`Nav renders editor version for desktop 1`] = `
<span
class="nav__keyboard-shortcut"
>
⌃+Enter
Ctrl+Enter
</span>
</button>
</li>
Expand All @@ -619,7 +619,7 @@ exports[`Nav renders editor version for desktop 1`] = `
<span
class="nav__keyboard-shortcut"
>
⇧+⌃+Enter
Shift+Ctrl+Enter
</span>
</button>
</li>
Expand Down
12 changes: 6 additions & 6 deletions client/modules/IDE/components/KeyboardShortcutModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function KeyboardShortcutModal() {
<ul className="keyboard-shortcuts__list">
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{metaKeyName} + {'\u21E7'} + F
{metaKeyName} + Shift + F
</span>
<span>{t('KeyboardShortcuts.CodeEditing.Tidy')}</span>
</li>
Expand All @@ -39,7 +39,7 @@ function KeyboardShortcutModal() {
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{metaKeyName} + {'\u21E7'} + G
{metaKeyName} + Shift + G
</span>
<span>
{t('KeyboardShortcuts.CodeEditing.FindPreviousTextMatch')}
Expand Down Expand Up @@ -84,24 +84,24 @@ function KeyboardShortcutModal() {
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{metaKeyName} + {'\u21E7'} + Enter
{metaKeyName} + Shift + Enter
</span>
<span>{t('KeyboardShortcuts.General.StopSketch')}</span>
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{metaKeyName} + {'\u21E7'} + 1
{metaKeyName} + Shift + 1
</span>
<span>{t('KeyboardShortcuts.General.TurnOnAccessibleOutput')}</span>
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{metaKeyName} + {'\u21E7'} + 2
{metaKeyName} + Shift + 2
</span>
<span>{t('KeyboardShortcuts.General.TurnOffAccessibleOutput')}</span>
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">{'\u21E7'} + Right</span>
<span className="keyboard-shortcut__command">Shift + Right</span>
<span>Go to Reference for Selected Item in Hinter</span>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion client/utils/metaKey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ const metaKey = (() => {
return 'Ctrl';
})();

const metaKeyName = metaKey === 'Cmd' ? '⌘' : '⌃';
const metaKeyName = metaKey === 'Cmd' ? '⌘' : 'Ctrl';

export { metaKey, metaKeyName };