Skip to content
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

a11y: add keyboard shortcut for copy, cut, paste #2694

Merged
merged 9 commits into from
Apr 28, 2020
Merged

a11y: add keyboard shortcut for copy, cut, paste #2694

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
222781d
open node shortcut for visual editor
alanlong9278 Apr 17, 2020
a600e86
refactor
alanlong9278 Apr 17, 2020
3a40f2a
move focus to nexe node
alanlong9278 Apr 17, 2020
1419d78
Merge branch 'master' into julong/keyboardShortCut
alanlong9278 Apr 20, 2020
06875e8
Merge branch 'master' into julong/keyboardShortCut
alanlong9278 Apr 23, 2020
e1b0bfa
Merge branch 'julong/keyboardShortCut' of https://github.com/microsof…
alanlong9278 Apr 23, 2020
24eb763
Merge branch 'master' into julong/keyboardShortCut
alanlong9278 Apr 28, 2020
254a603
delete useless code
alanlong9278 Apr 28, 2020
bcf8b89
fix some bug
alanlong9278 Apr 28, 2020
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
4 changes: 4 additions & 0 deletions Composer/packages/extensions/visual-designer/src/constants/KeyboardCommandTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,15 @@ const KeyboardNodeEditingShortcuts = {
'Windows.Control.c': KeyboardCommandTypes.Node.Copy,
'Windows.Control.X': KeyboardCommandTypes.Node.Cut,
'Windows.Control.x': KeyboardCommandTypes.Node.Cut,
'Windows.Control.V': KeyboardCommandTypes.Node.Paste,
'Windows.Control.v': KeyboardCommandTypes.Node.Paste,

'Mac.Meta.C': KeyboardCommandTypes.Node.Copy,
'Mac.Meta.c': KeyboardCommandTypes.Node.Copy,
'Mac.Meta.X': KeyboardCommandTypes.Node.Cut,
'Mac.Meta.x': KeyboardCommandTypes.Node.Cut,
'Mac.Meta.V': KeyboardCommandTypes.Node.Paste,
'Mac.Meta.v': KeyboardCommandTypes.Node.Paste,
};

const KeyboardOperationEditingShortcuts = {
Expand Down
14 changes: 9 additions & 5 deletions Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,16 @@ export const ObiEditor: FC<ObiEditorProps> = ({
case KeyboardCommandTypes.Node.Cut:
dispatchEvent(NodeEventTypes.CutSelection, { actionIds: getClipboardTargetsFromContext() });
break;
case KeyboardCommandTypes.Node.Paste:
dispatchEvent(NodeEventTypes.AppendSelection, {
target: focusedId,
actions: clipboardActions,
});
case KeyboardCommandTypes.Node.Paste: {
const currentSelectedId = selectionContext.selectedIds[0];
if (currentSelectedId.endsWith('+')) {
dispatchEvent(NodeEventTypes.AppendSelection, {
target: focusedId,
actions: clipboardActions,
});
alanlong9278 marked this conversation as resolved.
Show resolved Hide resolved
}
break;
}
}
break;
case KeyboardPrimaryTypes.Cursor: {
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/extensions/visual-designer/src/editors/editorConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const EditorConfig = {
showEvents: false,
arrowNavigation: true,
tabNavigation: true,
keyboardNodeEditing: false,
keyboardNodeEditing: true,
keyboardOperationEditing: true,
},
};